chore(order): cancel return (#7881)

packages/medusa/src/api/admin/returns/[id]/cancel/route.ts

@@ -1,35 +1,20 @@
-import {
-  ContainerRegistrationKeys,
-  remoteQueryObjectFromString,
-} from "@medusajs/utils"
+import { cancelReturnWorkflow } from "@medusajs/core-flows"
 import {
   AuthenticatedMedusaRequest,
   MedusaResponse,
 } from "../../../../../types/routing"
+import { AdminPostCancelReturnReqSchemaType } from "../../validators"
 
 export const POST = async (
   req: AuthenticatedMedusaRequest,
   res: MedusaResponse
 ) => {
-  const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
+  const input = req.validatedBody as AdminPostCancelReturnReqSchemaType
 
-  const queryObject = remoteQueryObjectFromString({
-    entryPoint: "return",
-    variables: {
-      filters: {
-        ...req.filterableFields,
-      },
-      ...req.remoteQueryConfig.pagination,
-    },
-    fields: req.remoteQueryConfig.fields,
+  const workflow = cancelReturnWorkflow(req.scope)
+  const { result } = await workflow.run({
+    input,
   })
 
-  const { rows: orders, metadata } = await remoteQuery(queryObject)
-
-  res.json({
-    orders,
-    count: metadata.count,
-    offset: metadata.skip,
-    limit: metadata.take,
-  })
+  res.status(200).json({ return: result })
 }

packages/medusa/src/api/admin/returns/validators.ts

@@ -52,7 +52,7 @@ const ItemSchema = z.object({
 export const AdminPostReturnsReqSchema = z.object({
   order_id: z.string(),
   items: z.array(ItemSchema),
-  return_shipping: ReturnShippingSchema,
+  return_shipping: ReturnShippingSchema.optional(),
   internal_note: z.string().nullish(),
   receive_now: z.boolean().optional(),
   refund_amount: z.number().optional(),
@@ -70,3 +70,12 @@ export const AdminPostReceiveReturnsReqSchema = z.object({
 export type AdminPostReceiveReturnsReqSchemaType = z.infer<
   typeof AdminPostReceiveReturnsReqSchema
 >
+
+export const AdminPostCancelReturnReqSchema = z.object({
+  return_id: z.string(),
+  no_notification: z.boolean().optional(),
+  internal_note: z.string().nullish(),
+})
+export type AdminPostCancelReturnReqSchemaType = z.infer<
+  typeof AdminPostReceiveReturnsReqSchema
+>