Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ data class OrderForCalculate(
val price: Double? = null,
val productPrice: Double? = null,
val needCalculateWholesalePrice: Boolean? = null,
val isCustomerSetPrice: Boolean? = null,
val selectedPrice: SelectedPrice? = null,
val shipping: Double? = null,
val tax: Double? = null,
val fixedShippingRate: Double? = null,
Expand Down Expand Up @@ -275,4 +277,8 @@ data class OrderForCalculate(
data class PaymentOption(
val paymentId: String? = null,
)

data class SelectedPrice(
val value: Double? = null
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class DtoContractUnitTest {
@Test
@Order(5)
fun `test no new exclusions added to file NullablePropertyRules`() {
val expectedNullablePropertiesCount = 931
val expectedNullablePropertiesCount = 933
val ignoreNullablePropertiesCount = nullablePropertyRules
.filterIsInstance<IgnoreNullable<*, *>>()
.size
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
IgnoreNullable(OrderForCalculate.OrderItem::price),
IgnoreNullable(OrderForCalculate.OrderItem::productId),
IgnoreNullable(OrderForCalculate.OrderItem::productPrice),
IgnoreNullable(OrderForCalculate.OrderItem::isCustomerSetPrice),
IgnoreNullable(OrderForCalculate.OrderItem::selectedPrice),
IgnoreNullable(OrderForCalculate.OrderItem::quantity),
IgnoreNullable(OrderForCalculate.OrderItem::quantityInStock),
IgnoreNullable(OrderForCalculate.OrderItem::selectedOptions),
Expand Down Expand Up @@ -125,6 +127,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
IgnoreNullable(OrderForCalculate.OrderItemTax::total),
IgnoreNullable(OrderForCalculate.OrderItemTax::value),
AllowNullable(OrderForCalculate.PaymentOption::paymentId),
AllowNullable(OrderForCalculate.SelectedPrice::value),
IgnoreNullable(OrderForCalculate.PersonInfo::city),
IgnoreNullable(OrderForCalculate.PersonInfo::companyName),
IgnoreNullable(OrderForCalculate.PersonInfo::countryCode),
Expand Down