Merge pull request #385 from Ecwid/ECWID-135534

ECWID-135534 api v3: calculate order details — use shipping rate if i…
Ecwid · Mar 20, 2024 · ae75fce · ae75fce
2 parents bbb2a12 + d9c8dd0
commit ae75fce
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 0 deletions.
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt
@@ -232,6 +232,7 @@ fun FetchedOrder.PersonInfo.toUpdated(): UpdatedOrder.PersonInfo {
 
 fun FetchedOrder.ShippingOption.toUpdated(): UpdatedOrder.ShippingOption {
 	return UpdatedOrder.ShippingOption(
+		shippingMethodId = shippingMethodId,
 		shippingCarrierName = shippingCarrierName,
 		shippingMethodName = shippingMethodName,
 		shippingRate = shippingRate,

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/FetchedCart.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/FetchedCart.kt
@@ -230,6 +230,7 @@ data class FetchedCart(
 	)
 
 	data class ShippingOptionInfo(
+		val shippingMethodId: String? = null,
 		val shippingCarrierName: String? = null,
 		val shippingMethodName: String? = null,
 		val shippingRate: Double? = null,

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt
@@ -294,6 +294,7 @@ data class UpdatedOrder(
 	)
 
 	data class ShippingOption(
+		val shippingMethodId: String? = null,
 		val shippingCarrierName: String? = null,
 		val shippingMethodName: String? = null,
 		val shippingRate: Double? = null,

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt
@@ -318,6 +318,7 @@ data class FetchedOrder(
 	)
 
 	data class ShippingOption(
+		val shippingMethodId: String? = null,
 		val shippingCarrierName: String? = null,
 		val shippingMethodName: String? = null,
 		val shippingRate: Double? = null,

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt b/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt
@@ -164,6 +164,7 @@ class CartsTest : BaseEntityTest() {
 			testOrder.shippingOption?.shippingCarrierName,
 			cartDetailsResult.shippingOption?.shippingCarrierName
 		)
+		assertEquals(testOrder.shippingOption?.shippingMethodId, cartDetailsResult.shippingOption?.shippingMethodId)
 		assertEquals(testOrder.shippingOption?.shippingMethodName, cartDetailsResult.shippingOption?.shippingMethodName)
 		assertEquals(testOrder.shippingOption?.shippingRate, cartDetailsResult.shippingOption?.shippingRate)
 		assertEquals(

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedCartRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedCartRules.kt
@@ -163,6 +163,7 @@ val fetchedCartNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	IgnoreNullable(FetchedCart.SelectionInfo::selectionModifier),
 	IgnoreNullable(FetchedCart.SelectionInfo::selectionModifierType),
 	IgnoreNullable(FetchedCart.SelectionInfo::selectionTitle),
+	AllowNullable(FetchedCart.ShippingOptionInfo::shippingMethodId),
 	IgnoreNullable(FetchedCart.ShippingOptionInfo::estimatedTransitTime),
 	IgnoreNullable(FetchedCart.ShippingOptionInfo::isPickup),
 	IgnoreNullable(FetchedCart.ShippingOptionInfo::pickupInstruction),

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt
@@ -172,6 +172,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	AllowNullable(FetchedOrder.ShippingLabelInfo::commercialInvoiceUrl),
 	AllowNullable(FetchedOrder.ShippingLabelInfo::labelFileType),
 	AllowNullable(FetchedOrder.ShippingLabelInfo::labelUrl),
+	AllowNullable(FetchedOrder.ShippingOption::shippingMethodId),
 	IgnoreNullable(FetchedOrder.ShippingOption::estimatedTransitTime),
 	IgnoreNullable(FetchedOrder.ShippingOption::fulfillmentType),
 	IgnoreNullable(FetchedOrder.ShippingOption::isPickup),

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt b/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt
@@ -100,6 +100,7 @@ fun generateTestOrder(): UpdatedOrder {
 		shippingPerson = generatePersonInfo(),
 
 		shippingOption = UpdatedOrder.ShippingOption(
+			shippingMethodId = "MethodId " + randomAlphanumeric(8),
 			shippingCarrierName = "Carrier " + randomAlphanumeric(8),
 			shippingMethodName = "Method " + randomAlphanumeric(8),
 			shippingRate = randomPrice(),