APIv3: Support filter paramters passed via filter_parameters array

lib/api3/generic/search/input.js

@@ -55,10 +55,34 @@ function parseFilter (req, res) {
     , operators = ['eq', 'ne', 'gt', 'gte', 'lt', 'lte', 'in', 'nin', 're']
     ;
 
+  // filter_parameters query parameter needs to be split
+  // into individual parameters before it can be processed
+  const processedQueryParams = {};
+
   for (let param in req.query) {
     if (!Object.prototype.hasOwnProperty.call(req.query, param)
       || reservedParams.includes(param)) continue;
 
+    if (param === 'filter_parameters') {
+      // filter_parameters are a space separated list of
+      // <param>$<operator>=<value>
+      // for the purpose of building the filter, we want
+      // to take each <param>$<operator> as the key for
+      // the processes query params map
+      const filterValues = req.query[param].split(' ');
+
+      for (const filterValue of filterValues) {
+        const filterParts = filterValue.split('=');
+
+        processedQueryParams[filterParts[0]] = filterParts[1];
+      }
+    }
+    else {
+      processedQueryParams[param] = req.query[param];
+    }
+  }
+
+  for (let param in processedQueryParams) {
     let field = param
       , operator = 'eq'
     ;
@@ -74,7 +98,7 @@ function parseFilter (req, res) {
         return null;
       }
     }
-    const value = parseValue(field, req.query[param]);
+    const value = parseValue(field, processedQueryParams[param]);
 
     filter.push({ field, operator, value });
   }
@@ -137,4 +161,4 @@ module.exports = {
   parseFilter,
   parseSort,
   parseSkip
-};
+};

lib/api3/storage/mongoCollection/utils.js

@@ -27,6 +27,7 @@ function normalizeDoc (doc) {
  */
 function parseFilter (filterDef, logicalOperator, onlyValid) {
   let filter = { };
+
   if (!filterDef)
     return filter;
 
@@ -39,56 +40,57 @@ function parseFilter (filterDef, logicalOperator, onlyValid) {
   for (const itemDef of filterDef) {
     let item;
 
+    // Check if a query is already started for given field
+    if (!filter.hasOwnProperty(itemDef.field)) {
+      filter[itemDef.field] = {};
+    }
+
     switch (itemDef.operator) {
       case 'eq':
-        item = itemDef.value;
+        filter[itemDef.field]['$eq'] = itemDef.value;
         break;
 
       case 'ne':
-        item = { $ne: itemDef.value };
+        filter[itemDef.field]['$ne'] = itemDef.value;
         break;
 
       case 'gt':
-        item = { $gt: itemDef.value };
+        filter[itemDef.field]['$gt'] = itemDef.value;
         break;
 
       case 'gte':
-        item = { $gte: itemDef.value };
+        filter[itemDef.field]['$gte'] = itemDef.value;
         break;
 
       case 'lt':
-        item = { $lt: itemDef.value };
+        filter[itemDef.field]['$lt'] = itemDef.value;
         break;
 
       case 'lte':
-        item = { $lte: itemDef.value };
+        filter[itemDef.field]['$lte'] = itemDef.value;
         break;
 
       case 'in':
-        item = { $in: itemDef.value.toString().split('|') };
+        filter[itemDef.field]['$in'] = itemDef.value.toString().split('|');
         break;
 
       case 'nin':
-        item = { $nin: itemDef.value.toString().split('|') };
+        filter[itemDef.field]['$nin'] = itemDef.value.toString().split('|');
         break;
 
       case 're':
-        item = { $regex: itemDef.value.toString() };
+        filter[itemDef.field]['$regex'] = itemDef.value.toString();
         break;
 
       default:
         throw new Error('Unsupported or missing filter operator ' + itemDef.operator);
-    }
+    } // switch (itemDef.operator)
 
     if (logicalOperator === 'or') {
-      let clause = { };
-      clause[itemDef.field] = item;
-      clauses.push(clause);
-    }
-    else {
-      filter[itemDef.field] = item;
+      clauses.push(filter);
+      filter = { };
     }
-  }
+  } // for (const itemDef of filterDef)
 
   if (logicalOperator === 'or') {
     filter = { $or: clauses };