c2-mongoose 2.1.51 → 2.1.53

package/dist/flow/CrudFlow.d.ts

@@ -1,9 +1,6 @@
 import mongoose, { ClientSession } from "mongoose";
-import { SearchResponse } from "../types/SearchResponse";
+import { SearchOptions, SearchResponse } from "../types/SearchResponse";
 import SearchFlow from "./SearchFlow";
-export interface PipelineStage {
-    [key: string]: any;
-}
 declare class CrudFlow<D> {
     private repository;
     private search;
@@ -15,7 +12,7 @@ declare class CrudFlow<D> {
     update(id: string, data: D, session?: any): Promise<D>;
     updateAny(id: string, data: any, session?: any): Promise<D>;
     updateByModel(filter: any, data: any, params: any): Promise<D>;
-    find(pipelineStages?: PipelineStage[]): Promise<SearchResponse<D>>;
+    find(options?: SearchOptions): Promise<SearchResponse<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>>;

package/dist/flow/CrudFlow.js

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

package/dist/flow/SearchFlow.d.ts

@@ -1,5 +1,5 @@
 import mongoose, { ClientSession } from "mongoose";
-import { SearchResponse } from "../types/SearchResponse";
+import { SearchOptions, SearchResponse } from "../types/SearchResponse";
 declare abstract class SearchFlow {
     searchText: string;
     order: string;
@@ -16,11 +16,11 @@ declare abstract class SearchFlow {
     buildPath(target: string, nested?: string): any;
     buildOrdenation(): any;
     buildRegex(searchText: string): RegExp;
-    searchPageable(model: mongoose.Model<any>, pipeline: any): Promise<{
+    searchPageable(model: mongoose.Model<any>, options: SearchOptions): Promise<{
         items: any;
         paging: any;
     }>;
-    search(model: mongoose.Model<any>, pipeline?: any): Promise<SearchResponse<any>>;
+    search(model: mongoose.Model<any>, options?: SearchOptions): Promise<SearchResponse<any>>;
     /**
      *
      * @param model

package/dist/flow/SearchFlow.js

@@ -144,18 +144,19 @@ var SearchFlow = /** @class */ (function () {
             .replace(/[ç|c|C|Ç]/g, '[c,ç]');
         return new RegExp("".concat(regexExpression), 'i');
     };
-    SearchFlow.prototype.searchPageable = function (model, pipeline) {
+    SearchFlow.prototype.searchPageable = function (model, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var stagesItems, result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         stagesItems = __spreadArray([
                             { $match: this.filters },
                             { $sort: this.sort },
                             { $skip: (this.page - 1) * this.limit },
                             { $limit: this.limit }
-                        ], pipeline, true);
+                        ], options.pipelines, true);
                         return [4 /*yield*/, model.aggregate([
                                 {
                                     $facet: {
@@ -172,25 +173,25 @@ var SearchFlow = /** @class */ (function () {
                                         ]
                                     }
                                 }
-                            ])];
+                            ]).session(options === null || options === void 0 ? void 0 : options.session)];
                     case 1:
-                        result = _a.sent();
+                        result = _b.sent();
                         return [2 /*return*/, {
                                 items: result[0].items,
-                                paging: result[0].paging[0]
+                                paging: ((_a = result[0]) === null || _a === void 0 ? void 0 : _a.paging[0]) || { total: 0, page: 1, limit: this.limit }
                             }];
                 }
             });
         });
     };
-    SearchFlow.prototype.search = function (model, pipeline) {
+    SearchFlow.prototype.search = function (model, options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!(this.pageable == true)) return [3 /*break*/, 4];
-                        if (!pipeline) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.searchPageable(model, pipeline)];
+                        if (!(options === null || options === void 0 ? void 0 : options.pipelines)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.searchPageable(model, options)];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2: return [4 /*yield*/, this.searchPageableOld(model)];
                     case 3: return [2 /*return*/, _a.sent()];

package/package.json

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

@@ -1,11 +1,8 @@
 import mongoose, { ClientSession } from "mongoose"
-import { SearchResponse } from "../types/SearchResponse"
+import { PipelineStage, SearchOptions, SearchResponse } from "../types/SearchResponse"
 import SearchFlow from "./SearchFlow"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
 
-export interface PipelineStage {
-    [key: string]: any;
-}
 class CrudFlow<D> {
 
     private repository: mongoose.Model<any>
@@ -47,8 +44,8 @@ class CrudFlow<D> {
         return dataAfter as D
     }
 
-    public async find(pipelineStages?: PipelineStage[]): Promise<SearchResponse<D>> {
-        return await this.search.search(this.repository, pipelineStages)
+    public async find(options?: SearchOptions): Promise<SearchResponse<D>> {
+        return await this.search.search(this.repository, options)
     }
 
     public async getOne(model: D, params: any = {}): Promise<D> {

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, SearchResponse } from "../types/SearchResponse"
+import { Pagination, PipelineStage, SearchOptions, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
 
 abstract class SearchFlow {
@@ -74,20 +74,20 @@ abstract class SearchFlow {
     return new RegExp(`${regexExpression}`, 'i');
   }
 
-  async searchPageable(model: mongoose.Model<any>, pipeline: any) {
+  async searchPageable(model: mongoose.Model<any>, options: SearchOptions) {
     let stagesItems = [
       { $match: this.filters },
       { $sort: this.sort },
       { $skip: (this.page - 1) * this.limit },
       { $limit: this.limit },
-      ...pipeline
+      ...options.pipelines
     ]
 
     const result = await model.aggregate(
       [
         {
           $facet: {
-            items: stagesItems,
+            items: stagesItems as any,
             paging: [
               { $match: this.filters },
               { $count: "total" },
@@ -102,17 +102,17 @@ abstract class SearchFlow {
           }
         }
       ]
-    )
+    ).session(options?.session as ClientSession)
     return {
       items: result[0].items,
-      paging: result[0].paging[0]
+      paging: result[0]?.paging[0] || { total: 0, page: 1, limit: this.limit }
     }
   }
 
-  public async search(model: mongoose.Model<any>, pipeline?: any): Promise<SearchResponse<any>> {
+  public async search(model: mongoose.Model<any>, options?: SearchOptions): Promise<SearchResponse<any>> {
     if (this.pageable == true) {
-      if (pipeline) {
-        return await this.searchPageable(model, pipeline)
+      if (options?.pipelines) {
+        return await this.searchPageable(model, options)
       }
       return await this.searchPageableOld(model)
     }

package/src/types/SearchResponse.d.ts

@@ -1,3 +1,5 @@
+import { ClientSession } from "mongoose";
+
 declare interface SearchResponse<T> {
     paging?: Pagination,
     items?: T[]
@@ -9,4 +11,13 @@ declare interface Pagination {
     limit?: number
 }
 
-export { SearchResponse, Pagination }
+declare interface PipelineStage {
+    [key: string]: any;
+}
+
+declare interface SearchOptions {
+    pipelines: PipelineStage[],
+    session?: ClientSession
+}
+
+export { SearchResponse, Pagination, PipelineStage, SearchOptions };