c2-mongoose 2.1.224 → 2.1.225

package/dist/flow/SearchFlow.d.ts

@@ -12,7 +12,7 @@ declare abstract class SearchFlow {
     orderBy: string;
     page: number;
     limit: number;
-    select: string[];
+    select: string | string[];
     populate: any;
     filters: any;
     sort: any;
@@ -20,7 +20,7 @@ declare abstract class SearchFlow {
     onlyMetadata: boolean;
     projection: {
         [key: string]: number;
-    };
+    } | undefined;
     constructor(params: any);
     buildProjections(): any;
     buildProjectionNested(projectCurrent: any, field: string, include: boolean): any;

package/dist/flow/SearchFlow.js

@@ -51,11 +51,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // import moment from "moment"
-var moment_timezone_1 = __importDefault(require("moment-timezone"));
 var mongoose_1 = require("mongoose");
 var Utils_1 = require("../utils/Utils");
-var BuildSelectPopulateFlowItem_1 = __importDefault(require("./item/BuildSelectPopulateFlowItem"));
-var BuildSelectSingleFlowItem_1 = __importDefault(require("./item/BuildSelectSingleFlowItem"));
+var moment_timezone_1 = __importDefault(require("moment-timezone"));
 var SearchFlow = /** @class */ (function () {
     function SearchFlow(params) {
         // Incluir as propriedades adicionais de 'params' como propriedades da classe
@@ -181,7 +179,7 @@ var SearchFlow = /** @class */ (function () {
                         }
                         stagesItems.push({ $match: this.filters });
                         if ((0, Utils_1.isNotEmpty)(this.projection)) {
-                            stagesItems.push({ $project: BuildSelectSingleFlowItem_1.default.build(model, this.select) });
+                            stagesItems.push({ $project: this.projection });
                         }
                         stagesItems.push({ $sort: this.sort });
                         stagesMetadata = [];
@@ -215,7 +213,7 @@ var SearchFlow = /** @class */ (function () {
                         if (!(_a < _b.length)) return [3 /*break*/, 5];
                         populate = _b[_a];
                         _c = result[0];
-                        return [4 /*yield*/, model.populate(result[0].items, __assign(__assign({}, populate), { select: BuildSelectPopulateFlowItem_1.default.build(model, this.projection, populate.path) }))];
+                        return [4 /*yield*/, model.populate(result[0].items, populate)];
                     case 3:
                         _c.items = _d.sent();
                         _d.label = 4;
@@ -244,7 +242,7 @@ var SearchFlow = /** @class */ (function () {
                         }
                         stagesItems.push({ $match: this.filters });
                         if ((0, Utils_1.isNotEmpty)(this.projection)) {
-                            stagesItems.push({ $project: BuildSelectSingleFlowItem_1.default.build(model, this.select) });
+                            stagesItems.push({ $project: this.projection });
                         }
                         stagesItems.push({ $sort: this.sort });
                         stagesItems.push({ $skip: ((this.page - 1) * this.limit) || 0 });
@@ -309,7 +307,7 @@ var SearchFlow = /** @class */ (function () {
                         if (!(_a < _b.length)) return [3 /*break*/, 5];
                         populate = _b[_a];
                         _c = result[0];
-                        return [4 /*yield*/, model.populate(result[0].items, __assign(__assign({}, populate), { select: BuildSelectPopulateFlowItem_1.default.build(model, this.projection, populate.path) }))];
+                        return [4 /*yield*/, model.populate(result[0].items, populate)];
                     case 3:
                         _c.items = _d.sent();
                         _d.label = 4;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.224",
+  "version": "2.1.225",
   "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,10 +1,8 @@
 // import moment from "moment"
-import moment from "moment-timezone"
-import mongoose, { ClientSession, PopulateOptions, Types } from "mongoose"
+import mongoose, { ClientSession, Types } from "mongoose"
 import { SearchOptions, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
-import BuildSelectPopulateFlowItem from "./item/BuildSelectPopulateFlowItem"
-import BuildSelectSingleFlowItem from "./item/BuildSelectSingleFlowItem"
+import moment from "moment-timezone"
 
 interface IPopulate {
   path: string,
@@ -18,13 +16,13 @@ abstract class SearchFlow {
   orderBy: string
   page: number
   limit: number
-  select: string[]
+  select: string | string[]
   populate: any
   filters: any
   sort: any
   pageable: boolean
   onlyMetadata: boolean
-  projection: { [key: string]: number }
+  projection: { [key: string]: number } | undefined
 
   constructor(params: any) {
     // Incluir as propriedades adicionais de 'params' como propriedades da classe
@@ -170,7 +168,7 @@ abstract class SearchFlow {
     stagesItems.push({ $match: this.filters })
 
     if (isNotEmpty(this.projection)) {
-      stagesItems.push({ $project: BuildSelectSingleFlowItem.build(model, this.select) })
+      stagesItems.push({ $project: this.projection })
     }
 
     stagesItems.push({ $sort: this.sort })
@@ -205,7 +203,7 @@ abstract class SearchFlow {
 
     if (isNotEmpty(this.populate) && Array.isArray(this.populate)) {
       for (var populate of this.populate) {
-        result[0].items = await model.populate(result[0].items, { ...populate, select: BuildSelectPopulateFlowItem.build(model, this.projection, populate.path) } as PopulateOptions)
+        result[0].items = await model.populate(result[0].items, populate)
       }
     }
 
@@ -227,7 +225,7 @@ abstract class SearchFlow {
     stagesItems.push({ $match: this.filters })
 
     if (isNotEmpty(this.projection)) {
-      stagesItems.push({ $project: BuildSelectSingleFlowItem.build(model, this.select) })
+      stagesItems.push({ $project: this.projection })
     }
 
     stagesItems.push({ $sort: this.sort })
@@ -246,10 +244,10 @@ abstract class SearchFlow {
     stagesPaging.push({ $match: this.filters })
     stagesPaging.push({ $count: "total" })
     stagesPaging.push(
-      {
-        $addFields: {
-          page: this.page || 1,
-          limit: this.limit,
+      { 
+        $addFields: { 
+          page: this.page || 1, 
+          limit: this.limit, 
           totalPages: {
             $cond: {
               if: { $eq: ['$total', 0] },
@@ -257,9 +255,9 @@ abstract class SearchFlow {
               else: { $ceil: { $divide: ['$total', this.limit] } }
             }
           },
-          startIndex: { $subtract: [{ $multiply: [this.page, this.limit] }, this.limit - 1] },
+          startIndex: { $subtract: [ { $multiply: [this.page, this.limit] }, this.limit - 1 ] },
           endIndex: { $multiply: [this.page, this.limit] }
-        }
+        } 
       })
 
     let stagesMetadata: any[] = []
@@ -295,7 +293,7 @@ abstract class SearchFlow {
 
     if (isNotEmpty(this.populate) && Array.isArray(this.populate)) {
       for (var populate of this.populate) {
-        result[0].items = await model.populate(result[0].items, { ...populate, select: BuildSelectPopulateFlowItem.build(model, this.projection, populate.path) } as PopulateOptions)
+        result[0].items = await model.populate(result[0].items, populate)
       }
     }
 
@@ -489,7 +487,7 @@ abstract class SearchFlow {
           condition[fieldName] = { $exists: value as boolean }
           filters.$and.push(condition)
         }
-
+        
         else {
           if (!Array.isArray(value)) {
             condition[key] = value
@@ -520,6 +518,25 @@ abstract class SearchFlow {
 
     return filters
   }
+
+  // public addFilterModel(model: any, filters: any) {
+  //   Object.entries(model).forEach(([key, value]) => {
+  //     if (key.endsWith('DateRange')) {
+  //       return
+  //     }
+  //     if (key.endsWith('Like')) {
+  //       return
+  //     }
+  //     if (['onlyMetadata', 'projection', 'pageable', 'orderSense', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+  //       return
+  //     }
+  //     if (isNotEmpty(value)) {
+  //       let condition = {} as any
+  //       condition[key] = value
+  //       filters.$and.push(condition)
+  //     }
+  //   })
+  // }
 }
 
 export default SearchFlow