From 9f495fd8531026b68be601e41ba96eade1cf2df5 Mon Sep 17 00:00:00 2001 From: Shahed Nasser Date: Fri, 30 Aug 2024 10:07:18 +0300 Subject: [PATCH] chore(types, medusa): [3/3] add missing query type arguments (#8880) Add missing type arguments in listing requests. 3/3 --- .../src/http/collection/store/queries.ts | 5 +++- .../types/src/http/currency/store/index.ts | 1 + .../types/src/http/currency/store/queries.ts | 8 ++++++ .../types/src/http/order/store/queries.ts | 9 ++++-- .../types/src/http/payment/store/index.ts | 1 + .../types/src/http/payment/store/payloads.ts | 3 ++ .../types/src/http/payment/store/queries.ts | 4 ++- .../types/src/http/product/store/queries.ts | 1 + packages/core/types/src/http/region/common.ts | 5 ++-- .../core/types/src/http/return/store/index.ts | 1 + .../types/src/http/return/store/payloads.ts | 20 +++++++++++++ .../src/http/shipping-option/store/index.ts | 1 + .../src/http/shipping-option/store/queries.ts | 7 +++++ .../src/http/stock-locations/admin/queries.ts | 23 +++++++++------ .../types/src/http/tax-rate/admin/queries.ts | 28 +++++++++---------- .../admin/customers/[id]/addresses/route.ts | 2 +- .../src/api/admin/stock-locations/route.ts | 8 ++---- packages/medusa/src/api/admin/stores/route.ts | 3 +- .../medusa/src/api/admin/tax-rates/route.ts | 8 ++---- .../medusa/src/api/admin/tax-regions/route.ts | 8 ++---- .../medusa/src/api/admin/uploads/route.ts | 3 +- packages/medusa/src/api/admin/users/route.ts | 2 +- .../api/admin/workflows-executions/route.ts | 4 +-- .../medusa/src/api/store/collections/route.ts | 2 +- .../medusa/src/api/store/currencies/route.ts | 2 +- .../medusa/src/api/store/customers/route.ts | 3 +- packages/medusa/src/api/store/orders/route.ts | 3 +- .../api/store/payment-collections/route.ts | 3 +- .../src/api/store/payment-providers/route.ts | 3 +- .../src/api/store/product-categories/route.ts | 8 ++++-- .../medusa/src/api/store/products/route.ts | 3 +- .../medusa/src/api/store/regions/route.ts | 2 +- packages/medusa/src/api/store/return/route.ts | 5 ++-- .../src/api/store/shipping-options/route.ts | 2 +- 34 files changed, 114 insertions(+), 77 deletions(-) create mode 100644 packages/core/types/src/http/currency/store/queries.ts create mode 100644 packages/core/types/src/http/payment/store/payloads.ts create mode 100644 packages/core/types/src/http/return/store/payloads.ts create mode 100644 packages/core/types/src/http/shipping-option/store/queries.ts diff --git a/packages/core/types/src/http/collection/store/queries.ts b/packages/core/types/src/http/collection/store/queries.ts index c50377b2f0..5b8324794d 100644 --- a/packages/core/types/src/http/collection/store/queries.ts +++ b/packages/core/types/src/http/collection/store/queries.ts @@ -1,3 +1,6 @@ +import { OperatorMap } from "../../../dal"; import { BaseCollectionListParams } from "../common"; -export interface StoreCollectionFilters extends BaseCollectionListParams {} +export interface StoreCollectionFilters extends Omit { + deleted_at?: OperatorMap +} diff --git a/packages/core/types/src/http/currency/store/index.ts b/packages/core/types/src/http/currency/store/index.ts index 57fa23181b..bedb8f98bc 100644 --- a/packages/core/types/src/http/currency/store/index.ts +++ b/packages/core/types/src/http/currency/store/index.ts @@ -1,2 +1,3 @@ export * from "./entities" +export * from "./queries" export * from "./responses" \ No newline at end of file diff --git a/packages/core/types/src/http/currency/store/queries.ts b/packages/core/types/src/http/currency/store/queries.ts new file mode 100644 index 0000000000..1f12c0a1fa --- /dev/null +++ b/packages/core/types/src/http/currency/store/queries.ts @@ -0,0 +1,8 @@ +import { BaseFilterable } from "../../../dal"; +import { FindParams } from "../../common"; + +export interface StoreGetCurrencyListParams extends + FindParams, BaseFilterable { + q?: string + code?: string | string[] + } \ No newline at end of file diff --git a/packages/core/types/src/http/order/store/queries.ts b/packages/core/types/src/http/order/store/queries.ts index bd5dfccf1a..ddb1a90881 100644 --- a/packages/core/types/src/http/order/store/queries.ts +++ b/packages/core/types/src/http/order/store/queries.ts @@ -1,3 +1,8 @@ -import { BaseOrderFilters } from "../common"; +import { BaseFilterable } from "../../../dal"; +import { FindParams } from "../../common"; -export interface StoreOrderFilters extends BaseOrderFilters {} +export interface StoreOrderFilters extends + FindParams, BaseFilterable { + id?: string | string[] + name?: string | string[] + } diff --git a/packages/core/types/src/http/payment/store/index.ts b/packages/core/types/src/http/payment/store/index.ts index bedb8f98bc..2f1b9df166 100644 --- a/packages/core/types/src/http/payment/store/index.ts +++ b/packages/core/types/src/http/payment/store/index.ts @@ -1,3 +1,4 @@ export * from "./entities" +export * from "./payloads" export * from "./queries" export * from "./responses" \ No newline at end of file diff --git a/packages/core/types/src/http/payment/store/payloads.ts b/packages/core/types/src/http/payment/store/payloads.ts new file mode 100644 index 0000000000..d8a8011e34 --- /dev/null +++ b/packages/core/types/src/http/payment/store/payloads.ts @@ -0,0 +1,3 @@ +export interface StoreCreatePaymentCollection { + cart_id: string +} \ No newline at end of file diff --git a/packages/core/types/src/http/payment/store/queries.ts b/packages/core/types/src/http/payment/store/queries.ts index f573eda2b2..80f1d17820 100644 --- a/packages/core/types/src/http/payment/store/queries.ts +++ b/packages/core/types/src/http/payment/store/queries.ts @@ -5,7 +5,9 @@ import { } from "../common" export interface StorePaymentProviderFilters - extends BasePaymentProviderFilters {} + extends BasePaymentProviderFilters { + is_enabled?: boolean + } export interface StorePaymentCollectionFilters extends BasePaymentCollectionFilters {} export interface StorePaymentSessionFilters extends BasePaymentSessionFilters {} diff --git a/packages/core/types/src/http/product/store/queries.ts b/packages/core/types/src/http/product/store/queries.ts index ff3b429980..c75f75517f 100644 --- a/packages/core/types/src/http/product/store/queries.ts +++ b/packages/core/types/src/http/product/store/queries.ts @@ -11,4 +11,5 @@ export interface StoreProductParams extends BaseProductListParams { region_id?: string currency_code?: string variants?: StoreProductVariantParams + province?: string } diff --git a/packages/core/types/src/http/region/common.ts b/packages/core/types/src/http/region/common.ts index 5a2d26508a..086a310724 100644 --- a/packages/core/types/src/http/region/common.ts +++ b/packages/core/types/src/http/region/common.ts @@ -25,9 +25,8 @@ export interface BaseRegionCountry { export interface BaseRegionFilters extends BaseFilterable { q?: string id?: string[] | string | OperatorMap - name?: string | OperatorMap - currency_code?: string | OperatorMap - metadata?: Record | OperatorMap> + name?: string | string[] + code?: string | string[] created_at?: OperatorMap updated_at?: OperatorMap } diff --git a/packages/core/types/src/http/return/store/index.ts b/packages/core/types/src/http/return/store/index.ts index 57fa23181b..ba78c783ea 100644 --- a/packages/core/types/src/http/return/store/index.ts +++ b/packages/core/types/src/http/return/store/index.ts @@ -1,2 +1,3 @@ export * from "./entities" +export * from "./payloads" export * from "./responses" \ No newline at end of file diff --git a/packages/core/types/src/http/return/store/payloads.ts b/packages/core/types/src/http/return/store/payloads.ts new file mode 100644 index 0000000000..348932f6c7 --- /dev/null +++ b/packages/core/types/src/http/return/store/payloads.ts @@ -0,0 +1,20 @@ +interface StoreCreateReturnItem { + id: string + quantity: number + reason_id?: string | null + note?: string | null +} + +interface StoreCreateReturnShipping { + option_id: string + price?: number +} + +export interface StoreCreateReturn { + order_id: string + items: StoreCreateReturnItem[] + return_shipping: StoreCreateReturnShipping + note?: string | null + receive_now?: boolean + location_id?: string | null +} \ No newline at end of file diff --git a/packages/core/types/src/http/shipping-option/store/index.ts b/packages/core/types/src/http/shipping-option/store/index.ts index 57fa23181b..bedb8f98bc 100644 --- a/packages/core/types/src/http/shipping-option/store/index.ts +++ b/packages/core/types/src/http/shipping-option/store/index.ts @@ -1,2 +1,3 @@ export * from "./entities" +export * from "./queries" export * from "./responses" \ No newline at end of file diff --git a/packages/core/types/src/http/shipping-option/store/queries.ts b/packages/core/types/src/http/shipping-option/store/queries.ts new file mode 100644 index 0000000000..fd13b92e3c --- /dev/null +++ b/packages/core/types/src/http/shipping-option/store/queries.ts @@ -0,0 +1,7 @@ +import { BaseFilterable } from "../../../dal"; +import { FindParams } from "../../common"; + +export interface StoreGetShippingOptionList extends + FindParams, BaseFilterable { + cart_id: string + } \ No newline at end of file diff --git a/packages/core/types/src/http/stock-locations/admin/queries.ts b/packages/core/types/src/http/stock-locations/admin/queries.ts index a552319240..68d3aff4d9 100644 --- a/packages/core/types/src/http/stock-locations/admin/queries.ts +++ b/packages/core/types/src/http/stock-locations/admin/queries.ts @@ -1,11 +1,16 @@ +import { BaseFilterable, OperatorMap } from "../../../dal" import { FindParams } from "../../common" -export interface AdminStockLocationListParams extends FindParams { - id?: string | string[] - q?: string - name?: string | string[] - address_id?: string | string[] - sales_channel_id?: string | string[] - $and?: AdminStockLocationListParams[] - $or?: AdminStockLocationListParams[] -} +export interface AdminStockLocationListParams extends + FindParams, BaseFilterable { + id?: string | string[] + q?: string + name?: string | string[] + address_id?: string | string[] + sales_channel_id?: string | string[] + $and?: AdminStockLocationListParams[] + $or?: AdminStockLocationListParams[] + created_at?: OperatorMap + updated_at?: OperatorMap + deleted_at?: OperatorMap + } diff --git a/packages/core/types/src/http/tax-rate/admin/queries.ts b/packages/core/types/src/http/tax-rate/admin/queries.ts index 33999c31bc..85bdc16c88 100644 --- a/packages/core/types/src/http/tax-rate/admin/queries.ts +++ b/packages/core/types/src/http/tax-rate/admin/queries.ts @@ -1,16 +1,16 @@ -import { OperatorMap } from "../../../dal" +import { BaseFilterable, OperatorMap } from "../../../dal" import { FindParams } from "../../common" -export interface AdminTaxRateListParams extends FindParams { - id?: string | string[] - q?: string - tax_region_id?: string | string[] | OperatorMap - is_default?: string - service_zone_id?: string - shipping_profile_id?: string - provider_id?: string - shipping_option_type_id?: string - created_at?: string | OperatorMap - updated_at?: string | OperatorMap - deleted_at?: string | OperatorMap -} +export interface AdminTaxRateListParams extends + FindParams, BaseFilterable { + q?: string + tax_region_id?: string | string[] | OperatorMap + is_default?: string + service_zone_id?: string + shipping_profile_id?: string + provider_id?: string + shipping_option_type_id?: string + created_at?: OperatorMap + updated_at?: OperatorMap + deleted_at?: OperatorMap + } diff --git a/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts b/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts index c7fbf4d8a3..dcaeb44819 100644 --- a/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts +++ b/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts @@ -12,7 +12,7 @@ import { refetchCustomer } from "../../helpers" import { AdditionalData, HttpTypes } from "@medusajs/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const customerId = req.params.id diff --git a/packages/medusa/src/api/admin/stock-locations/route.ts b/packages/medusa/src/api/admin/stock-locations/route.ts index bac5970c86..55540576d8 100644 --- a/packages/medusa/src/api/admin/stock-locations/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/route.ts @@ -9,15 +9,11 @@ import { import { createStockLocationsWorkflow } from "@medusajs/core-flows" import { refetchStockLocation } from "./helpers" -import { - AdminCreateStockLocationType, - AdminGetStockLocationsParamsType, -} from "./validators" import { HttpTypes } from "@medusajs/types" // Create stock location export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { result } = await createStockLocationsWorkflow(req.scope).run({ @@ -34,7 +30,7 @@ export const POST = async ( } export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/stores/route.ts b/packages/medusa/src/api/admin/stores/route.ts index c180cc132c..09b809f174 100644 --- a/packages/medusa/src/api/admin/stores/route.ts +++ b/packages/medusa/src/api/admin/stores/route.ts @@ -6,11 +6,10 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { AdminGetStoresParamsType } from "./validators" import { HttpTypes } from "@medusajs/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/tax-rates/route.ts b/packages/medusa/src/api/admin/tax-rates/route.ts index 10317daaf7..316ca9f554 100644 --- a/packages/medusa/src/api/admin/tax-rates/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/route.ts @@ -8,14 +8,10 @@ import { MedusaResponse, } from "../../../types/routing" import { refetchTaxRate } from "./helpers" -import { - AdminCreateTaxRateType, - AdminGetTaxRatesParamsType, -} from "./validators" import { HttpTypes } from "@medusajs/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { result } = await createTaxRatesWorkflow(req.scope).run({ @@ -36,7 +32,7 @@ export const POST = async ( } export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/tax-regions/route.ts b/packages/medusa/src/api/admin/tax-regions/route.ts index 8c6c29c0fa..8a2dd58191 100644 --- a/packages/medusa/src/api/admin/tax-regions/route.ts +++ b/packages/medusa/src/api/admin/tax-regions/route.ts @@ -7,15 +7,11 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { - AdminCreateTaxRegionType, - AdminGetTaxRegionsParamsType, -} from "./validators" import { refetchTaxRegion } from "./helpers" import { HttpTypes } from "@medusajs/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { result } = await createTaxRegionsWorkflow(req.scope).run({ @@ -36,7 +32,7 @@ export const POST = async ( } export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/uploads/route.ts b/packages/medusa/src/api/admin/uploads/route.ts index f5b9d3df98..a07e19952b 100644 --- a/packages/medusa/src/api/admin/uploads/route.ts +++ b/packages/medusa/src/api/admin/uploads/route.ts @@ -4,11 +4,10 @@ import { MedusaResponse, } from "../../../types/routing" import { MedusaError } from "@medusajs/utils" -import { AdminGetUploadParamsType } from "./validators" import { HttpTypes } from "@medusajs/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const input = req.files as Express.Multer.File[] diff --git a/packages/medusa/src/api/admin/users/route.ts b/packages/medusa/src/api/admin/users/route.ts index 48c23c54cf..8f366d6c9a 100644 --- a/packages/medusa/src/api/admin/users/route.ts +++ b/packages/medusa/src/api/admin/users/route.ts @@ -9,7 +9,7 @@ import { } from "../../../types/routing" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/workflows-executions/route.ts b/packages/medusa/src/api/admin/workflows-executions/route.ts index 1a40bb0d88..d93346f695 100644 --- a/packages/medusa/src/api/admin/workflows-executions/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/route.ts @@ -3,15 +3,13 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" - -import { AdminGetWorkflowExecutionsParamsType } from "./validators" import { ContainerRegistrationKeys, remoteQueryObjectFromString, } from "@medusajs/utils" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/store/collections/route.ts b/packages/medusa/src/api/store/collections/route.ts index 8e22f0b459..3408e6cfc0 100644 --- a/packages/medusa/src/api/store/collections/route.ts +++ b/packages/medusa/src/api/store/collections/route.ts @@ -10,7 +10,7 @@ import { } from "@medusajs/utils" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/store/currencies/route.ts b/packages/medusa/src/api/store/currencies/route.ts index d9a46060f5..5b7ba9ae56 100644 --- a/packages/medusa/src/api/store/currencies/route.ts +++ b/packages/medusa/src/api/store/currencies/route.ts @@ -6,7 +6,7 @@ import { MedusaRequest, MedusaResponse } from "../../../types/routing" import { HttpTypes } from "@medusajs/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/customers/route.ts b/packages/medusa/src/api/store/customers/route.ts index de3031096f..f8533e8a97 100644 --- a/packages/medusa/src/api/store/customers/route.ts +++ b/packages/medusa/src/api/store/customers/route.ts @@ -6,11 +6,10 @@ import { MedusaError } from "@medusajs/utils" import { createCustomerAccountWorkflow } from "@medusajs/core-flows" import { refetchCustomer } from "./helpers" -import { StoreCreateCustomerType } from "./validators" import { HttpTypes } from "@medusajs/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { // If `actor_id` is present, the request carries authentication for an existing customer diff --git a/packages/medusa/src/api/store/orders/route.ts b/packages/medusa/src/api/store/orders/route.ts index 53e7e2a92c..e898764271 100644 --- a/packages/medusa/src/api/store/orders/route.ts +++ b/packages/medusa/src/api/store/orders/route.ts @@ -6,11 +6,10 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { AdminGetOrdersParamsType } from "../../admin/draft-orders/validators" import { HttpTypes } from "@medusajs/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/store/payment-collections/route.ts b/packages/medusa/src/api/store/payment-collections/route.ts index 84eb5dfb82..85a76c259e 100644 --- a/packages/medusa/src/api/store/payment-collections/route.ts +++ b/packages/medusa/src/api/store/payment-collections/route.ts @@ -7,11 +7,10 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { StoreCreatePaymentCollectionType } from "./validators" import { HttpTypes } from "@medusajs/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/store/payment-providers/route.ts b/packages/medusa/src/api/store/payment-providers/route.ts index 54ae2888c7..e0956cdf21 100644 --- a/packages/medusa/src/api/store/payment-providers/route.ts +++ b/packages/medusa/src/api/store/payment-providers/route.ts @@ -7,12 +7,11 @@ import { MedusaError, remoteQueryObjectFromString, } from "@medusajs/utils" -import { StoreGetPaymentProvidersParamsType } from "./validators" import { HttpTypes } from "@medusajs/types" // TODO: Add more fields to provider, such as default name and maybe logo. export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { if (!req.filterableFields.region_id) { diff --git a/packages/medusa/src/api/store/product-categories/route.ts b/packages/medusa/src/api/store/product-categories/route.ts index 9640f7cd6b..4bce959bb3 100644 --- a/packages/medusa/src/api/store/product-categories/route.ts +++ b/packages/medusa/src/api/store/product-categories/route.ts @@ -1,4 +1,7 @@ -import { StoreProductCategoryListResponse } from "@medusajs/types" +import { + StoreProductCategoryListParams, + StoreProductCategoryListResponse, +} from "@medusajs/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, @@ -7,10 +10,9 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { StoreProductCategoriesParamsType } from "./validators" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/store/products/route.ts b/packages/medusa/src/api/store/products/route.ts index c691b5dcb9..ae13e1a220 100644 --- a/packages/medusa/src/api/store/products/route.ts +++ b/packages/medusa/src/api/store/products/route.ts @@ -5,12 +5,11 @@ import { } from "@medusajs/utils" import { MedusaResponse } from "../../../types/routing" import { wrapVariantsWithInventoryQuantity } from "../../utils/middlewares" -import { StoreGetProductsParamsType } from "./validators" import { RequestWithContext, wrapProductsWithTaxPrices } from "./helpers" import { HttpTypes } from "@medusajs/types" export const GET = async ( - req: RequestWithContext, + req: RequestWithContext, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/store/regions/route.ts b/packages/medusa/src/api/store/regions/route.ts index cb100add5f..a33023cdab 100644 --- a/packages/medusa/src/api/store/regions/route.ts +++ b/packages/medusa/src/api/store/regions/route.ts @@ -6,7 +6,7 @@ import { MedusaRequest, MedusaResponse } from "../../../types/routing" import { HttpTypes } from "@medusajs/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/return/route.ts b/packages/medusa/src/api/store/return/route.ts index 2bd2c59adc..be3856bbfb 100644 --- a/packages/medusa/src/api/store/return/route.ts +++ b/packages/medusa/src/api/store/return/route.ts @@ -1,13 +1,12 @@ import { createAndCompleteReturnOrderWorkflow } from "@medusajs/core-flows" import { MedusaRequest, MedusaResponse } from "../../../types/routing" -import { StorePostReturnsReqSchemaType } from "./validators" import { HttpTypes } from "@medusajs/types" export const POST = async ( - req: MedusaRequest, + req: MedusaRequest, res: MedusaResponse ) => { - const input = req.validatedBody as StorePostReturnsReqSchemaType + const input = req.validatedBody as HttpTypes.StoreCreateReturn const workflow = createAndCompleteReturnOrderWorkflow(req.scope) const { result } = await workflow.run({ diff --git a/packages/medusa/src/api/store/shipping-options/route.ts b/packages/medusa/src/api/store/shipping-options/route.ts index a9a72a3318..c0e3840f57 100644 --- a/packages/medusa/src/api/store/shipping-options/route.ts +++ b/packages/medusa/src/api/store/shipping-options/route.ts @@ -4,7 +4,7 @@ import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" import { MedusaRequest, MedusaResponse } from "../../../types/routing" export const GET = async ( - req: MedusaRequest, + req: MedusaRequest, res: MedusaResponse ) => { const { cart_id } = req.filterableFields as { cart_id: string }