chore(types, medusa): [2/n] add missing query type arguments (#8879)

Add missing type arguments in listing requests.

2/n

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 AdminPaymentFilters extends FindParams, BasePaymentFilters {
-
+  q?: string
-export interface RefundFilters extends BaseFilterable<AdminRefund> {
+  payment_session_id?: string | string[]
-  id?: string | string[]
+  created_at?: OperatorMap<string>
+  updated_at?: OperatorMap<string>
+  deleted_at?: OperatorMap<string>
 }
-export interface RefundReasonFilters extends BaseFilterable<AdminRefundReason> {
+
+export interface RefundReasonFilters extends FindParams, BaseFilterable<AdminRefundReason> {
   id?: string | string[]
+  q?: string
 }
 
 export interface AdminGetPaymentProvidersParams

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 {}

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<AdminProductVariantParams> {
+    q?: string
+    id?: string | string[]
+    manage_inventory?: boolean
+    allow_backorder?: boolean
+    created_at?: OperatorMap<string>
+    updated_at?: OperatorMap<string>
+    deleted_at?: OperatorMap<string>
+  }
 export interface AdminProductListParams extends BaseProductListParams {
   price_list_id?: string | string[]
   variants?: AdminProductVariantParams

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<BaseRegionFilters> {
+  q?: string
+  id?: string | string[]
+  code?: string | string[]
+  name?: string | string[]
+  created_at?: OperatorMap<string>
+  updated_at?: OperatorMap<string>
+  deleted_at?: OperatorMap<string>
+}
 export interface AdminRegionCountryFilters extends BaseRegionCountryFilters {}

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
+  shipping_profile_id?: string | string[]
-  provider_id?: string
+  provider_id?: string | string[]
-  shipping_option_type_id?: string
+  shipping_option_type_id?: string | string[]
   created_at?: OperatorMap<string>
   updated_at?: OperatorMap<string>
   deleted_at?: OperatorMap<string>

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<AdminGetPaymentsParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminPaymentFilters>,
   res: MedusaResponse<HttpTypes.AdminPaymentsResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)

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<HttpTypes.AdminPriceListListParams>,
   res: MedusaResponse<HttpTypes.AdminPriceListListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)

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<HttpTypes.AdminPricePreferenceListParams>,
   res: MedusaResponse<HttpTypes.AdminPricePreferenceListResponse>
 ) => {
   const { rows: price_preferences, metadata } = await refetchEntities(

packages/medusa/src/api/admin/product-categories/route.ts

@@ -1,21 +1,14 @@
 import { createProductCategoriesWorkflow } from "@medusajs/core-flows"
-import {
+import { HttpTypes } from "@medusajs/types"
-  AdminProductCategoryListResponse,
-  AdminProductCategoryResponse,
-} 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<AdminProductCategoriesParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminProductCategoryListParams>,
-  res: MedusaResponse<AdminProductCategoryListResponse>
+  res: MedusaResponse<HttpTypes.AdminProductCategoryListResponse>
 ) => {
   const { rows: product_categories, metadata } = await refetchEntities(
     "product_category",
@@ -34,8 +27,8 @@ export const GET = async (
 }
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreateProductCategoryType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminCreateProductCategory>,
-  res: MedusaResponse<AdminProductCategoryResponse>
+  res: MedusaResponse<HttpTypes.AdminProductCategoryResponse>
 ) => {
   const { result } = await createProductCategoriesWorkflow(req.scope).run({
     input: { product_categories: [req.validatedBody] },

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<AdminGetProductTagsParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminProductTagListParams>,
   res: MedusaResponse<HttpTypes.AdminProductTagListResponse>
 ) => {
   const { rows: product_tags, metadata } = await refetchEntities(
@@ -32,7 +28,7 @@ export const GET = async (
 }
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreateProductTagType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminCreateProductTag>,
   res: MedusaResponse<HttpTypes.AdminProductTagResponse>
 ) => {
   const input = [req.validatedBody]

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<AdminGetProductTypesParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminProductTypeListParams>,
   res: MedusaResponse<HttpTypes.AdminProductTypeListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
@@ -40,7 +36,7 @@ export const GET = async (
 }
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreateProductTypeType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminCreateProductType>,
   res: MedusaResponse<HttpTypes.AdminProductTypeResponse>
 ) => {
   const input = [req.validatedBody]

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<HttpTypes.AdminProductVariantParams>,
   res: MedusaResponse<HttpTypes.AdminProductVariantListResponse>
 ) => {
   const withInventoryQuantity = req.remoteQueryConfig.fields.some((field) =>

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<AdminGetPromotionsParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminGetPromotionsParams>,
   res: MedusaResponse<HttpTypes.AdminPromotionListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
@@ -40,7 +36,9 @@ export const GET = async (
 }
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreatePromotionType & AdditionalData>,
+  req: AuthenticatedMedusaRequest<
+    HttpTypes.AdminCreatePromotion & AdditionalData
+  >,
   res: MedusaResponse<HttpTypes.AdminPromotionResponse>
 ) => {
   const { additional_data, ...rest } = req.validatedBody

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<HttpTypes.RefundReasonFilters>,
   res: MedusaResponse<PaginatedResponse<RefundReasonsResponse>>
 ) => {
   const { rows: refund_reasons, metadata } = await refetchEntities(
@@ -29,7 +30,7 @@ export const GET = async (
 }
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreatePaymentRefundReasonType>,
+  req: AuthenticatedMedusaRequest<AdminCreateRefundReason>,
   res: MedusaResponse<RefundReasonResponse>
 ) => {
   const {

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<AdminGetRegionsParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminRegionFilters>,
   res: MedusaResponse<HttpTypes.AdminRegionListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
@@ -37,7 +36,7 @@ export const GET = async (
 }
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreateRegionType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminCreateRegion>,
   res: MedusaResponse<HttpTypes.AdminRegionResponse>
 ) => {
   const input = [req.validatedBody]

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<AdminGetReservationsParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminGetReservationsParams>,
   res: MedusaResponse<HttpTypes.AdminReservationListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
@@ -41,7 +37,7 @@ export const GET = async (
 }
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreateReservationType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminCreateReservation>,
   res: MedusaResponse<HttpTypes.AdminReservationResponse>
 ) => {
   const input = [req.validatedBody]

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<AdminGetReturnReasonsParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminReturnReasonListParams>,
   res: MedusaResponse<HttpTypes.AdminReturnReasonListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)

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<HttpTypes.AdminOrderFilters>,
   res: MedusaResponse<HttpTypes.AdminReturnsResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)

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<AdminGetSalesChannelsParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminSalesChannelListParams>,
   res: MedusaResponse<HttpTypes.AdminSalesChannelListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
@@ -40,7 +36,7 @@ export const GET = async (
 }
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreateSalesChannelType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminCreateSalesChannel>,
   res: MedusaResponse<HttpTypes.AdminSalesChannelResponse>
 ) => {
   const salesChannelsData = [req.validatedBody]

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<AdminGetShippingOptionsParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminShippingOptionListParams>,
   res: MedusaResponse<HttpTypes.AdminShippingOptionListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
@@ -40,7 +36,7 @@ export const GET = async (
 }
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreateShippingOptionType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminCreateShippingOption>,
   res: MedusaResponse<HttpTypes.AdminShippingOptionResponse>
 ) => {
   const shippingOptionPayload = req.validatedBody