c2-mongoose 2.1.286 → 2.1.288

package/dist/flow/SearcherFlow.js

@@ -304,7 +304,7 @@ var SearcherFlow = /** @class */ (function () {
         var _this = this;
         // Recuperar todos os campos do tipo String
         var camposString = (0, Utils_1.isEmpty)(this.searchTextFields) ? this.extractFieldsOfType(this.model.schema, 'String') : this.searchTextFields;
-        var andQueriesParam = [];
+        var andQueriesParam = {};
         Object.entries(objectSearch).forEach(function (_a) {
             var key = _a[0], value = _a[1];
             if ((0, Utils_1.isNotEmpty)(value) || value === null) {
@@ -341,7 +341,7 @@ var SearcherFlow = /** @class */ (function () {
                     value = false;
                 }
                 var condition = _this.buildCondition(key, value);
-                andQueriesParam.push(condition);
+                andQueriesParam = __assign(__assign({}, andQueriesParam), condition);
             }
         });
         if ((0, Utils_1.isNotEmpty)(this.searchText) && (0, Utils_1.isNotEmpty)(camposString)) {
@@ -353,7 +353,8 @@ var SearcherFlow = /** @class */ (function () {
                 conditionAux[fieldString] = { $regex: regex };
                 conditions.$or.push(conditionAux);
             }
-            andQueriesParam.push(conditions);
+            // andQueriesParam.push(conditions)
+            andQueriesParam = __assign(__assign({}, andQueriesParam), conditions);
         }
         // if (filters.$and.length === 0)
         //     delete filters['$and']
@@ -381,11 +382,7 @@ var SearcherFlow = /** @class */ (function () {
                 _loop_1(clauseOr);
             }
         }
-        var filtersFinal = {};
-        if (andQueriesParam.length > 0) {
-            // if (!filtersFinal.$or) filtersFinal.$or = []
-            filtersFinal = __assign(__assign({}, filtersFinal), andQueriesParam);
-        }
+        var filtersFinal = __assign({}, andQueriesParam);
         if (orPayload.length > 0) {
             if (!filtersFinal.$or)
                 filtersFinal.$or = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.286",
+  "version": "2.1.288",
   "description": "Lib to make any search in database mongoose and use as basic crud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/flow/SearcherFlow.ts

@@ -285,7 +285,7 @@ class SearcherFlow<D> {
         const camposString = isEmpty(this.searchTextFields) ? this.extractFieldsOfType(this.model.schema, 'String') : this.searchTextFields
 
 
-        const andQueriesParam = []
+        let andQueriesParam = {} as any
         Object.entries(objectSearch).forEach(([key, value]) => {
             if (isNotEmpty(value) || value === null) {
                 if ([
@@ -324,7 +324,7 @@ class SearcherFlow<D> {
                 }
 
                 const condition = this.buildCondition(key, value)
-                andQueriesParam.push(condition)
+                andQueriesParam = { ...andQueriesParam, ...condition }
             }
         })
 
@@ -337,7 +337,8 @@ class SearcherFlow<D> {
 
                 conditions.$or.push(conditionAux)
             }
-            andQueriesParam.push(conditions)
+            // andQueriesParam.push(conditions)
+            andQueriesParam = { ...andQueriesParam, ...conditions }
         }
 
         // if (filters.$and.length === 0)
@@ -361,11 +362,7 @@ class SearcherFlow<D> {
             }
         }
 
-        let filtersFinal = {} as any
-        if (andQueriesParam.length > 0) {
-            // if (!filtersFinal.$or) filtersFinal.$or = []
-            filtersFinal = { ...filtersFinal, ...andQueriesParam }
-        }
+        let filtersFinal = { ...andQueriesParam } as any
 
         if (orPayload.length > 0) {
             if (!filtersFinal.$or) filtersFinal.$or = []