diff --git a/packages/core/types/src/http/product/store/queries.ts b/packages/core/types/src/http/product/store/queries.ts index 2ad234c737..a0942e0836 100644 --- a/packages/core/types/src/http/product/store/queries.ts +++ b/packages/core/types/src/http/product/store/queries.ts @@ -1,4 +1,4 @@ -import { FindParams } from "../../common" +import { SelectParams } from "../../common" import { BaseProductListParams, BaseProductOptionParams, @@ -25,7 +25,7 @@ export interface StoreProductPricingContext { */ cart_id?: string } -export interface StoreProductParams extends FindParams, StoreProductPricingContext {} +export interface StoreProductParams extends SelectParams, StoreProductPricingContext {} export interface StoreProductListParams extends Omit, StoreProductPricingContext { diff --git a/packages/core/types/src/http/tax-rate/admin/payloads.ts b/packages/core/types/src/http/tax-rate/admin/payloads.ts index 447d5d1480..086589d644 100644 --- a/packages/core/types/src/http/tax-rate/admin/payloads.ts +++ b/packages/core/types/src/http/tax-rate/admin/payloads.ts @@ -1,4 +1,4 @@ -interface AdminCreateTaxRateRule { +export interface AdminCreateTaxRateRule { /** * The name of the table that the rule references. * diff --git a/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts b/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts index 65dcc22c91..21ab7065e5 100644 --- a/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts @@ -4,11 +4,14 @@ import { } from "@medusajs/framework/http" import { linkProductsToSalesChannelWorkflow } from "@medusajs/core-flows" -import { HttpTypes, LinkMethodRequest } from "@medusajs/framework/types" +import { HttpTypes } from "@medusajs/framework/types" import { refetchSalesChannel } from "../../helpers" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminBatchLink, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/sales-channels/[id]/route.ts b/packages/medusa/src/api/admin/sales-channels/[id]/route.ts index 097a98d0b0..78bc595506 100644 --- a/packages/medusa/src/api/admin/sales-channels/[id]/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/[id]/route.ts @@ -8,14 +8,10 @@ import { MedusaResponse, } from "@medusajs/framework/http" import { refetchSalesChannel } from "../helpers" -import { - AdminGetSalesChannelParamsType, - AdminUpdateSalesChannelType, -} from "../validators" import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const salesChannel = await refetchSalesChannel( @@ -35,7 +31,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdateSalesChannel, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const existingSalesChannel = await refetchSalesChannel( diff --git a/packages/medusa/src/api/admin/sales-channels/route.ts b/packages/medusa/src/api/admin/sales-channels/route.ts index 8995ffaadd..070c5f43d1 100644 --- a/packages/medusa/src/api/admin/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/route.ts @@ -36,7 +36,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateSalesChannel, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const salesChannelsData = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/stores/[id]/route.ts b/packages/medusa/src/api/admin/stores/[id]/route.ts index b20384a0e5..31d78829f6 100644 --- a/packages/medusa/src/api/admin/stores/[id]/route.ts +++ b/packages/medusa/src/api/admin/stores/[id]/route.ts @@ -8,7 +8,7 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "@medusajs/framework/http" -import { AdminGetStoreParamsType, AdminUpdateStoreType } from "../validators" +import { AdminGetStoreParamsType } from "../validators" import { refetchStore } from "../helpers" import { HttpTypes } from "@medusajs/framework/types" @@ -30,7 +30,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdateStore, + HttpTypes.AdminStoreParams + >, res: MedusaResponse ) => { const existingStore = await refetchStore(req.params.id, req.scope, ["id"]) diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/route.ts index 5ea918df73..15aa217ae1 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/route.ts @@ -12,14 +12,13 @@ import { MedusaResponse, } from "@medusajs/framework/http" import { refetchTaxRate } from "../helpers" -import { - AdminGetTaxRateParamsType, - AdminUpdateTaxRateType, -} from "../validators" import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdateTaxRate, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const existingTaxRate = await refetchTaxRate(req.params.id, req.scope, ["id"]) @@ -47,7 +46,9 @@ export const POST = async ( } export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts index 42435b69ff..f2ab6f19b5 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts @@ -7,7 +7,7 @@ import { refetchTaxRate } from "../../../helpers" import { HttpTypes } from "@medusajs/framework/types" export const DELETE = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest<{}, HttpTypes.SelectParams>, res: MedusaResponse ) => { await deleteTaxRateRulesWorkflow(req.scope).run({ diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts index a720712b7c..2e96e487c9 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts @@ -3,12 +3,14 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "@medusajs/framework/http" -import { AdminCreateTaxRateRuleType } from "../../validators" import { refetchTaxRate } from "../../helpers" import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateTaxRateRule, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { await createTaxRateRulesWorkflow(req.scope).run({ diff --git a/packages/medusa/src/api/admin/tax-rates/route.ts b/packages/medusa/src/api/admin/tax-rates/route.ts index 805279c205..b1e66b36e6 100644 --- a/packages/medusa/src/api/admin/tax-rates/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/route.ts @@ -11,7 +11,10 @@ import { refetchTaxRate } from "./helpers" import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateTaxRate, + HttpTypes.SelectParams + >, res: MedusaResponse ) => { const { result } = await createTaxRatesWorkflow(req.scope).run({ diff --git a/packages/medusa/src/api/admin/tax-regions/[id]/route.ts b/packages/medusa/src/api/admin/tax-regions/[id]/route.ts index db66025f50..e23ebddf25 100644 --- a/packages/medusa/src/api/admin/tax-regions/[id]/route.ts +++ b/packages/medusa/src/api/admin/tax-regions/[id]/route.ts @@ -11,10 +11,9 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, } from "@medusajs/framework/utils" -import { AdminUpdateTaxRegionType } from "../validators" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -32,7 +31,10 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminUpdateTaxRegion, + HttpTypes.AdminTaxRegionParams + >, res: MedusaResponse ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/tax-regions/route.ts b/packages/medusa/src/api/admin/tax-regions/route.ts index bb9a91eada..a2371111d7 100644 --- a/packages/medusa/src/api/admin/tax-regions/route.ts +++ b/packages/medusa/src/api/admin/tax-regions/route.ts @@ -11,7 +11,10 @@ import { refetchTaxRegion } from "./helpers" import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreateTaxRegion, + HttpTypes.AdminTaxRegionParams + >, res: MedusaResponse ) => { const { result } = await createTaxRegionsWorkflow(req.scope).run({ diff --git a/packages/medusa/src/api/admin/uploads/[id]/route.ts b/packages/medusa/src/api/admin/uploads/[id]/route.ts index bfb33fe97b..e3e5cd4f27 100644 --- a/packages/medusa/src/api/admin/uploads/[id]/route.ts +++ b/packages/medusa/src/api/admin/uploads/[id]/route.ts @@ -11,7 +11,7 @@ import { } from "@medusajs/framework/utils" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)