@azteam/express 1.2.316 → 1.2.318

package/lib/AdminController.js

@@ -148,26 +148,13 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       };
     }());
     _defineProperty(_assertThisInitialized(_this), "methodPostCreate", /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, res) {
-        var data, item;
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data, user) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                _context5.next = 2;
-                return _this.beforeCreate(req.body);
-              case 2:
-                data = _context5.sent;
-                _context5.next = 5;
-                return _this.repository.createByUser(req.user.id, data);
-              case 5:
-                item = _context5.sent;
-                _context5.next = 8;
-                return _this.afterCreate(item);
-              case 8:
-                item = _context5.sent;
-                return _context5.abrupt("return", res.success(item, _this.guardResponse, _this.allowResponse));
-              case 10:
+                return _context5.abrupt("return", _this.repository.createByUser(user.id, data));
+              case 1:
               case "end":
                 return _context5.stop();
             }
@@ -179,44 +166,20 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       };
     }());
     _defineProperty(_assertThisInitialized(_this), "methodPutModify", /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(req, res) {
-        var item, data;
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(item, data, user) {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                _context6.next = 2;
-                return _this.repository.findOneById(req.params.id);
-              case 2:
-                item = _context6.sent;
-                if (item) {
-                  _context6.next = 5;
-                  break;
-                }
-                return _context6.abrupt("return", res.error(_error.NOT_EXISTS));
-              case 5:
-                _context6.next = 7;
-                return _this.beforeModify(req.body);
-              case 7:
-                data = _context6.sent;
-                item.loadData(data);
-                item.modified_id = req.user.id;
-                _context6.next = 12;
-                return item.save();
-              case 12:
-                _context6.next = 14;
-                return _this.afterModify(item);
-              case 14:
-                item = _context6.sent;
-                return _context6.abrupt("return", res.success(item, _this.guardResponse, _this.allowResponse));
-              case 16:
+                return _context6.abrupt("return", item.modify(data, user.id));
+              case 1:
               case "end":
                 return _context6.stop();
             }
           }
         }, _callee6);
       }));
-      return function (_x11, _x12) {
+      return function (_x11, _x12, _x13) {
         return _ref6.apply(this, arguments);
       };
     }());
@@ -251,7 +214,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
           }
         }, _callee7);
       }));
-      return function (_x13, _x14) {
+      return function (_x14, _x15) {
         return _ref7.apply(this, arguments);
       };
     }());
@@ -283,7 +246,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
           }
         }, _callee8);
       }));
-      return function (_x15, _x16) {
+      return function (_x16, _x17) {
         return _ref8.apply(this, arguments);
       };
     }());
@@ -323,7 +286,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
           }
         }, _callee9);
       }));
-      return function (_x17, _x18) {
+      return function (_x18, _x19) {
         return _ref9.apply(this, arguments);
       };
     }());
@@ -399,7 +362,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
           }
         }, _callee10);
       }));
-      function beforeCreate(_x19) {
+      function beforeCreate(_x20) {
         return _beforeCreate.apply(this, arguments);
       }
       return beforeCreate;
@@ -420,7 +383,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
           }
         }, _callee11);
       }));
-      function afterCreate(_x20) {
+      function afterCreate(_x21) {
         return _afterCreate.apply(this, arguments);
       }
       return afterCreate;
@@ -428,29 +391,60 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "postCreate",
     value: function postCreate() {
+      var _this2 = this;
       return {
         disabled: !this.roles.CREATE,
         path: '/',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.CREATE]), this.methodPostCreate]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.CREATE]), /*#__PURE__*/function () {
+          var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(req, res) {
+            var data, item;
+            return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+              while (1) {
+                switch (_context12.prev = _context12.next) {
+                  case 0:
+                    _context12.next = 2;
+                    return _this2.beforeCreate(req.body);
+                  case 2:
+                    data = _context12.sent;
+                    _context12.next = 5;
+                    return _this2.methodPostCreate(data, req.user);
+                  case 5:
+                    item = _context12.sent;
+                    _context12.next = 8;
+                    return _this2.afterCreate(item);
+                  case 8:
+                    item = _context12.sent;
+                    return _context12.abrupt("return", res.success(item, _this2.guardResponse, _this2.allowResponse));
+                  case 10:
+                  case "end":
+                    return _context12.stop();
+                }
+              }
+            }, _callee12);
+          }));
+          return function (_x22, _x23) {
+            return _ref10.apply(this, arguments);
+          };
+        }()]
       };
     }
   }, {
     key: "beforeModify",
     value: function () {
-      var _beforeModify = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(data) {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+      var _beforeModify = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(data) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) {
-            switch (_context12.prev = _context12.next) {
+            switch (_context13.prev = _context13.next) {
               case 0:
-                return _context12.abrupt("return", data);
+                return _context13.abrupt("return", data);
               case 1:
               case "end":
-                return _context12.stop();
+                return _context13.stop();
             }
           }
-        }, _callee12);
+        }, _callee13);
       }));
