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 89b36963..75793f17 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 @@ -27,7 +27,7 @@ interface GiftApi { fun createGift( @Body request: GiftCreateRequest, @Header("Authorization") authHeader: String - ): Single> + ): Single> @GET("/api/v2/gifts/{applicationNo}") fun getGiftDetail( 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 465d5969..7f757459 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 @@ -63,6 +63,15 @@ data class GiftCreateRequest( @SerializedName("damageWaiverAgreed") val damageWaiverAgreed: Boolean ) +@Keep +data class GiftCreateResponse( + @SerializedName("applicationNo") val applicationNo: String, + @SerializedName("status") val status: String, + @SerializedName("statusName") val statusName: String, + @SerializedName("priceCan") val priceCan: Int, + @SerializedName("trackingDeadlineAt") val trackingDeadlineAt: String +) + @Keep data class GiftDetailResponse( @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 3dfc9f73..662bde1e 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 @@ -1,5 +1,8 @@ package kr.co.vividnext.sodalive.v2.gift.data +import io.reactivex.rxjava3.core.Single +import kr.co.vividnext.sodalive.common.ApiResponse + class GiftRepository(private val api: GiftApi) { fun getGiftInbox(page: Int, token: String) = api.getGiftInbox( type = "ALL", @@ -10,7 +13,7 @@ class GiftRepository(private val api: GiftApi) { fun getFormOptions(token: String) = api.getFormOptions(authHeader = token) - fun createGift(request: GiftCreateRequest, token: String) = api.createGift( + fun createGift(request: GiftCreateRequest, token: String): Single> = api.createGift( request = request, 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 2edd8b57..11eac232 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 @@ -13,6 +13,7 @@ import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.v2.gift.data.GiftApi import kr.co.vividnext.sodalive.v2.gift.data.GiftCancelResponse import kr.co.vividnext.sodalive.v2.gift.data.GiftCreateRequest +import kr.co.vividnext.sodalive.v2.gift.data.GiftCreateResponse 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 @@ -227,7 +228,7 @@ internal class InboxFakeApi : GiftApi { override fun getFormOptions(authHeader: String): Single> = Single.error(UnsupportedOperationException()) - override fun createGift(request: GiftCreateRequest, authHeader: String): Single> = + override fun createGift(request: GiftCreateRequest, authHeader: String): Single> = Single.error(UnsupportedOperationException()) override fun getGiftDetail(applicationNo: String, authHeader: String): Single> = 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 3ff57075..b550753e 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 @@ -277,7 +277,7 @@ private class RepositoryFakeGiftApi : GiftApi { override fun getFormOptions(authHeader: String): Single> = Single.error(UnsupportedOperationException()) - override fun createGift(request: GiftCreateRequest, authHeader: String): Single> = + override fun createGift(request: GiftCreateRequest, authHeader: String): Single> = Single.error(UnsupportedOperationException()) override fun getGiftDetail(