fix(orchestration): Ids wrongly processed when using operators map (#9781)

* fix(orchestration): Ids processing when using operators map

* fix(orchestration): Ids processing when using operators map

* address feedback

* address feedback

integration-tests/modules/__tests__/modules/remote-query.spec.ts

@@ -205,6 +205,7 @@ medusaIntegrationTestRunner({
         query = appContainer.resolve(ContainerRegistrationKeys.QUERY)
       })
 
+      let product
       beforeEach(async () => {
         await createAdminUser(dbConnection, adminHeaders, appContainer)
 
@@ -224,11 +225,13 @@ medusaIntegrationTestRunner({
           ],
         }
 
-        await api
+        const res = await api
           .post("/admin/products", payload, adminHeaders)
           .catch((err) => {
             console.log(err)
           })
+
+        product = res.data.product
       })
 
       it(`should throw if not exists`, async () => {
@@ -265,6 +268,25 @@ medusaIntegrationTestRunner({
         )
       })
 
+      it(`should support filtering using operators on a primary column`, async () => {
+        const { data } = await query.graph({
+          entity: "product",
+          fields: ["id", "title"],
+          filters: {
+            id: {
+              $in: [product.id],
+            },
+          },
+        })
+
+        expect(data).toEqual([
+          expect.objectContaining({
+            id: product.id,
+            title: product.title,
+          }),
+        ])
+      })
+
       it(`should perform cross module query and apply filters correctly to the correct modules [1]`, async () => {
         const { data } = await query.graph({
           entity: "product",

packages/core/orchestration/src/joiner/remote-joiner.ts

@@ -10,8 +10,10 @@ import {
 } from "@medusajs/types"
 import {
   deduplicate,
+  FilterOperatorMap,
   GraphQLUtils,
   isDefined,
+  isObject,
   isString,
   MedusaError,
 } from "@medusajs/utils"
@@ -440,9 +442,15 @@ export class RemoteJoiner {
   }> {
     const { expand, pkField, ids, relationship, options } = params
 
-    let uniqueIds = Array.isArray(ids) ? ids : ids ? [ids] : undefined
+    let uniqueIds: unknown[] | undefined
+    if (ids != null) {
+      const isIdsUsingOperatorMap =
+        isObject(ids) &&
+        Object.keys(ids).some((key) => !!FilterOperatorMap[key])
+      uniqueIds = isIdsUsingOperatorMap ? ids : Array.isArray(ids) ? ids : [ids]
+    }
 
-    if (uniqueIds) {
+    if (uniqueIds && Array.isArray(uniqueIds)) {
       const isCompositeKey = Array.isArray(uniqueIds[0])
       if (isCompositeKey) {
         const seen = new Set()

packages/core/utils/src/common/filter-operator-map.ts

@@ -0,0 +1,23 @@
+import { OperatorMap } from "@medusajs/types"
+
+export const FilterOperatorMap: { [K in keyof OperatorMap<string>]: string } = {
+  $and: "$and",
+  $or: "$or",
+  $eq: "$eq",
+  $ne: "$ne",
+  $in: "$in",
+  $nin: "$nin",
+  $not: "$not",
+  $gt: "$gt",
+  $gte: "$gte",
+  $lt: "$lt",
+  $lte: "$lte",
+  $like: "$like",
+  $re: "$re",
+  $ilike: "$ilike",
+  $fulltext: "$fulltext",
+  $overlap: "$overlap",
+  $contains: "$contains",
+  $contained: "$contained",
+  $exists: "$exists",
+}

packages/core/utils/src/common/index.ts

@@ -74,3 +74,4 @@ export * from "./trim-zeros"
 export * from "./upper-case-first"
 export * from "./validate-handle"
 export * from "./wrap-handler"
+export * from "./filter-operator-map"