diff --git a/gg-recruit-api/src/main/java/gg/recruit/api/admin/controller/RecruitmentAdminController.java b/gg-recruit-api/src/main/java/gg/recruit/api/admin/controller/RecruitmentAdminController.java index de8943138..e0f1d192a 100644 --- a/gg-recruit-api/src/main/java/gg/recruit/api/admin/controller/RecruitmentAdminController.java +++ b/gg-recruit-api/src/main/java/gg/recruit/api/admin/controller/RecruitmentAdminController.java @@ -59,7 +59,7 @@ public class RecruitmentAdminController { public ResponseEntity createRecruitment( @RequestBody @Valid RecruitmentRequestDto recruitmentDto) { Recruitment recruitment = RecruitmentRequestDto.RecruitmentMapper.INSTANCE.dtoToEntity(recruitmentDto); - Long recruitmentId = recruitmentAdminService.createRecruitment(recruitment, recruitmentDto.getForm()).getId(); + Long recruitmentId = recruitmentAdminService.createRecruitment(recruitment, recruitmentDto.getForms()).getId(); CreatedRecruitmentResponse createdRecruitmentResponse = new CreatedRecruitmentResponse(recruitmentId); return ResponseEntity.status(HttpStatus.CREATED).body(createdRecruitmentResponse); @@ -148,8 +148,8 @@ public ResponseEntity deleteRecruitment(@PathVariable @Positive Long recru public ResponseEntity updateRecruitment(@PathVariable @Positive Long recruitId, @RequestBody @Valid RecruitmentRequestDto recruitmentDto) { Recruitment recruitment = RecruitmentRequestDto.RecruitmentMapper.INSTANCE.dtoToEntity(recruitmentDto); - recruitment = recruitmentAdminService.updateRecruitment(recruitId, recruitment, recruitmentDto.getForm()); - recruitmentAdminService.createRecruitment(recruitment, recruitmentDto.getForm()); + recruitment = recruitmentAdminService.updateRecruitment(recruitId, recruitment, recruitmentDto.getForms()); + recruitmentAdminService.createRecruitment(recruitment, recruitmentDto.getForms()); return ResponseEntity.noContent().build(); } diff --git a/gg-recruit-api/src/main/java/gg/recruit/api/admin/controller/request/RecruitmentRequestDto.java b/gg-recruit-api/src/main/java/gg/recruit/api/admin/controller/request/RecruitmentRequestDto.java index 5e0eabe6a..f6728bd3c 100644 --- a/gg-recruit-api/src/main/java/gg/recruit/api/admin/controller/request/RecruitmentRequestDto.java +++ b/gg-recruit-api/src/main/java/gg/recruit/api/admin/controller/request/RecruitmentRequestDto.java @@ -44,7 +44,7 @@ public class RecruitmentRequestDto { @NotNull(message = "폼을 입력해주세요.") @Valid - List form; + List forms; @Builder public RecruitmentRequestDto(LocalDateTime startDate, LocalDateTime endDate, String title, @@ -55,7 +55,7 @@ public RecruitmentRequestDto(LocalDateTime startDate, LocalDateTime endDate, Str this.title = title; this.contents = contents; this.generation = generation; - this.form = form; + this.forms = form; } @Mapper diff --git a/gg-recruit-api/src/main/java/gg/recruit/api/admin/service/RecruitmentAdminService.java b/gg-recruit-api/src/main/java/gg/recruit/api/admin/service/RecruitmentAdminService.java index b53d26aab..f74fc2de4 100644 --- a/gg-recruit-api/src/main/java/gg/recruit/api/admin/service/RecruitmentAdminService.java +++ b/gg-recruit-api/src/main/java/gg/recruit/api/admin/service/RecruitmentAdminService.java @@ -124,7 +124,7 @@ private void addCheckList(Question question, List checkLists) throw new InvalidCheckListException(); } for (CheckListContent checkList : checkLists) { - new CheckList(question, checkList.getContent()); + new CheckList(question, checkList.getContents()); } } diff --git a/gg-recruit-api/src/main/java/gg/recruit/api/admin/service/param/CheckListContent.java b/gg-recruit-api/src/main/java/gg/recruit/api/admin/service/param/CheckListContent.java index e3d285840..4376c0fc7 100644 --- a/gg-recruit-api/src/main/java/gg/recruit/api/admin/service/param/CheckListContent.java +++ b/gg-recruit-api/src/main/java/gg/recruit/api/admin/service/param/CheckListContent.java @@ -11,9 +11,9 @@ public class CheckListContent { @NotBlank(message = "문항 내용을 입력해주세요.") @Size(min = 1, max = 100, message = "100자 이내로 입력해주세요.") - String content; + String contents; public CheckListContent(String content) { - this.content = content; + this.contents = content; } } diff --git a/gg-recruit-api/src/main/java/gg/recruit/api/user/controller/response/MyApplicationDetailResDto.java b/gg-recruit-api/src/main/java/gg/recruit/api/user/controller/response/MyApplicationDetailResDto.java index f2a18a34f..02efb7a29 100644 --- a/gg-recruit-api/src/main/java/gg/recruit/api/user/controller/response/MyApplicationDetailResDto.java +++ b/gg-recruit-api/src/main/java/gg/recruit/api/user/controller/response/MyApplicationDetailResDto.java @@ -15,14 +15,12 @@ public class MyApplicationDetailResDto { private Long applicationId; private LocalDateTime endTime; private String title; - private String content; private List forms; public MyApplicationDetailResDto(ApplicationWithAnswerSvcDto applicationWithAnswerSvcDto) { this.applicationId = applicationWithAnswerSvcDto.getApplicationId(); this.endTime = applicationWithAnswerSvcDto.getEndTime(); this.title = applicationWithAnswerSvcDto.getTitle(); - this.content = applicationWithAnswerSvcDto.getContent(); this.forms = applicationWithAnswerSvcDto.getForm().stream() .map(FormResDto::new) .collect(toList());