fix(medusa, types): fix more query types (#8907)

Fix issues / missing query types I didn't pick up in the previous PRs.

packages/core/types/src/http/payment/admin/queries.ts

@@ -3,15 +3,15 @@ import { FindParams } from "../../common"
 import {
   BasePaymentCollectionFilters,
   BasePaymentFilters,
-  BasePaymentProviderFilters,
   BasePaymentSessionFilters,
 } from "../common"
-import { AdminRefund, AdminRefundReason } from "./entities"
+import { AdminRefundReason } from "./entities"
 
-export interface AdminPaymentProviderFilters
+export interface AdminPaymentProviderFilters extends 
-  extends BasePaymentProviderFilters {
+  FindParams, BaseFilterable<AdminPaymentProviderFilters>{
-  is_enabled?: boolean
+    id: string | string[]
-}
+    is_enabled?: boolean
+  }
 export interface AdminPaymentCollectionFilters
   extends BasePaymentCollectionFilters {}
 export interface AdminPaymentSessionFilters extends BasePaymentSessionFilters {}

packages/core/types/src/http/product/admin/queries.ts

@@ -5,7 +5,7 @@ import {
   BaseProductOptionParams,
 } from "../common"
 
-export interface AdminProductOptionParams extends BaseProductOptionParams {}
+export interface AdminProductOptionParams extends Omit<BaseProductOptionParams, "product_id"> {}
 export interface AdminProductVariantParams extends 
   FindParams, BaseFilterable<AdminProductVariantParams> {
     q?: string
@@ -16,7 +16,7 @@ export interface AdminProductVariantParams extends
     updated_at?: OperatorMap<string>
     deleted_at?: OperatorMap<string>
   }
-export interface AdminProductListParams extends BaseProductListParams {
+export interface AdminProductListParams extends Omit<BaseProductListParams, "categories"> {
   price_list_id?: string | string[]
   variants?: AdminProductVariantParams
 }

packages/core/types/src/http/tax-rate/admin/queries.ts

@@ -5,7 +5,7 @@ export interface AdminTaxRateListParams extends
   FindParams, BaseFilterable<AdminTaxRateListParams> {
     q?: string
     tax_region_id?: string | string[] | OperatorMap<string | string[]>
-    is_default?: string
+    is_default?: "true" | "false"
     service_zone_id?: string
     shipping_profile_id?: string
     provider_id?: string

packages/medusa/src/api/admin/orders/validators.ts

@@ -28,11 +28,20 @@ export const AdminGetOrdersParams = createFindParams({
   offset: 0,
 }).merge(
   z.object({
-    id: z.union([z.string(), z.array(z.string())]).optional(),
+    id: z
-    status: z.union([z.string(), z.array(z.string())]).optional(),
+      .union([z.string(), z.array(z.string()), createOperatorMap()])
+      .optional(),
+    status: z
+      .union([z.string(), z.array(z.string()), createOperatorMap()])
+      .optional(),
+    name: z.union([z.string(), z.array(z.string())]).optional(),
+    sales_channel_id: z.array(z.string()).optional(),
+    fulfillment_status: z.array(z.string()).optional(),
+    payment_status: z.array(z.string()).optional(),
+    region_id: z.array(z.string()).optional(),
+    q: z.string().optional(),
     created_at: createOperatorMap().optional(),
     updated_at: createOperatorMap().optional(),
-    deleted_at: createOperatorMap().optional(),
   })
 )
 

packages/medusa/src/api/admin/payments/payment-providers/route.ts

@@ -3,14 +3,13 @@ import {
   AuthenticatedMedusaRequest,
   MedusaResponse,
 } from "../../../../types/routing"
-import { AdminGetPaymentProvidersParamsType } from "../validators"
 import {
   ContainerRegistrationKeys,
   remoteQueryObjectFromString,
 } from "@medusajs/utils"
 
 export const GET = async (
-  req: AuthenticatedMedusaRequest<AdminGetPaymentProvidersParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminPaymentProviderFilters>,
   res: MedusaResponse<HttpTypes.AdminPaymentProviderListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)

packages/medusa/src/api/admin/products/[id]/variants/route.ts

@@ -17,7 +17,7 @@ import {
 } from "../../helpers"
 
 export const GET = async (
-  req: AuthenticatedMedusaRequest,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminProductVariantParams>,
   res: MedusaResponse<HttpTypes.AdminProductVariantListResponse>
 ) => {
   const productId = req.params.id

packages/medusa/src/api/admin/promotions/rule-attribute-options/[rule_type]/route.ts

@@ -4,10 +4,9 @@ import {
   MedusaResponse,
 } from "../../../../../types/routing"
 import { getRuleAttributesMap, validateRuleType } from "../../utils"
-import { AdminGetPromotionRuleParamsType } from "../../validators"
 
 export const GET = async (
-  req: AuthenticatedMedusaRequest<AdminGetPromotionRuleParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminGetPromotionRuleParams>,
   res: MedusaResponse<HttpTypes.AdminRuleAttributeOptionsListResponse>
 ) => {
   const { rule_type: ruleType } = req.params

packages/medusa/src/api/admin/shipping-profiles/route.ts

@@ -9,13 +9,9 @@ import {
   MedusaResponse,
 } from "../../../types/routing"
 import { refetchShippingProfile } from "./helpers"
-import {
-  AdminCreateShippingProfileType,
-  AdminGetShippingProfilesParamsType,
-} from "./validators"
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreateShippingProfileType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminCreateShippingProfile>,
   res: MedusaResponse<HttpTypes.AdminShippingProfileResponse>
 ) => {
   const shippingProfilePayload = req.validatedBody
@@ -34,7 +30,7 @@ export const POST = async (
 }
 
 export const GET = async (
-  req: AuthenticatedMedusaRequest<AdminGetShippingProfilesParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminShippingProfileListParams>,
   res: MedusaResponse<HttpTypes.AdminShippingProfileListResponse>
 ) => {
   const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)