@azteam/express 1.2.223 → 1.2.226

package/package.json

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

package/src/AdminController.js

@@ -118,11 +118,11 @@ class AdminController extends Controller {
     }
 
     methodPostCreatePublic = async (req, res) => {
-        const data = await this.beforeCreate(req.body, req.user);
+        const data = await this.beforeCreate(req.body);
 
         let item = await this.repository.createByUser(req.user.id, data);
 
-        item = await this.afterCreate(item, req.user);
+        item = await this.afterCreate(item);
 
         return res.success(item, this.guardResponse, this.allowResponse);
     };
@@ -147,11 +147,13 @@ class AdminController extends Controller {
         let item = await this.repository.findOneById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
-        item.loadData(req.body);
+        const data = await this.beforeModify(req.body);
+
+        item.loadData(data);
         item.modified_id = req.user.id;
         await item.save();
 
-        item = await this.afterModify(item, req.user);
+        item = await this.afterModify(item);
 
         return res.success(item, this.guardResponse, this.allowResponse);
     };
@@ -207,12 +209,18 @@ class AdminController extends Controller {
         };
     }
 
+    async afterDelete(item) {
+        return item;
+    }
+
     methodDeletePublic = async (req, res) => {
         const item = await this.repository.findOneById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
         await item.delete(req.user.id);
 
+        await this.afterDelete(item);
+
         return res.success(true);
     };
 
@@ -241,12 +249,27 @@ class AdminController extends Controller {
         };
     }
 
+    async afterDestroy(item) {
+        return item;
+    }
+
     methodDeleteDestroyTrash = async (req, res) => {
-        const item = await this.repository.findOneTrashById(req.params.id);
+        const item = await this.repository.findOne(
+            {
+                _id: req.params.id,
+            },
+            {
+                trash: true,
+            }
+        );
         if (!item) return res.error(NOT_EXISTS);
 
+        const oldItem = item;
+
         await this.repository.destroy(item.id);
 
+        await this.afterDestroy(oldItem);
+
         return res.success(true);
     };