klaus/sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(gift): 배송 개인정보의 null 저장과 조회 호환을 지원한다

Browse Source
This commit is contained in:
klaus
2026-10-26 08:44:44 +09:00
parent c837ff18f8
commit f46a6c4c7c
8 changed files with 312 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/kotlin/kr/co/vividnext/sodalive/v2/gift/adapter/out/persistence/GiftDelivery.kt
+9 -9
View File
@@ -16,20 +16,20 @@ class GiftDelivery(
@Column(name = "gift_id", nullable = false)
val giftId: Long,
@Column(name = "sender_name", nullable = false, length = 50)
val senderName: String,
@Column(name = "sender_name", length = 50)
var senderName: String?,
@Column(name = "sender_phone_number", nullable = false, length = 30)
val senderPhoneNumber: String,
@Column(name = "sender_phone_number", length = 30)
var senderPhoneNumber: String?,
@Column(name = "sender_zip_code", nullable = false, length = 20)
val senderZipCode: String,
@Column(name = "sender_zip_code", length = 20)
var senderZipCode: String?,
@Column(name = "sender_address", nullable = false, length = 255)
val senderAddress: String,
@Column(name = "sender_address", length = 255)
var senderAddress: String?,
@Column(name = "sender_address_detail", length = 255)
val senderAddressDetail: String? = null,
var senderAddressDetail: String? = null,
@Column(name = "recipient_name", length = 50)
var recipientName: String? = null,
src/main/kotlin/kr/co/vividnext/sodalive/v2/gift/application/GiftAdminQueryService.kt
+4 -4
View File
@@ -115,8 +115,8 @@ class GiftAdminQueryService(
applicationNo = gift.applicationNo,
senderInfo = AdminGiftMemberInfoResult(
nickname = sender.nickname,
name = delivery.senderName,
phoneNumber = delivery.senderPhoneNumber,
name = delivery.senderName.orEmpty(),
phoneNumber = delivery.senderPhoneNumber.orEmpty(),
address = formatAddress(delivery.senderZipCode, delivery.senderAddress, delivery.senderAddressDetail)
),
recipientInfo = AdminGiftMemberInfoResult(
@@ -174,8 +174,8 @@ class GiftAdminQueryService(
return formatAddress(zipCode, address, recipientAddressDetail)
}
private fun formatAddress(zipCode: String, address: String, detail: String?) =
"($zipCode) $address" + if (detail.isNullOrBlank()) "" else ", $detail"
private fun formatAddress(zipCode: String?, address: String?, detail: String?) =
if (zipCode == null || address == null) "" else "($zipCode) $address" + if (detail.isNullOrBlank()) "" else ", $detail"
private fun invalidRequest() = SodaException(messageKey = "common.error.invalid_request")
src/main/kotlin/kr/co/vividnext/sodalive/v2/gift/application/GiftQueryService.kt
+4 -4
View File
@@ -259,8 +259,8 @@ class GiftQueryService(
}
private fun GiftDelivery.toSenderInfo() = GiftAddressResult(
name = senderName,
phoneNumber = senderPhoneNumber,
name = senderName.orEmpty(),
phoneNumber = senderPhoneNumber.orEmpty(),
address = formatAddress(senderZipCode, senderAddress, senderAddressDetail)
)
@@ -305,8 +305,8 @@ class GiftQueryService(
)
}
private fun formatAddress(zipCode: String, address: String, detail: String?) =
"($zipCode) $address" + if (detail.isNullOrBlank()) "" else ", $detail"
private fun formatAddress(zipCode: String?, address: String?, detail: String?) =
if (zipCode == null || address == null) "" else "($zipCode) $address" + if (detail.isNullOrBlank()) "" else ", $detail"
private fun invalidRequest() = SodaException(messageKey = "common.error.invalid_request")