c2-mongoose 2.1.30 → 2.1.32

package/dist/flow/CrudFlow.d.ts

@@ -15,6 +15,6 @@ declare class CrudFlow<D> {
     getOne(model: D, params?: any): Promise<D>;
     get(id: string, pop?: string, sel?: string, session?: ClientSession): Promise<D>;
     getById(id: string, session?: ClientSession): Promise<Partial<D>>;
-    sumBy(fieldToSum: string, fieldToGroup: string): Promise<any>;
+    sumBy(fieldToSum: string, fieldToGroup: string, addToSet: any): Promise<any>;
 }
 export default CrudFlow;

package/dist/flow/CrudFlow.js

@@ -169,11 +169,11 @@ var CrudFlow = /** @class */ (function () {
             });
         });
     };
-    CrudFlow.prototype.sumBy = function (fieldToSum, fieldToGroup) {
+    CrudFlow.prototype.sumBy = function (fieldToSum, fieldToGroup, addToSet) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.search.sumBy(this.repository, fieldToSum, fieldToGroup)];
+                    case 0: return [4 /*yield*/, this.search.sumBy(this.repository, fieldToSum, fieldToGroup, addToSet)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });

package/dist/flow/SearchFlow.d.ts

@@ -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, session?: ClientSession): Promise<any[]>;
+    sumBy(model: mongoose.Model<any>, _sum: any, _by: any, _addSet?: any, session?: ClientSession): Promise<any[]>;
     buildDefaultFilters(objectSearch: any): any;
     addFilterModel(model: any, filters: any): void;
 }

package/dist/flow/SearchFlow.js

@@ -210,23 +210,30 @@ var SearchFlow = /** @class */ (function () {
             });
         });
     };
-    SearchFlow.prototype.sumBy = function (model, _sum, _by, session) {
+    SearchFlow.prototype.sumBy = function (model, _sum, _by, _addSet, session) {
+        if (_addSet === void 0) { _addSet = undefined; }
         return __awaiter(this, void 0, void 0, function () {
-            var ret;
+            var sort, ret;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, model.aggregate([
-                            {
-                                '$match': this.filters
-                            },
-                            {
-                                $group: {
-                                    _id: _by,
-                                    totalValue: { "$sum": _sum },
-                                    count: { "$sum": 1 }
+                    case 0:
+                        sort = this.buildOrdenation();
+                        return [4 /*yield*/, model.aggregate([
+                                {
+                                    '$match': this.filters
+                                },
+                                {
+                                    $group: {
+                                        _id: _by,
+                                        totalValue: { "$sum": _sum },
+                                        count: { "$sum": 1 },
+                                        items: _addSet
+                                    }
+                                },
+                                {
+                                    $sort: sort
                                 }
-                            }
-                        ]).session(session)];
+                            ]).session(session)];
                     case 1:
                         ret = _a.sent();
                         return [2 /*return*/, ret];
@@ -240,7 +247,7 @@ var SearchFlow = /** @class */ (function () {
             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)) {
+                if (['pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                     return;
                 }
                 if (key.endsWith('DateRange') || key.endsWith('DateTimeRange')) {
@@ -278,9 +285,6 @@ var SearchFlow = /** @class */ (function () {
                 }
             }
         });
-        // if (isNotEmpty(objectSearch.model)) {
-        //   this.addFilterModel(objectSearch.model, filters)
-        // }
         if (filters.$and.length === 0)
             delete filters['$and'];
         return filters;
@@ -294,7 +298,7 @@ var SearchFlow = /** @class */ (function () {
             if (key.endsWith('Like')) {
                 return;
             }
-            if (['order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+            if (['pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                 return;
             }
             if ((0, Utils_1.isNotEmpty)(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.30",
+  "version": "2.1.32",
   "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/CrudFlow.ts

@@ -65,8 +65,8 @@ class CrudFlow<D> {
         return data as D
     }
 
-    public async sumBy(fieldToSum: string, fieldToGroup: string): Promise<any> {
-        return await this.search.sumBy(this.repository, fieldToSum, fieldToGroup)
+    public async sumBy(fieldToSum: string, fieldToGroup: string, addToSet: any): Promise<any> {
+        return await this.search.sumBy(this.repository, fieldToSum, fieldToGroup, addToSet)
     }
 }
 

package/src/flow/SearchFlow.ts

@@ -134,7 +134,8 @@ abstract class SearchFlow {
       .populate(params.populate)
   }
 
-  public async sumBy(model: mongoose.Model<any>, _sum: any, _by: any, session?: ClientSession): Promise<any[]> {
+  public async sumBy(model: mongoose.Model<any>, _sum: any, _by: any, _addSet: any = undefined, session?: ClientSession): Promise<any[]> {
+    const sort = this.buildOrdenation()
     const ret = await model.aggregate(
       [
         {
@@ -144,8 +145,12 @@ abstract class SearchFlow {
           $group: {
             _id: _by,
             totalValue: { "$sum": _sum },
-            count: { "$sum": 1 }
+            count: { "$sum": 1 },
+            items: _addSet
           }
+        },
+        {
+          $sort: sort
         }
       ]
     ).session(session!)
@@ -157,7 +162,7 @@ abstract class SearchFlow {
     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)) {
+        if (['pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
           return
         }
 
@@ -201,11 +206,6 @@ abstract class SearchFlow {
       }
     })
 
-
-    // if (isNotEmpty(objectSearch.model)) {
-    //   this.addFilterModel(objectSearch.model, filters)
-    // }
-
     if (filters.$and.length === 0)
       delete filters['$and']
 
@@ -220,7 +220,7 @@ abstract class SearchFlow {
       if (key.endsWith('Like')) {
         return
       }
-      if (['order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+      if (['pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
         return
       }
       if (isNotEmpty(value)) {