From 3c520405f0eacecaad9e54be3255a047fc9ef899 Mon Sep 17 00:00:00 2001 From: YangSiJun528 Date: Wed, 18 Oct 2023 15:25:33 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EC=9B=90=EC=84=9C=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B0=98=ED=99=98=20api=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=EC=97=90=20=EC=A0=91=EC=88=98=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/application/dto/response/SearchApplicationResDto.java | 1 + .../web/domain/application/mapper/ApplicationMapper.java | 1 + 2 files changed, 2 insertions(+) diff --git a/hellogsm-web/src/main/java/team/themoment/hellogsm/web/domain/application/dto/response/SearchApplicationResDto.java b/hellogsm-web/src/main/java/team/themoment/hellogsm/web/domain/application/dto/response/SearchApplicationResDto.java index 7f034cc5..481f9d25 100644 --- a/hellogsm-web/src/main/java/team/themoment/hellogsm/web/domain/application/dto/response/SearchApplicationResDto.java +++ b/hellogsm-web/src/main/java/team/themoment/hellogsm/web/domain/application/dto/response/SearchApplicationResDto.java @@ -17,6 +17,7 @@ public record SearchApplicationResDto( String teacherPhoneNumber, EvaluationStatus firstEvaluation, EvaluationStatus secondEvaluation, + Long registrationNumber, BigDecimal secondScore ){ diff --git a/hellogsm-web/src/main/java/team/themoment/hellogsm/web/domain/application/mapper/ApplicationMapper.java b/hellogsm-web/src/main/java/team/themoment/hellogsm/web/domain/application/mapper/ApplicationMapper.java index 171e55b0..fb611561 100644 --- a/hellogsm-web/src/main/java/team/themoment/hellogsm/web/domain/application/mapper/ApplicationMapper.java +++ b/hellogsm-web/src/main/java/team/themoment/hellogsm/web/domain/application/mapper/ApplicationMapper.java @@ -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); From e118219c781fc2c04f2c9fa50b56feb731cd1793 Mon Sep 17 00:00:00 2001 From: YangSiJun528 Date: Wed, 18 Oct 2023 15:26:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?test:=203c52040=20api=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/controller/ApplicationControllerTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hellogsm-web/src/test/java/team/themoment/hellogsm/web/domain/application/controller/ApplicationControllerTest.java b/hellogsm-web/src/test/java/team/themoment/hellogsm/web/domain/application/controller/ApplicationControllerTest.java index 991ac523..7d9db3f5 100644 --- a/hellogsm-web/src/test/java/team/themoment/hellogsm/web/domain/application/controller/ApplicationControllerTest.java +++ b/hellogsm-web/src/test/java/team/themoment/hellogsm/web/domain/application/controller/ApplicationControllerTest.java @@ -586,6 +586,7 @@ void search() throws Exception { "01012341234", EvaluationStatus.PASS, EvaluationStatus.NOT_YET, + 2002L, BigDecimal.valueOf(100) )) ); @@ -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( @@ -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차 시험 점수") ) ));