[FIX/#102] 구매뷰 orderId 관련 서버 수정사항 대응

Orange-Co · Sep 2, 2024 · e4250d8 · e4250d8
1 parent efc4f89
commit e4250d8
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 33 deletions.
diff --git a/data/src/main/java/co/orange/data/dto/request/OrderRequestDto.kt b/data/src/main/java/co/orange/data/dto/request/OrderRequestDto.kt
@@ -8,12 +8,12 @@ import kotlinx.serialization.Serializable
 data class OrderRequestDto(
     @SerialName("itemId")
     val itemId: String,
-    @SerialName("paymentId")
-    val paymentId: String,
+    @SerialName("orderId")
+    val orderId: String,
     @SerialName("selectedOptionDetailIdList")
     val selectedOptionDetailIdList: List<Long>,
 ) {
     companion object {
-        fun OrderRequestModel.toDto() = OrderRequestDto(itemId, paymentId, selectedOptionDetailIdList)
+        fun OrderRequestModel.toDto() = OrderRequestDto(itemId, orderId, selectedOptionDetailIdList)
     }
 }
diff --git a/data/src/main/java/co/orange/data/dto/request/PayEndRequestDto.kt b/data/src/main/java/co/orange/data/dto/request/PayEndRequestDto.kt
@@ -6,12 +6,12 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PayEndRequestDto(
-    @SerialName("paymentId")
-    val paymentId: String,
+    @SerialName("orderId")
+    val orderId: String,
     @SerialName("payStatus")
     val payStatus: String,
 ) {
     companion object {
-        fun PayEndRequestModel.toDto() = PayEndRequestDto(paymentId, payStatus)
+        fun PayEndRequestModel.toDto() = PayEndRequestDto(orderId, payStatus)
     }
 }
diff --git a/data/src/main/java/co/orange/data/dto/request/PayStartRequestDto.kt b/data/src/main/java/co/orange/data/dto/request/PayStartRequestDto.kt
@@ -6,8 +6,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PayStartRequestDto(
-    @SerialName("itemId")
-    val itemId: String,
+    @SerialName("productId")
+    val productId: String,
     @SerialName("charge")
     val charge: Int,
     @SerialName("totalPrice")
@@ -16,6 +16,6 @@ data class PayStartRequestDto(
     val method: String,
 ) {
     companion object {
-        fun PayStartRequestModel.toDto() = PayStartRequestDto(itemId, charge, totalPrice, method)
+        fun PayStartRequestModel.toDto() = PayStartRequestDto(productId, charge, totalPrice, method)
     }
 }
diff --git a/data/src/main/java/co/orange/data/dto/response/BuyProgressDto.kt b/data/src/main/java/co/orange/data/dto/response/BuyProgressDto.kt
@@ -6,8 +6,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class BuyProgressDto(
-    @SerialName("itemId")
-    val itemId: String,
+    @SerialName("productId")
+    val productId: String,
     @SerialName("productName")
     val productName: String,
     @SerialName("modifiedProductName")
@@ -27,7 +27,7 @@ data class BuyProgressDto(
 ) {
     fun toModel() =
         BuyProgressModel(
-            itemId,
+            productId,
             productName,
             modifiedProductName,
             imgUrl,

diff --git a/data/src/main/java/co/orange/data/dto/response/PayEndDto.kt b/data/src/main/java/co/orange/data/dto/response/PayEndDto.kt
@@ -6,16 +6,16 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PayEndDto(
-    @SerialName("paymentId")
-    val paymentId: String,
+    @SerialName("orderId")
+    val orderId: String,
     @SerialName("payStatus")
     val payStatus: String,
     @SerialName("endedAt")
     val endedAt: String,
 ) {
     fun toModel() =
         PayEndModel(
-            paymentId = paymentId,
+            orderId = orderId,
             payStatus = payStatus,
             endedAt = endedAt,
         )

diff --git a/data/src/main/java/co/orange/data/dto/response/PayStartDto.kt b/data/src/main/java/co/orange/data/dto/response/PayStartDto.kt
@@ -6,16 +6,16 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PayStartDto(
-    @SerialName("paymentId")
-    val paymentId: String,
+    @SerialName("orderId")
+    val orderId: String,
     @SerialName("payStatus")
     val payStatus: String,
     @SerialName("startedAt")
     val startedAt: String,
 ) {
     fun toModel() =
         PayStartModel(
-            paymentId = paymentId,
+            orderId = orderId,
             payStatus = payStatus,
             startedAt = startedAt,
         )

diff --git a/domain/src/main/kotlin/co/orange/domain/entity/request/OrderRequestModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/request/OrderRequestModel.kt
@@ -2,6 +2,6 @@ package co.orange.domain.entity.request
 
 data class OrderRequestModel(
     val itemId: String,
-    val paymentId: String,
+    val orderId: String,
     val selectedOptionDetailIdList: List<Long>,
 )
diff --git a/domain/src/main/kotlin/co/orange/domain/entity/request/PayEndRequestModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/request/PayEndRequestModel.kt
@@ -1,6 +1,6 @@
 package co.orange.domain.entity.request
 
 data class PayEndRequestModel(
-    val paymentId: String,
+    val orderId: String,
     val payStatus: String,
 )
diff --git a/domain/src/main/kotlin/co/orange/domain/entity/request/PayStartRequestModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/request/PayStartRequestModel.kt
@@ -1,7 +1,7 @@
 package co.orange.domain.entity.request
 
 data class PayStartRequestModel(
-    val itemId: String,
+    val productId: String,
     val charge: Int,
     val totalPrice: Int,
     val method: String,

diff --git a/domain/src/main/kotlin/co/orange/domain/entity/response/BuyProgressModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/response/BuyProgressModel.kt
@@ -1,7 +1,7 @@
 package co.orange.domain.entity.response
 
 data class BuyProgressModel(
-    val itemId: String,
+    val productId: String,
     val productName: String,
     val modifiedProductName: String,
     val imgUrl: String,

diff --git a/domain/src/main/kotlin/co/orange/domain/entity/response/PayEndModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/response/PayEndModel.kt
@@ -1,7 +1,7 @@
 package co.orange.domain.entity.response
 
 data class PayEndModel(
-    val paymentId: String,
+    val orderId: String,
     val payStatus: String,
     val endedAt: String,
 )
diff --git a/domain/src/main/kotlin/co/orange/domain/entity/response/PayStartModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/response/PayStartModel.kt
@@ -1,7 +1,7 @@
 package co.orange.domain.entity.response
 
 data class PayStartModel(
-    val paymentId: String,
+    val orderId: String,
     val payStatus: String,
     val startedAt: String,
 )
diff --git a/presentation/src/main/java/co/orange/presentation/buy/progress/BuyProgressViewModel.kt b/presentation/src/main/java/co/orange/presentation/buy/progress/BuyProgressViewModel.kt
@@ -27,9 +27,9 @@ class BuyProgressViewModel
         private val buyRepository: BuyRepository,
     ) : ViewModel() {
         var productId: String = ""
-        var paymentId: String = ""
+        private var orderId: String = ""
 
-        var buyProgressData: BuyProgressModel? = null
+        private var buyProgressData: BuyProgressModel? = null
 
         var payMethodId = MutableLiveData<Int>(-1)
         var payMethod = ""
@@ -112,13 +112,13 @@ class BuyProgressViewModel
             viewModelScope.launch {
                 buyRepository.postPaymentStart(
                     PayStartRequestModel(
-                        buyProgressData?.itemId.orEmpty(),
+                        buyProgressData?.productId.orEmpty(),
                         buyProgressData?.charge ?: -1,
                         buyProgressData?.totalPrice ?: -1,
                         payMethod,
                     ),
                 ).onSuccess {
-                    paymentId = it.paymentId
+                    orderId = it.orderId
                     if (it.payStatus == PAY_STATUS_PENDING) {
                         _postPayStartState.value = UiState.Success(it)
                     } else {
@@ -131,15 +131,15 @@ class BuyProgressViewModel
         }
 
         fun createIamportRequest(): IamPortRequest? {
-            return if (buyProgressData?.productName.isNullOrBlank() || payMethod.isBlank() || paymentId.isBlank()) {
+            return if (buyProgressData?.productName.isNullOrBlank() || payMethod.isBlank() || orderId.isBlank()) {
                 Timber.tag("okhttp").d("IAMPORT PURCHASE REQUEST ERROR : $buyProgressData")
                 null
             } else {
                 IamPortRequest(
                     pg = NICE_PAYMENTS,
                     pay_method = payMethod,
                     name = buyProgressData?.modifiedProductName,
-                    merchant_uid = paymentId,
+                    merchant_uid = orderId,
                     amount = buyProgressData?.totalPrice.toString(),
                     buyer_name = buyProgressData?.addressInfo?.recipient,
                     buyer_tel = buyProgressData?.addressInfo?.recipientPhone,
@@ -153,7 +153,7 @@ class BuyProgressViewModel
             viewModelScope.launch {
                 buyRepository.patchPaymentEnd(
                     PayEndRequestModel(
-                        paymentId,
+                        orderId,
                         if (errorCode.isNullOrEmpty()) PAY_SUCCESS else PAY_FAILURE,
                     ),
                 ).onSuccess {
@@ -170,8 +170,8 @@ class BuyProgressViewModel
             viewModelScope.launch {
                 buyRepository.postToRequestOrder(
                     OrderRequestModel(
-                        buyProgressData?.itemId.orEmpty(),
-                        paymentId,
+                        buyProgressData?.productId.orEmpty(),
+                        orderId,
                         // TODO 추후 옵션 대응
                         listOf(),
                     ),