c2-mongoose 2.1.18 → 2.1.20

package/dist/flow/SearchFlow.d.ts

@@ -1,4 +1,4 @@
-import mongoose from "mongoose";
+import mongoose, { ClientSession } from "mongoose";
 import { SearchResponse } from "../types/SearchResponse";
 declare abstract class SearchFlow {
     searchText: string;
@@ -21,7 +21,7 @@ declare abstract class SearchFlow {
     private result;
     count(model: mongoose.Model<any>): Promise<number>;
     findOne(repository: mongoose.Model<any>, model: any, params?: any): Promise<any>;
-    sumBy(model: mongoose.Model<any>, _sum: any, _by: any): Promise<any[]>;
+    sumBy(model: mongoose.Model<any>, _sum: any, _by: any, session?: ClientSession): Promise<any[]>;
     buildDefaultFilters(objectSearch: any): any;
     addFilterModel(model: any, filters: any): void;
 }

package/dist/flow/SearchFlow.js

@@ -215,7 +215,7 @@ var SearchFlow = /** @class */ (function () {
             });
         });
     };
-    SearchFlow.prototype.sumBy = function (model, _sum, _by) {
+    SearchFlow.prototype.sumBy = function (model, _sum, _by, session) {
         return __awaiter(this, void 0, void 0, function () {
             var ret;
             return __generator(this, function (_a) {
@@ -231,7 +231,7 @@ var SearchFlow = /** @class */ (function () {
                                     count: { "$sum": 1 }
                                 }
                             }
-                        ])];
+                        ]).session(session)];
                     case 1:
                         ret = _a.sent();
                         return [2 /*return*/, ret];
@@ -253,11 +253,17 @@ var SearchFlow = /** @class */ (function () {
                     var values = value;
                     if ((0, Utils_1.isNotEmpty)(values[0])) {
                         var momentValue = (0, moment_1.default)(values[0]);
-                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $gte: momentValue.toDate().setHours(0, 0, 0) });
+                        momentValue.hour(0);
+                        momentValue.minute(0);
+                        momentValue.second(0);
+                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $gte: momentValue.toDate() });
                     }
                     if ((0, Utils_1.isNotEmpty)(values[1])) {
                         var momentValue = (0, moment_1.default)(values[1]);
-                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $lte: momentValue.toDate().setHours(23, 59, 59) });
+                        momentValue.hour(23);
+                        momentValue.minute(59);
+                        momentValue.second(59);
+                        condition[fieldName] = __assign(__assign({}, condition[fieldName]), { $lte: momentValue.toDate() });
                     }
                     filters.$and.push(condition);
                 }

package/package.json

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

@@ -1,5 +1,5 @@
 import moment from "moment"
-import mongoose from "mongoose"
+import mongoose, { ClientSession } from "mongoose"
 import { dbCollation } from "../configuration/Environment"
 import { Pagination, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
@@ -143,7 +143,7 @@ abstract class SearchFlow {
       .populate(params.populate)
   }
 
-  public async sumBy(model: mongoose.Model<any>, _sum: any, _by: any): Promise<any[]> {
+  public async sumBy(model: mongoose.Model<any>, _sum: any, _by: any, session?: ClientSession): Promise<any[]> {
     const ret = await model.aggregate(
       [
         {
@@ -157,7 +157,7 @@ abstract class SearchFlow {
           }
         }
       ]
-    )
+    ).session(session!)
     return ret
   }
 
@@ -175,17 +175,23 @@ abstract class SearchFlow {
           var values = value as any
           if (isNotEmpty(values[0])) {
             var momentValue = moment(values[0])
+            momentValue.hour(0)
+            momentValue.minute(0)
+            momentValue.second(0)
             condition[fieldName] = {
               ...condition[fieldName],
-              $gte: momentValue.toDate().setHours(0, 0, 0)
+              $gte: momentValue.toDate()
             }
           }
 
           if (isNotEmpty(values[1])) {
             var momentValue = moment(values[1])
+            momentValue.hour(23)
+            momentValue.minute(59)
+            momentValue.second(59)
             condition[fieldName] = {
               ...condition[fieldName],
-              $lte: momentValue.toDate().setHours(23, 59, 59)
+              $lte: momentValue.toDate()
             }
           }
           filters.$and.push(condition)