c2-mongoose 2.1.361 → 2.1.363

package/dist/flow/searcher/v2/GetOneByFilterFlow.d.ts

@@ -1,6 +1,7 @@
 import mongoose from "mongoose";
+import { IForeingData } from "../v3/item/OneToManyFlowItem";
 declare class GetOneByFilterFlow {
-    exec(params: any, model: mongoose.Model<any>): Promise<any>;
+    exec(params: any, model: mongoose.Model<any>, oneToMany?: IForeingData[]): Promise<any>;
 }
 declare const _default: GetOneByFilterFlow;
 export default _default;

package/dist/flow/searcher/v2/GetOneByFilterFlow.js

@@ -51,10 +51,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var MatchFlowItem_1 = __importDefault(require("./item/MatchFlowItem"));
 var PopulateFlowItem_1 = __importDefault(require("./item/PopulateFlowItem"));
 var ProjectFlowItem_1 = __importDefault(require("./item/ProjectFlowItem"));
+var OneToManyFlowItem_1 = __importDefault(require("../v3/item/OneToManyFlowItem"));
 var GetOneByFilterFlow = /** @class */ (function () {
     function GetOneByFilterFlow() {
     }
-    GetOneByFilterFlow.prototype.exec = function (params, model) {
+    GetOneByFilterFlow.prototype.exec = function (params, model, oneToMany) {
+        if (oneToMany === void 0) { oneToMany = []; }
         return __awaiter(this, void 0, void 0, function () {
             var pipeline, result;
             return __generator(this, function (_a) {
@@ -62,6 +64,7 @@ var GetOneByFilterFlow = /** @class */ (function () {
                     case 0:
                         pipeline = [];
                         pipeline = __spreadArray(__spreadArray([], pipeline, true), PopulateFlowItem_1.default.exec(params.populate, model), true);
+                        pipeline = __spreadArray(__spreadArray([], pipeline, true), OneToManyFlowItem_1.default.execute(oneToMany), true);
                         pipeline = __spreadArray(__spreadArray([], pipeline, true), ProjectFlowItem_1.default.exec(params.select), true);
                         return [4 /*yield*/, model.aggregate(__spreadArray(__spreadArray([], MatchFlowItem_1.default.exec(params, model), true), pipeline, true), {
                                 collation: {

package/dist/flow/searcher/v3/SearcherV3Flow.d.ts

@@ -1,11 +1,10 @@
 import mongoose from "mongoose";
-import { IForeingData } from "./item/OneToManyFlowItem";
 export interface IParams {
     [key: string]: any;
     mainFilter: any;
 }
 declare class SearcherV3Flow {
-    exec(params: IParams, model: mongoose.Model<any>, oneToMany?: IForeingData[]): Promise<any>;
+    exec(params: IParams, model: mongoose.Model<any>): Promise<any>;
 }
 declare const _default: SearcherV3Flow;
 export default _default;

package/dist/flow/searcher/v3/SearcherV3Flow.js

@@ -54,13 +54,11 @@ var PopulateFlowItem_1 = __importDefault(require("./item/PopulateFlowItem"));
 var SortFlowItem_1 = __importDefault(require("./item/SortFlowItem"));
 var ProjectFlowItem_1 = __importDefault(require("./item/ProjectFlowItem"));
 var BuildPaginationDataFlowItem_1 = __importDefault(require("./item/BuildPaginationDataFlowItem"));
-var OneToManyFlowItem_1 = __importDefault(require("./item/OneToManyFlowItem"));
 var SearcherV3Flow = /** @class */ (function () {
     function SearcherV3Flow() {
     }
-    SearcherV3Flow.prototype.exec = function (params, model, oneToMany) {
+    SearcherV3Flow.prototype.exec = function (params, model) {
         var _a, _b, _c;
-        if (oneToMany === void 0) { oneToMany = []; }
         return __awaiter(this, void 0, void 0, function () {
             var facet, pipelineFacetPaging, pipelineFacetItems, mainFilters, result, ret;
             return __generator(this, function (_d) {
@@ -73,7 +71,6 @@ var SearcherV3Flow = /** @class */ (function () {
                         pipelineFacetItems = [];
                         pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), GroupFlowItem_1.default.execute(params.groupBy, params.sumFields, params.groupDetailed, model), true);
                         pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), PopulateFlowItem_1.default.execute(params.populate, model), true);
-                        pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), OneToManyFlowItem_1.default.execute(oneToMany), true);
                         pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), MatchFlowItem_1.default.execute(params, model), true);
                         pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), SortFlowItem_1.default.execute(params.orderBy, params.orderSense), true);
                         pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), ProjectFlowItem_1.default.execute(params.select), true);

package/dist/flow/searcher/v3/item/OneToManyFlowItem.js

@@ -9,6 +9,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var lodash_1 = require("lodash");
 var OneToManyFlowItem = /** @class */ (function () {
     function OneToManyFlowItem() {
     }
@@ -21,7 +22,7 @@ var OneToManyFlowItem = /** @class */ (function () {
                         from: foreing.collectionChild,
                         localField: "_id",
                         foreignField: foreing.parentFieldOnChild,
-                        as: foreing.collectionChild
+                        as: (0, lodash_1.camelCase)(foreing.collectionChild)
                     }
                 },
             ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.361",
+  "version": "2.1.363",
   "description": "Lib to make any search in database mongoose and use as basic crud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,11 +30,13 @@
   "dependencies": {
     "dotenv": "^16.0.3",
     "express-http-context": "^1.2.4",
+    "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
     "mongoose": "8.16.1"
   },
   "devDependencies": {
+    "@types/lodash": "^4.17.20",
     "typescript": "^4.9.5"
   }
 }

package/src/flow/searcher/v2/GetOneByFilterFlow.ts

@@ -2,14 +2,16 @@ import mongoose from "mongoose"
 import MatchFlowItem from "./item/MatchFlowItem"
 import PopulateFlowItem from "./item/PopulateFlowItem"
 import ProjectFlowItem from "./item/ProjectFlowItem"
+import OneToManyFlowItem, { IForeingData } from "../v3/item/OneToManyFlowItem"
 
 
 class GetOneByFilterFlow {
 
-  async exec(params: any, model: mongoose.Model<any>) {
+  async exec(params: any, model: mongoose.Model<any>, oneToMany: IForeingData[] = []) {
 
     let pipeline: any[] = []
-    pipeline = [...pipeline, ...PopulateFlowItem.exec(params.populate, model),]
+    pipeline = [...pipeline, ...PopulateFlowItem.exec(params.populate, model)]
+    pipeline = [...pipeline, ...OneToManyFlowItem.execute(oneToMany)]
     pipeline = [...pipeline, ...ProjectFlowItem.exec(params.select)]
 
     let result = await model.aggregate([

package/src/flow/searcher/v3/SearcherV3Flow.ts

@@ -14,7 +14,7 @@ export interface IParams {
 
 class SearcherV3Flow {
 
-  async exec(params: IParams, model: mongoose.Model<any>, oneToMany: IForeingData[] = []) {
+  async exec(params: IParams, model: mongoose.Model<any>) {
 
 
     params.page = Number(params.page ?? 1)
@@ -25,7 +25,6 @@ class SearcherV3Flow {
     let pipelineFacetItems: any[] = []
     pipelineFacetItems = [...pipelineFacetItems, ...GroupFlowItem.execute(params.groupBy, params.sumFields, params.groupDetailed, model)]
     pipelineFacetItems = [...pipelineFacetItems, ...PopulateFlowItem.execute(params.populate, model)]
-    pipelineFacetItems = [...pipelineFacetItems, ...OneToManyFlowItem.execute(oneToMany)]
     pipelineFacetItems = [...pipelineFacetItems, ...MatchFlowItem.execute(params, model)]
     pipelineFacetItems = [...pipelineFacetItems, ...SortFlowItem.execute(params.orderBy, params.orderSense)]
     pipelineFacetItems = [...pipelineFacetItems, ...ProjectFlowItem.execute(params.select)]

package/src/flow/searcher/v3/item/OneToManyFlowItem.ts

@@ -1,5 +1,4 @@
-import mongoose from "mongoose";
-
+import { camelCase } from "lodash"
 export interface IForeingData {
   collectionChild: string;
   parentFieldOnChild: string;
@@ -15,7 +14,7 @@ class OneToManyFlowItem {
             from: foreing.collectionChild, // The collection where user data is stored
             localField: "_id",
             foreignField: foreing.parentFieldOnChild,
-            as: foreing.collectionChild
+            as: camelCase(foreing.collectionChild)
           }
         },
       ]