From ee76011d9ec2b3021ce062e37125bdcb6323b5f0 Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 2 Oct 2026 23:54:21 +0900 Subject: [PATCH] =?UTF-8?q?feat(gift):=20=EB=B0=B0=EC=86=A1=EC=A7=80=20API?= =?UTF-8?q?=20=EA=B3=84=EC=95=BD=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=9C?= =?UTF-8?q?=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/v2/gift/data/GiftApi.kt | 7 ++ .../sodalive/v2/gift/data/GiftModels.kt | 19 +++ .../sodalive/v2/gift/data/GiftRepository.kt | 7 ++ .../v2/gift/GiftInboxViewModelTest.kt | 8 ++ .../v2/gift/GiftSendRequestViewModelTest.kt | 8 ++ .../v2/gift/data/GiftRepositoryTest.kt | 110 ++++++++++++++++++ 6 files changed, 159 insertions(+) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftApi.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftApi.kt index a9459480..89b36963 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftApi.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftApi.kt @@ -42,6 +42,13 @@ interface GiftApi { @Header("Authorization") authHeader: String ): Single> + @POST("/api/v2/gifts/{applicationNo}/recipient-address") + fun registerRecipientAddress( + @Path("applicationNo") applicationNo: String, + @Body request: GiftRecipientAddressRequest, + @Header("Authorization") authHeader: String + ): Single> + @POST("/api/v2/gifts/{applicationNo}/cancel") fun cancelGift( @Path("applicationNo") applicationNo: String, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftModels.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftModels.kt index 166602a1..465d5969 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftModels.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftModels.kt @@ -130,6 +130,25 @@ data class GiftTrackingResponse( @SerializedName("recipientAddressDeadlineAt") val recipientAddressDeadlineAt: String ) +@Keep +data class GiftRecipientAddressRequest( + @SerializedName("recipientName") val recipientName: String, + @SerializedName("recipientPhoneNumber") val recipientPhoneNumber: String, + @SerializedName("recipientZipCode") val recipientZipCode: String, + @SerializedName("recipientAddress") val recipientAddress: String, + @SerializedName("recipientAddressDetail") val recipientAddressDetail: String, + @SerializedName("recipientTermsAgreed") val recipientTermsAgreed: Boolean, + @SerializedName("recipientPrivacyAgreed") val recipientPrivacyAgreed: Boolean +) + +@Keep +data class GiftRecipientAddressResponse( + @SerializedName("applicationNo") val applicationNo: String, + @SerializedName("status") val status: String, + @SerializedName("statusName") val statusName: String, + @SerializedName("recipientAddressRegisteredAt") val recipientAddressRegisteredAt: String +) + @Keep data class GiftCancelResponse( @SerializedName("applicationNo") val applicationNo: String, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftRepository.kt index 7b60f2a5..3dfc9f73 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftRepository.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/data/GiftRepository.kt @@ -27,6 +27,13 @@ class GiftRepository(private val api: GiftApi) { authHeader = token ) + fun registerRecipientAddress(applicationNo: String, request: GiftRecipientAddressRequest, token: String) = + api.registerRecipientAddress( + applicationNo = applicationNo, + request = request, + authHeader = token + ) + fun cancelGift(applicationNo: String, token: String) = api.cancelGift( applicationNo = applicationNo, authHeader = token diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxViewModelTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxViewModelTest.kt index e6dfe36c..2edd8b57 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxViewModelTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxViewModelTest.kt @@ -17,6 +17,8 @@ import kr.co.vividnext.sodalive.v2.gift.data.GiftDetailResponse import kr.co.vividnext.sodalive.v2.gift.data.GiftFormOptionsResponse import kr.co.vividnext.sodalive.v2.gift.data.GiftInboxResponse import kr.co.vividnext.sodalive.v2.gift.data.GiftInboxItemResponse +import kr.co.vividnext.sodalive.v2.gift.data.GiftRecipientAddressRequest +import kr.co.vividnext.sodalive.v2.gift.data.GiftRecipientAddressResponse import kr.co.vividnext.sodalive.v2.gift.data.GiftRepository import kr.co.vividnext.sodalive.v2.gift.data.GiftTrackingRequest import kr.co.vividnext.sodalive.v2.gift.data.GiftTrackingResponse @@ -237,6 +239,12 @@ internal class InboxFakeApi : GiftApi { authHeader: String ): Single> = Single.error(UnsupportedOperationException()) + override fun registerRecipientAddress( + applicationNo: String, + request: GiftRecipientAddressRequest, + authHeader: String + ): Single> = Single.error(UnsupportedOperationException()) + override fun cancelGift(applicationNo: String, authHeader: String): Single> = Single.error(UnsupportedOperationException()) } diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendRequestViewModelTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendRequestViewModelTest.kt index 66dfe2a4..bb4828b0 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendRequestViewModelTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendRequestViewModelTest.kt @@ -19,6 +19,8 @@ import kr.co.vividnext.sodalive.v2.gift.data.GiftCategoryResponse import kr.co.vividnext.sodalive.v2.gift.data.GiftCreateRequest import kr.co.vividnext.sodalive.v2.gift.data.GiftDetailResponse import kr.co.vividnext.sodalive.v2.gift.data.GiftFormOptionsResponse +import kr.co.vividnext.sodalive.v2.gift.data.GiftRecipientAddressRequest +import kr.co.vividnext.sodalive.v2.gift.data.GiftRecipientAddressResponse import kr.co.vividnext.sodalive.v2.gift.data.GiftRepository import kr.co.vividnext.sodalive.v2.gift.data.GiftSizeResponse import kr.co.vividnext.sodalive.v2.gift.data.GiftTrackingRequest @@ -186,6 +188,12 @@ class GiftSendRequestViewModelTest { authHeader: String ): Single> = Single.error(UnsupportedOperationException()) + override fun registerRecipientAddress( + applicationNo: String, + request: GiftRecipientAddressRequest, + authHeader: String + ): Single> = Single.error(UnsupportedOperationException()) + override fun cancelGift( applicationNo: String, authHeader: String diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/data/GiftRepositoryTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/data/GiftRepositoryTest.kt index 5d08c944..3ff57075 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/data/GiftRepositoryTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/data/GiftRepositoryTest.kt @@ -8,6 +8,11 @@ import org.junit.Assert.assertNull import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Test +import retrofit2.http.Body +import retrofit2.http.Header +import retrofit2.http.POST +import retrofit2.http.Path +import java.lang.reflect.ParameterizedType class GiftRepositoryTest { @@ -97,6 +102,73 @@ class GiftRepositoryTest { ) } + @Test + fun `수신 주소 request는 계약된 JSON key로만 직렬화된다`() { + val json = Gson().toJson( + GiftRecipientAddressRequest( + recipientName = "가상수신자", + recipientPhoneNumber = "01012345678", + recipientZipCode = "01234", + recipientAddress = "가상시 가상로 1", + recipientAddressDetail = "101호", + recipientTermsAgreed = true, + recipientPrivacyAgreed = false + ) + ) + + assertEquals( + "{\"recipientName\":\"가상수신자\",\"recipientPhoneNumber\":\"01012345678\"," + + "\"recipientZipCode\":\"01234\",\"recipientAddress\":\"가상시 가상로 1\"," + + "\"recipientAddressDetail\":\"101호\",\"recipientTermsAgreed\":true," + + "\"recipientPrivacyAgreed\":false}", + json + ) + } + + @Test + fun `수신 주소 응답은 신청 번호와 상태 및 등록 시각을 보존한다`() { + val response = Gson().fromJson( + """ + {"applicationNo":"GIFT-ADDRESS-001","status":"ADDRESS_REGISTERED","statusName":"배송지 입력 완료","recipientAddressRegisteredAt":"2026-10-11T23:30:00Z"} + """.trimIndent(), + GiftRecipientAddressResponse::class.java + ) + + assertEquals( + GiftRecipientAddressResponse( + applicationNo = "GIFT-ADDRESS-001", + status = "ADDRESS_REGISTERED", + statusName = "배송지 입력 완료", + recipientAddressRegisteredAt = "2026-10-11T23:30:00Z" + ), + response + ) + } + + @Test + fun `수신 주소 API는 신청 번호 본문 인증과 응답 계약을 제공한다`() { + val method = GiftApi::class.java.getDeclaredMethod( + "registerRecipientAddress", + String::class.java, + GiftRecipientAddressRequest::class.java, + String::class.java + ) + + assertEquals( + "/api/v2/gifts/{applicationNo}/recipient-address", + requireNotNull(method.getAnnotation(POST::class.java)).value + ) + assertEquals("applicationNo", method.parameterAnnotations[0].filterIsInstance().single().value) + assertTrue(method.parameterAnnotations[1].any { it is Body }) + assertEquals("Authorization", method.parameterAnnotations[2].filterIsInstance
().single().value) + + val singleType = method.genericReturnType as ParameterizedType + assertEquals(Single::class.java, singleType.rawType) + val responseType = singleType.actualTypeArguments.single() as ParameterizedType + assertEquals(ApiResponse::class.java, responseType.rawType) + assertEquals(GiftRecipientAddressResponse::class.java, responseType.actualTypeArguments.single()) + } + @Test fun `cancel response는 priceCan과 canceledAt을 보존한다`() { val response = Gson().fromJson( @@ -138,6 +210,28 @@ class GiftRepositoryTest { assertEquals("Bearer tracking-token", api.trackingCall?.authHeader) } + @Test + fun `수신 주소 repository는 신청번호 요청 본문 인증을 변경 없이 전달한다`() { + val api = RepositoryFakeGiftApi() + val request = GiftRecipientAddressRequest( + "가상수신자", + "01012345678", + "01234", + "가상시 가상로 1", + "101호", + true, + true + ) + + GiftRepository(api).registerRecipientAddress("GIFT-ADDRESS-001", request, "Bearer address-token") + .test() + .assertError(UnsupportedOperationException::class.java) + + assertEquals("GIFT-ADDRESS-001", api.recipientAddressCall?.applicationNo) + assertSame(request, api.recipientAddressCall?.request) + assertEquals("Bearer address-token", api.recipientAddressCall?.authHeader) + } + @Test fun `취소 repository는 신청번호와 인증을 변경 없이 전달한다`() { val api = RepositoryFakeGiftApi() @@ -161,9 +255,16 @@ private data class TrackingCall( val authHeader: String ) +private data class RecipientAddressCall( + val applicationNo: String, + val request: GiftRecipientAddressRequest, + val authHeader: String +) + private class RepositoryFakeGiftApi : GiftApi { var detailCall: DetailCall? = null var trackingCall: TrackingCall? = null + var recipientAddressCall: RecipientAddressCall? = null var cancelCall: DetailCall? = null override fun getGiftInbox( @@ -196,6 +297,15 @@ private class RepositoryFakeGiftApi : GiftApi { return Single.error(UnsupportedOperationException()) } + override fun registerRecipientAddress( + applicationNo: String, + request: GiftRecipientAddressRequest, + authHeader: String + ): Single> { + recipientAddressCall = RecipientAddressCall(applicationNo, request, authHeader) + return Single.error(UnsupportedOperationException()) + } + override fun cancelGift( applicationNo: String, authHeader: String