diff --git a/packages/core/types/src/http/payment/admin/queries.ts b/packages/core/types/src/http/payment/admin/queries.ts index ee8fba964f..899eaf3ea8 100644 --- a/packages/core/types/src/http/payment/admin/queries.ts +++ b/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 - extends BasePaymentProviderFilters { - is_enabled?: boolean -} +export interface AdminPaymentProviderFilters extends + FindParams, BaseFilterable{ + id: string | string[] + is_enabled?: boolean + } export interface AdminPaymentCollectionFilters extends BasePaymentCollectionFilters {} export interface AdminPaymentSessionFilters extends BasePaymentSessionFilters {} diff --git a/packages/core/types/src/http/product/admin/queries.ts b/packages/core/types/src/http/product/admin/queries.ts index 7cd385779d..e273d21f86 100644 --- a/packages/core/types/src/http/product/admin/queries.ts +++ b/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 {} export interface AdminProductVariantParams extends FindParams, BaseFilterable { q?: string @@ -16,7 +16,7 @@ export interface AdminProductVariantParams extends updated_at?: OperatorMap deleted_at?: OperatorMap } -export interface AdminProductListParams extends BaseProductListParams { +export interface AdminProductListParams extends Omit { price_list_id?: string | string[] variants?: AdminProductVariantParams } 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 85bdc16c88..6fc1f92736 100644 --- a/packages/core/types/src/http/tax-rate/admin/queries.ts +++ b/packages/core/types/src/http/tax-rate/admin/queries.ts @@ -5,7 +5,7 @@ export interface AdminTaxRateListParams extends FindParams, BaseFilterable { q?: string tax_region_id?: string | string[] | OperatorMap - is_default?: string + is_default?: "true" | "false" service_zone_id?: string shipping_profile_id?: string provider_id?: string diff --git a/packages/medusa/src/api/admin/orders/validators.ts b/packages/medusa/src/api/admin/orders/validators.ts index 532bca77b5..44f0e82319 100644 --- a/packages/medusa/src/api/admin/orders/validators.ts +++ b/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(), - status: z.union([z.string(), z.array(z.string())]).optional(), + id: z + .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(), }) ) diff --git a/packages/medusa/src/api/admin/payments/payment-providers/route.ts b/packages/medusa/src/api/admin/payments/payment-providers/route.ts index c5628ede2b..c995af289d 100644 --- a/packages/medusa/src/api/admin/payments/payment-providers/route.ts +++ b/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, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/products/[id]/variants/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/route.ts index 3543db3796..13d2d84370 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/route.ts +++ b/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, res: MedusaResponse ) => { const productId = req.params.id diff --git a/packages/medusa/src/api/admin/promotions/rule-attribute-options/[rule_type]/route.ts b/packages/medusa/src/api/admin/promotions/rule-attribute-options/[rule_type]/route.ts index 91c709a90a..322d65a8a2 100644 --- a/packages/medusa/src/api/admin/promotions/rule-attribute-options/[rule_type]/route.ts +++ b/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, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { rule_type: ruleType } = req.params diff --git a/packages/medusa/src/api/admin/shipping-profiles/route.ts b/packages/medusa/src/api/admin/shipping-profiles/route.ts index 4d46d671d8..65ad978f7e 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/route.ts +++ b/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, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const shippingProfilePayload = req.validatedBody @@ -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)