ECWID-124999 - add OrderItem.combinationId

Ecwid · Aug 8, 2023 · 832474d · 832474d
1 parent 162675f
commit 832474d
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 1 deletion.
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt
@@ -152,6 +152,7 @@ fun FetchedOrder.OrderItem.toUpdated(): UpdatedOrder.OrderItem {
 		taxable = taxable,
 
 		selectedOptions = selectedOptions?.map(FetchedOrder.OrderItemSelectedOption::toUpdated),
+		combinationId = combinationId,
 		taxes = taxes?.map(FetchedOrder.OrderItemTax::toUpdated),
 		dimensions = dimensions?.toUpdated(),
 		discounts = discounts?.map(FetchedOrder.OrderItemDiscounts::toUpdated),

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt
@@ -90,6 +90,7 @@ data class OrderForCalculate(
 		val couponApplied: Boolean? = null,
 
 		val selectedOptions: List<OrderItemOption>? = null,
+		val combinationId: Int? = null,
 		val taxes: List<OrderItemTax>? = null,
 		val files: List<OrderItemProductFile>? = null,
 		val dimensions: ProductDimensions? = null,

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt
@@ -147,6 +147,7 @@ data class CalculateOrderDetailsResult(
 		val couponApplied: Boolean? = null,
 
 		val selectedOptions: List<OrderItemOption>? = null,
+		val combinationId: Int? = null,
 		val taxes: List<OrderItemTax>? = null,
 		val files: List<OrderItemProductFile>? = null,
 		val dimensions: ProductDimensions? = null,

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
@@ -143,6 +143,7 @@ data class FetchedCart(
 		val couponApplied: Boolean? = null,
 
 		val selectedOptions: List<OrderItemOption>? = null,
+		val combinationId: Int? = null,
 		val taxes: List<OrderItemTax>? = null,
 		val files: List<OrderItemProductFile>? = null,
 		val dimensions: ProductDimensions? = 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
@@ -153,6 +153,7 @@ data class UpdatedOrder(
 		val isGiftCard: Boolean? = null,
 
 		val selectedOptions: List<OrderItemSelectedOption>? = null,
+		val combinationId: Int? = null,
 		val taxes: List<OrderItemTax>? = null,
 		val dimensions: ProductDimensions? = null,
 		val discountsAllowed: Boolean? = 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
@@ -191,6 +191,7 @@ data class FetchedOrder(
 		val subscriptionId: Long? = null,
 
 		val selectedOptions: List<OrderItemSelectedOption>? = null,
+		val combinationId: Int? = null,
 		val files: List<OrderItemProductFile>? = null,
 		val taxable: Boolean? = null,
 		val taxes: List<OrderItemTax>? = 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
@@ -111,6 +111,7 @@ class CartsTest : BaseEntityTest() {
 				assertEquals(orderSelectedOption.type, cartSelectedOptions.type)
 				// TODO Discover why after each create field `valuesArray` some times resets to null
 			}
+			assertEquals(orderItem.combinationId, cartItem.combinationId)
 
 			assertEquals(orderItem.taxes?.count(), cartItem.taxes?.count())
 			cartItem.taxes?.forEachIndexed { taxIndex, cartTaxes ->
@@ -316,6 +317,7 @@ class CartsTest : BaseEntityTest() {
 					calculatedOrderItemOptions.files?.count()
 				) // TODO Discover why after each calculation this field resets to null
 			}
+			assertEquals(forCalculateItem.combinationId, calculatedItem.combinationId)
 
 			assertEquals(forCalculateItem.files?.count(), calculatedItem.files?.count())
 			calculatedItem.files?.forEachIndexed { taxIndex, calculatedFile ->
@@ -488,6 +490,7 @@ class CartsTest : BaseEntityTest() {
 				generateDateSelectedOption(),
 				generateFilesSelectedOption()
 			),
+			combinationId = randomId(),
 			taxes = listOf(
 				generateTestOrderItemTax()
 			),

diff --git a/...lin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt b/...lin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt
@@ -53,6 +53,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::quantity),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::quantityInStock),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::selectedOptions),
+	AllowNullable(CalculateOrderDetailsResult.OrderItem::combinationId),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::shipping),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::shortDescription),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::sku),

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
@@ -2,7 +2,7 @@ package com.ecwid.apiclient.v3.rule.nullablepropertyrules
 
 import com.ecwid.apiclient.v3.dto.cart.result.FetchedCart
 import com.ecwid.apiclient.v3.rule.NullablePropertyRule
-import com.ecwid.apiclient.v3.rule.NullablePropertyRule.IgnoreNullable
+import com.ecwid.apiclient.v3.rule.NullablePropertyRule.*
 
 val fetchedCartNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
     IgnoreNullable(FetchedCart::acceptMarketing),
@@ -97,6 +97,7 @@ val fetchedCartNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	IgnoreNullable(FetchedCart.OrderItem::quantity),
 	IgnoreNullable(FetchedCart.OrderItem::quantityInStock),
 	IgnoreNullable(FetchedCart.OrderItem::selectedOptions),
+	AllowNullable(FetchedCart.OrderItem::combinationId),
 	IgnoreNullable(FetchedCart.OrderItem::shipping),
 	IgnoreNullable(FetchedCart.OrderItem::shortDescription),
 	IgnoreNullable(FetchedCart.OrderItem::sku),

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
@@ -81,6 +81,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	AllowNullable(FetchedOrder.RecurringChargeSettings::subscriptionPriceWithSignUpFee),
 	AllowNullable(FetchedOrder.RecurringChargeSettings::signUpFee),
 	IgnoreNullable(FetchedOrder.OrderItem::selectedOptions),
+	AllowNullable(FetchedOrder.OrderItem::combinationId),
 	AllowNullable(FetchedOrder.OrderItem::selectedPrice),
 	IgnoreNullable(FetchedOrder.OrderItem::shipping),
 	IgnoreNullable(FetchedOrder.OrderItem::shortDescription),

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt
@@ -73,6 +73,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
 	IgnoreNullable(OrderForCalculate.OrderItem::quantity),
 	IgnoreNullable(OrderForCalculate.OrderItem::quantityInStock),
 	IgnoreNullable(OrderForCalculate.OrderItem::selectedOptions),
+	AllowNullable(OrderForCalculate.OrderItem::combinationId),
 	IgnoreNullable(OrderForCalculate.OrderItem::shipping),
 	IgnoreNullable(OrderForCalculate.OrderItem::shortDescription),
 	IgnoreNullable(OrderForCalculate.OrderItem::sku),

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt b/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt
@@ -216,6 +216,7 @@ private fun generateTestOrderItem() = UpdatedOrder.OrderItem(
 		generateDateSelectedOption(),
 		generateFilesSelectedOption()
 	),
+	combinationId = randomId(),
 	taxes = listOf(
 		generateTestOrderItemTax(),
 		generateTestOrderItemTax()