From 80fd20b21e89f775f7d9b8ffec4b1a7ffaabdb16 Mon Sep 17 00:00:00 2001 From: Shahed Nasser Date: Fri, 30 Aug 2024 10:18:14 +0300 Subject: [PATCH] chore(types, medusa): [2/n] add missing query type arguments (#8879) Add missing type arguments in listing requests. 2/n --- .../types/src/http/payment/admin/queries.ts | 16 ++++++++++------ .../types/src/http/pricing/admin/queries.ts | 1 + .../types/src/http/product/admin/queries.ts | 14 ++++++++++++-- .../core/types/src/http/region/admin/queries.ts | 12 +++++++++++- .../src/http/shipping-option/admin/queries.ts | 8 ++++---- packages/medusa/src/api/admin/payments/route.ts | 3 +-- .../medusa/src/api/admin/price-lists/route.ts | 2 +- .../src/api/admin/price-preferences/route.ts | 2 +- .../src/api/admin/product-categories/route.ts | 17 +++++------------ .../medusa/src/api/admin/product-tags/route.ts | 8 ++------ .../medusa/src/api/admin/product-types/route.ts | 8 ++------ .../src/api/admin/product-variants/route.ts | 2 +- .../medusa/src/api/admin/promotions/route.ts | 10 ++++------ .../src/api/admin/refund-reasons/route.ts | 7 ++++--- packages/medusa/src/api/admin/regions/route.ts | 5 ++--- .../medusa/src/api/admin/reservations/route.ts | 8 ++------ .../src/api/admin/return-reasons/route.ts | 3 +-- packages/medusa/src/api/admin/returns/route.ts | 2 +- .../src/api/admin/sales-channels/route.ts | 8 ++------ .../src/api/admin/shipping-options/route.ts | 8 ++------ 20 files changed, 69 insertions(+), 75 deletions(-) diff --git a/packages/core/types/src/http/payment/admin/queries.ts b/packages/core/types/src/http/payment/admin/queries.ts index 4d1ff5ab80..ee8fba964f 100644 --- a/packages/core/types/src/http/payment/admin/queries.ts +++ b/packages/core/types/src/http/payment/admin/queries.ts @@ -1,4 +1,4 @@ -import { BaseFilterable } from "../../../dal" +import { BaseFilterable, OperatorMap } from "../../../dal" import { FindParams } from "../../common" import { BasePaymentCollectionFilters, @@ -16,13 +16,17 @@ export interface AdminPaymentCollectionFilters extends BasePaymentCollectionFilters {} export interface AdminPaymentSessionFilters extends BasePaymentSessionFilters {} -export interface AdminPaymentFilters extends BasePaymentFilters {} - -export interface RefundFilters extends BaseFilterable { - id?: string | string[] +export interface AdminPaymentFilters extends FindParams, BasePaymentFilters { + q?: string + payment_session_id?: string | string[] + created_at?: OperatorMap + updated_at?: OperatorMap + deleted_at?: OperatorMap } -export interface RefundReasonFilters extends BaseFilterable { + +export interface RefundReasonFilters extends FindParams, BaseFilterable { id?: string | string[] + q?: string } export interface AdminGetPaymentProvidersParams diff --git a/packages/core/types/src/http/pricing/admin/queries.ts b/packages/core/types/src/http/pricing/admin/queries.ts index 57ad288e2f..26d972f7cb 100644 --- a/packages/core/types/src/http/pricing/admin/queries.ts +++ b/packages/core/types/src/http/pricing/admin/queries.ts @@ -7,6 +7,7 @@ export interface AdminPricePreferenceListParams id?: string | string[] attribute?: string | string[] value?: string | string[] + q?: string } export interface AdminPricePreferenceParams extends SelectParams {} diff --git a/packages/core/types/src/http/product/admin/queries.ts b/packages/core/types/src/http/product/admin/queries.ts index 2b05df0b33..7cd385779d 100644 --- a/packages/core/types/src/http/product/admin/queries.ts +++ b/packages/core/types/src/http/product/admin/queries.ts @@ -1,11 +1,21 @@ +import { BaseFilterable, OperatorMap } from "../../../dal" +import { FindParams } from "../../common" import { BaseProductListParams, BaseProductOptionParams, - BaseProductVariantParams, } from "../common" export interface AdminProductOptionParams extends BaseProductOptionParams {} -export interface AdminProductVariantParams extends BaseProductVariantParams {} +export interface AdminProductVariantParams extends + FindParams, BaseFilterable { + q?: string + id?: string | string[] + manage_inventory?: boolean + allow_backorder?: boolean + created_at?: OperatorMap + updated_at?: OperatorMap + deleted_at?: OperatorMap + } export interface AdminProductListParams extends BaseProductListParams { price_list_id?: string | string[] variants?: AdminProductVariantParams diff --git a/packages/core/types/src/http/region/admin/queries.ts b/packages/core/types/src/http/region/admin/queries.ts index db57198d76..696d85392a 100644 --- a/packages/core/types/src/http/region/admin/queries.ts +++ b/packages/core/types/src/http/region/admin/queries.ts @@ -1,7 +1,17 @@ +import { BaseFilterable, OperatorMap } from "../../../dal"; +import { FindParams } from "../../common"; import { BaseRegionCountryFilters, BaseRegionFilters, } from "../common" -export interface AdminRegionFilters extends BaseRegionFilters {} +export interface AdminRegionFilters extends FindParams, BaseFilterable { + q?: string + id?: string | string[] + code?: string | string[] + name?: string | string[] + created_at?: OperatorMap + updated_at?: OperatorMap + deleted_at?: OperatorMap +} export interface AdminRegionCountryFilters extends BaseRegionCountryFilters {} \ No newline at end of file diff --git a/packages/core/types/src/http/shipping-option/admin/queries.ts b/packages/core/types/src/http/shipping-option/admin/queries.ts index 10f0648ed3..d0a358ae5e 100644 --- a/packages/core/types/src/http/shipping-option/admin/queries.ts +++ b/packages/core/types/src/http/shipping-option/admin/queries.ts @@ -4,11 +4,11 @@ import { FindParams } from "../../common" export interface AdminShippingOptionListParams extends FindParams { id?: string | string[] q?: string - service_zone_id?: string + service_zone_id?: string | string[] stock_location_id?: string | string[] - shipping_profile_id?: string - provider_id?: string - shipping_option_type_id?: string + shipping_profile_id?: string | string[] + provider_id?: string | string[] + shipping_option_type_id?: string | string[] created_at?: OperatorMap updated_at?: OperatorMap deleted_at?: OperatorMap diff --git a/packages/medusa/src/api/admin/payments/route.ts b/packages/medusa/src/api/admin/payments/route.ts index 5f1600736f..4646e08dc7 100644 --- a/packages/medusa/src/api/admin/payments/route.ts +++ b/packages/medusa/src/api/admin/payments/route.ts @@ -6,11 +6,10 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { AdminGetPaymentsParamsType } 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/price-lists/route.ts b/packages/medusa/src/api/admin/price-lists/route.ts index bd62179a34..dea51b773a 100644 --- a/packages/medusa/src/api/admin/price-lists/route.ts +++ b/packages/medusa/src/api/admin/price-lists/route.ts @@ -12,7 +12,7 @@ import { AdminCreatePriceListType } 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/price-preferences/route.ts b/packages/medusa/src/api/admin/price-preferences/route.ts index 9e18fd3f71..b7409c7582 100644 --- a/packages/medusa/src/api/admin/price-preferences/route.ts +++ b/packages/medusa/src/api/admin/price-preferences/route.ts @@ -7,7 +7,7 @@ import { refetchEntities, refetchEntity } from "../../utils/refetch-entity" import { createPricePreferencesWorkflow } from "@medusajs/core-flows" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { rows: price_preferences, metadata } = await refetchEntities( diff --git a/packages/medusa/src/api/admin/product-categories/route.ts b/packages/medusa/src/api/admin/product-categories/route.ts index 4d2ee098cf..4eb2745343 100644 --- a/packages/medusa/src/api/admin/product-categories/route.ts +++ b/packages/medusa/src/api/admin/product-categories/route.ts @@ -1,21 +1,14 @@ import { createProductCategoriesWorkflow } from "@medusajs/core-flows" -import { - AdminProductCategoryListResponse, - AdminProductCategoryResponse, -} from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" import { refetchEntities } from "../../utils/refetch-entity" -import { - AdminCreateProductCategoryType, - AdminProductCategoriesParamsType, -} from "./validators" export const GET = async ( - req: AuthenticatedMedusaRequest, - res: MedusaResponse + req: AuthenticatedMedusaRequest, + res: MedusaResponse ) => { const { rows: product_categories, metadata } = await refetchEntities( "product_category", @@ -34,8 +27,8 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, - res: MedusaResponse + req: AuthenticatedMedusaRequest, + res: MedusaResponse ) => { const { result } = await createProductCategoriesWorkflow(req.scope).run({ input: { product_categories: [req.validatedBody] }, diff --git a/packages/medusa/src/api/admin/product-tags/route.ts b/packages/medusa/src/api/admin/product-tags/route.ts index bdfde06160..f586d101cf 100644 --- a/packages/medusa/src/api/admin/product-tags/route.ts +++ b/packages/medusa/src/api/admin/product-tags/route.ts @@ -4,15 +4,11 @@ import { } from "../../../types/routing" import { createProductTagsWorkflow } from "@medusajs/core-flows" -import { - AdminCreateProductTagType, - AdminGetProductTagsParamsType, -} from "./validators" import { refetchEntities, refetchEntity } from "../../utils/refetch-entity" import { HttpTypes } from "@medusajs/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { rows: product_tags, metadata } = await refetchEntities( @@ -32,7 +28,7 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const input = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/product-types/route.ts b/packages/medusa/src/api/admin/product-types/route.ts index d2a2102cd8..949585ee2f 100644 --- a/packages/medusa/src/api/admin/product-types/route.ts +++ b/packages/medusa/src/api/admin/product-types/route.ts @@ -9,14 +9,10 @@ import { } from "@medusajs/utils" import { createProductTypesWorkflow } from "@medusajs/core-flows" import { refetchProductType } from "./helpers" -import { - AdminCreateProductTypeType, - AdminGetProductTypesParamsType, -} 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) @@ -40,7 +36,7 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const input = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/product-variants/route.ts b/packages/medusa/src/api/admin/product-variants/route.ts index 1b08cf6319..602226e7eb 100644 --- a/packages/medusa/src/api/admin/product-variants/route.ts +++ b/packages/medusa/src/api/admin/product-variants/route.ts @@ -5,7 +5,7 @@ import { refetchEntities } from "../../utils/refetch-entity" import { remapKeysForVariant, remapVariantResponse } from "../products/helpers" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const withInventoryQuantity = req.remoteQueryConfig.fields.some((field) => diff --git a/packages/medusa/src/api/admin/promotions/route.ts b/packages/medusa/src/api/admin/promotions/route.ts index 87726b11a1..599d1401ab 100644 --- a/packages/medusa/src/api/admin/promotions/route.ts +++ b/packages/medusa/src/api/admin/promotions/route.ts @@ -8,14 +8,10 @@ import { MedusaResponse, } from "../../../types/routing" import { refetchPromotion } from "./helpers" -import { - AdminCreatePromotionType, - AdminGetPromotionsParamsType, -} from "./validators" import { AdditionalData, HttpTypes } from "@medusajs/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -40,7 +36,9 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest< + HttpTypes.AdminCreatePromotion & AdditionalData + >, res: MedusaResponse ) => { const { additional_data, ...rest } = req.validatedBody diff --git a/packages/medusa/src/api/admin/refund-reasons/route.ts b/packages/medusa/src/api/admin/refund-reasons/route.ts index 575cbc36df..d18d045325 100644 --- a/packages/medusa/src/api/admin/refund-reasons/route.ts +++ b/packages/medusa/src/api/admin/refund-reasons/route.ts @@ -1,15 +1,16 @@ import { createRefundReasonsWorkflow } from "@medusajs/core-flows" import { AuthenticatedMedusaRequest, MedusaResponse } from "@medusajs/framework" import { + AdminCreateRefundReason, + HttpTypes, PaginatedResponse, RefundReasonResponse, RefundReasonsResponse, } from "@medusajs/types" import { refetchEntities, refetchEntity } from "../../utils/refetch-entity" -import { AdminCreatePaymentRefundReasonType } from "./validators" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse> ) => { const { rows: refund_reasons, metadata } = await refetchEntities( @@ -29,7 +30,7 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { diff --git a/packages/medusa/src/api/admin/regions/route.ts b/packages/medusa/src/api/admin/regions/route.ts index 3d4c086f0b..d10ec3f31f 100644 --- a/packages/medusa/src/api/admin/regions/route.ts +++ b/packages/medusa/src/api/admin/regions/route.ts @@ -7,12 +7,11 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, } from "@medusajs/utils" -import { AdminCreateRegionType, AdminGetRegionsParamsType } from "./validators" import { refetchRegion } from "./helpers" import { HttpTypes } from "@medusajs/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -37,7 +36,7 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const input = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/reservations/route.ts b/packages/medusa/src/api/admin/reservations/route.ts index 782f08b576..f8c1d7931a 100644 --- a/packages/medusa/src/api/admin/reservations/route.ts +++ b/packages/medusa/src/api/admin/reservations/route.ts @@ -8,15 +8,11 @@ import { } from "@medusajs/utils" import { createReservationsWorkflow } from "@medusajs/core-flows" -import { - AdminCreateReservationType, - AdminGetReservationsParamsType, -} from "./validators" import { refetchReservation } from "./helpers" import { HttpTypes } from "@medusajs/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -41,7 +37,7 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const input = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/return-reasons/route.ts b/packages/medusa/src/api/admin/return-reasons/route.ts index b60c791a4e..2cb61ca257 100644 --- a/packages/medusa/src/api/admin/return-reasons/route.ts +++ b/packages/medusa/src/api/admin/return-reasons/route.ts @@ -8,10 +8,9 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { AdminGetReturnReasonsParamsType } 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/admin/returns/route.ts b/packages/medusa/src/api/admin/returns/route.ts index 8fed2d27c3..10066eaabc 100644 --- a/packages/medusa/src/api/admin/returns/route.ts +++ b/packages/medusa/src/api/admin/returns/route.ts @@ -13,7 +13,7 @@ import { import { AdminPostReturnsReqSchemaType } 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/admin/sales-channels/route.ts b/packages/medusa/src/api/admin/sales-channels/route.ts index a3b64197d6..8952d0f797 100644 --- a/packages/medusa/src/api/admin/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/route.ts @@ -8,14 +8,10 @@ import { MedusaResponse, } from "../../../types/routing" import { refetchSalesChannel } from "./helpers" -import { - AdminCreateSalesChannelType, - AdminGetSalesChannelsParamsType, -} 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) @@ -40,7 +36,7 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const salesChannelsData = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/shipping-options/route.ts b/packages/medusa/src/api/admin/shipping-options/route.ts index d8ec727a22..ee766f440f 100644 --- a/packages/medusa/src/api/admin/shipping-options/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/route.ts @@ -9,13 +9,9 @@ import { MedusaResponse, } from "../../../types/routing" import { refetchShippingOption } from "./helpers" -import { - AdminCreateShippingOptionType, - AdminGetShippingOptionsParamsType, -} from "./validators" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -40,7 +36,7 @@ export const GET = async ( } export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const shippingOptionPayload = req.validatedBody