ECWID-131152 - move FetchedProduct rules to a separate file

Ecwid · Dec 8, 2023 · a63ecd9 · a63ecd9
1 parent ebd868c
commit a63ecd9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt
@@ -12,8 +12,6 @@ import com.ecwid.apiclient.v3.dto.order.result.DeletedOrder
 import com.ecwid.apiclient.v3.dto.payment.PaymentAppRequest
 import com.ecwid.apiclient.v3.dto.product.request.ProductInventoryUpdateRequest
 import com.ecwid.apiclient.v3.dto.product.request.ProductUpdateRequest
-import com.ecwid.apiclient.v3.dto.product.request.UpdatedProduct
-import com.ecwid.apiclient.v3.dto.product.result.FetchedProduct
 import com.ecwid.apiclient.v3.dto.product.result.GetProductFiltersResult
 import com.ecwid.apiclient.v3.dto.product.result.ProductInventoryUpdateResult
 import com.ecwid.apiclient.v3.dto.profile.request.StoreProfileRequest
@@ -47,14 +45,6 @@ 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),
-	AllowNullable(FetchedProduct.ShippingPreparationTime::localDeliveryPreparationTimeForInStockItemInMinutes),
-	AllowNullable(FetchedProduct.ProductOption.ChoiceBased::defaultChoice),
-	AllowNullable(FetchedProduct.ProductOption.CheckboxOption::defaultChoice),
-
-	AllowNullable(UpdatedProduct.ProductOption::required),
 
 	AllowNullable(FetchedLatestStats::productCount),
 	AllowNullable(FetchedLatestStats::categoryCount),
@@ -79,8 +69,6 @@ val otherNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	IgnoreNullable(ProductInventoryUpdateResult::warning),
 
 	AllowNullable(FetchedStorageData::value),
-	AllowNullable(FetchedProduct::minPurchaseQuantity),
-	AllowNullable(FetchedProduct::maxPurchaseQuantity),
 
 	AllowNullable(ReportRequest::startedFrom),
 	AllowNullable(ReportRequest::endedAt),

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
@@ -145,5 +145,13 @@ val fetchedProductNullablePropertyRules: List<NullablePropertyRule<*, *>> = list
 	IgnoreNullable(FetchedProduct.SubscriptionSettings::displayedOneTimePurchaseMarkupPercent),
 	IgnoreNullable(FetchedProduct.SubscriptionSettings::displayedOneTimePurchaseMarkupPercentFormatted),
 	AllowNullable(FetchedProduct.SubscriptionSettings::oneTimePurchasePrice),
-	IgnoreNullable(FetchedProduct.SubscriptionSettings::oneTimePurchasePriceFormatted)
+	IgnoreNullable(FetchedProduct.SubscriptionSettings::oneTimePurchasePriceFormatted),
+	AllowNullable(FetchedProduct.ShippingPreparationTime::pickupPreparationTimeForInStockItemInMinutes),
+	AllowNullable(FetchedProduct.ShippingPreparationTime::shippingPreparationTimeForInStockItemDays),
+	AllowNullable(FetchedProduct.ShippingPreparationTime::shippingPreparationTimeForOutOfStockItemDays),
+	AllowNullable(FetchedProduct.ShippingPreparationTime::localDeliveryPreparationTimeForInStockItemInMinutes),
+	AllowNullable(FetchedProduct.ProductOption.ChoiceBased::defaultChoice),
+	AllowNullable(FetchedProduct.ProductOption.CheckboxOption::defaultChoice),
+	AllowNullable(FetchedProduct::minPurchaseQuantity),
+	AllowNullable(FetchedProduct::maxPurchaseQuantity),
 )