cgserver 13.0.0 → 13.0.2

package/dist/lib/Framework/Database/Mongo/MongoBaseService.js

@@ -1,10 +1,40 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoBaseService = void 0;
-const mongoose_1 = __importDefault(require("mongoose"));
+const mongoose_1 = __importStar(require("mongoose"));
 const _error_1 = require("../../Config/_error_");
 const Log_1 = require("../../Logic/Log");
 const MongoManager_1 = require("./MongoManager");
@@ -34,18 +64,21 @@ class MongoBaseService {
         this._schema = schema;
     }
     async findOne(filter, projection, options) {
+        filter = this._convertFilter(filter);
         if (!this.model) {
             throw new Error("Model is not defined");
         }
         return await this.model.findOne(filter, projection, options);
     }
     async find(filter, projection, options) {
+        filter = this._convertFilter(filter);
         if (!this.model) {
             throw new Error("Model is not defined");
         }
         return await this.model.find(filter, projection, options);
     }
     async findMany(filter, projection, options, skip, limit) {
+        filter = this._convertFilter(filter);
         if (!this.model) {
             throw new Error("Model is not defined");
         }
@@ -87,6 +120,7 @@ class MongoBaseService {
     }
     async updateOne(filter, update, options) {
         try {
+            filter = this._convertFilter(filter);
             if (!this.model) {
                 throw new Error("Model is not defined");
             }
@@ -99,6 +133,7 @@ class MongoBaseService {
     }
     async updateMany(filter, update, options) {
         try {
+            filter = this._convertFilter(filter);
             if (!this.model) {
                 throw new Error("Model is not defined");
             }
@@ -111,6 +146,7 @@ class MongoBaseService {
     }
     async deleteOne(filter) {
         try {
+            filter = this._convertFilter(filter);
             if (!this.model) {
                 throw new Error("Model is not defined");
             }
@@ -123,6 +159,7 @@ class MongoBaseService {
     }
     async deleteMany(filter) {
         try {
+            filter = this._convertFilter(filter);
             if (!this.model) {
                 throw new Error("Model is not defined");
             }
@@ -134,6 +171,7 @@ class MongoBaseService {
         }
     }
     async exists(filter) {
+        filter = this._convertFilter(filter);
         if (!this.model) {
             throw new Error("Model is not defined");
         }
@@ -149,17 +187,30 @@ class MongoBaseService {
     }
     // findOneAndUpdate method for MongoDB operations
     async findOneAndUpdate(filter, update, options) {
+        filter = this._convertFilter(filter);
         if (!this.model) {
             throw new Error("Model is not defined");
         }
-        return await this.model.findOneAndUpdate(filter, update, options);
+        let rs = await this.model.findOneAndUpdate(filter, update, options);
+        return rs;
     }
     async countDocuments(filter) {
+        filter = this._convertFilter(filter);
         if (!this.model) {
             throw new Error("Model is not defined");
         }
         return await this.model.countDocuments(filter);
     }
+    _convertFilter(filter) {
+        if (!filter) {
+            return {};
+        }
+        if (filter.id && typeof filter.id === 'string') {
+            filter._id = new mongoose_1.Types.ObjectId(filter.id);
+            delete filter.id;
+        }
+        return filter;
+    }
     async getAutoIds() {
         let id = await MongoManager_1.gMongoMgr.getMongo().getAutoIds(this.model.collection.name);
         return id;

package/dist/types/Framework/Database/Mongo/MongoBaseService.d.ts

@@ -35,7 +35,8 @@ export declare class MongoBaseService<T extends Document> {
     }>;
     exists(filter: FilterQuery<T>): Promise<boolean>;
     aggregate(pipeline?: any[]): mongoose.Aggregate<any[]>;
-    findOneAndUpdate(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: any): Promise<T | null>;
+    findOneAndUpdate(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: MongooseQueryOptions): Promise<mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T, {}> & mongoose.Default__v<mongoose.Require_id<T>>>>;
     countDocuments(filter?: FilterQuery<T>): Promise<number>;
+    protected _convertFilter(filter: FilterQuery<T>): FilterQuery<T>;
     getAutoIds(): Promise<number>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "13.0.0",
+  "version": "13.0.2",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",