fix: nin operator for resource question nested id

ReliefApplications · Jun 3, 2024 · c842b72 · c842b72
1 parent 80f04bd
commit c842b72
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/schema/query/recordsAggregation.query.ts b/src/schema/query/recordsAggregation.query.ts
@@ -493,6 +493,9 @@ export default {
                       [`data.${fieldName}.data.id`]: {
                         $toString: `$data.${fieldName}._id`,
                       },
+                      [`data.${fieldName}.data.__ID__`]: {
+                        $toString: `$data.${fieldName}._id`,
+                      },
                       [`data.${fieldName}.data._id`]: `$data.${fieldName}._id`,
                     });
                   } else if (!selectableField.includes('By')) {

diff --git a/src/utils/schema/resolvers/Query/getFilter.ts b/src/utils/schema/resolvers/Query/getFilter.ts
@@ -143,13 +143,22 @@ const buildMongoFilter = (
     }
 
     // Special filter on id, to be used in context filters
-    if (filter.field === '__ID__') {
+    if (filter.field.endsWith('__ID__')) {
+      const toMatch = filter.field.replace('__ID__', '_id');
       switch (filter.operator) {
         case 'eq':
-          return { _id: new Types.ObjectId(filter.value) };
+          return { [toMatch]: new Types.ObjectId(filter.value) };
         case 'neq':
-          return { _id: { $ne: new Types.ObjectId(filter.value) } };
+          return { [toMatch]: { $ne: new Types.ObjectId(filter.value) } };
         default:
+        case 'in':
+          return {
+            [toMatch]: { $in: filter.value.map((x) => new Types.ObjectId(x)) },
+          };
+        case 'nin':
+          return {
+            [toMatch]: { $nin: filter.value.map((x) => new Types.ObjectId(x)) },
+          };
           return {};
       }
     }