chore(orchestration): validate PK when throwIfKeyNotFound (#11190)

CLOSES: FRMW-2895

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

@@ -832,5 +832,21 @@ describe("RemoteJoiner", () => {
     await expect(dataNotFound).rejects.toThrowError(
       "order id not found: ord_1234556"
     )
+
+    const queryNotFoundNoParam = RemoteJoiner.parseQuery(`
+      query {
+        order {
+          id
+          number
+        }
+      }
+    `)
+    const dataNotFoundNoPK = joiner.query(queryNotFoundNoParam, {
+      throwIfKeyNotFound: true,
+    })
+
+    await expect(dataNotFoundNoPK).rejects.toThrowError(
+      "order: Primary key(s) [id] not found in filters"
+    )
   })
 })

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

@@ -37,6 +37,15 @@ type InternalImplodeMapping = {
   isList?: boolean
 }
 
+type InternalParseExpandsParams = {
+  initialService: RemoteExpandProperty
+  query: RemoteJoinerQuery
+  serviceConfig: InternalJoinerServiceConfig
+  expands: RemoteJoinerQuery["expands"]
+  implodeMapping: InternalImplodeMapping[]
+  options?: RemoteJoinerOptions
+}
+
 export class RemoteJoiner {
   private serviceConfigCache: Map<string, InternalJoinerServiceConfig> =
     new Map()
@@ -831,14 +840,9 @@ export class RemoteJoiner {
     })
   }
 
-  private parseExpands(params: {
-    initialService: RemoteExpandProperty
-    query: RemoteJoinerQuery
-    serviceConfig: InternalJoinerServiceConfig
-    expands: RemoteJoinerQuery["expands"]
-    implodeMapping: InternalImplodeMapping[]
-    options?: RemoteJoinerOptions
-  }): Map<string, RemoteExpandProperty> {
+  private parseExpands(
+    params: InternalParseExpandsParams
+  ): Map<string, RemoteExpandProperty> {
     const { initialService, query, serviceConfig, expands, implodeMapping } =
       params
 
@@ -1203,8 +1207,30 @@ export class RemoteJoiner {
       queryObj,
     })
 
+    if (options?.throwIfKeyNotFound) {
+      if (primaryKeyArg?.value == undefined) {
+        if (!primaryKeyArg) {
+          throw new MedusaError(
+            MedusaError.Types.NOT_FOUND,
+            `${
+              serviceConfig.entity ?? serviceConfig.serviceName
+            }: Primary key(s) [${serviceConfig.primaryKeys.join(
+              ", "
+            )}] not found in filters`
+          )
+        }
+
+        throw new MedusaError(
+          MedusaError.Types.NOT_FOUND,
+          `${
+            serviceConfig.entity ?? serviceConfig.serviceName
+          }: Value for primary key ${primaryKeyArg.name} not found in filters`
+        )
+      }
+    }
+
     const implodeMapping: InternalImplodeMapping[] = []
-    const parseExpandsConfig: Parameters<typeof this.parseExpands>[0] = {
+    const parseExpandsConfig: InternalParseExpandsParams = {
       initialService: {
         property: "",
         parent: "",