@nextage/nx-frame-be 1.0.23 → 1.0.28

package/build/common/base/base.model.d.ts

@@ -31,7 +31,7 @@ import { BaseMongoDoc, BaseMongoModel } from './base.interfaces';
 import { ArrayItemParams, ChangeStreamData } from './base.interfaces';
 import { CrudItemEvent, FilterParams } from './base.interfaces';
 import { QueryPagination } from './base.interfaces';
-import { ModelData, ModelDefParams } from './mongo.types';
+import { ModelData } from './mongo.types';
 export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel extends BaseMongoModel<TAttrs, TDoc>> extends EventEmitter {
     name: string;
     mgModel: TMongoModel;
@@ -58,7 +58,7 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
     /**
      * Get default parameters
      */
-    get modelParams(): ModelDefParams | null;
+    get modelParams(): any;
     /**
      *
      */
@@ -152,6 +152,13 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
      * @param {*} params
      */
     findOneNative(params: FilterParams): Promise<mongoose.mongo.WithId<mongoose.mongo.BSON.Document> | null>;
+    /**
+     *
+     * @param id
+     * @param context
+     * @returns
+     */
+    beforeGet(filter: FilterParams, context: NxContext): Promise<FilterParams>;
     /**
      *
      * @param {*} item
@@ -207,7 +214,7 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
      *
      * @param {*} sort
      */
-    parseSortObject(sort: NxObject): NxObject;
+    parseSortObject(sort?: NxObject): NxObject;
     /**
      * Create document using Moongose wrapper method
      *

package/build/common/base/base.model.js

@@ -56,7 +56,7 @@ class BaseModel extends events_1.EventEmitter {
     get modelParams() {
         if (!this.defaultParams)
             return null;
-        return this.defaultParams;
+        return (0, utils_1.clone)(this.defaultParams);
     }
     /**
      *
@@ -153,8 +153,9 @@ class BaseModel extends events_1.EventEmitter {
             let options = {};
             if (offset || limit)
                 options = { skip: offset, limit: limit };
-            if (sort || this.defaultParams.sort)
-                options.sort = this.parseSortObject(sort || this.defaultParams.sort);
+            options.sort = this.parseSortObject(sort);
+            // if (sort || this.modelParams.sort)
+            //   options.sort = this.parseSortObject(sort || this.modelParams.sort!);
             // return await this.mgModel.find(filter, fields, options).sort(this.parseSortObject(sort || this.defaultParams.sort!));
             let query = this.mgModel.find(filter, fields, options);
             if (Array.isArray(queryActions.populate))
@@ -196,8 +197,10 @@ class BaseModel extends events_1.EventEmitter {
     get(id_1) {
         return __awaiter(this, arguments, void 0, function* (id, context = {}) {
             if (!id)
-                return Promise.resolve(null);
-            return this.mgModel.findById(id);
+                return null;
+            const filter = { _id: (0, mongo_utils_1.toObjectId)(id) };
+            yield this.beforeGet(filter, context);
+            return this.mgModel.findOne(filter);
         });
     }
     /**
@@ -246,6 +249,17 @@ class BaseModel extends events_1.EventEmitter {
     findOneNative(params) {
         return this.mgModel.collection.findOne(params);
     }
+    /**
+     *
+     * @param id
+     * @param context
+     * @returns
+     */
+    beforeGet(filter, context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return filter;
+        });
+    }
     /**
      *
      * @param {*} item
@@ -353,6 +367,9 @@ class BaseModel extends events_1.EventEmitter {
      * @param {*} sort
      */
     parseSortObject(sort) {
+        var _a;
+        sort !== null && sort !== void 0 ? sort : (sort = (_a = this.modelParams) === null || _a === void 0 ? void 0 : _a.sort);
+        sort !== null && sort !== void 0 ? sort : (sort = {});
         for (let k in sort) {
             if (sort[k] === 0)
                 sort[k] = -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextage/nx-frame-be",
-  "version": "1.0.23",
+  "version": "1.0.28",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",