c2-mongoose 2.1.11 → 2.1.13

package/dist/flow/SearchFlow.js

@@ -46,7 +46,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+var moment_1 = __importDefault(require("moment"));
 var Environment_1 = require("../configuration/Environment");
 var Utils_1 = require("../utils/Utils");
 var SearchFlow = /** @class */ (function () {
@@ -237,27 +241,29 @@ 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', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                     return;
                 }
-                if (key.endsWith('DateRange')) {
-                    var keyAux = key.replace('Range', '');
+                if (key.endsWith('DateRange') || key.endsWith('DateTimeRange')) {
+                    var fieldName = key.replace('Range', '');
                     var values = value;
                     if ((0, Utils_1.isNotEmpty)(values[0])) {
-                        condition[keyAux] = __assign(__assign({}, condition[keyAux]), { $gte: new Date(values[0]) });
+                        var momentValue = (0, moment_1.default)(values[0]);
+                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $gte: momentValue.toDate() });
                     }
                     if ((0, Utils_1.isNotEmpty)(values[1])) {
-                        condition[keyAux] = __assign(__assign({}, condition[keyAux]), { $lte: new Date(values[1]) });
+                        var momentValue = (0, moment_1.default)(values[1]);
+                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $lte: momentValue.toDate() });
                     }
                     filters.$and.push(condition);
                 }
                 else if (key.endsWith('Like')) {
-                    var keyAux = key.replace('Like', '');
-                    condition[keyAux] = { $regex: value, $options: 'i' };
+                    var fieldName = key.replace('Like', '');
+                    condition[fieldName] = { $regex: value, $options: 'i' };
                     filters.$and.push(condition);
                 }
                 else {
@@ -271,9 +277,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.11",
+  "version": "2.1.13",
   "description": "Lib to make any search in database mongoose and use as basic crud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,6 +29,7 @@
   "homepage": "https://gitlab.com/cabral_consultoria/c2-mongoose#readme",
   "dependencies": {
     "dotenv": "^16.0.3",
+    "moment": "^2.29.4",
     "mongoose": "^7.0.1"
   },
   "devDependencies": {

package/src/flow/SearchFlow.ts

@@ -1,3 +1,4 @@
+import moment from "moment"
 import mongoose from "mongoose"
 import { dbCollation } from "../configuration/Environment"
 import { Pagination, SearchResponse } from "../types/SearchResponse"
@@ -162,33 +163,35 @@ 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', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
           return
         }
 
-        if (key.endsWith('DateRange')) {
-          var keyAux = key.replace('Range', '')
+        if (key.endsWith('DateRange') || key.endsWith('DateTimeRange') ) {
+          var fieldName = key.replace('Range', '')
           var values = value as any
           if (isNotEmpty(values[0])) {
-            condition[keyAux] = {
-              ...condition[keyAux],
-              $gte: new Date(values[0])
+            var momentValue = moment(values[0])
+            condition[fieldName] = {
+              ...condition[fieldName],
+              $gte: momentValue.toDate()
             }
           }
 
           if (isNotEmpty(values[1])) {
-            condition[keyAux] = {
-              ...condition[keyAux],
-              $lte: new Date(values[1])
+            var momentValue = moment(values[1])
+            condition[fieldName] = {
+              ...condition[fieldName],
+              $lte: momentValue.toDate()
             }
           }
           filters.$and.push(condition)
         } else if (key.endsWith('Like')) {
-          var keyAux = key.replace('Like', '')
-          condition[keyAux] = { $regex: value as any, $options: 'i' }
+          var fieldName = key.replace('Like', '')
+          condition[fieldName] = { $regex: value as any, $options: 'i' }
           filters.$and.push(condition)
         } else {
           if (!Array.isArray(value)) {
@@ -202,9 +205,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']