Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GET] application/search response body에 registrationNumber 추가 #292

Merged
merged 2 commits into from
Oct 18, 2023
Merged

[GET] application/search response body에 registrationNumber 추가 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c52040
feat: 원서 리스트 반환 api 형식에 접수번호 필드 추가
YangSiJun528 Oct 18, 2023
e118219
test: 3c52040 api 변경사항 테스트 반영
YangSiJun528 Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../team/themoment/hellogsm/web/domain/application/dto/response/SearchApplicationResDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public record SearchApplicationResDto(
String teacherPhoneNumber,
EvaluationStatus firstEvaluation,
EvaluationStatus secondEvaluation,
Long registrationNumber,
BigDecimal secondScore
){

Expand Down
1 change: 1 addition & 0 deletions ...rc/main/java/team/themoment/hellogsm/web/domain/application/mapper/ApplicationMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ default Application updateApplicationByApplicationReqDtoAndApplication(Applicati
@Mapping(source = "admissionInfo.teacherPhoneNumber", target = "teacherPhoneNumber"),
@Mapping(source = "admissionStatus.firstEvaluation", target = "firstEvaluation"),
@Mapping(source = "admissionStatus.secondEvaluation", target = "secondEvaluation"),
@Mapping(source = "admissionStatus.registrationNumber", target = "registrationNumber"),
@Mapping(source = "admissionStatus.secondScore", target = "secondScore"),
})
SearchApplicationResDto applicationToSearchApplicationResDto(Application application);
Expand Down
3 changes: 3 additions & 0 deletions .../team/themoment/hellogsm/web/domain/application/controller/ApplicationControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@ void search() throws Exception {
"01012341234",
EvaluationStatus.PASS,
EvaluationStatus.NOT_YET,
2002L,
BigDecimal.valueOf(100)
))
);
Expand Down Expand Up @@ -614,6 +615,7 @@ void search() throws Exception {
.andExpect(jsonPath("$.applications[0].guardianPhoneNumber").value(searchApplicationsResDto.applications().get(0).guardianPhoneNumber()))
.andExpect(jsonPath("$.applications[0].firstEvaluation").value(searchApplicationsResDto.applications().get(0).firstEvaluation().name()))
.andExpect(jsonPath("$.applications[0].secondEvaluation").value(searchApplicationsResDto.applications().get(0).secondEvaluation().name()))
.andExpect(jsonPath("$.applications[0].registrationNumber").value(searchApplicationsResDto.applications().get(0).registrationNumber()))
.andExpect(jsonPath("$.applications[0].secondScore").value(searchApplicationsResDto.applications().get(0).secondScore()))
.andDo(this.documentationHandler.document(
queryParameters(
Expand All @@ -637,6 +639,7 @@ void search() throws Exception {
fieldWithPath("applications[].teacherPhoneNumber").type(STRING).description("선생님 전화번호"),
fieldWithPath("applications[].firstEvaluation").type(enumAsString(EvaluationStatus.class)).description("1차 평가 결과"),
fieldWithPath("applications[].secondEvaluation").type(enumAsString(EvaluationStatus.class)).description("2차 평가 결과"),
fieldWithPath("applications[].registrationNumber").type(enumAsString(EvaluationStatus.class)).description("접수번호"),
fieldWithPath("applications[].secondScore").type(NUMBER).description("2차 시험 점수")
)
));
Expand Down