c2-mongoose 2.1.208 → 2.1.210

package/dist/flow/SearchFlow.d.ts

@@ -12,7 +12,7 @@ declare abstract class SearchFlow {
     orderBy: string;
     page: number;
     limit: number;
-    select: string | string[];
+    select: string[];
     populate: any;
     filters: any;
     sort: any;

package/dist/flow/SearchFlow.js

@@ -54,6 +54,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var mongoose_1 = require("mongoose");
 var Utils_1 = require("../utils/Utils");
 var moment_timezone_1 = __importDefault(require("moment-timezone"));
+var BuildSelectSingleFlowItem_1 = __importDefault(require("./item/BuildSelectSingleFlowItem"));
 var SearchFlow = /** @class */ (function () {
     function SearchFlow(params) {
         // Incluir as propriedades adicionais de 'params' como propriedades da classe
@@ -179,7 +180,7 @@ var SearchFlow = /** @class */ (function () {
                         }
                         stagesItems.push({ $match: this.filters });
                         if ((0, Utils_1.isNotEmpty)(this.projection)) {
-                            stagesItems.push({ $project: this.projection });
+                            stagesItems.push({ $project: BuildSelectSingleFlowItem_1.default.build(model, this.select) });
                         }
                         stagesItems.push({ $sort: this.sort });
                         stagesMetadata = [];
@@ -242,7 +243,7 @@ var SearchFlow = /** @class */ (function () {
                         }
                         stagesItems.push({ $match: this.filters });
                         if ((0, Utils_1.isNotEmpty)(this.projection)) {
-                            stagesItems.push({ $project: this.projection });
+                            stagesItems.push({ $project: BuildSelectSingleFlowItem_1.default.build(model, this.select) });
                         }
                         stagesItems.push({ $sort: this.sort });
                         stagesItems.push({ $skip: ((this.page - 1) * this.limit) || 0 });

package/dist/flow/item/BuildSelectSingleFlowItem.d.ts

@@ -0,0 +1,7 @@
+import mongoose from "mongoose";
+declare class BuildSelectSingleFlowItem {
+    build(model: mongoose.Model<any>, selects: string[]): any;
+    buildProjectionNested(model: mongoose.Model<any>, projectCurrent: any, field: string, include: boolean): any;
+}
+declare const _default: BuildSelectSingleFlowItem;
+export default _default;

package/dist/flow/item/BuildSelectSingleFlowItem.js

@@ -0,0 +1,47 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var Utils_1 = require("../../utils/Utils");
+var BuildSelectSingleFlowItem = /** @class */ (function () {
+    function BuildSelectSingleFlowItem() {
+    }
+    BuildSelectSingleFlowItem.prototype.build = function (model, selects) {
+        var projection = {};
+        for (var _i = 0, selects_1 = selects; _i < selects_1.length; _i++) {
+            var field = selects_1[_i];
+            var include = field.startsWith("-") ? false : true;
+            field = field.replace("-", "");
+            projection = __assign(__assign({}, projection), this.buildProjectionNested(model, projection, field, include));
+        }
+        return projection;
+    };
+    BuildSelectSingleFlowItem.prototype.buildProjectionNested = function (model, projectCurrent, field, include) {
+        var _a = field.split('.'), first = _a[0], rest = _a.slice(1);
+        if ((0, Utils_1.isEmpty)(first) && (0, Utils_1.isEmpty)(rest)) {
+            var campoInfo = model.schema.path(first);
+            // Verifique se o tipo do campo é mongoose.Types.ObjectId
+            if (campoInfo.instance === "ObjectID") {
+                console.log('O campo é um Types.ObjectId');
+                return undefined;
+            }
+        }
+        if (rest.length === 0) {
+            projectCurrent[first] = include ? 1 : 0;
+            return projectCurrent;
+        }
+        projectCurrent[first] = __assign(__assign({}, projectCurrent[first]), this.buildProjectionNested(model, {}, rest.join("."), include));
+        return projectCurrent;
+    };
+    return BuildSelectSingleFlowItem;
+}());
+exports.default = new BuildSelectSingleFlowItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.208",
+  "version": "2.1.210",
   "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,8 +1,9 @@
 // import moment from "moment"
-import mongoose, { ClientSession, PopulateOption, PopulateOptions, Types } from "mongoose"
+import mongoose, { ClientSession, PopulateOption, PopulateOptions, Types, model } from "mongoose"
 import { SearchOptions, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
 import moment from "moment-timezone"
+import BuildSelectSingleFlowItem from "./item/BuildSelectSingleFlowItem"
 
 interface IPopulate {
   path: string,
@@ -16,7 +17,7 @@ abstract class SearchFlow {
   orderBy: string
   page: number
   limit: number
-  select: string | string[]
+  select: string[]
   populate: any
   filters: any
   sort: any
@@ -168,7 +169,7 @@ abstract class SearchFlow {
     stagesItems.push({ $match: this.filters })
 
     if (isNotEmpty(this.projection)) {
-      stagesItems.push({ $project: this.projection })
+      stagesItems.push({ $project: BuildSelectSingleFlowItem.build(model, this.select) })
     }
 
     stagesItems.push({ $sort: this.sort })
@@ -203,7 +204,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: this.projection[populate.path] } as PopulateOptions )
+        result[0].items = await model.populate(result[0].items, { populate, select: this.projection[populate.path] } as PopulateOptions)
       }
     }
 
@@ -225,7 +226,7 @@ abstract class SearchFlow {
     stagesItems.push({ $match: this.filters })
 
     if (isNotEmpty(this.projection)) {
-      stagesItems.push({ $project: this.projection })
+      stagesItems.push({ $project: BuildSelectSingleFlowItem.build(model, this.select) })
     }
 
     stagesItems.push({ $sort: this.sort })
@@ -244,10 +245,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] },
@@ -255,9 +256,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[] = []
@@ -293,7 +294,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: this.projection[populate.path] } as PopulateOptions )
+        result[0].items = await model.populate(result[0].items, { populate, select: this.projection[populate.path] } as PopulateOptions)
       }
     }
 
@@ -487,7 +488,7 @@ abstract class SearchFlow {
           condition[fieldName] = { $exists: value as boolean }
           filters.$and.push(condition)
         }
-        
+
         else {
           if (!Array.isArray(value)) {
             condition[key] = value

package/src/flow/item/BuildSelectSingleFlowItem.ts

@@ -0,0 +1,48 @@
+import mongoose from "mongoose"
+import { isEmpty } from "../../utils/Utils"
+
+class BuildSelectSingleFlowItem {
+
+  build(model: mongoose.Model<any>, selects: string[]) {
+
+    let projection: any = {}
+    for (var field of selects) {
+      let include = field.startsWith("-") ? false : true
+      field = field.replace("-", "")
+      projection = {
+        ...projection,
+        ...this.buildProjectionNested(model, projection, field, include)
+      }
+
+    }
+    return projection;
+  }
+
+  buildProjectionNested(model: mongoose.Model<any>, projectCurrent: any, field: string, include: boolean) {
+    let [first, ...rest] = field.split('.')
+
+    if (isEmpty(first) && isEmpty(rest)){
+
+      const campoInfo = model.schema.path(first);
+  
+      // Verifique se o tipo do campo é mongoose.Types.ObjectId
+      if (campoInfo.instance === "ObjectID") {
+        console.log('O campo é um Types.ObjectId');
+        return undefined
+      }
+    }
+
+    if (rest.length === 0) {
+      projectCurrent[first] = include ? 1 : 0
+      return projectCurrent
+    }
+
+    projectCurrent[first] = {
+      ...projectCurrent[first],
+      ...this.buildProjectionNested(model, {}, rest.join("."), include)
+    }
+    return projectCurrent
+  }
+}
+
+export default new BuildSelectSingleFlowItem