c2-mongoose 2.1.10 → 2.1.12

package/dist/flow/SearchFlow.js

@@ -237,11 +237,11 @@ var SearchFlow = /** @class */ (function () {
     };
     SearchFlow.prototype.buildDefaultFilters = function (objectSearch) {
         var filters = { $and: [] };
-        Object.entries(objectSearch).forEach(function (_a) {
+        Object.entries(objectSearch.model).forEach(function (_a) {
             var key = _a[0], value = _a[1];
             if ((0, Utils_1.isNotEmpty)(value)) {
                 var condition = {};
-                if (['order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'searchText'].includes(key)) {
+                if (['order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                     return;
                 }
                 if (key.endsWith('DateRange')) {
@@ -256,7 +256,6 @@ var SearchFlow = /** @class */ (function () {
                     filters.$and.push(condition);
                 }
                 else if (key.endsWith('Like')) {
-                    console.log(key);
                     var keyAux = key.replace('Like', '');
                     condition[keyAux] = { $regex: value, $options: 'i' };
                     filters.$and.push(condition);
@@ -272,9 +271,9 @@ var SearchFlow = /** @class */ (function () {
                 }
             }
         });
-        if ((0, Utils_1.isNotEmpty)(objectSearch.model)) {
-            this.addFilterModel(objectSearch.model, filters);
-        }
+        // if (isNotEmpty(objectSearch.model)) {
+        //   this.addFilterModel(objectSearch.model, filters)
+        // }
         if (filters.$and.length === 0)
             delete filters['$and'];
         return filters;
@@ -282,6 +281,15 @@ var SearchFlow = /** @class */ (function () {
     SearchFlow.prototype.addFilterModel = function (model, filters) {
         Object.entries(model).forEach(function (_a) {
             var key = _a[0], value = _a[1];
+            if (key.endsWith('DateRange')) {
+                return;
+            }
+            if (key.endsWith('Like')) {
+                return;
+            }
+            if (['order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+                return;
+            }
             if ((0, Utils_1.isNotEmpty)(value)) {
                 var condition = {};
                 condition[key] = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "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/SearchFlow.ts

@@ -162,10 +162,10 @@ abstract class SearchFlow {
 
   public buildDefaultFilters(objectSearch: any) {
     let filters = { $and: [] } as any
-    Object.entries(objectSearch).forEach(([key, value]) => {
+    Object.entries(objectSearch.model).forEach(([key, value]) => {
       if (isNotEmpty(value)) {
         let condition = {} as any
-        if (['order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'searchText'].includes(key)) {
+        if (['order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
           return
         }
 
@@ -187,7 +187,6 @@ abstract class SearchFlow {
           }
           filters.$and.push(condition)
         } else if (key.endsWith('Like')) {
-          console.log(key)
           var keyAux = key.replace('Like', '')
           condition[keyAux] = { $regex: value as any, $options: 'i' }
           filters.$and.push(condition)
@@ -203,9 +202,9 @@ abstract class SearchFlow {
     })
 
 
-    if (isNotEmpty(objectSearch.model)) {
-      this.addFilterModel(objectSearch.model, filters)
-    }
+    // if (isNotEmpty(objectSearch.model)) {
+    //   this.addFilterModel(objectSearch.model, filters)
+    // }
 
     if (filters.$and.length === 0)
       delete filters['$and']
@@ -215,6 +214,15 @@ abstract class SearchFlow {
 
   public addFilterModel(model: any, filters: any) {
     Object.entries(model).forEach(([key, value]) => {
+      if (key.endsWith('DateRange')) {
+        return
+      }
+      if (key.endsWith('Like')) {
+        return
+      }
+      if (['order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+        return
+      }
       if (isNotEmpty(value)) {
         let condition = {} as any
         condition[key] = value