cgserver 13.0.2 → 13.0.4

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

@@ -68,28 +68,16 @@ class MongoBaseService {
         if (!this.model) {
             throw new Error("Model is not defined");
         }
-        return await this.model.findOne(filter, projection, options);
+        let one = await this.model.findOne(filter, projection, options).lean();
+        return one;
     }
     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");
-        }
-        let query = this.model.find(filter, projection, options);
-        if (skip !== undefined) {
-            query = query.skip(skip);
-        }
-        if (limit !== undefined) {
-            query = query.limit(limit);
-        }
-        return await query.exec();
+        let list = await this.model.find(filter, projection, options).lean();
+        return list;
     }
     async findById(id, projection, options) {
         if (!this.model) {
@@ -209,6 +197,10 @@ class MongoBaseService {
             filter._id = new mongoose_1.Types.ObjectId(filter.id);
             delete filter.id;
         }
+        else if (filter.id) {
+            filter._id = filter.id;
+            delete filter.id;
+        }
         return filter;
     }
     async getAutoIds() {

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

@@ -8,8 +8,7 @@ export declare class MongoBaseService<T extends Document> {
     constructor(collection_name: string, schema: mongoose.Schema<T>);
     findOne(filter?: FilterQuery<T>, projection?: any, options?: any): Promise<T | null>;
     find(filter?: FilterQuery<T>, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T[]>;
-    findMany(filter?: FilterQuery<T>, projection?: any, options?: any, skip?: number, limit?: number): Promise<T[]>;
-    findById(id: string | Types.ObjectId, projection?: any, options?: any): Promise<T | null>;
+    findById(id: string | Types.ObjectId, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T | null>;
     create(doc: Partial<T>): Promise<T>;
     insert(doc: Partial<T>): Promise<{
         errcode: Errcode;

package/package.json

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