asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(promotion): check currency when computing actions for promotions (#13084)

Browse Source 
* fix(promotion): check currency when computing actions for promotions

* chore: fix tests

* chore: fix more specs
This commit is contained in:
Riqwan Thamir
2025-07-31 11:41:07 +02:00
committed by GitHub
parent 54a74b0215
commit 75320e744f
12 changed files with 152 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/modules/promotion/integration-tests/__fixtures__/campaigns/data.ts
View File

@@ -11,7 +11,7 @@ export const defaultCampaignsData = [
budget: {
type: CampaignBudgetType.SPEND,
limit: 1000,
currency_code: "USD",
currency_code: "usd",
used: 0,
},
},
@@ -25,7 +25,7 @@ export const defaultCampaignsData = [
budget: {
type: CampaignBudgetType.USAGE,
limit: 1000,
currency_code: "USD",
currency_code: "usd",
used: 0,
},
},

4
packages/modules/promotion/integration-tests/__fixtures__/promotion/data.ts
View File

@@ -7,7 +7,7 @@ export const defaultPromotionsData: CreatePromotionDTO[] = [
code: "PROMOTION_1",
type: PromotionType.STANDARD,
application_method: {
currency_code: "USD",
currency_code: "usd",
target_type: "items",
type: "fixed",
allocation: "across",
@@ -19,7 +19,7 @@ export const defaultPromotionsData: CreatePromotionDTO[] = [
code: "PROMOTION_2",
type: PromotionType.STANDARD,
application_method: {
currency_code: "USD",
currency_code: "usd",
target_type: "items",
type: "fixed",
allocation: "across",

2
packages/modules/promotion/integration-tests/__fixtures__/promotion/index.ts
View File

@@ -59,7 +59,7 @@ export async function createDefaultPromotion(
campaign_id: "campaign-id-1",
...promotion,
application_method: {
currency_code: "USD",
currency_code: "usd",
target_type: "items",
type: "fixed",
allocation: "across",

44
packages/modules/promotion/integration-tests/__tests__/services/promotion-module/compute-actions.spec.ts
View File

@@ -2694,6 +2694,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -2743,6 +2744,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -2816,6 +2818,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions([], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -2891,6 +2894,7 @@ moduleIntegrationTestRunner({
const result = await service.computeActions(
[],
{
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -2980,6 +2984,7 @@ moduleIntegrationTestRunner({
const result = await service.computeActions(
["PROMOTION_TEST", "PROMOTION_TEST_2"],
{
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3092,6 +3097,7 @@ moduleIntegrationTestRunner({
const result = await service.computeActions(
["PROMOTION_TEST", "PROMOTION_TEST_2"],
{
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3177,6 +3183,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3230,6 +3237,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3280,6 +3288,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3352,6 +3361,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions([], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3449,6 +3459,7 @@ moduleIntegrationTestRunner({
const result = await service.computeActions(
["PROMOTION_TEST", "PROMOTION_TEST_2"],
{
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3559,6 +3570,7 @@ moduleIntegrationTestRunner({
const result = await service.computeActions(
["PROMOTION_TEST", "PROMOTION_TEST_2"],
{
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3631,6 +3643,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3683,6 +3696,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3731,6 +3745,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3803,6 +3818,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions([], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -3900,6 +3916,7 @@ moduleIntegrationTestRunner({
const result = await service.computeActions(
["PROMOTION_TEST", "PROMOTION_TEST_2"],
{
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4010,6 +4027,7 @@ moduleIntegrationTestRunner({
const result = await service.computeActions(
["PROMOTION_TEST", "PROMOTION_TEST_2"],
{
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4088,6 +4106,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4140,6 +4159,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4183,6 +4203,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4252,6 +4273,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions([], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4260,6 +4282,7 @@ moduleIntegrationTestRunner({
items: [
{
id: "item_cotton_tshirt",
is_discountable: true,
quantity: 1,
subtotal: 100,
product_category: {
@@ -4271,6 +4294,7 @@ moduleIntegrationTestRunner({
},
{
id: "item_cotton_sweater",
is_discountable: true,
quantity: 2,
subtotal: 300,
product_category: {
@@ -4351,6 +4375,7 @@ moduleIntegrationTestRunner({
id: "item_cotton_tshirt",
quantity: 1,
subtotal: 50,
is_discountable: true,
product_category: {
id: "catg_cotton",
},
@@ -4362,6 +4387,7 @@ moduleIntegrationTestRunner({
id: "item_cotton_sweater",
quantity: 1,
subtotal: 150,
is_discountable: true,
product_category: {
id: "catg_cotton",
},
@@ -4461,6 +4487,7 @@ moduleIntegrationTestRunner({
product: {
id: "prod_tshirt",
},
is_discountable: true,
},
{
id: "item_cotton_sweater",
@@ -4472,6 +4499,7 @@ moduleIntegrationTestRunner({
product: {
id: "prod_sweater",
},
is_discountable: true,
},
],
}
@@ -4527,6 +4555,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4537,6 +4566,7 @@ moduleIntegrationTestRunner({
id: "item_cotton_tshirt",
quantity: 1,
subtotal: 100,
is_discountable: true,
product_category: {
id: "catg_cotton",
},
@@ -4554,6 +4584,7 @@ moduleIntegrationTestRunner({
id: "item_cotton_sweater",
quantity: 5,
subtotal: 750,
is_discountable: true,
product_category: {
id: "catg_cotton",
},
@@ -4617,6 +4648,7 @@ moduleIntegrationTestRunner({
})
const result = await service.computeActions(["PROMOTION_TEST"], {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4678,6 +4710,7 @@ moduleIntegrationTestRunner({
describe("when promotion of type buyget", () => {
it("should compute adjustment when target and buy rules match", async () => {
const context = {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4771,6 +4804,7 @@ moduleIntegrationTestRunner({
it("should return empty array when conditions for minimum qty aren't met", async () => {
const context = {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4857,6 +4891,7 @@ moduleIntegrationTestRunner({
it("should compute actions for multiple items when conditions for target qty exceed one item", async () => {
const context = {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -4957,6 +4992,7 @@ moduleIntegrationTestRunner({
it("should return empty array when target rules arent met with context", async () => {
const context = {
currency_code: "usd",
customer: {
customer_group: {
id: "VIP",
@@ -5332,24 +5368,28 @@ moduleIntegrationTestRunner({
quantity: 1,
subtotal: 500,
product: { id: product1 },
is_discountable: true,
},
{
id: "item_cotton_tshirt1",
quantity: 1,
subtotal: 500,
product: { id: product1 },
is_discountable: true,
},
{
id: "item_cotton_tshirt2",
quantity: 1,
subtotal: 1000,
product: { id: product1 },
is_discountable: true,
},
{
id: "item_cotton_tshirt3",
quantity: 1,
subtotal: 1000,
product: { id: product1 },
is_discountable: true,
},
],
}
@@ -5384,6 +5424,7 @@ moduleIntegrationTestRunner({
quantity: 3,
subtotal: 1000,
product: { id: product1 },
is_discountable: true,
},
],
}
@@ -5405,18 +5446,21 @@ moduleIntegrationTestRunner({
quantity: 1,
subtotal: 1000,
product: { id: product1 },
is_discountable: true,
},
{
id: "item_cotton_tshirt1",
quantity: 1,
subtotal: 1000,
product: { id: product1 },
is_discountable: true,
},
{
id: "item_cotton_tshirt2",
quantity: 1,
subtotal: 1000,
product: { id: product1 },
is_discountable: true,
},
],
}

4
packages/modules/promotion/integration-tests/__tests__/services/promotion-module/promotion.spec.ts
View File

@@ -154,7 +154,7 @@ moduleIntegrationTestRunner({
ends_at: endsAt,
budget: {
type: CampaignBudgetType.SPEND,
currency_code: "USD",
currency_code: "usd",
used: 100,
limit: 100,
},
@@ -179,7 +179,7 @@ moduleIntegrationTestRunner({
ends_at: endsAt,
budget: expect.objectContaining({
type: CampaignBudgetType.SPEND,
currency_code: "USD",
currency_code: "usd",
used: 100,
limit: 100,
}),

6
packages/modules/promotion/src/services/promotion-module.ts
View File

@@ -520,13 +520,17 @@ export default class PromotionModuleService
continue
}
const isCurrencyCodeValid =
!isDefined(applicationMethod.currency_code) ||
applicationContext.currency_code === applicationMethod.currency_code
const isPromotionApplicable = areRulesValidForContext(
promotionRules,
applicationContext,
ApplicationMethodTargetType.ORDER
)
if (!isPromotionApplicable) {
if (!isPromotionApplicable || !isCurrencyCodeValid) {
continue
}