Merge pull request #88 from Together42/hotfix-rotation

hotfix: fix month/year validation

Author: seo-wo

Diff for: src/rotation/dto/find-rotation-query.dto.ts

@@ -1,20 +1,29 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsNumber, IsOptional } from 'class-validator';
+import { Transform } from 'class-transformer';
+import { IsNumber, IsOptional, Max, Min } from 'class-validator';
 
 export class FindRotationQueryDto {
+  @Transform((params) => +params.value)
   @ApiProperty({
+    required: false,
     example: 1,
     description: '로테이션 정보를 찾는 기준이 되는 월. 기본값은 다음 달 월입니다.',
   })
   @IsOptional()
   @IsNumber()
+  @Min(1)
+  @Max(12)
   month?: number;
 
+  @Transform((params) => +params.value)
   @ApiProperty({
+    required: false,
     example: 2024,
     description: '로테이션 정보를 찾는 기준이 되는 연도. 기본값은 다음 달 연도입니다.',
   })
   @IsOptional()
   @IsNumber()
+  @Min(2020)
+  @Max(2100)
   year?: number;
 }

Diff for: src/rotation/pipe/month-validation.pipe.ts

@@ -41,8 +41,8 @@ import {
 } from 'src/common/dto/error-response.dto';
 import { FindTodayRotationDto } from './dto/find-today-rotation.dto';
 import { FindRegistrationDto } from './dto/find-registration.dto';
-import { MonthValidationPipe } from './pipe/month-validation.pipe';
 import { FindAllRotationDto } from './dto/find-all-rotation.dto';
+import { FindRotationQueryDto } from './dto/find-rotation-query.dto';
 
 @Controller('rotations')
 @ApiTags('rotations')
@@ -156,9 +156,9 @@ export class RotationsController {
   @ApiBadRequestResponse({ type: BadRequestExceptionBody })
   @ApiInternalServerErrorResponse({ type: InternalServerExceptionBody })
   findAllRotation(
-    @Query('year') year: number,
-    @Query('month', new MonthValidationPipe()) month: number,
+    @Query() findRotationQueryDto: FindRotationQueryDto,
   ): Promise<FindAllRotationDto[]> {
+    const { year, month } = findRotationQueryDto;
     return this.rotationsService.findAllRotation(year, month);
   }
 

Diff for: src/rotation/rotations.controller.ts

@@ -352,25 +352,23 @@ export class RotationsService {
    * 만약 parameter로 month와 year가 들어오면, 해당 스코프에 맞는 레코드를 반환.
    */
   async findAllRotation(year?: number, month?: number): Promise<FindAllRotationDto[]> {
-    let records: Promise<RotationEntity[]>;
-
-    if (year && month) {
-      records = this.rotationRepository.find({
-        where: {
-          year: year,
-          month: month,
+    const records = await this.rotationRepository.find({
+      where: {
+        year,
+        month,
+      },
+      relations: ['user'],
+      select: {
+        user: {
+          nickname: true,
         },
-      });
-    } else {
-      records = this.rotationRepository.find();
-    }
+      },
+    });
 
-    const modifiedRecords = await Promise.all(
-      (await records).map(async (record) => {
-        const userRecord = await this.userService.findOneById(record.userId);
-        return { ...record, intraId: userRecord.nickname };
-      }),
-    );
+    const modifiedRecords = records.map((records) => {
+      const { user, ...other } = records;
+      return { ...other, intraId: user.nickname };
+    });
 
     return modifiedRecords;
   }