fix(types, medusa): request / response types clean-up (#9043)

More clean-up of request / response types

integration-tests/modules/__tests__/fixtures/fulfillment/index.ts

@@ -49,7 +49,6 @@ export function generateCreateFulfillmentData(
         label_url: "test-label-url_" + randomString,
       },
     ],
-    order: data.order ?? {},
     order_id: data.order_id,
   }
 }

packages/core/types/src/http/claim/common.ts

@@ -21,7 +21,7 @@ export interface BaseClaim
   extends Omit<BaseOrder, "status" | "version" | "items"> {
   order_id: string
   claim_items: BaseClaimItem[]
-  additional_items: any[]
+  additional_items: BaseClaimItem[]
   return?: ReturnDTO
   return_id?: string
   no_notification?: boolean

packages/core/types/src/http/currency/common.ts

@@ -1,5 +1,3 @@
-import { RawRounding } from "../../common"
-
 export interface BaseCurrency {
   code: string
   symbol: string
@@ -7,7 +5,6 @@ export interface BaseCurrency {
   name: string
   decimal_digits: number
   rounding: number
-  raw_rounding: RawRounding
   created_at: string
   updated_at: string
   deleted_at: string | null

packages/core/types/src/tax/common.ts

@@ -43,7 +43,7 @@ export interface TaxRateDTO {
   /**
    * Whether the tax rate should be combined with parent rates.
    *
-   * Learn more [here](https://docs.medusajs.com/experimental/tax/tax-rates-and-rules/#combinable-tax-rates).
+   * Learn more [here](https://docs.medusajs.com/v2/resources/commerce-modules/tax/tax-rates-and-rules#combinable-tax-rates).
    */
   is_combinable: boolean
 

packages/core/types/src/tax/mutations.ts

@@ -129,7 +129,7 @@ export interface UpdateTaxRateDTO {
   /**
    * Whether the tax rate is combinable.
    *
-   * Learn more [here](https://docs.medusajs.com/experimental/tax/tax-rates-and-rules/#combinable-tax-rates).
+   * Learn more [here](https://docs.medusajs.com/v2/resources/commerce-modules/tax/tax-rates-and-rules#combinable-tax-rates).
    */
   is_combinable?: boolean
 

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

@@ -4,11 +4,10 @@ import {
   MedusaResponse,
 } from "../../../../../types/routing"
 import { refetchFulfillment } from "../../helpers"
-import { AdminCancelFulfillmentType } from "../../validators"
 import { HttpTypes } from "@medusajs/types"
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCancelFulfillmentType>,
+  req: AuthenticatedMedusaRequest,
   res: MedusaResponse<HttpTypes.AdminFulfillmentResponse>
 ) => {
   const { id } = req.params

packages/medusa/src/api/admin/fulfillments/middlewares.ts

@@ -3,7 +3,6 @@ import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"
 import {
-  AdminCancelFulfillment,
   AdminCreateFulfillment,
   AdminCreateShipment,
   AdminFulfillmentParams,
@@ -14,7 +13,6 @@ export const adminFulfillmentsRoutesMiddlewares: MiddlewareRoute[] = [
     method: ["POST"],
     matcher: "/admin/fulfillments/:id/cancel",
     middlewares: [
-      validateAndTransformBody(AdminCancelFulfillment),
       validateAndTransformQuery(
         AdminFulfillmentParams,
         QueryConfig.retrieveTransformQueryConfig

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

@@ -19,9 +19,6 @@ const AdminCreateFulfillmentLabel = z.object({
   label_url: z.string(),
 })
 
-export type AdminCancelFulfillmentType = z.infer<typeof AdminCancelFulfillment>
-export const AdminCancelFulfillment = z.object({})
-
 export type AdminCreateFulfillmentType = z.infer<typeof AdminCreateFulfillment>
 // TODO: revisit the data shape this endpoint accepts
 export const AdminCreateFulfillment = z.object({
@@ -30,7 +27,6 @@ export const AdminCreateFulfillment = z.object({
   delivery_address: AddressPayload,
   items: z.array(AdminCreateFulfillmentItem),
   labels: z.array(AdminCreateFulfillmentLabel),
-  order: z.object({}),
   order_id: z.string(),
   shipping_option_id: z.string().nullish(),
   data: z.record(z.unknown()).nullable(),

packages/medusa/src/api/admin/orders/[id]/archive/route.ts

@@ -7,18 +7,17 @@ import {
   AuthenticatedMedusaRequest,
   MedusaResponse,
 } from "../../../../../types/routing"
-import { AdminArchiveOrderType } from "../../validators"
 import { HttpTypes } from "@medusajs/types"
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminArchiveOrderType>,
+  req: AuthenticatedMedusaRequest,
   res: MedusaResponse<HttpTypes.AdminOrderResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
   const { id } = req.params
 
   await archiveOrderWorkflow(req.scope).run({
-    input: { orderIds: [req.validatedBody.order_id] },
+    input: { orderIds: [id] },
   })
 
   const queryObject = remoteQueryObjectFromString({

packages/medusa/src/api/admin/orders/middlewares.ts

@@ -3,7 +3,6 @@ import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"
 import {
-  AdminArchiveOrder,
   AdminCompleteOrder,
   AdminGetOrdersOrderParams,
   AdminGetOrdersParams,
@@ -58,7 +57,6 @@ export const adminOrderRoutesMiddlewares: MiddlewareRoute[] = [
     method: ["POST"],
     matcher: "/admin/orders/:id/archive",
     middlewares: [
-      validateAndTransformBody(AdminArchiveOrder),
       validateAndTransformQuery(
         AdminGetOrdersOrderParams,
         QueryConfig.retrieveTransformQueryConfig

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

@@ -47,11 +47,6 @@ export const AdminGetOrdersParams = createFindParams({
 
 export type AdminGetOrdersParamsType = z.infer<typeof AdminGetOrdersParams>
 
-export const AdminArchiveOrder = z.object({
-  order_id: z.string(),
-})
-export type AdminArchiveOrderType = z.infer<typeof AdminArchiveOrder>
-
 export const AdminCompleteOrder = WithAdditionalData(z.object({}))
 
 const Item = z.object({

packages/medusa/src/api/store/carts/[id]/complete/route.ts

@@ -5,11 +5,10 @@ import { prepareRetrieveQuery } from "../../../../../utils/get-query-config"
 import { refetchOrder } from "../../../orders/helpers"
 import { refetchCart } from "../../helpers"
 import { defaultStoreCartFields } from "../../query-config"
-import { StoreCompleteCartType } from "../../validators"
 import { HttpTypes } from "@medusajs/types"
 
 export const POST = async (
-  req: MedusaRequest<StoreCompleteCartType>,
+  req: MedusaRequest,
   res: MedusaResponse<HttpTypes.StoreCompleteCartResponse>
 ) => {
   const cart_id = req.params.id

packages/medusa/src/api/store/carts/middlewares.ts

@@ -11,7 +11,6 @@ import {
   StoreAddCartPromotions,
   StoreAddCartShippingMethods,
   StoreCalculateCartTaxes,
-  StoreCompleteCart,
   StoreCreateCart,
   StoreGetCartsCart,
   StoreRemoveCartPromotions,
@@ -134,7 +133,6 @@ export const storeCartRoutesMiddlewares: MiddlewareRoute[] = [
     method: ["POST"],
     matcher: "/store/carts/:id/complete",
     middlewares: [
-      validateAndTransformBody(StoreCompleteCart),
       validateAndTransformQuery(
         StoreGetOrderParams,
         OrderQueryConfig.retrieveTransformQueryConfig

packages/medusa/src/api/store/carts/validators.ts

@@ -86,13 +86,6 @@ export const StoreAddCartShippingMethods = z
   })
   .strict()
 
-export const StoreCompleteCart = z
-  .object({
-    idempotency_key: z.string().optional(),
-  })
-  .strict()
-export type StoreCompleteCartType = z.infer<typeof StoreCompleteCart>
-
 export type StoreCreateCartPaymentCollectionType = z.infer<
   typeof StoreCreateCartPaymentCollection
 >