chore: make draft order changes

Author: riqwan

packages/core/core-flows/src/draft-order/utils/fields.ts

@@ -27,10 +27,7 @@ export const draftOrderFieldsForRefreshSteps = [
   "shipping_methods.tax_lines.*",
   "customer.*",
   "customer.groups.*",
-  "promotion_link.*",
-  "promotion_link.promotion",
-  "promotion_link.promotion.id",
-  "promotion_link.promotion.code",
+  "promotions.*",
   "subtotal",
   "item_total",
   "total",

packages/core/core-flows/src/draft-order/workflows/add-draft-order-items.ts

@@ -27,38 +27,39 @@ export const addDraftOrderItemsWorkflowId = "add-draft-order-items"
 /**
  * This workflow adds items to a draft order. It's used by the
  * [Add Item to Draft Order Admin API Route](https://docs.medusajs.com/api/admin#draft-orders_postdraftordersidedititems).
- * 
+ *
  * You can use this workflow within your customizations or your own custom workflows, allowing you to wrap custom logic around adding items to
  * a draft order.
- * 
+ *
  * @example
  * const { result } = await addDraftOrderItemsWorkflow(container)
  * .run({
  *   input: {
  *     order_id: "order_123",
- *     items: [{ 
- *       variant_id: "variant_123", 
- *       quantity: 1 
+ *     items: [{
+ *       variant_id: "variant_123",
+ *       quantity: 1
  *     }]
  *   }
  * })
- * 
+ *
  * @summary
- * 
+ *
  * Add items to a draft order.
  */
 export const addDraftOrderItemsWorkflow = createWorkflow(
   addDraftOrderItemsWorkflowId,
   function (
     input: WorkflowData<OrderWorkflow.OrderEditAddNewItemWorkflowInput>
   ) {
-    const order: OrderDTO = useRemoteQueryStep({
-      entry_point: "orders",
-      fields: draftOrderFieldsForRefreshSteps,
-      variables: { id: input.order_id },
-      list: false,
-      throw_if_key_not_found: true,
-    }).config({ name: "order-query" })
+    const order: OrderDTO & { promotions: { code: string }[] } =
+      useRemoteQueryStep({
+        entry_point: "orders",
+        fields: draftOrderFieldsForRefreshSteps,
+        variables: { id: input.order_id },
+        list: false,
+        throw_if_key_not_found: true,
+      }).config({ name: "order-query" })
 
     const orderChange: OrderChangeDTO = useRemoteQueryStep({
       entry_point: "order_change",
@@ -92,19 +93,10 @@ export const addDraftOrderItemsWorkflow = createWorkflow(
       },
     })
 
-    const appliedPromoCodes: string[] = transform(order, (order) => {
-      const promotionLink = (order as any).promotion_link
-
-      if (!promotionLink) {
-        return []
-      }
-
-      if (Array.isArray(promotionLink)) {
-        return promotionLink.map((promo) => promo.promotion.code)
-      }
-
-      return [promotionLink.promotion.code]
-    })
+    const appliedPromoCodes: string[] = transform(
+      order,
+      (order) => order.promotions?.map((promotion) => promotion.code) ?? []
+    )
 
     // If any the order has any promo codes, then we need to refresh the adjustments.
     when(

packages/core/core-flows/src/draft-order/workflows/add-draft-order-shipping-methods.ts

@@ -48,10 +48,10 @@ export interface AddDraftOrderShippingMethodsWorkflowInput {
 /**
  * This workflow adds shipping methods to a draft order. It's used by the
  * [Add Shipping Method to Draft Order Admin API Route](https://docs.medusajs.com/api/admin#draft-orders_postdraftordersideditshippingmethods).
- * 
+ *
  * You can use this workflow within your customizations or your own custom workflows, allowing you to wrap custom logic around adding shipping methods to
  * a draft order.
- * 
+ *
  * @example
  * const { result } = await addDraftOrderShippingMethodsWorkflow(container)
  * .run({
@@ -61,15 +61,19 @@ export interface AddDraftOrderShippingMethodsWorkflowInput {
  *     custom_amount: 10
  *   }
  * })
- * 
+ *
  * @summary
- * 
+ *
  * Add shipping methods to a draft order.
  */
 export const addDraftOrderShippingMethodsWorkflow = createWorkflow(
   addDraftOrderShippingMethodsWorkflowId,
   function (input: WorkflowData<AddDraftOrderShippingMethodsWorkflowInput>) {
-    const order: OrderDTO = useRemoteQueryStep({
+    const order: OrderDTO & {
+      promotions: {
+        code: string
+      }[]
+    } = useRemoteQueryStep({
       entry_point: "orders",
       fields: draftOrderFieldsForRefreshSteps,
       variables: { id: input.order_id },
@@ -133,19 +137,10 @@ export const addDraftOrderShippingMethodsWorkflow = createWorkflow(
       },
     })
 
-    const appliedPromoCodes = transform(order, (order) => {
-      const promotionLink = (order as any).promotion_link
-
-      if (!promotionLink) {
-        return []
-      }
-
-      if (Array.isArray(promotionLink)) {
-        return promotionLink.map((promo) => promo.promotion.code)
-      }
-
-      return [promotionLink.promotion.code]
-    })
+    const appliedPromoCodes: string[] = transform(
+      order,
+      (order) => order.promotions?.map((promotion) => promotion.code) ?? []
+    )
 
     // If any the order has any promo codes, then we need to refresh the adjustments.
     when(

packages/core/core-flows/src/draft-order/workflows/cancel-draft-order-edit.ts

@@ -33,26 +33,30 @@ export interface CancelDraftOrderEditWorkflowInput {
 /**
  * This workflow cancels a draft order edit. It's used by the
  * [Cancel Draft Order Edit Admin API Route](https://docs.medusajs.com/api/admin#draft-orders_deletedraftordersidedit).
- * 
+ *
  * You can use this workflow within your customizations or your own custom workflows, allowing you to wrap custom logic around
  * cancelling a draft order edit.
- * 
+ *
  * @example
  * const { result } = await cancelDraftOrderEditWorkflow(container)
  * .run({
  *   input: {
  *     order_id: "order_123",
  *   }
  * })
- * 
+ *
  * @summary
- * 
+ *
  * Cancel a draft order edit.
  */
 export const cancelDraftOrderEditWorkflow = createWorkflow(
   cancelDraftOrderEditWorkflowId,
   function (input: WorkflowData<CancelDraftOrderEditWorkflowInput>) {
-    const order: OrderDTO = useRemoteQueryStep({
+    const order: OrderDTO & {
+      promotions: {
+        code: string
+      }[]
+    } = useRemoteQueryStep({
       entry_point: "orders",
       fields: ["version", ...draftOrderFieldsForRefreshSteps],
       variables: { id: input.order_id },
@@ -125,18 +129,12 @@ export const cancelDraftOrderEditWorkflow = createWorkflow(
     const promotionsToRefresh = transform(
       { order, promotionsToRemove, promotionsToRestore },
       ({ order, promotionsToRemove, promotionsToRestore }) => {
-        const promotionLink = (order as any).promotion_link
+        const orderPromotions = order.promotions
         const codes: Set<string> = new Set()
 
-        if (promotionLink) {
-          if (Array.isArray(promotionLink)) {
-            promotionLink.forEach((promo) => {
-              codes.add(promo.promotion.code)
-            })
-          } else {
-            codes.add(promotionLink.promotion.code)
-          }
-        }
+        orderPromotions?.forEach((promo) => {
+          codes.add(promo.code)
+        })
 
         for (const code of promotionsToRemove) {
           codes.delete(code)
@@ -163,9 +161,7 @@ export const cancelDraftOrderEditWorkflow = createWorkflow(
       },
     })
 
-    when(shippingToRestore, (methods) => {
-      return !!methods?.length
-    }).then(() => {
+    when(shippingToRestore, (methods) => !!methods?.length).then(() => {
       restoreDraftOrderShippingMethodsStep({
         shippingMethods: shippingToRestore as any,
       })

packages/core/core-flows/src/draft-order/workflows/remove-draft-order-action-item.ts

@@ -28,10 +28,10 @@ export const removeDraftOrderActionItemWorkflowId =
 /**
  * This workflow removes an item that was added or updated in a draft order edit. It's used by the
  * [Remove Item from Draft Order Edit Admin API Route](https://docs.medusajs.com/api/admin#draft-orders_deletedraftordersidedititemsaction_id).
- * 
+ *
  * You can use this workflow within your customizations or your own custom workflows, allowing you to wrap custom logic around
  * removing an item from a draft order edit.
- * 
+ *
  * @example
  * const { result } = await removeDraftOrderActionItemWorkflow(container)
  * .run({
@@ -40,17 +40,21 @@ export const removeDraftOrderActionItemWorkflowId =
  *     action_id: "action_123",
  *   }
  * })
- * 
+ *
  * @summary
- * 
+ *
  * Remove an item from a draft order edit.
  */
 export const removeDraftOrderActionItemWorkflow = createWorkflow(
   removeDraftOrderActionItemWorkflowId,
   function (
     input: WorkflowData<OrderWorkflow.DeleteOrderEditItemActionWorkflowInput>
   ): WorkflowResponse<OrderPreviewDTO> {
-    const order: OrderDTO = useRemoteQueryStep({
+    const order: OrderDTO & {
+      promotions: {
+        code: string
+      }[]
+    } = useRemoteQueryStep({
       entry_point: "orders",
       fields: ["id", "status", "is_draft_order", "canceled_at", "items.*"],
       variables: { id: input.order_id },
@@ -89,19 +93,8 @@ export const removeDraftOrderActionItemWorkflow = createWorkflow(
 
     const appliedPromoCodes: string[] = transform(
       refetchedOrder,
-      (refetchedOrder) => {
-        const promotionLink = (refetchedOrder as any).promotion_link
-
-        if (!promotionLink) {
-          return []
-        }
-
-        if (Array.isArray(promotionLink)) {
-          return promotionLink.map((promo) => promo.promotion.code)
-        }
-
-        return [promotionLink.promotion.code]
-      }
+      (refetchedOrder) =>
+        refetchedOrder.promotions?.map((promotion) => promotion.code) ?? []
     )
 
     // If any the order has any promo codes, then we need to refresh the adjustments.

packages/core/core-flows/src/draft-order/workflows/remove-draft-order-action-shipping-method.ts

@@ -32,10 +32,10 @@ export const removeDraftOrderActionShippingMethodWorkflowId =
 /**
  * This workflow removes a shipping method that was added to an edited draft order. It's used by the
  * [Remove Shipping Method from Draft Order Edit Admin API Route](https://docs.medusajs.com/api/admin#draft-orders_deletedraftordersideditshippingmethodsaction_id).
- * 
+ *
  * You can use this workflow within your customizations or your own custom workflows, allowing you to wrap custom logic around
  * removing a shipping method from an edited draft order.
- * 
+ *
  * @example
  * const { result } = await removeDraftOrderActionShippingMethodWorkflow(container)
  * .run({
@@ -44,9 +44,9 @@ export const removeDraftOrderActionShippingMethodWorkflowId =
  *     action_id: "action_123",
  *   }
  * })
- * 
+ *
  * @summary
- * 
+ *
  * Remove a shipping method from an edited draft order.
  */
 export const removeDraftOrderActionShippingMethodWorkflow = createWorkflow(
@@ -100,19 +100,11 @@ export const removeDraftOrderActionShippingMethodWorkflow = createWorkflow(
       order,
     })
 
-    const appliedPromoCodes = transform(context, (context) => {
-      const promotionLink = (context as any).promotion_link
-
-      if (!promotionLink) {
-        return []
-      }
-
-      if (Array.isArray(promotionLink)) {
-        return promotionLink.map((promo) => promo.promotion.code)
-      }
-
-      return [promotionLink.promotion.code]
-    })
+    const appliedPromoCodes: string[] = transform(
+      context,
+      (context) =>
+        (context as any).promotions?.map((promotion) => promotion.code) ?? []
+    )
 
     when(
       appliedPromoCodes,

packages/core/core-flows/src/draft-order/workflows/remove-draft-order-shipping-method.ts

@@ -41,10 +41,10 @@ export interface RemoveDraftOrderShippingMethodWorkflowInput {
 /**
  * This workflow removes an existing shipping method from a draft order edit. It's used by the
  * [Remove Shipping Method from Draft Order Edit Admin API Route](https://docs.medusajs.com/api/admin#draft-orders_deletedraftordersideditshippingmethodsmethodmethod_id).
- * 
+ *
  * You can use this workflow within your customizations or your own custom workflows, allowing you to wrap custom logic around
  * removing a shipping method from a draft order edit.
- * 
+ *
  * @example
  * const { result } = await removeDraftOrderShippingMethodWorkflow(container)
  * .run({
@@ -53,15 +53,19 @@ export interface RemoveDraftOrderShippingMethodWorkflowInput {
  *     shipping_method_id: "sm_123",
  *   }
  * })
- * 
+ *
  * @summary
- * 
+ *
  * Remove an existing shipping method from a draft order edit.
  */
 export const removeDraftOrderShippingMethodWorkflow = createWorkflow(
   removeDraftOrderShippingMethodWorkflowId,
   function (input: WorkflowData<RemoveDraftOrderShippingMethodWorkflowInput>) {
-    const order: OrderDTO = useRemoteQueryStep({
+    const order: OrderDTO & {
+      promotions: {
+        code: string
+      }[]
+    } = useRemoteQueryStep({
       entry_point: "orders",
       fields: draftOrderFieldsForRefreshSteps,
       variables: { id: input.order_id },
@@ -89,19 +93,10 @@ export const removeDraftOrderShippingMethodWorkflow = createWorkflow(
       },
     })
 
-    const appliedPromoCodes = transform(order, (order) => {
-      const promotionLink = (order as any).promotion_link
-
-      if (!promotionLink) {
-        return []
-      }
-
-      if (Array.isArray(promotionLink)) {
-        return promotionLink.map((promo) => promo.promotion.code)
-      }
-
-      return [promotionLink.promotion.code]
-    })
+    const appliedPromoCodes: string[] = transform(
+      order,
+      (order) => order.promotions?.map((promotion) => promotion.code) ?? []
+    )
 
     // If any the order has any promo codes, then we need to refresh the adjustments.
     when(