fix: filtering records on form name would break query

Author: AntoineRelief

src/utils/filter/getFilter.ts

@@ -171,7 +171,6 @@ const buildMongoFilter = (filter: any, fields: any[]): any => {
           }
           case 'contains': {
             if (MULTISELECT_TYPES.includes(field.type)) {
-              console.log(value);
               if (Array.isArray(value)) {
                 return { [fieldName]: { $all: value } };
               } else {

src/utils/schema/resolvers/Query/getAfterLookupsFilter.ts

@@ -55,8 +55,14 @@ const buildAfterLookupsMongoFilter = (
         //
         let fieldName: string;
         if (['form', 'lastUpdateForm'].includes(filter.field)) {
-          filter.value = mongoose.Types.ObjectId(filter.value);
-          fieldName = `_${filter.field}._id`;
+          // If value is an ID, search for exact ID
+          if (mongoose.isValidObjectId(filter.value)) {
+            filter.value = mongoose.Types.ObjectId(filter.value);
+            fieldName = `_${filter.field}._id`;
+          } else {
+            // Else, search for the name
+            fieldName = `_${filter.field}.name`;
+          }
         } else {
           fieldName = `_${field}.user.${subField}`;
         }

src/utils/schema/resolvers/Query/getFilter.ts

@@ -122,13 +122,13 @@ const buildMongoFilter = (
           _id: { $in: filter.value.map((x) => mongoose.Types.ObjectId(x)) },
         };
       }
-      if (filter.field === 'form') {
-        filter.value = mongoose.Types.ObjectId(filter.value);
-        fieldName = '_form._id';
-      }
-      if (filter.field === 'lastUpdateForm') {
-        filter.value = mongoose.Types.ObjectId(filter.value);
-        fieldName = '_lastUpdateForm._id';
+      if (['form', 'lastUpdateForm'].includes(filter.field)) {
+        if (mongoose.isValidObjectId(filter.value)) {
+          filter.value = mongoose.Types.ObjectId(filter.value);
+          fieldName = `_${filter.field}._id`;
+        } else {
+          fieldName = `_${filter.field}.name`;
+        }
       }
 
       const isAttributeFilter = filter.field.startsWith('$attribute.');