ECWID-137410 ecwid-java-api-client: add customerGroupId to order enti…

…ties — added
Ecwid · Mar 29, 2024 · 7e44ac6 · 7e44ac6
1 parent ce111c8
commit 7e44ac6
Show file tree

Hide file tree

Showing 6 changed files with 6 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
@@ -37,6 +37,7 @@ fun FetchedOrder.toUpdated(): UpdatedOrder {
 
 		customerId = customerId,
 		customerGroup = customerGroup,
+		customerGroupId = customerGroupId,
 		acceptMarketing = acceptMarketing,
 
 		total = total,

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
@@ -11,6 +11,7 @@ data class OrderForCalculate(
 	val email: String? = null,
 	val ipAddress: String? = null,
 	val customerId: Int? = null,
+	val customerGroupId: Int? = null,
 	val customerTaxExempt: Boolean? = null,
 	val customerTaxId: String? = null,
 	val reversedTaxApplied: Boolean? = 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
@@ -42,6 +42,7 @@ data class UpdatedOrder(
 
 	val customerId: Int? = null,
 	val customerGroup: String? = null,
+	val customerGroupId: Int? = null,
 	val acceptMarketing: Boolean? = null,
 
 	val total: 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
@@ -56,7 +56,7 @@ data class FetchedOrder(
 
 	val customerId: Int? = null, // TODO Figure out how to test
 	val customerGroup: String? = null,
-	val customerGroupId: Long? = null,
+	val customerGroupId: Int? = null,
 	val acceptMarketing: Boolean? = null,
 
 	val giftCardRedemption: Double? = null,

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
@@ -8,6 +8,7 @@ import com.ecwid.apiclient.v3.rule.NullablePropertyRule.IgnoreNullable
 val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	IgnoreNullable(OrderForCalculate::billingPerson),
 	IgnoreNullable(OrderForCalculate::customerId),
+	AllowNullable(OrderForCalculate::customerGroupId),
 	AllowNullable(OrderForCalculate::customerTaxId),
 	AllowNullable(OrderForCalculate::customerTaxExempt),
 	AllowNullable(OrderForCalculate::customSurcharges),

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt b/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt
@@ -50,6 +50,7 @@ fun generateTestOrder(): UpdatedOrder {
 		externalTransactionId = randomAlphanumeric(16),
 
 		customerGroup = "Group " + randomAlphanumeric(8),
+		customerGroupId = randomId(),
 		acceptMarketing = randomBoolean(),
 
 		total = totalPrice,