Skip to content

Commit

Permalink
Merge pull request #91 from boostcampwm-2024/dev-back
Browse files Browse the repository at this point in the history
[BE] main으로 머지
  • Loading branch information
sjy2335 authored Nov 14, 2024
2 parents e72bc04 + 2b21fa7 commit aa72478
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions backend/console-server/src/project/project.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class ProjectController {
@ApiResponse({
status: 200,
description: '프로젝트 목록이 성공적으로 반환됨',
type: ProjectResponseDto,
type: FindByGenerationDto,
})
findByGeneration(@Query() findGenerationProjectDto: FindByGenerationDto) {
return this.projectService.findByGeneration(findGenerationProjectDto);
Expand All @@ -50,7 +50,7 @@ export class ProjectController {
@ApiResponse({
status: 200,
description: '기수의 전체 프로젝트 개수가 정상적으로 반환됨',
type: ProjectResponseDto,
type: CountProjectByGenerationDto,
})
async countProjectByGeneration(
@Query() countProjectByGenerationDto: CountProjectByGenerationDto,
Expand Down
2 changes: 1 addition & 1 deletion backend/console-server/src/project/project.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class ProjectService {
where: { generation: generation },
});

return projects.map((p) => plainToInstance(FindByGenerationResponseDto, p.name));
return projects.map((p) => plainToInstance(FindByGenerationResponseDto, p));
}

async countProjectByGeneration(countProjectByGenerationDto: CountProjectByGenerationDto) {
Expand Down

0 comments on commit aa72478

Please sign in to comment.