From 624d8e0472e259cf29da958b65ea53850cdbf08b Mon Sep 17 00:00:00 2001 From: coehgns Date: Mon, 13 Oct 2025 13:47:48 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat=20(=20#66=20)=20:=20ApplicationDetailR?= =?UTF-8?q?esponse=EC=97=90=20=EB=8F=84=EB=A1=9C=EB=AA=85=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C,=20=ED=8A=B9=EA=B8=B0=20=EC=82=AC=ED=95=AD=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 --- .../presentation/dto/response/ApplicationDetailResponse.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/presentation/dto/response/ApplicationDetailResponse.kt b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/presentation/dto/response/ApplicationDetailResponse.kt index 1a0e6495..72643a93 100644 --- a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/presentation/dto/response/ApplicationDetailResponse.kt +++ b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/presentation/dto/response/ApplicationDetailResponse.kt @@ -30,6 +30,9 @@ data class ApplicationDetailResponse( // 점수 정보 val scores: ScoreInfo?, val applicantGender: Gender?, + val streetAddress: String?, + val nationalMeritChild: Boolean?, + val specialAdmissionTarget: Boolean?, ) data class ScoreInfo( From ba74c2ef263781648fce1f28a9ce4b4f07111bc6 Mon Sep 17 00:00:00 2001 From: coehgns Date: Mon, 13 Oct 2025 13:47:57 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat=20(=20#66=20)=20:=20ApplicationJpaEnti?= =?UTF-8?q?ty=EC=97=90=20=EB=8F=84=EB=A1=9C=EB=AA=85=20=EC=A3=BC=EC=86=8C,?= =?UTF-8?q?=20=ED=8A=B9=EA=B8=B0=20=EC=82=AC=ED=95=AD=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/domain/entity/ApplicationJpaEntity.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/entity/ApplicationJpaEntity.kt b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/entity/ApplicationJpaEntity.kt index 0cec4ed3..1a20e063 100644 --- a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/entity/ApplicationJpaEntity.kt +++ b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/entity/ApplicationJpaEntity.kt @@ -69,6 +69,8 @@ class ApplicationJpaEntity( val parentRelation: String?, @Column(name = "postal_code", length = 10) val postalCode: String?, + @Column(name = "street_address") + val streetAddress: String?, @Column(name = "detail_address", length = 500) val detailAddress: String?, // ===== 자기소개 및 학업계획 ===== @@ -76,6 +78,10 @@ class ApplicationJpaEntity( val studyPlan: String?, @Column(name = "self_introduce", columnDefinition = "TEXT") val selfIntroduce: String?, + @Column(name = "national_merit_child") + val nationalMeritChild: Boolean?, + @Column(name = "special_admission_target") + val specialAdmissionTarget: Boolean?, @Column(name = "school_code", length = 20) val schoolCode: String?, // ===== 성적 데이터 (JSON) ===== @@ -127,9 +133,12 @@ class ApplicationJpaEntity( parentTel = null, parentRelation = null, postalCode = null, + streetAddress = null, detailAddress = null, studyPlan = null, selfIntroduce = null, + nationalMeritChild = null, + specialAdmissionTarget = null, schoolCode = null, scoresData = "{}", totalScore = null, From c54f062a3f1833c8d6759a4acc9a2de46180cbb4 Mon Sep 17 00:00:00 2001 From: coehgns Date: Mon, 13 Oct 2025 13:48:06 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat=20(=20#66=20)=20:=20ApplicationMapper?= =?UTF-8?q?=EC=97=90=20=EB=8F=84=EB=A1=9C=EB=AA=85=20=EC=A3=BC=EC=86=8C,?= =?UTF-8?q?=20=ED=8A=B9=EA=B8=B0=20=EC=82=AC=ED=95=AD=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/domain/mapper/ApplicationMapper.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/mapper/ApplicationMapper.kt b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/mapper/ApplicationMapper.kt index 6d33bb02..98cf9f90 100644 --- a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/mapper/ApplicationMapper.kt +++ b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/mapper/ApplicationMapper.kt @@ -93,9 +93,12 @@ class ApplicationMapper( parentTel = model.parentTel, parentRelation = model.parentRelation, postalCode = model.postalCode, + streetAddress = model.streetAddress, detailAddress = model.detailAddress, studyPlan = model.studyPlan, selfIntroduce = model.selfIntroduce, + nationalMeritChild = model.nationalMeritChild, + specialAdmissionTarget = model.specialAdmissionTarget, schoolCode = model.schoolCode, scoresData = scoresDataJson, totalScore = model.totalScore, @@ -133,7 +136,7 @@ class ApplicationMapper( birthDate = entity.birthDate, applicationType = entity.applicationType, educationalStatus = entity.educationalStatus, - streetAddress = null, + streetAddress = entity.streetAddress, submittedAt = entity.submittedAt, reviewedAt = entity.reviewedAt, createdAt = entity.createdAt, @@ -146,10 +149,10 @@ class ApplicationMapper( studyPlan = entity.studyPlan, selfIntroduce = entity.selfIntroduce, schoolCode = entity.schoolCode, - nationalMeritChild = null, - specialAdmissionTarget = null, + nationalMeritChild = entity.nationalMeritChild, + specialAdmissionTarget = entity.specialAdmissionTarget, graduationDate = null, - applicantGender = null, + applicantGender = entity.applicantGender, guardianGender = null, schoolName = null, studentId = null, From 7daf8b21cb1adb4ebe94e0ffc13bfbb996b7b3b1 Mon Sep 17 00:00:00 2001 From: coehgns Date: Mon, 13 Oct 2025 13:48:38 +0900 Subject: [PATCH 4/6] =?UTF-8?q?feat=20(=20#66=20)=20:=20ApplicationPersist?= =?UTF-8?q?enceService=EC=97=90=20=EB=8F=84=EB=A1=9C=EB=AA=85=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C,=20=ED=8A=B9=EA=B8=B0=20=EC=82=AC=ED=95=AD=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 --- .../application/usecase/ApplicationPersistenceService.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationPersistenceService.kt b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationPersistenceService.kt index 0517a7f4..3974ac8d 100644 --- a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationPersistenceService.kt +++ b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationPersistenceService.kt @@ -111,9 +111,12 @@ class ApplicationPersistenceService( parentTel = extractStringValue(applicationData, "parentTel"), parentRelation = extractStringValue(applicationData, "parentRelation"), postalCode = extractStringValue(applicationData, "postalCode"), + streetAddress = extractStringValue(applicationData, "streetAddress"), detailAddress = extractStringValue(applicationData, "detailAddress"), studyPlan = extractStringValue(applicationData, "studyPlan"), selfIntroduce = extractStringValue(applicationData, "selfIntroduce"), + nationalMeritChild = extractBooleanValue(applicationData, "nationalMeritChild") ?: false, + specialAdmissionTarget = extractBooleanValue(applicationData, "specialAdmissionTarget") ?: false, schoolCode = extractStringValue(applicationData, "schoolCode"), scoresData = scoresJson, totalScore = scoreResult.totalScore?.toBigDecimal(), From 369143f94abc6ef6028c60724c0e9f8881c4e63f Mon Sep 17 00:00:00 2001 From: coehgns Date: Mon, 13 Oct 2025 13:48:53 +0900 Subject: [PATCH 5/6] =?UTF-8?q?feat=20(=20#66=20)=20:=20ApplicationQueryUs?= =?UTF-8?q?eCase=EC=97=90=20=EB=8F=84=EB=A1=9C=EB=AA=85=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C,=20=ED=8A=B9=EA=B8=B0=20=EC=82=AC=ED=95=AD=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/usecase/ApplicationQueryUseCase.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationQueryUseCase.kt b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationQueryUseCase.kt index 5402c98d..6a9f552b 100644 --- a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationQueryUseCase.kt +++ b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationQueryUseCase.kt @@ -77,6 +77,9 @@ class ApplicationQueryUseCase( studyPlan = application.studyPlan, selfIntroduce = application.selfIntroduce, isDaejeon = application.isDaejeon, + streetAddress = application.streetAddress, + nationalMeritChild = application.nationalMeritChild, + specialAdmissionTarget = application.specialAdmissionTarget, scores = ApplicationDetailResponse.ScoreInfo( totalScore = application.totalScore?.toDouble(), From 585f9b2eebb5163a0d819aacb4c12d18e929f031 Mon Sep 17 00:00:00 2001 From: coehgns Date: Mon, 13 Oct 2025 13:49:25 +0900 Subject: [PATCH 6/6] =?UTF-8?q?feat=20(=20#66=20)=20:=20=20request=20conve?= =?UTF-8?q?rter=EC=97=90=20=ED=8A=B9=EA=B8=B0=20=EC=82=AC=ED=95=AD=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 --- .../application/presentation/ApplicationSubmissionController.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/presentation/ApplicationSubmissionController.kt b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/presentation/ApplicationSubmissionController.kt index 8948cb17..57539fea 100644 --- a/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/presentation/ApplicationSubmissionController.kt +++ b/casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/presentation/ApplicationSubmissionController.kt @@ -91,6 +91,8 @@ class ApplicationSubmissionController( request.postalCode?.let { applicationData["postalCode"] = it } request.schoolCode?.let { applicationData["schoolCode"] = it } request.applicantGender?.let { applicationData["applicantGender"] = it } + request.nationalMeritChild?.let { applicationData["nationalMeritChild"] = it } + request.specialAdmissionTarget?.let { applicationData["specialAdmissionTarget"] = it } // 성적 정보 - 3학년 1학기 request.korean_3_1?.let { scoresData["korean_3_1"] = it }