core(core-flows, medusa): remove request item return (#8146)

packages/core/core-flows/src/order/workflows/index.ts

@@ -26,6 +26,7 @@ export * from "./exchange-request-item-return"
 export * from "./get-order-detail"
 export * from "./get-orders-list"
 export * from "./receive-return"
+export * from "./remove-request-item-return"
 export * from "./remove-return-shipping-method"
 export * from "./request-item-return"
 export * from "./update-order-change-actions"

packages/core/core-flows/src/order/workflows/remove-request-item-return.ts

@@ -0,0 +1,95 @@
+import {
+  OrderChangeActionDTO,
+  OrderChangeDTO,
+  OrderDTO,
+  OrderWorkflow,
+  ReturnDTO,
+} from "@medusajs/types"
+import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils"
+import {
+  WorkflowData,
+  createStep,
+  createWorkflow,
+} from "@medusajs/workflows-sdk"
+import { useRemoteQueryStep } from "../../common"
+import { deleteOrderChangeActionsStep, previewOrderChangeStep } from "../steps"
+import {
+  throwIfIsCancelled,
+  throwIfOrderChangeIsNotActive,
+} from "../utils/order-validation"
+
+const validationStep = createStep(
+  "remove-request-item-return-validation",
+  async function ({
+    order,
+    orderChange,
+    orderReturn,
+    input,
+  }: {
+    order: OrderDTO
+    orderReturn: ReturnDTO
+    orderChange: OrderChangeDTO
+    input: OrderWorkflow.DeleteRequestItemReturnWorkflowInput
+  }) {
+    throwIfIsCancelled(order, "Order")
+    throwIfIsCancelled(orderReturn, "Return")
+    throwIfOrderChangeIsNotActive({ orderChange })
+
+    const associatedAction = orderChange.actions?.find(
+      (a) => a.id === input.action_id
+    ) as OrderChangeActionDTO
+
+    if (!associatedAction) {
+      throw new Error(
+        `No request return found for return ${input.return_id} in order change ${orderChange.id}`
+      )
+    } else if (associatedAction.action !== ChangeActionType.RETURN_ITEM) {
+      throw new Error(
+        `Action ${associatedAction.id} is not requesting item return`
+      )
+    }
+  }
+)
+
+export const removeRequestItemReturnWorkflowId = "remove-request-item-return"
+export const removeRequestItemReturnWorkflow = createWorkflow(
+  removeRequestItemReturnWorkflowId,
+  function (
+    input: WorkflowData<OrderWorkflow.DeleteRequestItemReturnWorkflowInput>
+  ): WorkflowData<OrderDTO> {
+    const orderReturn: ReturnDTO = useRemoteQueryStep({
+      entry_point: "return",
+      fields: ["id", "status", "order_id"],
+      variables: { id: input.return_id },
+      list: false,
+      throw_if_key_not_found: true,
+    })
+
+    const order: OrderDTO = useRemoteQueryStep({
+      entry_point: "orders",
+      fields: ["id", "status", "items.*"],
+      variables: { id: orderReturn.order_id },
+      list: false,
+      throw_if_key_not_found: true,
+    }).config({ name: "order-query" })
+
+    const orderChange: OrderChangeDTO = useRemoteQueryStep({
+      entry_point: "order_change",
+      fields: ["id", "status", "version", "actions.*"],
+      variables: {
+        filters: {
+          order_id: orderReturn.order_id,
+          return_id: orderReturn.id,
+          status: [OrderChangeStatus.PENDING, OrderChangeStatus.REQUESTED],
+        },
+      },
+      list: false,
+    }).config({ name: "order-change-query" })
+
+    validationStep({ order, input, orderReturn, orderChange })
+
+    deleteOrderChangeActionsStep({ ids: [input.action_id] })
+
+    return previewOrderChangeStep(order.id)
+  }
+)

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

@@ -34,7 +34,7 @@ const validationStep = createStep(
     throwIfIsCancelled(orderReturn, "Return")
     throwIfOrderChangeIsNotActive({ orderChange })
 
-    const associatedAction = orderChange.actions.find(
+    const associatedAction = orderChange.actions?.find(
       (a) => a.id === input.action_id
     ) as OrderChangeActionDTO
 
@@ -81,7 +81,7 @@ export const removeReturnShippingMethodWorkflow = createWorkflow(
     const dataToRemove = transform(
       { orderChange, input },
       ({ orderChange, input }) => {
-        const associatedAction = orderChange.actions.find(
+        const associatedAction = orderChange.actions?.find(
           (a) => a.id === input.action_id
         ) as OrderChangeActionDTO