c2-mongoose 2.1.281 → 2.1.283

package/dist/flow/SearcherFlow.js

@@ -238,16 +238,16 @@ var SearcherFlow = /** @class */ (function () {
             var values = value;
             if ((0, Utils_1.isNotEmpty)(values[0])) {
                 var momentValue = (0, moment_1.default)(values[0]);
-                momentValue.hour(0);
-                momentValue.minute(0);
-                momentValue.second(0);
+                // momentValue.hour(0)
+                // momentValue.minute(0)
+                // momentValue.second(0)
                 condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $gte: momentValue.tz('America/Sao_Paulo', true).toDate() });
             }
             if ((0, Utils_1.isNotEmpty)(values[1])) {
                 var momentValue = (0, moment_1.default)(values[1]);
-                momentValue.hour(23);
-                momentValue.minute(59);
-                momentValue.second(59);
+                // momentValue.hour(23)
+                // momentValue.minute(59)
+                // momentValue.second(59)
                 condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $lte: momentValue.tz('America/Sao_Paulo', true).toDate() });
             }
         }
@@ -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 filters = { $and: [], $or: [] };
+        var filters = { $and: [] };
         Object.entries(objectSearch).forEach(function (_a) {
             var key = _a[0], value = _a[1];
             if ((0, Utils_1.isNotEmpty)(value) || value === null) {
@@ -358,22 +358,27 @@ var SearcherFlow = /** @class */ (function () {
         if (filters.$and.length === 0)
             delete filters['$and'];
         if (objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or) {
-            Object.entries(objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or).forEach(function (_a) {
-                var key = _a[0], value = _a[1];
-                if ((0, Utils_1.isEmpty)(value))
-                    return;
-                if (typeof value === 'string' && _this.isValidObjectId(value) && key !== 'owner') {
-                    value = new mongoose_1.Types.ObjectId(value);
-                }
-                if (value === 'true') {
-                    value = true;
-                }
-                if (value === 'false') {
-                    value = false;
-                }
-                var condition = _this.buildCondition(key, value);
-                filters.$or.push(condition);
-            });
+            for (var _b = 0, _c = objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or; _b < _c.length; _b++) {
+                var clause = _c[_b];
+                if (!filters.$or)
+                    filters.$or = [];
+                Object.entries(clause).forEach(function (_a) {
+                    var key = _a[0], value = _a[1];
+                    if ((0, Utils_1.isEmpty)(value))
+                        return;
+                    if (typeof value === 'string' && _this.isValidObjectId(value) && key !== 'owner') {
+                        value = new mongoose_1.Types.ObjectId(value);
+                    }
+                    if (value === 'true') {
+                        value = true;
+                    }
+                    if (value === 'false') {
+                        value = false;
+                    }
+                    var condition = _this.buildCondition(key, value);
+                    filters.$or.push(condition);
+                });
+            }
         }
         return filters;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.281",
+  "version": "2.1.283",
   "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

@@ -211,9 +211,9 @@ class SearcherFlow<D> {
             var values = value as any
             if (isNotEmpty(values[0])) {
                 var momentValue = moment(values[0])
-                momentValue.hour(0)
-                momentValue.minute(0)
-                momentValue.second(0)
+                // momentValue.hour(0)
+                // momentValue.minute(0)
+                // momentValue.second(0)
                 condition[fieldName] = {
                     ...condition[fieldName],
                     $gte: momentValue.tz('America/Sao_Paulo', true).toDate()
@@ -222,9 +222,9 @@ class SearcherFlow<D> {
 
             if (isNotEmpty(values[1])) {
                 var momentValue = moment(values[1])
-                momentValue.hour(23)
-                momentValue.minute(59)
-                momentValue.second(59)
+                // momentValue.hour(23)
+                // momentValue.minute(59)
+                // momentValue.second(59)
                 condition[fieldName] = {
                     ...condition[fieldName],
                     $lte: momentValue.tz('America/Sao_Paulo', true).toDate()
@@ -285,7 +285,7 @@ class SearcherFlow<D> {
         const camposString = isEmpty(this.searchTextFields) ? this.extractFieldsOfType(this.model.schema, 'String') : this.searchTextFields
 
 
-        let filters = { $and: [], $or: [] } as any
+        let filters = { $and: [] } as any
         Object.entries(objectSearch).forEach(([key, value]) => {
             if (isNotEmpty(value) || value === null) {
                 if ([
@@ -344,24 +344,29 @@ class SearcherFlow<D> {
             delete filters['$and']
 
         if (objectSearch?.or) {
-            Object.entries(objectSearch?.or).forEach(([key, value]) => {
-                if (isEmpty(value)) return
-    
-                if (typeof value === 'string' && this.isValidObjectId(value as string) && key !== 'owner') {
-                    value = new Types.ObjectId(value as string)
-                }
-    
-                if (value === 'true') {
-                    value = true
-                }
-    
-                if (value === 'false') {
-                    value = false
-                }
+            for (const clause of objectSearch?.or) {
+                if (!filters.$or) filters.$or = []
+
+                Object.entries(clause).forEach(([key, value]) => {
+                    
+                    if (isEmpty(value)) return
     
-                const condition = this.buildCondition(key, value)
-                filters.$or.push(condition)
-            })
+                    if (typeof value === 'string' && this.isValidObjectId(value as string) && key !== 'owner') {
+                        value = new Types.ObjectId(value as string)
+                    }
+        
+                    if (value === 'true') {
+                        value = true
+                    }
+        
+                    if (value === 'false') {
+                        value = false
+                    }
+        
+                    const condition = this.buildCondition(key, value)
+                    filters.$or.push(condition)
+                })
+            }
         }