c2-mongoose 2.1.95 → 2.1.97

package/dist/flow/CrudFlow.d.ts

@@ -13,7 +13,7 @@ declare class CrudFlow<D> {
     updateAny(id: string, data: any, session?: any): Promise<D>;
     updateByModel(filter: any, data: any, params: any): Promise<D>;
     find(options?: SearchOptions): Promise<SearchResponse<D>>;
-    getOne(model: D, params?: any): Promise<D>;
+    getOne(model: D, session: ClientSession): Promise<D>;
     get(id: string, pop?: string, sel?: string, session?: ClientSession): Promise<D>;
     getById(id: string, session?: ClientSession): Promise<Partial<D>>;
     sumBy(fieldToSum: any, fieldToGroup: any, addToSet?: any, session?: ClientSession): Promise<any>;

package/dist/flow/CrudFlow.js

@@ -133,13 +133,12 @@ var CrudFlow = /** @class */ (function () {
             });
         });
     };
-    CrudFlow.prototype.getOne = function (model, params) {
-        if (params === void 0) { params = {}; }
+    CrudFlow.prototype.getOne = function (model, session) {
         return __awaiter(this, void 0, void 0, function () {
             var data;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.search.findOne(this.repository, model, params)];
+                    case 0: return [4 /*yield*/, this.search.findOne(this.repository, model, session)];
                     case 1:
                         data = _a.sent();
                         return [2 /*return*/, data];

package/dist/flow/SearchFlow.d.ts

@@ -38,9 +38,10 @@ declare abstract class SearchFlow {
     private searchNoPageable;
     private result;
     count(model: mongoose.Model<any>): Promise<number>;
-    findOne(repository: mongoose.Model<any>, model: any, params?: any): Promise<any>;
+    findOne(repository: mongoose.Model<any>, model: any, session?: ClientSession): Promise<any>;
     sumBy(model: mongoose.Model<any>, _sum: any, _by: any, items?: any, session?: ClientSession): Promise<any[]>;
     sumByPaging(model: mongoose.Model<any>, fieldToSum: any, fieldToGroup: any, items?: any): Promise<SearchResponse<any>>;
+    isValidObjectId(value: string): boolean;
     buildDefaultFilters(objectSearch: any): any;
     addFilterModel(model: any, filters: any): void;
 }

package/dist/flow/SearchFlow.js

@@ -309,16 +309,15 @@ var SearchFlow = /** @class */ (function () {
             });
         });
     };
-    SearchFlow.prototype.findOne = function (repository, model, params) {
-        if (params === void 0) { params = {}; }
+    SearchFlow.prototype.findOne = function (repository, model, session) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, repository.findOne(model)
-                            .sort(params.sort)
-                            .select(params.select)
-                            .populate(params.populate)
-                            .session(params === null || params === void 0 ? void 0 : params.session)];
+                            .sort(this.sort)
+                            .select(this.select)
+                            .populate(this.populate)
+                            .session(session)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -404,6 +403,10 @@ var SearchFlow = /** @class */ (function () {
             });
         });
     };
+    SearchFlow.prototype.isValidObjectId = function (value) {
+        var objectIdPattern = /^[0-9a-fA-F]{24}$/;
+        return objectIdPattern.test(value);
+    };
     SearchFlow.prototype.buildDefaultFilters = function (objectSearch) {
         var _this = this;
         var filters = { $and: [] };
@@ -414,7 +417,7 @@ var SearchFlow = /** @class */ (function () {
                 if (['projection', 'pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                     return;
                 }
-                if (typeof value === 'string' && mongoose_1.Types.ObjectId.isValid(value)) {
+                if (typeof value === 'string' && _this.isValidObjectId(value)) {
                     value = new mongoose_1.Types.ObjectId(value);
                 }
                 if (value === 'true') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.95",
+  "version": "2.1.97",
   "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/CrudFlow.ts

@@ -48,8 +48,8 @@ class CrudFlow<D> {
         return await this.search.search(this.repository, options)
     }
 
-    public async getOne(model: D, params: any = {}): Promise<D> {
-        const data = await this.search.findOne(this.repository, model, params)
+    public async getOne(model: D, session: ClientSession): Promise<D> {
+        const data = await this.search.findOne(this.repository, model, session)
         return data as D
     }
 

package/src/flow/SearchFlow.ts

@@ -247,12 +247,12 @@ abstract class SearchFlow {
     return await model.countDocuments(this.filters).exec()
   }
 
-  public async findOne(repository: mongoose.Model<any>, model: any, params: any = {}) {
+  public async findOne(repository: mongoose.Model<any>, model: any, session?: ClientSession) {
     return await repository.findOne(model)
-      .sort(params.sort)
-      .select(params.select)
-      .populate(params.populate)
-      .session(params?.session)
+      .sort(this.sort)
+      .select(this.select)
+      .populate(this.populate)
+      .session(session!)
   }
 
   public async sumBy(model: mongoose.Model<any>, _sum: any, _by: any, items: any = undefined, session?: ClientSession): Promise<any[]> {
@@ -321,6 +321,11 @@ abstract class SearchFlow {
     }
   }
 
+  public isValidObjectId(value: string) {
+    const objectIdPattern = /^[0-9a-fA-F]{24}$/;
+    return objectIdPattern.test(value);
+  }
+
   public buildDefaultFilters(objectSearch: any) {
     let filters = { $and: [] } as any
     Object.entries(objectSearch.model).forEach(([key, value]) => {
@@ -330,7 +335,7 @@ abstract class SearchFlow {
           return
         }
 
-        if (typeof value === 'string' && Types.ObjectId.isValid(value as any)) {
+        if (typeof value === 'string' && this.isValidObjectId(value as string)) {
           value = new Types.ObjectId(value as string)
         }