Merge pull request #178 from Ecwid/custom_price_tiers

Added customPriceTiers to FetchedProduct and UpdatedProduct

Author: garnet-ecwid

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

@@ -51,6 +51,8 @@ fun FetchedProduct.toUpdated(): UpdatedProduct {
 		ribbonTranslated = ribbonTranslated,
 		subtitleTranslated = subtitleTranslated,
 		nameYourPriceEnabled = nameYourPriceEnabled,
+		customPriceTiers = customPriceTiers?.map { it.toUpdated() },
+		priceDefaultTier = priceDefaultTier,
 		subscriptionSettings = subscriptionSettings?.toUpdated(),
 		googleProductCategory = googleProductCategory,
 		productCondition = productCondition,
@@ -71,6 +73,10 @@ private fun FetchedProduct.SubscriptionSettings.toUpdated() = UpdatedProduct.Sub
 	recurringChargeSettings = recurringChargeSettings.toUpdated()
 )
 
+private fun FetchedProduct.CustomPriceTier.toUpdated() = UpdatedProduct.CustomPriceTier(
+	value = value,
+)
+
 private fun List<FetchedProduct.RecurringChargeSettings>.toUpdated() = map {
 	UpdatedProduct.RecurringChargeSettings(
 		recurringInterval = it.recurringInterval,

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

@@ -52,6 +52,8 @@ data class UpdatedProduct(
 	val ribbonTranslated: LocalizedValueMap? = null,
 	val subtitleTranslated: LocalizedValueMap? = null,
 	val nameYourPriceEnabled: Boolean? = null,
+	val customPriceTiers: List<CustomPriceTier>? = null,
+	val priceDefaultTier: Int? = null,
 	val subscriptionSettings: SubscriptionSettings? = null,
 	val googleProductCategory: Int? = null,
 	val productCondition: ProductCondition? = null,
@@ -321,6 +323,10 @@ data class UpdatedProduct(
 		val height: Double? = null
 	)
 
+	data class CustomPriceTier(
+		val value: Double = 0.0
+	)
+
 	data class ProductMedia(
 		val images: List<ProductImage>? = null
 	)

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

@@ -82,6 +82,8 @@ data class FetchedProduct(
 	val ribbonTranslated: LocalizedValueMap? = null,
 	val subtitleTranslated: LocalizedValueMap? = null,
 	val nameYourPriceEnabled: Boolean? = null,
+	val customPriceTiers: List<CustomPriceTier>? = null,
+	val priceDefaultTier: Int? = null,
 	val subscriptionSettings: SubscriptionSettings? = null,
 	val googleProductCategory: Int? = null,
 	val googleProductCategoryName: String? = null,
@@ -245,6 +247,10 @@ data class FetchedProduct(
 		val height: Double? = null
 	)
 
+	data class CustomPriceTier(
+		val value: Double = 0.0
+	)
+
 	data class GalleryImage(
 		val id: Long = 0,
 		val orderBy: Int = 0,

src/test/kotlin/com/ecwid/apiclient/v3/rule/NonnullPropertyRules.kt

@@ -21,6 +21,7 @@ val nonnullPropertyRules: List<NonnullPropertyRule<*, *>> = listOf(
 	AllowNonnull(UpdatedProduct.ProductOption.SizeOption::required),
 	AllowNonnull(UpdatedProduct.ProductOption.TextAreaOption::required),
 	AllowNonnull(UpdatedProduct.ProductOption.TextFieldOption::required),
+	AllowNonnull(UpdatedProduct.CustomPriceTier::value),
 
 	IgnoreNonnull(UpdatedCoupon::code),
 	IgnoreNonnull(UpdatedCoupon::name),

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

@@ -36,6 +36,8 @@ val fetchedProductNullablePropertyRules: List<NullablePropertyRule<*, *>> = list
 	IgnoreNullable(FetchedProduct::media),
 	IgnoreNullable(FetchedProduct::nameTranslated),
 	IgnoreNullable(FetchedProduct::nameYourPriceEnabled),
+	IgnoreNullable(FetchedProduct::customPriceTiers),
+	IgnoreNullable(FetchedProduct::priceDefaultTier),
 	IgnoreNullable(FetchedProduct::options),
 	IgnoreNullable(FetchedProduct::originalImage),
 	IgnoreNullable(FetchedProduct::price),