From 170429a9b3d0dfe874439a9b100d80d94ba476eb Mon Sep 17 00:00:00 2001 From: Shahed Nasser Date: Fri, 30 Aug 2024 10:35:18 +0300 Subject: [PATCH] chore(types, medusa): [1/n] add missing query type arguments (#8877) Add missing type arguments in listing requests. 1/n --- .../core/types/src/http/fulfillment/admin/index.ts | 1 + .../core/types/src/http/fulfillment/admin/queries.ts | 6 ++++++ .../core/types/src/http/inventory/admin/queries.ts | 4 ++-- packages/core/types/src/http/invite/admin/index.ts | 1 + packages/core/types/src/http/invite/admin/queries.ts | 11 +++++++++++ packages/core/types/src/http/order/admin/queries.ts | 8 ++++++-- packages/medusa/src/api/admin/api-keys/route.ts | 2 +- packages/medusa/src/api/admin/campaigns/route.ts | 2 +- packages/medusa/src/api/admin/claims/route.ts | 2 +- packages/medusa/src/api/admin/collections/route.ts | 2 +- packages/medusa/src/api/admin/currencies/route.ts | 2 +- .../medusa/src/api/admin/customer-groups/route.ts | 2 +- packages/medusa/src/api/admin/customers/route.ts | 2 +- packages/medusa/src/api/admin/draft-orders/route.ts | 2 +- packages/medusa/src/api/admin/exchanges/route.ts | 2 +- .../src/api/admin/fulfillment-providers/route.ts | 3 +-- .../medusa/src/api/admin/inventory-items/route.ts | 8 ++------ packages/medusa/src/api/admin/invites/route.ts | 5 ++--- packages/medusa/src/api/admin/notifications/route.ts | 3 +-- packages/medusa/src/api/admin/orders/route.ts | 2 +- 20 files changed, 43 insertions(+), 27 deletions(-) create mode 100644 packages/core/types/src/http/fulfillment/admin/queries.ts create mode 100644 packages/core/types/src/http/invite/admin/queries.ts diff --git a/packages/core/types/src/http/fulfillment/admin/index.ts b/packages/core/types/src/http/fulfillment/admin/index.ts index 1b4873c3fc..9bcc100ddc 100644 --- a/packages/core/types/src/http/fulfillment/admin/index.ts +++ b/packages/core/types/src/http/fulfillment/admin/index.ts @@ -1,3 +1,4 @@ export * from "./entitites" export * from "./payloads" +export * from "./queries" export * from "./responses" diff --git a/packages/core/types/src/http/fulfillment/admin/queries.ts b/packages/core/types/src/http/fulfillment/admin/queries.ts new file mode 100644 index 0000000000..0356bad84c --- /dev/null +++ b/packages/core/types/src/http/fulfillment/admin/queries.ts @@ -0,0 +1,6 @@ +export interface AdminGetFulfillmentProvidersParams { + id?: string | string[] + stock_location_id?: string | string[] + is_enabled?: boolean + q?: string +} \ No newline at end of file diff --git a/packages/core/types/src/http/inventory/admin/queries.ts b/packages/core/types/src/http/inventory/admin/queries.ts index 9dedaec5c5..b0c1205f7a 100644 --- a/packages/core/types/src/http/inventory/admin/queries.ts +++ b/packages/core/types/src/http/inventory/admin/queries.ts @@ -1,7 +1,7 @@ import { FindParams } from "../../common" -import { OperatorMap } from "../../../dal" +import { BaseFilterable, OperatorMap } from "../../../dal" -export interface AdminInventoryItemParams extends FindParams { +export interface AdminInventoryItemParams extends FindParams, BaseFilterable { id?: string | string[] q?: string sku?: string | string[] diff --git a/packages/core/types/src/http/invite/admin/index.ts b/packages/core/types/src/http/invite/admin/index.ts index ba78c783ea..2f1b9df166 100644 --- a/packages/core/types/src/http/invite/admin/index.ts +++ b/packages/core/types/src/http/invite/admin/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/invite/admin/queries.ts b/packages/core/types/src/http/invite/admin/queries.ts new file mode 100644 index 0000000000..fc8be1e707 --- /dev/null +++ b/packages/core/types/src/http/invite/admin/queries.ts @@ -0,0 +1,11 @@ +import { BaseFilterable, OperatorMap } from "../../../dal" +import { FindParams } from "../../common" + +export interface AdminGetInvitesParams extends FindParams, BaseFilterable { + q?: string + id?: string | string[] + email?: string | string[] + created_at?: OperatorMap + updated_at?: OperatorMap + deleted_at?: OperatorMap +} \ No newline at end of file diff --git a/packages/core/types/src/http/order/admin/queries.ts b/packages/core/types/src/http/order/admin/queries.ts index 498d8cd624..2eee6271a5 100644 --- a/packages/core/types/src/http/order/admin/queries.ts +++ b/packages/core/types/src/http/order/admin/queries.ts @@ -1,3 +1,7 @@ -import { BaseOrderFilters } from "../common"; +import { BaseFilterable } from "../../../dal"; +import { FindParams } from "../../common"; -export interface AdminOrderFilters extends BaseOrderFilters {} \ No newline at end of file +export interface AdminOrderFilters extends FindParams, BaseFilterable { + id?: string[] | string + name?: string[] | string +} \ No newline at end of file diff --git a/packages/medusa/src/api/admin/api-keys/route.ts b/packages/medusa/src/api/admin/api-keys/route.ts index 4f162fc2e0..652fdcf941 100644 --- a/packages/medusa/src/api/admin/api-keys/route.ts +++ b/packages/medusa/src/api/admin/api-keys/route.ts @@ -11,7 +11,7 @@ import { AdminCreateApiKeyType } 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/campaigns/route.ts b/packages/medusa/src/api/admin/campaigns/route.ts index bf91ff7676..f71438362f 100644 --- a/packages/medusa/src/api/admin/campaigns/route.ts +++ b/packages/medusa/src/api/admin/campaigns/route.ts @@ -12,7 +12,7 @@ import { refetchCampaign } from "./helpers" import { AdditionalData, 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/claims/route.ts b/packages/medusa/src/api/admin/claims/route.ts index be793a10fc..a5f4c6ef20 100644 --- a/packages/medusa/src/api/admin/claims/route.ts +++ b/packages/medusa/src/api/admin/claims/route.ts @@ -13,7 +13,7 @@ import { import { AdminPostOrderClaimsReqSchemaType } 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/collections/route.ts b/packages/medusa/src/api/admin/collections/route.ts index c9bf12f1b4..280a6f1924 100644 --- a/packages/medusa/src/api/admin/collections/route.ts +++ b/packages/medusa/src/api/admin/collections/route.ts @@ -13,7 +13,7 @@ import { refetchCollection } 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) diff --git a/packages/medusa/src/api/admin/currencies/route.ts b/packages/medusa/src/api/admin/currencies/route.ts index 4bc34c614f..0cf76127c5 100644 --- a/packages/medusa/src/api/admin/currencies/route.ts +++ b/packages/medusa/src/api/admin/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/admin/customer-groups/route.ts b/packages/medusa/src/api/admin/customer-groups/route.ts index e691878375..5bd440e50a 100644 --- a/packages/medusa/src/api/admin/customer-groups/route.ts +++ b/packages/medusa/src/api/admin/customer-groups/route.ts @@ -12,7 +12,7 @@ import { refetchCustomerGroup } 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) diff --git a/packages/medusa/src/api/admin/customers/route.ts b/packages/medusa/src/api/admin/customers/route.ts index 84e32b1a45..fca8d0e867 100644 --- a/packages/medusa/src/api/admin/customers/route.ts +++ b/packages/medusa/src/api/admin/customers/route.ts @@ -13,7 +13,7 @@ import { refetchCustomer } from "./helpers" import { AdminCreateCustomerType } 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/draft-orders/route.ts b/packages/medusa/src/api/admin/draft-orders/route.ts index 42dd540586..4191d73d77 100644 --- a/packages/medusa/src/api/admin/draft-orders/route.ts +++ b/packages/medusa/src/api/admin/draft-orders/route.ts @@ -14,7 +14,7 @@ import { refetchOrder } from "./helpers" import { AdditionalData, CreateOrderDTO, 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/admin/exchanges/route.ts b/packages/medusa/src/api/admin/exchanges/route.ts index 6646b68de9..b0c5ab8ac7 100644 --- a/packages/medusa/src/api/admin/exchanges/route.ts +++ b/packages/medusa/src/api/admin/exchanges/route.ts @@ -13,7 +13,7 @@ import { import { AdminPostOrderExchangesReqSchemaType } 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/fulfillment-providers/route.ts b/packages/medusa/src/api/admin/fulfillment-providers/route.ts index d65467311f..1c47545ca9 100644 --- a/packages/medusa/src/api/admin/fulfillment-providers/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-providers/route.ts @@ -6,11 +6,10 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { AdminFulfillmentProvidersParamsType } 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/inventory-items/route.ts b/packages/medusa/src/api/admin/inventory-items/route.ts index c88e9ae2bb..4140f41f11 100644 --- a/packages/medusa/src/api/admin/inventory-items/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/route.ts @@ -8,15 +8,11 @@ import { } from "@medusajs/utils" import { createInventoryItemsWorkflow } from "@medusajs/core-flows" -import { - AdminCreateInventoryItemType, - AdminGetInventoryItemsParamsType, -} from "./validators" import { refetchInventoryItem } from "./helpers" import { HttpTypes } from "@medusajs/types" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { result } = await createInventoryItemsWorkflow(req.scope).run({ @@ -33,7 +29,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/invites/route.ts b/packages/medusa/src/api/admin/invites/route.ts index 5c8c3cf073..7e4b334526 100644 --- a/packages/medusa/src/api/admin/invites/route.ts +++ b/packages/medusa/src/api/admin/invites/route.ts @@ -8,12 +8,11 @@ import { } from "@medusajs/utils" import { createInvitesWorkflow } from "@medusajs/core-flows" -import { AdminCreateInviteType, AdminGetInvitesParamsType } from "./validators" import { refetchInvite } 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 workflow = createInvitesWorkflow(req.scope) diff --git a/packages/medusa/src/api/admin/notifications/route.ts b/packages/medusa/src/api/admin/notifications/route.ts index b9acb53074..c79e1c8acd 100644 --- a/packages/medusa/src/api/admin/notifications/route.ts +++ b/packages/medusa/src/api/admin/notifications/route.ts @@ -2,12 +2,11 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { AdminGetNotificationsParamsType } from "./validators" import { refetchEntities } from "../../utils/refetch-entity" import { HttpTypes } from "@medusajs/types" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { rows: notifications, metadata } = await refetchEntities( diff --git a/packages/medusa/src/api/admin/orders/route.ts b/packages/medusa/src/api/admin/orders/route.ts index f239095aaa..6440833a7c 100644 --- a/packages/medusa/src/api/admin/orders/route.ts +++ b/packages/medusa/src/api/admin/orders/route.ts @@ -6,7 +6,7 @@ import { } from "../../../types/routing" export const GET = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const variables = {