add local delivery to import/export

hanna-ecwid · hanna-ecwid · commit cbb25e1b2b29 · 2022-07-19T12:46:11.000+04:00
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedProduct.kt b/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedProduct.kt
@@ -201,7 +201,8 @@ private fun FetchedProduct.ProductDimensions.toUpdated() = UpdatedProduct.Produc
 private fun FetchedProduct.ShippingPreparationTime.toUpdated() = UpdatedProduct.ShippingPreparationTime(
 	shippingPreparationTimeForInStockItemDays = shippingPreparationTimeForInStockItemDays,
 	shippingPreparationTimeForOutOfStockItemDays = shippingPreparationTimeForOutOfStockItemDays,
-	pickupPreparationTimeForInStockItemInMinutes = pickupPreparationTimeForInStockItemInMinutes
+	pickupPreparationTimeForInStockItemInMinutes = pickupPreparationTimeForInStockItemInMinutes,
+	localDeliveryPreparationTimeForInStockItemInMinutes = localDeliveryPreparationTimeForInStockItemInMinutes
 )
 
 fun FetchedProduct.ProductMedia.toUpdated() = UpdatedProduct.ProductMedia(
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/product/request/UpdatedProduct.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/product/request/UpdatedProduct.kt
@@ -332,7 +332,8 @@ data class UpdatedProduct(
 	data class ShippingPreparationTime(
 		val shippingPreparationTimeForInStockItemDays: String? = null,
 		val shippingPreparationTimeForOutOfStockItemDays: String? = null,
-		val pickupPreparationTimeForInStockItemInMinutes: Int? = null
+		val pickupPreparationTimeForInStockItemInMinutes: Int? = null,
+		val localDeliveryPreparationTimeForInStockItemInMinutes: Int? = null,
 	)
 
 	data class CustomPriceTier(
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/product/result/FetchedProduct.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/product/result/FetchedProduct.kt
@@ -255,7 +255,8 @@ data class FetchedProduct(
 	data class ShippingPreparationTime(
 		val shippingPreparationTimeForInStockItemDays: String? = null,
 		val shippingPreparationTimeForOutOfStockItemDays: String? = null,
-		val pickupPreparationTimeForInStockItemInMinutes: Int? = null
+		val pickupPreparationTimeForInStockItemInMinutes: Int? = null,
+		val localDeliveryPreparationTimeForInStockItemInMinutes: Int? = null,
 	)
 
 	data class CustomPriceTier(
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt
@@ -40,6 +40,7 @@ val otherNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	AllowNullable(FetchedProduct.ShippingPreparationTime::pickupPreparationTimeForInStockItemInMinutes),
 	AllowNullable(FetchedProduct.ShippingPreparationTime::shippingPreparationTimeForInStockItemDays),
 	AllowNullable(FetchedProduct.ShippingPreparationTime::shippingPreparationTimeForOutOfStockItemDays),
+	AllowNullable(FetchedProduct.ShippingPreparationTime::localDeliveryPreparationTimeForInStockItemInMinutes),
 
 	IgnoreNullable(ConvertCartToOrderResult::id),
 	IgnoreNullable(ConvertCartToOrderResult::orderNumber),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedProductRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedProductRules.kt
@@ -39,6 +39,10 @@ val fetchedProductNullablePropertyRules: List<NullablePropertyRule<*, *>> = list
 	IgnoreNullable(FetchedProduct::customPriceTiers),
 	IgnoreNullable(FetchedProduct::priceDefaultTier),
 	IgnoreNullable(FetchedProduct::shippingPreparationTime),
+	AllowNullable(FetchedProduct.ShippingPreparationTime::pickupPreparationTimeForInStockItemInMinutes),
+	AllowNullable(FetchedProduct.ShippingPreparationTime::shippingPreparationTimeForInStockItemDays),
+	AllowNullable(FetchedProduct.ShippingPreparationTime::shippingPreparationTimeForOutOfStockItemDays),
+	AllowNullable(FetchedProduct.ShippingPreparationTime::localDeliveryPreparationTimeForInStockItemInMinutes),
 	IgnoreNullable(FetchedProduct::showDeliveryTimeInStorefront),
 	IgnoreNullable(FetchedProduct::options),
 	IgnoreNullable(FetchedProduct::originalImage),

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,8 @@ private fun FetchedProduct.ProductDimensions.toUpdated() = UpdatedProduct.Produc`
`201`	`201`	`private fun FetchedProduct.ShippingPreparationTime.toUpdated() = UpdatedProduct.ShippingPreparationTime(`
`202`	`202`	`shippingPreparationTimeForInStockItemDays = shippingPreparationTimeForInStockItemDays,`
`203`	`203`	`shippingPreparationTimeForOutOfStockItemDays = shippingPreparationTimeForOutOfStockItemDays,`
`204`		`- pickupPreparationTimeForInStockItemInMinutes = pickupPreparationTimeForInStockItemInMinutes`
	`204`	`+ pickupPreparationTimeForInStockItemInMinutes = pickupPreparationTimeForInStockItemInMinutes,`
	`205`	`+ localDeliveryPreparationTimeForInStockItemInMinutes = localDeliveryPreparationTimeForInStockItemInMinutes`
`205`	`206`	`)`
`206`	`207`
`207`	`208`	`fun FetchedProduct.ProductMedia.toUpdated() = UpdatedProduct.ProductMedia(`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,8 @@ data class UpdatedProduct(`
`332`	`332`	`data class ShippingPreparationTime(`
`333`	`333`	`val shippingPreparationTimeForInStockItemDays: String? = null,`
`334`	`334`	`val shippingPreparationTimeForOutOfStockItemDays: String? = null,`
`335`		`- val pickupPreparationTimeForInStockItemInMinutes: Int? = null`
	`335`	`+ val pickupPreparationTimeForInStockItemInMinutes: Int? = null,`
	`336`	`+ val localDeliveryPreparationTimeForInStockItemInMinutes: Int? = null,`
`336`	`337`	`)`
`337`	`338`
`338`	`339`	`data class CustomPriceTier(`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,8 @@ data class FetchedProduct(`
`255`	`255`	`data class ShippingPreparationTime(`
`256`	`256`	`val shippingPreparationTimeForInStockItemDays: String? = null,`
`257`	`257`	`val shippingPreparationTimeForOutOfStockItemDays: String? = null,`
`258`		`- val pickupPreparationTimeForInStockItemInMinutes: Int? = null`
	`258`	`+ val pickupPreparationTimeForInStockItemInMinutes: Int? = null,`
	`259`	`+ val localDeliveryPreparationTimeForInStockItemInMinutes: Int? = null,`
`259`	`260`	`)`
`260`	`261`
`261`	`262`	`data class CustomPriceTier(`