c2-mongoose 2.1.75 → 2.1.77

package/dist/flow/SearchFlow.js

@@ -60,6 +60,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var moment_1 = __importDefault(require("moment"));
+var mongoose_1 = require("mongoose");
 var Environment_1 = require("../configuration/Environment");
 var Utils_1 = require("../utils/Utils");
 var SearchFlow = /** @class */ (function () {
@@ -195,7 +196,7 @@ var SearchFlow = /** @class */ (function () {
                         stagesItems = __spreadArray([
                             { $match: this.filters },
                             { $sort: this.sort },
-                            { $skip: (this.page - 1) * this.limit },
+                            { $skip: ((this.page - 1) * this.limit) || 0 },
                             { $limit: this.limit },
                             this.projection ? { $project: this.projection } : { $addFields: {} }
                         ], options.pipelines, true);
@@ -208,7 +209,7 @@ var SearchFlow = /** @class */ (function () {
                                             { $count: "total" },
                                             {
                                                 $addFields: {
-                                                    page: this.page,
+                                                    page: this.page || 1,
                                                     limit: this.limit
                                                 }
                                             }
@@ -415,6 +416,9 @@ var SearchFlow = /** @class */ (function () {
                 if (['projection', 'pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                     return;
                 }
+                if (key.endsWith("_id")) {
+                    value = new mongoose_1.Types.ObjectId(value);
+                }
                 if (value === 'true') {
                     value = true;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.75",
+  "version": "2.1.77",
   "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,5 +1,5 @@
 import moment from "moment"
-import mongoose, { ClientSession } from "mongoose"
+import mongoose, { ClientSession, Types } from "mongoose"
 import { dbCollation } from "../configuration/Environment"
 import { Pagination, SearchOptions, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
@@ -119,7 +119,7 @@ abstract class SearchFlow {
     let stagesItems = [
       { $match: this.filters },
       { $sort: this.sort },
-      { $skip: (this.page - 1) * this.limit },
+      { $skip: ((this.page - 1) * this.limit) || 0 },
       { $limit: this.limit },
       this.projection ? { $project: this.projection } : { $addFields: {} },
       ...options.pipelines
@@ -136,7 +136,7 @@ abstract class SearchFlow {
               {
                 $addFields:
                 {
-                  page: this.page,
+                  page: this.page || 1,
                   limit: this.limit
                 }
               }
@@ -309,6 +309,10 @@ abstract class SearchFlow {
           return
         }
 
+        if (key.endsWith("_id")) {
+          value = new Types.ObjectId(value as string)
+        }
+
         if (value === 'true') {
           value = true
         }