c2-mongoose 2.1.212 → 2.1.214

package/dist/flow/SearchFlow.js

@@ -51,9 +51,10 @@ 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 moment_timezone_1 = __importDefault(require("moment-timezone"));
+var BuildSelectPopulateFlowItem_1 = __importDefault(require("./item/BuildSelectPopulateFlowItem"));
 var BuildSelectSingleFlowItem_1 = __importDefault(require("./item/BuildSelectSingleFlowItem"));
 var SearchFlow = /** @class */ (function () {
     function SearchFlow(params) {
@@ -214,7 +215,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: this.projection ? this.projection[populate.path] : undefined }))];
+                        return [4 /*yield*/, model.populate(result[0].items, __assign(__assign({}, populate), { select: BuildSelectPopulateFlowItem_1.default.build(model, this.projection, populate.path) }))];
                     case 3:
                         _c.items = _d.sent();
                         _d.label = 4;
@@ -308,7 +309,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: this.projection ? this.projection[populate.path] : undefined }))];
+                        return [4 /*yield*/, model.populate(result[0].items, __assign(__assign({}, populate), { select: BuildSelectPopulateFlowItem_1.default.build(model, this.projection, populate.path) }))];
                     case 3:
                         _c.items = _d.sent();
                         _d.label = 4;

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

@@ -0,0 +1,6 @@
+import mongoose from "mongoose";
+declare class BuildSelectPopulateFlowItem {
+    build(model: mongoose.Model<any>, projection: any, path: string): any;
+}
+declare const _default: BuildSelectPopulateFlowItem;
+export default _default;

package/dist/flow/item/BuildSelectPopulateFlowItem.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var Utils_1 = require("../../utils/Utils");
+var BuildSelectPopulateFlowItem = /** @class */ (function () {
+    function BuildSelectPopulateFlowItem() {
+    }
+    BuildSelectPopulateFlowItem.prototype.build = function (model, projection, path) {
+        var campoInfo = model.schema.path(path);
+        // Verifique se o tipo do campo é mongoose.Types.ObjectId
+        if (campoInfo.instance === "ObjectID") {
+            return undefined;
+        }
+        if ((0, Utils_1.isEmpty)(projection[path]) || isNaN(projection[path]) === false) {
+            return undefined;
+        }
+        return projection[path];
+    };
+    return BuildSelectPopulateFlowItem;
+}());
+exports.default = new BuildSelectPopulateFlowItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.212",
+  "version": "2.1.214",
   "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, model } from "mongoose"
+import moment from "moment-timezone"
+import mongoose, { ClientSession, PopulateOptions, Types } from "mongoose"
 import { SearchOptions, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
-import moment from "moment-timezone"
+import BuildSelectPopulateFlowItem from "./item/BuildSelectPopulateFlowItem"
 import BuildSelectSingleFlowItem from "./item/BuildSelectSingleFlowItem"
 
 interface IPopulate {
@@ -204,7 +205,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 ? this.projection[populate.path] : undefined } as PopulateOptions)
+        result[0].items = await model.populate(result[0].items, { ...populate, select: BuildSelectPopulateFlowItem.build(model, this.projection, populate.path) } as PopulateOptions)
       }
     }
 
@@ -294,7 +295,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 ? this.projection[populate.path] : undefined } as PopulateOptions)
+        result[0].items = await model.populate(result[0].items, { ...populate, select: BuildSelectPopulateFlowItem.build(model, this.projection, populate.path) } as PopulateOptions)
       }
     }
 

package/src/flow/item/BuildSelectPopulateFlowItem.ts

@@ -0,0 +1,22 @@
+import mongoose from "mongoose";
+import { isEmpty } from "../../utils/Utils";
+
+class BuildSelectPopulateFlowItem {
+
+  build(model: mongoose.Model<any>, projection: any, path: string) {
+
+    const campoInfo = model.schema.path(path);
+
+    // Verifique se o tipo do campo é mongoose.Types.ObjectId
+    if (campoInfo.instance === "ObjectID") {
+      return undefined
+    }
+
+    if (isEmpty(projection[path]) || isNaN(projection[path]) === false) {
+      return undefined
+    }
+    return projection[path];
+  }
+}
+
+export default new BuildSelectPopulateFlowItem