c2-mongoose 2.1.57 → 2.1.59

package/dist/flow/SearchFlow.d.ts

@@ -6,18 +6,24 @@ declare abstract class SearchFlow {
     orderBy: string;
     page: number;
     limit: number;
-    select: string;
+    select: string | string[];
     populate: any;
     filters: any;
     sort: any;
     pageable: boolean;
+    projection: {
+        [key: string]: number;
+    };
     constructor(params: any);
     buildPopulate(): any;
+    buildProjections(): {
+        [key: string]: number;
+    };
     buildPath(target: string, nested?: string): any;
     buildOrdenation(): any;
     buildRegex(searchText: string): RegExp;
     searchPageable(model: mongoose.Model<any>, options: SearchOptions): Promise<{
-        items: any[];
+        items: any;
         paging: any;
     }>;
     search(model: mongoose.Model<any>, options?: SearchOptions): Promise<SearchResponse<any>>;

package/dist/flow/SearchFlow.js

@@ -101,6 +101,7 @@ var SearchFlow = /** @class */ (function () {
         this.page = Number(params.page || 1);
         this.limit = Number(params.limit || 25);
         this.pageable = params.pageable == false || params.pageable == 'false' ? false : true;
+        this.projection = this.buildProjections();
         this.buildPopulate();
         this.buildOrdenation();
     }
@@ -118,6 +119,17 @@ var SearchFlow = /** @class */ (function () {
         }
         this.populate = populates;
     };
+    SearchFlow.prototype.buildProjections = function () {
+        if (!Array.isArray(this.select)) {
+            return {};
+        }
+        var projection = {};
+        for (var _i = 0, _a = this.select; _i < _a.length; _i++) {
+            var field = _a[_i];
+            projection[field] = 1;
+        }
+        return projection;
+    };
     SearchFlow.prototype.buildPath = function (target, nested) {
         if (nested === void 0) { nested = ""; }
         var populate = {};
@@ -148,7 +160,7 @@ var SearchFlow = /** @class */ (function () {
     SearchFlow.prototype.searchPageable = function (model, options) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var stagesItems, result, populate, items;
+            var stagesItems, result;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -156,7 +168,8 @@ var SearchFlow = /** @class */ (function () {
                             { $match: this.filters },
                             { $sort: this.sort },
                             { $skip: (this.page - 1) * this.limit },
-                            { $limit: this.limit }
+                            { $limit: this.limit },
+                            { $project: this.projection }
                         ], options.pipelines, true);
                         return [4 /*yield*/, model.aggregate([
                                 {
@@ -177,12 +190,8 @@ var SearchFlow = /** @class */ (function () {
                             ]).session(options === null || options === void 0 ? void 0 : options.session)];
                     case 1:
                         result = _b.sent();
-                        populate = __assign(__assign({}, this.populate), { select: this.select });
-                        return [4 /*yield*/, model.populate(result[0].items, populate)];
-                    case 2:
-                        items = _b.sent();
                         return [2 /*return*/, {
-                                items: items,
+                                items: result[0].items,
                                 paging: ((_a = result[0]) === null || _a === void 0 ? void 0 : _a.paging[0]) || { total: 0, page: 1, limit: this.limit }
                             }];
                 }
@@ -361,7 +370,7 @@ var SearchFlow = /** @class */ (function () {
             var key = _a[0], value = _a[1];
             if ((0, Utils_1.isNotEmpty)(value)) {
                 var condition = {};
-                if (['pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+                if (['projection', 'pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                     return;
                 }
                 if (value === 'true') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.57",
+  "version": "2.1.59",
   "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,7 +1,7 @@
 import moment from "moment"
 import mongoose, { ClientSession } from "mongoose"
 import { dbCollation } from "../configuration/Environment"
-import { Pagination, PipelineStage, SearchOptions, SearchResponse } from "../types/SearchResponse"
+import { Pagination, SearchOptions, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
 
 abstract class SearchFlow {
@@ -10,11 +10,12 @@ abstract class SearchFlow {
   orderBy: string
   page: number
   limit: number
-  select: string
+  select: string | string[]
   populate: any
   filters: any
   sort: any
   pageable: boolean
+  projection: { [key: string]: number }
 
   constructor(params: any) {
     this.searchText = params.searchText || ""
@@ -25,6 +26,7 @@ abstract class SearchFlow {
     this.page = Number(params.page || 1)
     this.limit = Number(params.limit || 25)
     this.pageable = params.pageable == false || params.pageable == 'false' ? false : true
+    this.projection = this.buildProjections()
     this.buildPopulate()
     this.buildOrdenation()
   }
@@ -45,6 +47,19 @@ abstract class SearchFlow {
     this.populate = populates
   }
 
+  buildProjections() {
+    if (!Array.isArray(this.select)) {
+      return {}
+    }
+
+    let projection: { [key: string]: number } = {}
+    for (var field of this.select) {
+      projection[field] = 1
+    }
+
+    return projection
+  }
+
   public buildPath(target: string, nested: string = "") {
     var populate = {} as any
     populate.path = target
@@ -80,6 +95,7 @@ abstract class SearchFlow {
       { $sort: this.sort },
       { $skip: (this.page - 1) * this.limit },
       { $limit: this.limit },
+      { $project: this.projection },
       ...options.pipelines
     ]
 
@@ -103,14 +119,8 @@ abstract class SearchFlow {
         }
       ]
     ).session(options?.session as ClientSession)
-    let populate = {
-      ...this.populate,
-      select: this.select
-    }
-    let items = await model.populate(result[0].items, populate)
-
     return {
-      items: items,
+      items: result[0].items,
       paging: result[0]?.paging[0] || { total: 0, page: 1, limit: this.limit }
     }
   }
@@ -260,7 +270,7 @@ abstract class SearchFlow {
     Object.entries(objectSearch.model).forEach(([key, value]) => {
       if (isNotEmpty(value)) {
         let condition = {} as any
-        if (['pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+        if (['projection', 'pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
           return
         }