@azteam/express 1.2.219 → 1.2.222

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.219",
+    "version": "1.2.222",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",

package/src/AdminController.js

@@ -109,11 +109,11 @@ class AdminController extends Controller {
         };
     }
 
-    async beforeCreate(data, user) {
+    async beforeCreate(data) {
         return data;
     }
 
-    async afterCreate(item, user) {
+    async afterCreate(item) {
         return item;
     }
 
@@ -135,11 +135,11 @@ class AdminController extends Controller {
         };
     }
 
-    async beforeModify(data, user) {
+    async beforeModify(data) {
         return data;
     }
 
-    async afterModify(item, user) {
+    async afterModify(item) {
         return item;
     }
 
@@ -147,9 +147,9 @@ class AdminController extends Controller {
         let item = await this.repository.findOneById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
-        const data = await this.beforeModify(req.body, req.user);
-
-        item = await this.repository.modifyByUser(req.user.id, item, data);
+        item.loadData(req.body);
+        item.modified_id = req.user.id;
+        await item.save();
 
         item = await this.afterModify(item, req.user);
 
@@ -169,11 +169,50 @@ class AdminController extends Controller {
         };
     }
 
+    putModifyStatusAvailablePublic() {
+        return {
+            disabled: !this.roles.UPDATE,
+            path: '/available/:id',
+            method: [
+                adminRoleMiddleware([this.roles.UPDATE]),
+                validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
+                async (req, res) => {
+                    const item = await this.repository.findOneById(req.params.id);
+                    if (!item) return res.error(NOT_EXISTS);
+
+                    await item.modifyStatusAvailable(req.user.id);
+
+                    return res.success(item, this.guardResponse, this.allowResponse);
+                },
+            ],
+        };
+    }
+
+    putModifyStatusUnavailablePublic() {
+        return {
+            disabled: !this.roles.UPDATE,
+            path: '/unavailable/:id',
+            method: [
+                adminRoleMiddleware([this.roles.UPDATE]),
+                validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
+                async (req, res) => {
+                    const item = await this.repository.findOneById(req.params.id);
+                    if (!item) return res.error(NOT_EXISTS);
+
+                    await item.modifyStatusUnavailable(req.user.id);
+
+                    return res.success(item, this.guardResponse, this.allowResponse);
+                },
+            ],
+        };
+    }
+
     methodDeletePublic = async (req, res) => {
         const item = await this.repository.findOneById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
-        await this.repository.deleteByUser(req.user.id, item);
+        await item.delete(req.user.id);
+
         return res.success(true);
     };
 
@@ -189,7 +228,8 @@ class AdminController extends Controller {
         const item = await this.repository.findOneTrashById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
-        await this.repository.restoreByUser(req.user.id, item);
+        await item.restore(req.user.id);
+
         return res.success(true);
     };
 
@@ -205,7 +245,8 @@ class AdminController extends Controller {
         const item = await this.repository.findOneTrashById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
-        await this.repository.destroy(item);
+        await this.repository.destroy(item.id);
+
         return res.success(true);
     };
 

package/src/middleware/cacheMiddleware.js

@@ -14,7 +14,7 @@ export default function (key, options = {}) {
             let cacheKey = key;
 
             if (options.query) {
-                cacheKey += `${cacheKey}:${_.get(req, options.query)}`;
+                cacheKey = `${cacheKey}:${_.get(req, options.query)}`;
             }
             if (req.paginate) {
                 if (_.isEmpty(req.query) && req.paginate.page <= options.limitPage) {

package/src/middleware/paginateMiddleware.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 
 function omitData(data) {
-    Object.keys(data).map(function (key, index) {
+    Object.keys(data).map(function (key) {
         let value = data[key];
         if (typeof value === 'string') {
             value = value.trim();
@@ -10,11 +10,10 @@ function omitData(data) {
             } else {
                 data[key] = value;
             }
-        } else {
-            if (value === null || value === undefined || Number.isNaN(value)) {
-                delete data[key];
-            }
+        } else if (value === null || value === undefined || Number.isNaN(value)) {
+            delete data[key];
         }
+        return true;
     });
     return data;
 }