c2-mongoose 2.1.279 → 2.1.281

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 filters = { $and: [] };
+        var filters = { $and: [], $or: [] };
         Object.entries(objectSearch).forEach(function (_a) {
             var key = _a[0], value = _a[1];
             if ((0, Utils_1.isNotEmpty)(value) || value === null) {
@@ -357,23 +357,24 @@ var SearcherFlow = /** @class */ (function () {
         }
         if (filters.$and.length === 0)
             delete filters['$and'];
-        Object.entries(objectSearch === null || objectSearch === void 0 ? void 0 : objectSearch.or).forEach(function (_a) {
-            var key = _a[0], value = _a[1];
-            console.log(key, value);
-            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);
-        });
+        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);
+            });
+        }
         return filters;
     };
     SearcherFlow.prototype.isValidObjectId = function (value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.279",
+  "version": "2.1.281",
   "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
 
 
-        let filters = { $and: [] } as any
+        let filters = { $and: [], $or: [] } as any
         Object.entries(objectSearch).forEach(([key, value]) => {
             if (isNotEmpty(value) || value === null) {
                 if ([
@@ -343,26 +343,27 @@ class SearcherFlow<D> {
         if (filters.$and.length === 0)
             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
+                }
+    
+                const condition = this.buildCondition(key, value)
+                filters.$or.push(condition)
+            })
+        } 
 
-        Object.entries(objectSearch?.or).forEach(([key, value]) => {
-            console.log(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
-            }
-
-            const condition = this.buildCondition(key, value)
-            filters.$or.push(condition)
-        })
 
         return filters
     }