Skip to content

The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.

refactor(admin): streamline seller ID filtering for products and orders

Jakub Sieradzki5699333865eb
diff --git a/packages/core-plugin/src/api/admin/middlewares.ts b/packages/core-plugin/src/api/admin/middlewares.ts
index 99005a009..1d97e30fd 100644
--- a/packages/core-plugin/src/api/admin/middlewares.ts
+++ b/packages/core-plugin/src/api/admin/middlewares.ts
@@ -13,43 +13,41 @@ import { AdminGetOrderGroupParams } from "./order-groups/validators"
import { adminPayoutsMiddlewares } from "./payouts/middlewares"
import { adminSellersMiddlewares } from "./sellers/middlewares"
import { adminCommissionRatesMiddlewares } from "./commission-rates/middlewares"
+import { AdminGetProductsParams } from "./products/validators"
+import { listProductQueryConfig } from "@medusajs/medusa/api/admin/products/query-config"
+import { AdminGetOrdersParams } from "./orders/validators"
+import { listTransformQueryConfig as listOrderQueryConfig } from "@medusajs/medusa/api/admin/orders/query-config"
-const extractSellerIdFromQuery = (
+const maybeApplySellerProductFilter = (
req: AuthenticatedMedusaRequest,
- _res: MedusaResponse,
+ res: MedusaResponse,
next: MedusaNextFunction
) => {
- const sellerId = req.query.seller_id
- if (sellerId) {
- delete req.query.seller_id
- ;(req as any).__seller_id = sellerId
+ if (!req.filterableFields.seller_id) {
+ return next()
}
- next()
+
+ return maybeApplyLinkFilter({
+ entryPoint: "product_seller",
+ resourceId: "product_id",
+ filterableField: "seller_id",
+ })(req, res, next)
}
-const injectSellerIdFilter = (
- entryPoint: string,
- resourceId: string
+const maybeApplySellerOrderFilter = (
+ req: AuthenticatedMedusaRequest,
+ res: MedusaResponse,
+ next: MedusaNextFunction
) => {
- return (
- req: AuthenticatedMedusaRequest,
- res: MedusaResponse,
- next: MedusaNextFunction
- ) => {
- const sellerId = (req as any).__seller_id
- if (!sellerId) {
- return next()
- }
-
- delete (req as any).__seller_id
- req.filterableFields.seller_id = sellerId
-
- return maybeApplyLinkFilter({
- entryPoint,
- resourceId,
- filterableField: "seller_id",
- })(req, res, next)
+ if (!req.filterableFields.seller_id) {
+ return next()
}
+
+ return maybeApplyLinkFilter({
+ entryPoint: "order_seller",
+ resourceId: "order_id",
+ filterableField: "seller_id",
+ })(req, res, next)
}
export const adminMiddlewares: MiddlewareRoute[] = [
@@ -67,22 +65,26 @@ export const adminMiddlewares: MiddlewareRoute[] = [
...adminPayoutsMiddlewares,
...adminSellersMiddlewares,
...adminCommissionRatesMiddlewares,
- {
- matcher: "/admin/products",
- middlewares: [extractSellerIdFromQuery],
- },
- {
- matcher: "/admin/orders",
- middlewares: [extractSellerIdFromQuery],
- },
{
method: ["GET"],
matcher: "/admin/products",
- middlewares: [injectSellerIdFilter("product_seller", "product_id")],
+ middlewares: [
+ validateAndTransformQuery(
+ AdminGetProductsParams,
+ listProductQueryConfig
+ ),
+ maybeApplySellerProductFilter,
+ ],
},
{
method: ["GET"],
matcher: "/admin/orders",
- middlewares: [injectSellerIdFilter("order_seller", "order_id")],
+ middlewares: [
+ validateAndTransformQuery(
+ AdminGetOrdersParams,
+ listOrderQueryConfig
+ ),
+ maybeApplySellerOrderFilter,
+ ],
},
]