-      function beforeModify(_x21) {
+      function beforeModify(_x24) {
         return _beforeModify.apply(this, arguments);
       }
       return beforeModify;
@@ -458,20 +452,20 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "afterModify",
     value: function () {
-      var _afterModify = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(item) {
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+      var _afterModify = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(item) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) {
-            switch (_context13.prev = _context13.next) {
+            switch (_context14.prev = _context14.next) {
               case 0:
-                return _context13.abrupt("return", item);
+                return _context14.abrupt("return", item);
               case 1:
               case "end":
-                return _context13.stop();
+                return _context14.stop();
             }
           }
-        }, _callee13);
+        }, _callee14);
       }));
-      function afterModify(_x22) {
+      function afterModify(_x25) {
         return _afterModify.apply(this, arguments);
       }
       return afterModify;
@@ -479,53 +473,91 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "putModify",
     value: function putModify() {
+      var _this3 = this;
       return {
         disabled: !this.roles.UPDATE,
         path: '/:id',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodPutModify]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
+          var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(req, res) {
+            var item, data;
+            return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+              while (1) {
+                switch (_context15.prev = _context15.next) {
+                  case 0:
+                    _context15.next = 2;
+                    return _this3.repository.findOneById(req.params.id);
+                  case 2:
+                    item = _context15.sent;
+                    if (item) {
+                      _context15.next = 5;
+                      break;
+                    }
+                    return _context15.abrupt("return", res.error(_error.NOT_EXISTS));
+                  case 5:
+                    _context15.next = 7;
+                    return _this3.beforeModify(req.body);
+                  case 7:
+                    data = _context15.sent;
+                    item = _this3.methodPutModify(item, data, req.user);
+                    _context15.next = 11;
+                    return _this3.afterModify(item);
+                  case 11:
+                    item = _context15.sent;
+                    return _context15.abrupt("return", res.success(item, _this3.guardResponse, _this3.allowResponse));
+                  case 13:
+                  case "end":
+                    return _context15.stop();
+                }
+              }
+            }, _callee15);
+          }));
+          return function (_x26, _x27) {
+            return _ref11.apply(this, arguments);
+          };
+        }()]
       };
     }
   }, {
     key: "putModifyStatusAvailable",
     value: function putModifyStatusAvailable() {
-      var _this2 = this;
+      var _this4 = this;
       return {
         disabled: !this.roles.UPDATE,
         path: '/available/:id',
         method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
-          var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(req, res) {
+          var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(req, res) {
             var item;
-            return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+            return _regeneratorRuntime().wrap(function _callee16$(_context16) {
               while (1) {
-                switch (_context14.prev = _context14.next) {
+                switch (_context16.prev = _context16.next) {
                   case 0:
-                    _context14.next = 2;
-                    return _this2.repository.findOneById(req.params.id);
+                    _context16.next = 2;
+                    return _this4.repository.findOneById(req.params.id);
                   case 2:
-                    item = _context14.sent;
+                    item = _context16.sent;
                     if (item) {
-                      _context14.next = 5;
+                      _context16.next = 5;
                       break;
                     }
-                    return _context14.abrupt("return", res.error(_error.NOT_EXISTS));
+                    return _context16.abrupt("return", res.error(_error.NOT_EXISTS));
                   case 5:
-                    _context14.next = 7;
+                    _context16.next = 7;
                     return item.modifyStatusAvailable(req.user.id);
                   case 7:
-                    _context14.next = 9;
-                    return _this2.afterModify(item);
+                    _context16.next = 9;
+                    return _this4.afterModify(item);
                   case 9:
-                    item = _context14.sent;
-                    return _context14.abrupt("return", res.success(item, _this2.guardResponse, _this2.allowResponse));
+                    item = _context16.sent;
+                    return _context16.abrupt("return", res.success(item, _this4.guardResponse, _this4.allowResponse));
                   case 11:
                   case "end":
-                    return _context14.stop();
+                    return _context16.stop();
                 }
               }
-            }, _callee14);
+            }, _callee16);
           }));
-          return function (_x23, _x24) {
-            return _ref10.apply(this, arguments);
+          return function (_x28, _x29) {
+            return _ref12.apply(this, arguments);
           };
         }()]
       };
