Admitting multiple $or in querystring.

Author: lucas-barbosa-oliveira

lib/mapper/filters.js

@@ -14,6 +14,7 @@ function filters(query, options) {
         delete query.start_at
         delete query.end_at
         delete query.period
+        let or_count = 0
         for (const elem in query) {
             if (query[elem] instanceof Array) {
                 query[elem].forEach(function (param) {
@@ -22,7 +23,18 @@ function filters(query, options) {
             } else {
                 if (query[elem] instanceof Object) {
                 } else if (query[elem].includes(',')) {
-                    result['$or'] = result['$or'].concat(splitByCommas(elem, query[elem]))
+                    if (or_count === 0){
+                      result['$or'] = result['$or'].concat(splitByCommas(elem, query[elem]))
+                    }
+                    else if (or_count === 1) {
+                      result['$and'].push({'$or': result['$or']})
+                      result['$and'].push({'$or': splitByCommas(elem, query[elem])})
+                      result['$or'] = []
+                    }
+                    else{
+                      result['$and'].push({'$or': splitByCommas(elem, query[elem])})
+                    }
+                    or_count++
                 } else {
                     Object.assign(result, processQuery(elem, query[elem]))
                 }