Skip to content

Commit a6e0514

Browse files
committed
fix: change return type in findAllRotation and remove comment
1 parent 299480e commit a6e0514

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import {
4242
import { FindTodayRotationDto } from './dto/find-today-rotation.dto';
4343
import { FindRegistrationDto } from './dto/find-registration.dto';
4444
import { MonthValidationPipe } from './pipe/month-validation.pipe';
45+
import { FindAllRotationDto } from './dto/find-all-rotation.dto';
4546

4647
@Controller('rotations')
4748
@ApiTags('rotations')
@@ -157,7 +158,7 @@ export class RotationsController {
157158
findAllRotation(
158159
@Query('year') year: number,
159160
@Query('month', new MonthValidationPipe()) month: number,
160-
): Promise<Partial<RotationEntity>[]> {
161+
): Promise<FindAllRotationDto[]> {
161162
return this.rotationsService.findAllRotation(year, month);
162163
}
163164

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

+4-15
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { HolidayService } from 'src/holiday/holiday.service';
2121
import { createRotation } from './utils/rotation';
2222
import { FindTodayRotationDto } from './dto/find-today-rotation.dto';
2323
import { FindRegistrationDto } from './dto/find-registration.dto';
24+
import { FindAllRotationDto } from './dto/find-all-rotation.dto';
2425

2526
function getRotationCronTime() {
2627
if (process.env.NODE_ENV === 'production') {
@@ -225,19 +226,7 @@ export class RotationsService {
225226
}
226227

227228
const intraIdRecord = await this.userService.findOneById(userId);
228-
// const modifiedRecord = {};
229-
230-
// if (records.length == 0) {
231-
// modifiedRecord['year'] = year;
232-
// modifiedRecord['month'] = month;
233-
// modifiedRecord['attendLimit'] = [];
234-
// modifiedRecord['intraId'] = intraIdRecord.nickname;
235-
// } else {
236-
// modifiedRecord['year'] = records[0].year;
237-
// modifiedRecord['month'] = records[0].month;
238-
// modifiedRecord['attendLimit'] = records[0].attendLimit;
239-
// modifiedRecord['intraId'] = intraIdRecord.nickname;
240-
// }
229+
241230
let modifiedRecord: FindRegistrationDto;
242231

243232
if (records.length == 0) {
@@ -362,8 +351,8 @@ export class RotationsService {
362351
* 기본적으로는 모든 로테이션을 반환.
363352
* 만약 parameter로 month와 year가 들어오면, 해당 스코프에 맞는 레코드를 반환.
364353
*/
365-
async findAllRotation(year?: number, month?: number): Promise<Partial<RotationEntity>[]> {
366-
let records: Promise<Partial<RotationEntity>[]>;
354+
async findAllRotation(year?: number, month?: number): Promise<FindAllRotationDto[]> {
355+
let records: Promise<RotationEntity[]>;
367356

368357
if (year && month) {
369358
records = this.rotationRepository.find({

0 commit comments

Comments
 (0)