@@ -533,44 +565,44 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "putModifyStatusUnavailable",
     value: function putModifyStatusUnavailable() {
-      var _this3 = this;
+      var _this5 = this;
       return {
         disabled: !this.roles.UPDATE,
         path: '/unavailable/:id',
         method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
-          var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(req, res) {
+          var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(req, res) {
             var item;
-            return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+            return _regeneratorRuntime().wrap(function _callee17$(_context17) {
               while (1) {
-                switch (_context15.prev = _context15.next) {
+                switch (_context17.prev = _context17.next) {
                   case 0:
-                    _context15.next = 2;
-                    return _this3.repository.findOneById(req.params.id);
+                    _context17.next = 2;
+                    return _this5.repository.findOneById(req.params.id);
                   case 2:
-                    item = _context15.sent;
+                    item = _context17.sent;
                     if (item) {
-                      _context15.next = 5;
+                      _context17.next = 5;
                       break;
                     }
-                    return _context15.abrupt("return", res.error(_error.NOT_EXISTS));
+                    return _context17.abrupt("return", res.error(_error.NOT_EXISTS));
                   case 5:
-                    _context15.next = 7;
+                    _context17.next = 7;
                     return item.modifyStatusUnavailable(req.body.message, req.user.id);
                   case 7:
-                    _context15.next = 9;
-                    return _this3.afterModify(item);
+                    _context17.next = 9;
+                    return _this5.afterModify(item);
                   case 9:
-                    item = _context15.sent;
-                    return _context15.abrupt("return", res.success(item, _this3.guardResponse, _this3.allowResponse));
+                    item = _context17.sent;
+                    return _context17.abrupt("return", res.success(item, _this5.guardResponse, _this5.allowResponse));
                   case 11:
                   case "end":
-                    return _context15.stop();
+                    return _context17.stop();
                 }
               }
-            }, _callee15);
+            }, _callee17);
           }));
-          return function (_x25, _x26) {
-            return _ref11.apply(this, arguments);
+          return function (_x30, _x31) {
+            return _ref13.apply(this, arguments);
           };
         }()]
       };
@@ -578,44 +610,44 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "putModifyStatusWaiting",
     value: function putModifyStatusWaiting() {
-      var _this4 = this;
+      var _this6 = this;
       return {
         disabled: !this.roles.UPDATE,
         path: '/waiting/:id',
         method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE]), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
-          var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(req, res) {
+          var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(req, res) {
             var item;
-            return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+            return _regeneratorRuntime().wrap(function _callee18$(_context18) {
               while (1) {
-                switch (_context16.prev = _context16.next) {
+                switch (_context18.prev = _context18.next) {
                   case 0:
-                    _context16.next = 2;
-                    return _this4.repository.findOneById(req.params.id);
+                    _context18.next = 2;
+                    return _this6.repository.findOneById(req.params.id);
                   case 2:
-                    item = _context16.sent;
+                    item = _context18.sent;
                     if (item) {
-                      _context16.next = 5;
+                      _context18.next = 5;
                       break;
                     }
-                    return _context16.abrupt("return", res.error(_error.NOT_EXISTS));
+                    return _context18.abrupt("return", res.error(_error.NOT_EXISTS));
                   case 5:
-                    _context16.next = 7;
+                    _context18.next = 7;
                     return item.modifyStatusWaiting(req.user.id);
                   case 7:
-                    _context16.next = 9;
-                    return _this4.afterModify(item);
+                    _context18.next = 9;
+                    return _this6.afterModify(item);
                   case 9:
-                    item = _context16.sent;
-                    return _context16.abrupt("return", res.success(item, _this4.guardResponse, _this4.allowResponse));
+                    item = _context18.sent;
+                    return _context18.abrupt("return", res.success(item, _this6.guardResponse, _this6.allowResponse));
                   case 11:
                   case "end":
-                    return _context16.stop();
+                    return _context18.stop();
                 }
               }
-            }, _callee16);
+            }, _callee18);
           }));
