Skip to content

ECWID-99676 Delivery timeframes: new import/export #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garnet-ecwid merged 2 commits into from
May 25, 2022
Merged

ECWID-99676 Delivery timeframes: new import/export #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18e1678
ECWID-99676 Delivery timeframes: new import/export
hanna-ecwid May 25, 2022
de5b0c0
ECWID-99676 Delivery timeframes: new import/export - фикс теста
hanna-ecwid May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedProduct.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ fun FetchedProduct.toUpdated(): UpdatedProduct {

weight = weight,
dimensions = dimensions?.toUpdated(),
shippingPreparationTime = shippingPreparationTime?.toUpdated(),
showDeliveryTimeInStorefront = showDeliveryTimeInStorefront,
volume = volume,
shipping = shipping?.toUpdated(),
isShippingRequired = isShippingRequired,
Expand Down Expand Up @@ -195,6 +197,12 @@ private fun FetchedProduct.ProductDimensions.toUpdated() = UpdatedProduct.Produc
height = height
)

private fun FetchedProduct.ShippingPreparationTime.toUpdated() = UpdatedProduct.ShippingPreparationTime(
shippingPreparationTimeForInStockItemDays = shippingPreparationTimeForInStockItemDays,
shippingPreparationTimeForOutOfStockItemDays = shippingPreparationTimeForOutOfStockItemDays,
pickupPreparationTimeForInStockItemInMinutes = pickupPreparationTimeForInStockItemInMinutes
)

fun FetchedProduct.ProductMedia.toUpdated() = UpdatedProduct.ProductMedia(
images = images.map(FetchedProduct.ProductImage::toUpdated)
)
Expand Down
10 changes: 10 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/product/request/UpdatedProduct.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ data class UpdatedProduct(
val weight: Double? = null,
val dimensions: ProductDimensions? = null,
val volume: Double? = null,

val shippingPreparationTime: ShippingPreparationTime? = null,
val showDeliveryTimeInStorefront: Boolean? = null,

val shipping: ShippingSettings? = null,
val isShippingRequired: Boolean? = null,

Expand Down Expand Up @@ -324,6 +328,12 @@ data class UpdatedProduct(
val height: Double? = null
)

data class ShippingPreparationTime(
val shippingPreparationTimeForInStockItemDays: String? = null,
val shippingPreparationTimeForOutOfStockItemDays: String? = null,
val pickupPreparationTimeForInStockItemInMinutes: Int? = null
)

data class CustomPriceTier(
val value: Double = 0.0
)
Expand Down
10 changes: 10 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/product/result/FetchedProduct.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ data class FetchedProduct(
val weight: Double? = null,
val dimensions: ProductDimensions? = null,
val volume: Double = 0.0,

val shippingPreparationTime: ShippingPreparationTime? = null,
val showDeliveryTimeInStorefront: Boolean? = null,

val shipping: ShippingSettings? = null,
val isShippingRequired: Boolean? = null,

Expand Down Expand Up @@ -247,6 +251,12 @@ data class FetchedProduct(
val height: Double? = null
)

data class ShippingPreparationTime(
val shippingPreparationTimeForInStockItemDays: String? = null,
val shippingPreparationTimeForOutOfStockItemDays: String? = null,
val pickupPreparationTimeForInStockItemInMinutes: Int? = null
)

data class CustomPriceTier(
val value: Double = 0.0
)
Expand Down
4 changes: 4 additions & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.ecwid.apiclient.v3.dto.variation.request.ProductVariationsRequest
import com.ecwid.apiclient.v3.rule.NullablePropertyRule.AllowNullable
import com.ecwid.apiclient.v3.rule.NullablePropertyRule.IgnoreNullable
import com.ecwid.apiclient.v3.rule.nullablepropertyrules.*
import com.ecwid.apiclient.v3.dto.product.result.FetchedProduct
import kotlin.reflect.KProperty1

val otherNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
Expand All @@ -35,6 +36,9 @@ val otherNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
AllowNullable(GetProductFiltersResult.ProductFilters::onsale),
AllowNullable(GetProductFiltersResult.ProductFilters::options),
AllowNullable(GetProductFiltersResult.ProductFilters::price),
AllowNullable(FetchedProduct.ShippingPreparationTime::pickupPreparationTimeForInStockItemInMinutes),
AllowNullable(FetchedProduct.ShippingPreparationTime::shippingPreparationTimeForInStockItemDays),
AllowNullable(FetchedProduct.ShippingPreparationTime::shippingPreparationTimeForOutOfStockItemDays),

IgnoreNullable(ConvertCartToOrderResult::id),
IgnoreNullable(ConvertCartToOrderResult::orderNumber),
Expand Down
2 changes: 2 additions & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedProductRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ val fetchedProductNullablePropertyRules: List<NullablePropertyRule<*, *>> = list
IgnoreNullable(FetchedProduct::nameYourPriceEnabled),
IgnoreNullable(FetchedProduct::customPriceTiers),
IgnoreNullable(FetchedProduct::priceDefaultTier),
IgnoreNullable(FetchedProduct::shippingPreparationTime),
IgnoreNullable(FetchedProduct::showDeliveryTimeInStorefront),
IgnoreNullable(FetchedProduct::options),
IgnoreNullable(FetchedProduct::originalImage),
IgnoreNullable(FetchedProduct::price),
Expand Down