Merge pull request #557 from Ecwid/ECOM-19730

CBE: add support for the new batteryIncluded field in the public API for the product

Author: winrokru

.DS_Store

@@ -72,6 +72,7 @@ fun FetchedProduct.toUpdated(): UpdatedProduct {
 		minPurchaseQuantity = minPurchaseQuantity,
 		maxPurchaseQuantity = maxPurchaseQuantity,
 		reviewsCollectingAllowed = reviewsCollectingAllowed,
+		batteryIncluded = batteryIncluded,
 	)
 }
 

src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedProduct.kt

@@ -72,6 +72,7 @@ data class UpdatedProduct(
 	val minPurchaseQuantity: Int? = null,
 	val maxPurchaseQuantity: Int? = null,
 	val reviewsCollectingAllowed: Boolean? = null,
+	val batteryIncluded: Boolean? = null,
 ) : ApiUpdatedDTO {
 
 	data class Ribbon(

src/main/kotlin/com/ecwid/apiclient/v3/dto/product/request/UpdatedProduct.kt

@@ -140,6 +140,7 @@ data class FetchedProduct(
 	val minPurchaseQuantity: Int? = null,
 	val maxPurchaseQuantity: Int? = null,
 	val reviewsCollectingAllowed: Boolean? = null,
+	val batteryIncluded: Boolean? = null,
 	val rating: Double? = null,
 	val reviewsModerated: Int? = null,
 	val reviewsPublished: Int? = null,

src/main/kotlin/com/ecwid/apiclient/v3/dto/product/result/FetchedProduct.kt

@@ -13,6 +13,7 @@ import com.ecwid.apiclient.v3.exception.EcwidApiException
 import com.ecwid.apiclient.v3.util.randomAlphanumeric
 import com.ecwid.apiclient.v3.util.randomBoolean
 import com.ecwid.apiclient.v3.util.randomEmail
+import com.ecwid.apiclient.v3.util.randomNumeric
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Disabled
@@ -419,7 +420,7 @@ private fun generateTestCustomerForCreate(customerGroupId: Int?): UpdatedCustome
 			generateShippingAddress(),
 			generateShippingAddress()
 		),
-		taxId = randomAlphanumeric(8),
+		taxId = randomNumeric(8),
 		taxIdValid = randomBoolean(),
 		taxExempt = randomBoolean(),
 		acceptMarketing = randomBoolean(),
@@ -444,7 +445,7 @@ private fun generateTestCustomerForUpdate(
 			generateShippingAddress(oldShippingAddresses?.get(2)?.id),
 			generateShippingAddress(oldShippingAddresses?.get(3)?.id)
 		),
-		taxId = randomAlphanumeric(8),
+		taxId = randomNumeric(8),
 		taxIdValid = randomBoolean(),
 		taxExempt = randomBoolean(),
 		acceptMarketing = randomBoolean(),

src/test/kotlin/com/ecwid/apiclient/v3/entity/CustomersTest.kt

@@ -73,6 +73,7 @@ val fetchedProductNullablePropertyRules: List<NullablePropertyRule<*, *>> = list
 	AllowNullable(FetchedProduct::rating),
 	IgnoreNullable(FetchedProduct::relatedProducts),
 	AllowNullable(FetchedProduct::reviewsCollectingAllowed),
+	AllowNullable(FetchedProduct::batteryIncluded),
 	AllowNullable(FetchedProduct::reviewsModerated),
 	AllowNullable(FetchedProduct::reviewsPublished),
 	IgnoreNullable(FetchedProduct::ribbon),

src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedProductRules.kt

@@ -62,6 +62,14 @@ internal fun randomAlphanumeric(size: Int): String {
 		.joinToString("")
 }
 
+internal fun randomNumeric(size: Int): String {
+	val digits = ('0'..'9').toList()
+	return (1..size)
+		.map { Random.nextInt(0, digits.size) }
+		.map(digits::get)
+		.joinToString("")
+}
+
 internal inline fun <reified E : Enum<E>> randomEnumValue(vararg exclude: E): E {
 	return E::class.java.enumConstants
 		.toSortedSet()