From a2b6ef36d964419bccdfa09af4f0bff604affc80 Mon Sep 17 00:00:00 2001 From: Shahed Nasser Date: Tue, 28 Oct 2025 11:09:51 +0200 Subject: [PATCH] chore: fixes to http and request types for payment and regions (#13831) --- .../core/types/src/http/price-list/admin/payloads.ts | 6 +++--- packages/core/types/src/http/region/store/queries.ts | 3 ++- .../medusa/src/api/admin/currencies/[code]/route.ts | 2 +- .../src/api/admin/price-lists/[id]/products/route.ts | 5 ++++- .../medusa/src/api/admin/price-lists/[id]/route.ts | 8 +++++--- packages/medusa/src/api/admin/price-lists/route.ts | 6 ++++-- .../src/api/admin/price-preferences/[id]/route.ts | 7 +++++-- .../medusa/src/api/admin/price-preferences/route.ts | 5 ++++- packages/medusa/src/api/admin/regions/[id]/route.ts | 10 +++++++--- packages/medusa/src/api/admin/regions/route.ts | 5 ++++- .../medusa/src/api/store/currencies/[code]/route.ts | 2 +- packages/medusa/src/api/store/regions/[id]/route.ts | 2 +- 12 files changed, 41 insertions(+), 20 deletions(-) diff --git a/packages/core/types/src/http/price-list/admin/payloads.ts b/packages/core/types/src/http/price-list/admin/payloads.ts index 31bca42c48..45819f9f4e 100644 --- a/packages/core/types/src/http/price-list/admin/payloads.ts +++ b/packages/core/types/src/http/price-list/admin/payloads.ts @@ -38,7 +38,7 @@ export interface AdminCreatePriceList { /** * The price list's description. */ - description?: string | null + description: string /** * The price list's start date. */ @@ -50,11 +50,11 @@ export interface AdminCreatePriceList { /** * The price list's status. */ - status: PriceListStatus + status?: PriceListStatus /** * The price list's type. */ - type: PriceListType + type?: PriceListType /** * The price list's rules. */ diff --git a/packages/core/types/src/http/region/store/queries.ts b/packages/core/types/src/http/region/store/queries.ts index 9b2eafcc8f..8d8623ebc0 100644 --- a/packages/core/types/src/http/region/store/queries.ts +++ b/packages/core/types/src/http/region/store/queries.ts @@ -1,5 +1,6 @@ +import { FindParams } from "../../common"; import { BaseRegionCountryFilters, BaseRegionFilters } from "../common" export interface StoreRegionFilters - extends Omit {} + extends Omit, FindParams {} export interface StoreRegionCountryFilters extends BaseRegionCountryFilters {} diff --git a/packages/medusa/src/api/admin/currencies/[code]/route.ts b/packages/medusa/src/api/admin/currencies/[code]/route.ts index c73620f27c..9dd048c363 100644 --- a/packages/medusa/src/api/admin/currencies/[code]/route.ts +++ b/packages/medusa/src/api/admin/currencies/[code]/route.ts @@ -7,7 +7,7 @@ import { MedusaRequest, MedusaResponse } from "@medusajs/framework/http" import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( - req: MedusaRequest, + req: MedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts b/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts index 680baa2359..2dd054da9a 100644 --- a/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts @@ -8,7 +8,10 @@ import { import { fetchPriceList, fetchPriceListPriceIdsForProduct } from "../../helpers" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminLinkPriceListProducts, + HttpTypes.AdminPriceListParams + >, res: MedusaResponse ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/price-lists/[id]/route.ts b/packages/medusa/src/api/admin/price-lists/[id]/route.ts index f881b47d16..f0e8f03ca7 100644 --- a/packages/medusa/src/api/admin/price-lists/[id]/route.ts +++ b/packages/medusa/src/api/admin/price-lists/[id]/route.ts @@ -7,11 +7,10 @@ import { MedusaResponse, } from "@medusajs/framework/http" import { fetchPriceList } from "../helpers" -import { AdminUpdatePriceListType } from "../validators" import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const price_list = await fetchPriceList( @@ -24,7 +23,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdatePriceList, + HttpTypes.AdminPriceListParams + >, res: MedusaResponse ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/price-lists/route.ts b/packages/medusa/src/api/admin/price-lists/route.ts index 8b8abd0da0..8803c70cbb 100644 --- a/packages/medusa/src/api/admin/price-lists/route.ts +++ b/packages/medusa/src/api/admin/price-lists/route.ts @@ -8,7 +8,6 @@ import { MedusaResponse, } from "@medusajs/framework/http" import { fetchPriceList, transformPriceList } from "./helpers" -import { AdminCreatePriceListType } from "./validators" import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( @@ -37,7 +36,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreatePriceList, + HttpTypes.AdminPriceListListParams + >, res: MedusaResponse ) => { const workflow = createPriceListsWorkflow(req.scope) diff --git a/packages/medusa/src/api/admin/price-preferences/[id]/route.ts b/packages/medusa/src/api/admin/price-preferences/[id]/route.ts index 75e6527ade..a45f02c6c1 100644 --- a/packages/medusa/src/api/admin/price-preferences/[id]/route.ts +++ b/packages/medusa/src/api/admin/price-preferences/[id]/route.ts @@ -11,7 +11,7 @@ import { } from "@medusajs/framework/http" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const price_preference = await refetchEntity({ @@ -25,7 +25,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdatePricePreference, + HttpTypes.AdminPricePreferenceParams + >, res: MedusaResponse ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/price-preferences/route.ts b/packages/medusa/src/api/admin/price-preferences/route.ts index 4e444fb137..99acead356 100644 --- a/packages/medusa/src/api/admin/price-preferences/route.ts +++ b/packages/medusa/src/api/admin/price-preferences/route.ts @@ -28,7 +28,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreatePricePreference, + HttpTypes.AdminPricePreferenceParams + >, res: MedusaResponse ) => { const workflow = createPricePreferencesWorkflow(req.scope) diff --git a/packages/medusa/src/api/admin/regions/[id]/route.ts b/packages/medusa/src/api/admin/regions/[id]/route.ts index bad7006c69..d7befab2a6 100644 --- a/packages/medusa/src/api/admin/regions/[id]/route.ts +++ b/packages/medusa/src/api/admin/regions/[id]/route.ts @@ -8,11 +8,12 @@ import { MedusaResponse, } from "@medusajs/framework/http" import { refetchRegion } from "../helpers" -import { AdminGetRegionParamsType, AdminUpdateRegionType } from "../validators" import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const region = await refetchRegion( @@ -32,7 +33,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdateRegion, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const existingRegion = await refetchRegion(req.params.id, req.scope, ["id"]) diff --git a/packages/medusa/src/api/admin/regions/route.ts b/packages/medusa/src/api/admin/regions/route.ts index 903556aa81..08d6df7a66 100644 --- a/packages/medusa/src/api/admin/regions/route.ts +++ b/packages/medusa/src/api/admin/regions/route.ts @@ -36,7 +36,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateRegion, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const input = [req.validatedBody] diff --git a/packages/medusa/src/api/store/currencies/[code]/route.ts b/packages/medusa/src/api/store/currencies/[code]/route.ts index 4aa94c4681..05bd6b0ed2 100644 --- a/packages/medusa/src/api/store/currencies/[code]/route.ts +++ b/packages/medusa/src/api/store/currencies/[code]/route.ts @@ -7,7 +7,7 @@ import { MedusaRequest, MedusaResponse } from "@medusajs/framework/http" import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( - req: MedusaRequest, + req: MedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/store/regions/[id]/route.ts b/packages/medusa/src/api/store/regions/[id]/route.ts index 6cdcf94e3f..2db559512f 100644 --- a/packages/medusa/src/api/store/regions/[id]/route.ts +++ b/packages/medusa/src/api/store/regions/[id]/route.ts @@ -7,7 +7,7 @@ import { MedusaRequest, MedusaResponse } from "@medusajs/framework/http" import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( - req: MedusaRequest, + req: MedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)