-          return function (_x27, _x28) {
-            return _ref12.apply(this, arguments);
+          return function (_x32, _x33) {
+            return _ref14.apply(this, arguments);
           };
         }()]
       };
@@ -623,20 +655,20 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "afterDelete",
     value: function () {
-      var _afterDelete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(item) {
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+      var _afterDelete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(item) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) {
-            switch (_context17.prev = _context17.next) {
+            switch (_context19.prev = _context19.next) {
               case 0:
-                return _context17.abrupt("return", item);
+                return _context19.abrupt("return", item);
               case 1:
               case "end":
-                return _context17.stop();
+                return _context19.stop();
             }
           }
-        }, _callee17);
+        }, _callee19);
       }));
-      function afterDelete(_x29) {
+      function afterDelete(_x34) {
         return _afterDelete.apply(this, arguments);
       }
       return afterDelete;
@@ -662,20 +694,20 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "afterDestroy",
     value: function () {
-      var _afterDestroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(item) {
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+      var _afterDestroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(item) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) {
-            switch (_context18.prev = _context18.next) {
+            switch (_context20.prev = _context20.next) {
               case 0:
-                return _context18.abrupt("return", item);
+                return _context20.abrupt("return", item);
               case 1:
               case "end":
-                return _context18.stop();
+                return _context20.stop();
             }
           }
-        }, _callee18);
+        }, _callee20);
       }));
-      function afterDestroy(_x30) {
+      function afterDestroy(_x35) {
         return _afterDestroy.apply(this, arguments);
       }
       return afterDestroy;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.316",
+    "version": "1.2.318",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {

package/src/AdminController.js

@@ -116,21 +116,26 @@ class AdminController extends Controller {
         return item;
     }
 
-    methodPostCreate = async (req, res) => {
-        const data = await this.beforeCreate(req.body);
-
-        let item = await this.repository.createByUser(req.user.id, data);
-
-        item = await this.afterCreate(item);
-
-        return res.success(item, this.guardResponse, this.allowResponse);
+    methodPostCreate = async (data, user) => {
+        return this.repository.createByUser(user.id, data);
     };
 
     postCreate() {
         return {
             disabled: !this.roles.CREATE,
             path: '/',
-            method: [adminRoleMiddleware([this.roles.CREATE]), this.methodPostCreate],
+            method: [
+                adminRoleMiddleware([this.roles.CREATE]),
+                async (req, res) => {
+                    const data = await this.beforeCreate(req.body);
+
+                    let item = await this.methodPostCreate(data, req.user);
+
+                    item = await this.afterCreate(item);
+
+                    return res.success(item, this.guardResponse, this.allowResponse);
+                },
+            ],
         };
     }
 
@@ -142,26 +147,30 @@ class AdminController extends Controller {
         return item;
     }
 
-    methodPutModify = async (req, res) => {
-        let item = await this.repository.findOneById(req.params.id);
-        if (!item) return res.error(NOT_EXISTS);
-
-        const data = await this.beforeModify(req.body);
-
-        item.loadData(data);
-        item.modified_id = req.user.id;
-        await item.save();
-
-        item = await this.afterModify(item);
-
-        return res.success(item, this.guardResponse, this.allowResponse);
+    methodPutModify = async (item, data, user) => {
+        return item.modify(data, user.id);
     };
 
     putModify() {
         return {
             disabled: !this.roles.UPDATE,
             path: '/:id',
-            method: [adminRoleMiddleware([this.roles.UPDATE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodPutModify],
+            method: [
+                adminRoleMiddleware([this.roles.UPDATE]),
+                validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
+                async (req, res) => {
+                    let item = await this.repository.findOneById(req.params.id);
+                    if (!item) return res.error(NOT_EXISTS);
+
+                    const data = await this.beforeModify(req.body);
+
+                    item = this.methodPutModify(item, data, req.user);
+
+                    item = await this.afterModify(item);
+
+                    return res.success(item, this.guardResponse, this.allowResponse);
+                },
+            ],
         };
     }