Skip to content
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,19 @@ 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?,
// ===== 자기소개 및 학업계획 =====
@Column(name = "study_plan", columnDefinition = "TEXT")
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) =====
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Loading