Skip to content

ECWID-156302 - add absent enums to DiscountBase #458

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
mvgreen merged 3 commits into from
Jan 27, 2025
Merged

ECWID-156302 - add absent enums to DiscountBase #458

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89a5602
ECWID-156302 - add absent enums to DiscountBase
danyaRedin Jan 23, 2025
8a7a86b
Fill in the orderTotal field in tests
mvgreen Jan 27, 2025
fa40118
Revert changes to pull-request.yml in case they were unnecessary for …
mvgreen Jan 27, 2025
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
29 changes: 28 additions & 1 deletion src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ fun generateTestOrder(): UpdatedOrder {
generateTestOnTotalDiscountInfo(),
generateTestOnMembershipDiscountInfo(),
generateTestOnTotalAndMembershipDiscountInfo(),
generateTestCustomDiscountInfo()
generateTestCustomDiscountInfo(),
generateTestItemDiscountInfo(),
generateTestShippingDiscountInfo(),
generateTestSubtotalDiscountInfo()
),

// TODO Pass real discount coupon code when API client will support this
Expand Down Expand Up @@ -190,6 +193,30 @@ private fun generateTestCustomDiscountInfo() = UpdatedOrder.DiscountInfo(
description = "Custom discount " + randomAlphanumeric(8)
)

private fun generateTestItemDiscountInfo() = UpdatedOrder.DiscountInfo(
value = randomPrice(),
type = randomEnumValue<DiscountType>(),
base = DiscountBase.ITEM,
orderTotal = randomPrice(),
description = "On item discount " + randomAlphanumeric(8)
)

private fun generateTestShippingDiscountInfo() = UpdatedOrder.DiscountInfo(
value = randomPrice(),
type = randomEnumValue<DiscountType>(),
base = DiscountBase.SHIPPING,
orderTotal = randomPrice(),
description = "On shipping discount " + randomAlphanumeric(8)
)

private fun generateTestSubtotalDiscountInfo() = UpdatedOrder.DiscountInfo(
value = randomPrice(),
type = randomEnumValue<DiscountType>(),
base = DiscountBase.SUBTOTAL,
orderTotal = randomPrice(),
description = "On subtotal discount " + randomAlphanumeric(8)
)

private fun generateTestOrderItem() = UpdatedOrder.OrderItem(
// var id: Int? = null, // TODO readonly
// productId = com.ecwid.api.v3.randomId(), // TODO need to pass existing product id
Expand Down
Loading