Skip to content

Commit 299480e

Browse files
committed
hotfix: fix type error
1 parent 8179fe6 commit 299480e

File tree

2 files changed

+29
-16
lines changed

2 files changed

+29
-16
lines changed

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

+3-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
Param,
77
Delete,
88
Patch,
9-
ValidationPipe,
109
Query,
1110
UseGuards,
1211
UnauthorizedException,
@@ -17,7 +16,6 @@ import { CreateRotationDto } from './dto/create-rotation.dto';
1716
import { UpdateRotationDto } from './dto/update-rotation.dto';
1817
import { RotationAttendeeEntity } from './entity/rotation-attendee.entity';
1918
import { GetUser } from 'src/decorator/user.decorator';
20-
import { FindRotationQueryDto } from './dto/find-rotation-query.dto';
2119
import { RemoveRotationQueryDto } from './dto/remove-rotation.dto';
2220
import { RotationEntity } from './entity/rotation.entity';
2321
import { JwtGuard } from 'src/auth/guard/jwt.guard';
@@ -43,7 +41,6 @@ import {
4341
} from 'src/common/dto/error-response.dto';
4442
import { FindTodayRotationDto } from './dto/find-today-rotation.dto';
4543
import { FindRegistrationDto } from './dto/find-registration.dto';
46-
import { FindAllRotationDto } from './dto/find-all-rotation.dto';
4744
import { MonthValidationPipe } from './pipe/month-validation.pipe';
4845

4946
@Controller('rotations')
@@ -158,10 +155,9 @@ export class RotationsController {
158155
@ApiBadRequestResponse({ type: BadRequestExceptionBody })
159156
@ApiInternalServerErrorResponse({ type: InternalServerExceptionBody })
160157
findAllRotation(
161-
@Query(ValidationPipe)
162-
findRotationQueryDto: FindRotationQueryDto,
163-
): Promise<FindAllRotationDto[]> {
164-
const { month, year } = findRotationQueryDto
158+
@Query('year') year: number,
159+
@Query('month', new MonthValidationPipe()) month: number,
160+
): Promise<Partial<RotationEntity>[]> {
165161
return this.rotationsService.findAllRotation(year, month);
166162
}
167163

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

+26-9
Original file line numberDiff line numberDiff line change
@@ -225,18 +225,35 @@ export class RotationsService {
225225
}
226226

227227
const intraIdRecord = await this.userService.findOneById(userId);
228-
const modifiedRecord = {};
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+
// }
241+
let modifiedRecord: FindRegistrationDto;
229242

230243
if (records.length == 0) {
231-
modifiedRecord['year'] = year;
232-
modifiedRecord['month'] = month;
233-
modifiedRecord['attendLimit'] = [];
234-
modifiedRecord['intraId'] = intraIdRecord.nickname;
244+
modifiedRecord = {
245+
year: year,
246+
month: month,
247+
attendLimit: JSON.parse(JSON.stringify([])),
248+
intraId: intraIdRecord.nickname,
249+
};
235250
} else {
236-
modifiedRecord['year'] = records[0].year;
237-
modifiedRecord['month'] = records[0].month;
238-
modifiedRecord['attendLimit'] = records[0].attendLimit;
239-
modifiedRecord['intraId'] = intraIdRecord.nickname;
251+
modifiedRecord = {
252+
year: records[0].year,
253+
month: records[0].month,
254+
attendLimit: records[0].attendLimit,
255+
intraId: intraIdRecord.nickname,
256+
};
240257
}
241258

242259
return modifiedRecord;

0 commit comments

Comments
 (0)