modify: 코드래빗 리뷰 반영

유저 리더보드 조회시 GROUP BY절에 user.email 추가
타입 안정성 강화: DTO에 유효성 검증 추가 및 관련 코드 수정에 따른 테스트 케이스 삭제

Author: ooheunda

src/repositories/__test__/leaderboard.repo.test.ts

@@ -194,7 +194,7 @@ describe('LeaderboardRepository', () => {
 
       await repo.getLeaderboard('user', 'viewCount', 30, 10);
 
-      expect(mockPool.query).toHaveBeenCalledWith(expect.stringContaining('GROUP BY u.id'), expect.anything());
+      expect(mockPool.query).toHaveBeenCalledWith(expect.stringContaining('GROUP BY u.id, u.email'), expect.anything());
     });
 
     it('post 타입에는 GROUP BY 절이 포함되지 않아야 한다', async () => {
@@ -225,33 +225,6 @@ describe('LeaderboardRepository', () => {
       );
     });
 
-    it('유효하지 않은 sort 값이 전달되면 기본값(view_diff)을 사용해야 한다', async () => {
-      const mockResult = [{ view_diff: 10 }];
-
-      mockPool.query.mockResolvedValue({
-        rows: mockResult,
-        rowCount: mockResult.length,
-      } as unknown as QueryResult);
-
-      await repo.getLeaderboard('user', 'invalidSort', 30, 10);
-
-      expect(mockPool.query).toHaveBeenCalledWith(expect.stringContaining('view_diff DESC'), expect.anything());
-    });
-
-    it('유효하지 않은 type 값이 전달되면 기본값(user)을 사용해야 한다', async () => {
-      const mockResult = [{ view_diff: 10 }];
-
-      mockPool.query.mockResolvedValue({
-        rows: mockResult,
-        rowCount: mockResult.length,
-      } as unknown as QueryResult);
-
-      const result = await repo.getLeaderboard('invalidType', 'viewCount', 30, 10);
-
-      expect(result).toEqual(mockResult);
-      expect(mockPool.query).toHaveBeenCalledWith(expect.stringContaining('FROM users_user u'), expect.anything());
-    });
-
     it('데이터가 없는 경우 빈 배열을 반환해야 한다', async () => {
       mockPool.query.mockResolvedValue({
         rows: [],

src/repositories/leaderboard.repository.ts

@@ -1,11 +1,12 @@
 import { Pool } from 'pg';
 import logger from '@/configs/logger.config';
 import { DBError } from '@/exception';
+import { LeaderboardSortType, LeaderboardType } from '@/types/dto/requests/getLeaderboardQuery.type';
 
 export class LeaderboardRepository {
   constructor(private pool: Pool) {}
 
-  async getLeaderboard(type: string, sort: string, dateRange: number, limit: number) {
+  async getLeaderboard(type: LeaderboardType, sort: LeaderboardSortType, dateRange: number, limit: number) {
     try {
       const cteQuery = this.buildLeaderboardCteQuery();
       const selectQuery = this.buildLeaderboardSelectQuery(type);
@@ -49,7 +50,7 @@ export class LeaderboardRepository {
   }
 
   // 메인 연산을 포함하는 SELECT 절 빌드
-  private buildLeaderboardSelectQuery(type: string) {
+  private buildLeaderboardSelectQuery(type: LeaderboardType) {
     if (type === 'post') {
       return `
         SELECT
@@ -98,7 +99,7 @@ export class LeaderboardRepository {
   }
 
   // CTE 테이블 조인 및 WHERE 절을 포함하는 FROM 절 빌드
-  private buildLeaderboardFromClause(type: string) {
+  private buildLeaderboardFromClause(type: LeaderboardType) {
     if (type === 'post') {
       return `
         FROM posts_post p
@@ -118,7 +119,7 @@ export class LeaderboardRepository {
   }
 
   // sort 매개변수를 정렬 컬럼으로 매핑
-  private mapSortColByType(sort: string, type: string) {
+  private mapSortColByType(sort: LeaderboardSortType, type: LeaderboardType) {
     let sortCol = '';
 
     switch (sort) {
@@ -138,15 +139,15 @@ export class LeaderboardRepository {
   }
 
   // 매핑된 정렬 컬럼으로 ORDER BY 절 및 LIMIT 절 빌드
-  private buildLeaderboardGroupOrderClause(sortCol: string, type: string) {
+  private buildLeaderboardGroupOrderClause(sortCol: string, type: LeaderboardType) {
     if (type === 'post') {
       return `
         ORDER BY ${sortCol} DESC
         LIMIT $2;
       `;
     } else {
       return `
-        GROUP BY u.id
+        GROUP BY u.id, u.email
         ORDER BY ${sortCol} DESC
         LIMIT $2;
       `;

src/services/leaderboard.service.ts

@@ -1,5 +1,6 @@
 import logger from '@/configs/logger.config';
 import { LeaderboardRepository } from '@/repositories/leaderboard.repository';
+import { LeaderboardSortType, LeaderboardType } from '@/types/dto/requests/getLeaderboardQuery.type';
 import {
   LeaderboardPostType,
   LeaderboardResponseData,
@@ -10,8 +11,8 @@ export class LeaderboardService {
   constructor(private leaderboardRepo: LeaderboardRepository) {}
 
   async getLeaderboard(
-    type: string = 'user',
-    sort: string = 'viewCount',
+    type: LeaderboardType = 'user',
+    sort: LeaderboardSortType = 'viewCount',
     dateRange: number = 30,
     limit: number = 10,
   ): Promise<LeaderboardResponseData> {
@@ -26,7 +27,10 @@ export class LeaderboardService {
     }
   }
 
-  private mapRawResultToLeaderboardResponseData(rawResult: unknown[], type: string): LeaderboardResponseData {
+  private mapRawResultToLeaderboardResponseData(
+    rawResult: RawPostResult[] | RawUserResult[],
+    type: LeaderboardType,
+  ): LeaderboardResponseData {
     const result: LeaderboardResponseData = { posts: null, users: null };
 
     if (type === 'post') {
@@ -60,7 +64,6 @@ export class LeaderboardService {
     return result;
   }
 }
-
 interface RawPostResult {
   id: number;
   title: string;

src/types/dto/requests/getLeaderboardQuery.type.ts

@@ -1,5 +1,5 @@
 import { Transform } from 'class-transformer';
-import { IsNumber, IsOptional, IsString, Max, Min } from 'class-validator';
+import { IsEnum, IsNumber, IsOptional, Max, Min } from 'class-validator';
 
 /**
  * @swagger
@@ -68,11 +68,13 @@ export interface GetLeaderboardQuery {
  */
 export class GetLeaderboardQueryDto {
   @IsOptional()
-  @IsString()
+  @IsEnum(['user', 'post'])
+  @Transform(({ value }) => (value === '' ? 'user' : value))
   type?: LeaderboardType;
 
   @IsOptional()
-  @IsString()
+  @IsEnum(['viewCount', 'likeCount', 'postCount'])
+  @Transform(({ value }) => (value === '' ? 'viewCount' : value))
   sort?: LeaderboardSortType;
 
   @IsOptional()