From bc87c9a0ba1cb1c1fbced95f1ce9a0ea3c00fd4d Mon Sep 17 00:00:00 2001 From: Shahed Nasser Date: Tue, 28 Oct 2025 11:08:07 +0200 Subject: [PATCH] chore: fixes to http and request types for fulfillment (#13826) * chore: fixes to http and request types for fulfillment * fix type error --- .../core/js-sdk/src/admin/fulfillment-provider.ts | 2 +- .../src/http/fulfillment-provider/admin/queries.ts | 2 +- .../types/src/http/fulfillment-set/admin/index.ts | 1 + .../core/types/src/http/fulfillment/admin/index.ts | 1 - .../core/types/src/http/fulfillment/admin/queries.ts | 6 ------ .../[id]/service-zones/[zone_id]/route.ts | 8 +++++--- .../fulfillment-sets/[id]/service-zones/route.ts | 6 ++++-- .../src/api/admin/fulfillments/[id]/cancel/route.ts | 2 +- .../src/api/admin/fulfillments/[id]/shipment/route.ts | 6 ++++-- packages/medusa/src/api/admin/fulfillments/route.ts | 6 ++++-- .../src/api/admin/shipping-option-types/[id]/route.ts | 6 ++++-- .../src/api/admin/shipping-option-types/route.ts | 5 ++++- .../src/api/admin/shipping-options/[id]/route.ts | 11 +++++------ .../admin/shipping-options/[id]/rules/batch/route.ts | 3 ++- .../medusa/src/api/admin/shipping-options/route.ts | 5 ++++- .../src/api/admin/shipping-profiles/[id]/route.ts | 11 +++++------ .../medusa/src/api/admin/shipping-profiles/route.ts | 5 ++++- .../store/shipping-options/[id]/calculate/route.ts | 5 ++++- 18 files changed, 53 insertions(+), 38 deletions(-) delete mode 100644 packages/core/types/src/http/fulfillment/admin/queries.ts diff --git a/packages/core/js-sdk/src/admin/fulfillment-provider.ts b/packages/core/js-sdk/src/admin/fulfillment-provider.ts index 21d04a1582..73600bb8b4 100644 --- a/packages/core/js-sdk/src/admin/fulfillment-provider.ts +++ b/packages/core/js-sdk/src/admin/fulfillment-provider.ts @@ -62,7 +62,7 @@ export class FulfillmentProvider { * Learn more about the `fields` property in the [API reference](https://docs.medusajs.com/api/store#select-fields-and-relations). */ async list( - query?: HttpTypes.AdminFulfillmentProviderListParams, + query?: HttpTypes.AdminGetFulfillmentProvidersParams, headers?: ClientHeaders ) { return await this.client.fetch( diff --git a/packages/core/types/src/http/fulfillment-provider/admin/queries.ts b/packages/core/types/src/http/fulfillment-provider/admin/queries.ts index 7c25733a3e..86c34495c8 100644 --- a/packages/core/types/src/http/fulfillment-provider/admin/queries.ts +++ b/packages/core/types/src/http/fulfillment-provider/admin/queries.ts @@ -1,6 +1,6 @@ import { FindParams } from "../../common" -export interface AdminFulfillmentProviderListParams extends FindParams { +export interface AdminGetFulfillmentProvidersParams extends FindParams { /** * Filter by provider ID(s). */ diff --git a/packages/core/types/src/http/fulfillment-set/admin/index.ts b/packages/core/types/src/http/fulfillment-set/admin/index.ts index 427fd44efc..1f82a2ead5 100644 --- a/packages/core/types/src/http/fulfillment-set/admin/index.ts +++ b/packages/core/types/src/http/fulfillment-set/admin/index.ts @@ -1,3 +1,4 @@ export * from "./entities" export * from "./payloads" +export * from "./queries" export * from "./responses" diff --git a/packages/core/types/src/http/fulfillment/admin/index.ts b/packages/core/types/src/http/fulfillment/admin/index.ts index 9bcc100ddc..1b4873c3fc 100644 --- a/packages/core/types/src/http/fulfillment/admin/index.ts +++ b/packages/core/types/src/http/fulfillment/admin/index.ts @@ -1,4 +1,3 @@ export * from "./entitites" export * from "./payloads" -export * from "./queries" export * from "./responses" diff --git a/packages/core/types/src/http/fulfillment/admin/queries.ts b/packages/core/types/src/http/fulfillment/admin/queries.ts deleted file mode 100644 index 48fa6c5ae7..0000000000 --- a/packages/core/types/src/http/fulfillment/admin/queries.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface AdminGetFulfillmentProvidersParams { - id?: string | string[] - stock_location_id?: string | string[] - is_enabled?: boolean - q?: string -} diff --git a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts index 0b56799bd0..b239db1415 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts @@ -19,10 +19,9 @@ import { MedusaRequest, MedusaResponse, } from "@medusajs/framework/http" -import { AdminUpdateFulfillmentSetServiceZonesType } from "../../../validators" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -48,7 +47,10 @@ export const GET = async ( } export const POST = async ( - req: MedusaRequest, + req: MedusaRequest< + HttpTypes.AdminUpdateFulfillmentSetServiceZone, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const fulfillmentModuleService = req.scope.resolve( diff --git a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts index ef42f05f75..97214e5bc5 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts @@ -1,11 +1,13 @@ import { createServiceZonesWorkflow } from "@medusajs/core-flows" import { MedusaRequest, MedusaResponse } from "@medusajs/framework/http" -import { AdminCreateFulfillmentSetServiceZonesType } from "../../validators" import { refetchFulfillmentSet } from "../../helpers" import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( - req: MedusaRequest, + req: MedusaRequest< + HttpTypes.AdminCreateFulfillmentSetServiceZone, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const workflowInput = { diff --git a/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts b/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts index a8db892a0c..aa3f120780 100644 --- a/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts @@ -7,7 +7,7 @@ import { refetchFulfillment } from "../../helpers" import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest<{}, HttpTypes.SelectParams>, res: MedusaResponse ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts b/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts index 616f799149..8b3a342461 100644 --- a/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts +++ b/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts @@ -5,10 +5,12 @@ import { MedusaResponse, } from "@medusajs/framework/http" import { refetchFulfillment } from "../../helpers" -import { AdminCreateShipmentType } from "../../validators" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateFulfillmentShipment, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/fulfillments/route.ts b/packages/medusa/src/api/admin/fulfillments/route.ts index 80a52372a1..62646528f5 100644 --- a/packages/medusa/src/api/admin/fulfillments/route.ts +++ b/packages/medusa/src/api/admin/fulfillments/route.ts @@ -5,10 +5,12 @@ import { MedusaResponse, } from "@medusajs/framework/http" import { refetchFulfillment } from "./helpers" -import { AdminCreateFulfillmentType } from "./validators" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateFulfillment, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const { result: fullfillment } = await createFulfillmentWorkflow( diff --git a/packages/medusa/src/api/admin/shipping-option-types/[id]/route.ts b/packages/medusa/src/api/admin/shipping-option-types/[id]/route.ts index 1262d3aaaf..69ff5a7476 100644 --- a/packages/medusa/src/api/admin/shipping-option-types/[id]/route.ts +++ b/packages/medusa/src/api/admin/shipping-option-types/[id]/route.ts @@ -10,7 +10,6 @@ import { import { refetchShippingOptionType } from "../helpers" import { AdminGetShippingOptionTypeParamsType, - AdminUpdateShippingOptionTypeType, } from "../validators" import { HttpTypes } from "@medusajs/framework/types" import { MedusaError } from "@medusajs/framework/utils" @@ -35,7 +34,10 @@ export const GET = async ( * @since 2.10.0 */ export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdateShippingOptionType, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const existingShippingOptionType = await refetchShippingOptionType( diff --git a/packages/medusa/src/api/admin/shipping-option-types/route.ts b/packages/medusa/src/api/admin/shipping-option-types/route.ts index 92c847dc82..961f8d1ba6 100644 --- a/packages/medusa/src/api/admin/shipping-option-types/route.ts +++ b/packages/medusa/src/api/admin/shipping-option-types/route.ts @@ -36,7 +36,10 @@ export const GET = async ( * @since 2.10.0 */ export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateShippingOptionType, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const input = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/shipping-options/[id]/route.ts b/packages/medusa/src/api/admin/shipping-options/[id]/route.ts index ae97d49e31..ed7ace5d70 100644 --- a/packages/medusa/src/api/admin/shipping-options/[id]/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/[id]/route.ts @@ -8,14 +8,10 @@ import { MedusaResponse, } from "@medusajs/framework/http" import { refetchShippingOption } from "../helpers" -import { - AdminGetShippingOptionParamsType, - AdminUpdateShippingOptionType, -} from "../validators" import { MedusaError } from "@medusajs/framework/utils" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const shippingOption = await refetchShippingOption( @@ -35,7 +31,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdateShippingOption, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const shippingOptionPayload = req.validatedBody diff --git a/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts b/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts index a4a2a4fb26..274e8a60ef 100644 --- a/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts @@ -11,7 +11,8 @@ export const POST = async ( BatchMethodRequest< HttpTypes.AdminCreateShippingOptionRule, HttpTypes.AdminUpdateShippingOptionRule - > + >, + HttpTypes.SelectParams >, res: MedusaResponse ) => { diff --git a/packages/medusa/src/api/admin/shipping-options/route.ts b/packages/medusa/src/api/admin/shipping-options/route.ts index 01a7c94921..9f5893f818 100644 --- a/packages/medusa/src/api/admin/shipping-options/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/route.ts @@ -36,7 +36,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateShippingOption, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const shippingOptionPayload = req.validatedBody diff --git a/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts b/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts index d6eed0646b..ca5ce1dc1b 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts @@ -9,13 +9,9 @@ import { MedusaResponse, } from "@medusajs/framework/http" import { refetchShippingProfile } from "../helpers" -import { - AdminGetShippingProfileParamsType, - AdminUpdateShippingProfileType, -} from "../validators" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const shippingProfile = await refetchShippingProfile( @@ -52,7 +48,10 @@ export const DELETE = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdateShippingProfile, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/shipping-profiles/route.ts b/packages/medusa/src/api/admin/shipping-profiles/route.ts index 9e71d8bbe0..88672ea6a9 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/route.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/route.ts @@ -11,7 +11,10 @@ import { import { refetchShippingProfile } from "./helpers" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateShippingProfile, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const shippingProfilePayload = req.validatedBody diff --git a/packages/medusa/src/api/store/shipping-options/[id]/calculate/route.ts b/packages/medusa/src/api/store/shipping-options/[id]/calculate/route.ts index 8447d00eb7..e56e23cf53 100644 --- a/packages/medusa/src/api/store/shipping-options/[id]/calculate/route.ts +++ b/packages/medusa/src/api/store/shipping-options/[id]/calculate/route.ts @@ -4,7 +4,10 @@ import { calculateShippingOptionsPricesWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys } from "@medusajs/framework/utils" export const POST = async ( - req: MedusaRequest, + req: MedusaRequest< + HttpTypes.StoreCalculateShippingOptionPrice, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)