From 423583e06c287fbb3013d2ac4571f8f7c45f7628 Mon Sep 17 00:00:00 2001 From: Shahed Nasser Date: Tue, 3 Sep 2024 18:08:22 +0300 Subject: [PATCH] fix(medusa): fix update promotion's request type (#8966) Fix the validator of the update promotion API route to match the update workflow input's type. --- .../promotions/admin/promotions.spec.ts | 18 ------------------ .../types/src/promotion/common/promotion.ts | 2 +- .../src/api/admin/promotions/validators.ts | 4 ---- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/integration-tests/http/__tests__/promotions/admin/promotions.spec.ts b/integration-tests/http/__tests__/promotions/admin/promotions.spec.ts index 02dd4dec7f..60d52573dd 100644 --- a/integration-tests/http/__tests__/promotions/admin/promotions.spec.ts +++ b/integration-tests/http/__tests__/promotions/admin/promotions.spec.ts @@ -495,24 +495,6 @@ medusaIntegrationTestRunner({ ) }) - it("should throw an error when both campaign and campaign_id params are passed", async () => { - const { response } = await api - .post( - `/admin/promotions/${promotion.id}`, - { - campaign: { name: "test campaign" }, - campaign_id: "test", - }, - adminHeaders - ) - .catch((e) => e) - - expect(response.status).toEqual(400) - expect(response.data.message).toContain( - `Invalid request: Field 'campaign, campaign_identifier' is required` - ) - }) - it("should update a promotion successfully", async () => { const response = await api.post( `/admin/promotions/${promotion.id}`, diff --git a/packages/core/types/src/promotion/common/promotion.ts b/packages/core/types/src/promotion/common/promotion.ts index dbfb306784..dad6290d61 100644 --- a/packages/core/types/src/promotion/common/promotion.ts +++ b/packages/core/types/src/promotion/common/promotion.ts @@ -138,7 +138,7 @@ export interface UpdatePromotionDTO { /** * The associated application method. */ - application_method?: UpdateApplicationMethodDTO + application_method?: Omit /** * The associated campaign's ID. diff --git a/packages/medusa/src/api/admin/promotions/validators.ts b/packages/medusa/src/api/admin/promotions/validators.ts index 80ecbf41c0..f18d4f51f7 100644 --- a/packages/medusa/src/api/admin/promotions/validators.ts +++ b/packages/medusa/src/api/admin/promotions/validators.ts @@ -132,8 +132,6 @@ export const AdminUpdateApplicationMethod = z type: z.nativeEnum(ApplicationMethodType).optional(), target_type: z.nativeEnum(ApplicationMethodTargetType).optional(), allocation: z.nativeEnum(ApplicationMethodAllocation).optional(), - target_rules: z.array(AdminCreatePromotionRule).optional(), - buy_rules: z.array(AdminCreatePromotionRule).optional(), apply_to_quantity: z.number().nullish(), buy_rules_min_quantity: z.number().nullish(), }) @@ -186,9 +184,7 @@ export const UpdatePromotion = z is_automatic: z.boolean().optional(), type: z.nativeEnum(PromotionType).optional(), campaign_id: z.string().nullish(), - campaign: CreateCampaign.optional(), application_method: AdminUpdateApplicationMethod.optional(), - rules: z.array(AdminCreatePromotionRule).optional(), }) .strict()