@azteam/express 1.2.427 → 1.2.430

package/lib/controller/AdminController.js

@@ -331,6 +331,31 @@ var AdminController = /*#__PURE__*/function (_Controller) {
     return _this;
   }
   _createClass(AdminController, [{
+    key: "getFilterOption",
+    value: function getFilterOption() {
+      var _this2 = this;
+      return {
+        disabled: !this.roles.READ,
+        path: '/filter_option',
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ], this.roleMiddlewareOptions), /*#__PURE__*/function () {
+          var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(req, res) {
+            return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+              while (1) switch (_context11.prev = _context11.next) {
+                case 0:
+                  return _context11.abrupt("return", res.success(_this2.paginateOptions));
+                case 1:
+                case "end":
+                  return _context11.stop();
+              }
+            }, _callee11);
+          }));
+          return function (_x22, _x23) {
+            return _ref11.apply(this, arguments);
+          };
+        }()]
+      };
+    }
+  }, {
     key: "getAll",
     value: function getAll() {
       return {
@@ -378,18 +403,18 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "beforeCreate",
     value: function () {
-      var _beforeCreate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(data) {
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _beforeCreate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(data) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              return _context11.abrupt("return", data);
+              return _context12.abrupt("return", data);
             case 1:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11);
+        }, _callee12);
       }));
-      function beforeCreate(_x22) {
+      function beforeCreate(_x24) {
         return _beforeCreate.apply(this, arguments);
       }
       return beforeCreate;
@@ -397,18 +422,18 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "afterCreate",
     value: function () {
-      var _afterCreate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(item) {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _afterCreate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(item) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              return _context12.abrupt("return", item);
+              return _context13.abrupt("return", item);
             case 1:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12);
+        }, _callee13);
       }));
-      function afterCreate(_x23) {
+      function afterCreate(_x25) {
         return _afterCreate.apply(this, arguments);
       }
       return afterCreate;
@@ -416,37 +441,37 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "postCreate",
     value: function postCreate() {
-      var _this2 = this;
+      var _this3 = this;
       return {
         disabled: !this.roles.CREATE,
         path: '/',
         method: [(0, _middleware.adminRoleMiddleware)([this.roles.CREATE], this.roleMiddlewareOptions), /*#__PURE__*/function () {
-          var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(req, res) {
+          var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(req, res) {
             var data, item;
-            return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-              while (1) switch (_context13.prev = _context13.next) {
+            return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+              while (1) switch (_context14.prev = _context14.next) {
                 case 0:
-                  _context13.next = 2;
-                  return _this2.beforeCreate(req.body);
+                  _context14.next = 2;
+                  return _this3.beforeCreate(req.body);
                 case 2:
-                  data = _context13.sent;
-                  _context13.next = 5;
-                  return _this2.methodPostCreate(data, req.user);
+                  data = _context14.sent;
+                  _context14.next = 5;
+                  return _this3.methodPostCreate(data, req.user);
                 case 5:
-                  item = _context13.sent;
-                  _context13.next = 8;
-                  return _this2.afterCreate(item);
+                  item = _context14.sent;
+                  _context14.next = 8;
+                  return _this3.afterCreate(item);
                 case 8:
-                  item = _context13.sent;
-                  return _context13.abrupt("return", res.success(item, _this2.guardResponse, _this2.allowResponse));
+                  item = _context14.sent;
+                  return _context14.abrupt("return", res.success(item, _this3.guardResponse, _this3.allowResponse));
                 case 10:
                 case "end":
-                  return _context13.stop();
+                  return _context14.stop();
               }
-            }, _callee13);
+            }, _callee14);
           }));
-          return function (_x24, _x25) {
-            return _ref11.apply(this, arguments);
+          return function (_x26, _x27) {
+            return _ref12.apply(this, arguments);
           };
         }()]
       };
@@ -454,18 +479,18 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "beforeModify",
     value: function () {
-      var _beforeModify = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(data) {
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _beforeModify = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(data) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              return _context14.abrupt("return", data);
+              return _context15.abrupt("return", data);
             case 1:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14);
+        }, _callee15);
       }));
-      function beforeModify(_x26) {
+      function beforeModify(_x28) {
         return _beforeModify.apply(this, arguments);
       }
       return beforeModify;
@@ -473,18 +498,18 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "afterModify",
     value: function () {
-      var _afterModify = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(item) {
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _afterModify = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(item) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              return _context15.abrupt("return", item);
+              return _context16.abrupt("return", item);
             case 1:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15);
+        }, _callee16);
       }));
-      function afterModify(_x27) {
+      function afterModify(_x29) {
         return _afterModify.apply(this, arguments);
       }
       return afterModify;
@@ -492,58 +517,13 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "putModify",
     value: function putModify() {
-      var _this3 = this;
-      return {
-        disabled: !this.roles.UPDATE,
-        path: '/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
-          var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(req, res) {
-            var item, data;
-            return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-              while (1) switch (_context16.prev = _context16.next) {
-                case 0:
-                  _context16.next = 2;
-                  return _this3.repository.findOneById(req.params.id);
-                case 2:
-                  item = _context16.sent;
-                  if (item) {
-                    _context16.next = 5;
-                    break;
-                  }
-                  return _context16.abrupt("return", res.error(_error.NOT_EXISTS));
-                case 5:
-                  _context16.next = 7;
-                  return _this3.beforeModify(req.body);
-                case 7:
-                  data = _context16.sent;
-                  item = _this3.methodPutModify(item, data, req.user);
-                  _context16.next = 11;
-                  return _this3.afterModify(item);
-                case 11:
-                  item = _context16.sent;
-                  return _context16.abrupt("return", res.success(item, _this3.guardResponse, _this3.allowResponse));
-                case 13:
-                case "end":
-                  return _context16.stop();
-              }
-            }, _callee16);
-          }));
-          return function (_x28, _x29) {
-            return _ref12.apply(this, arguments);
-          };
-        }()]
-      };
-    }
-  }, {
-    key: "putModifyStatusAvailable",
-    value: function putModifyStatusAvailable() {
       var _this4 = this;
       return {
         disabled: !this.roles.UPDATE,
-        path: '/available/:id([a-zA-Z0-9]+)',
+        path: '/:id([a-zA-Z0-9]+)',
         method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(req, res) {
-            var item;
+            var item, data;
             return _regeneratorRuntime().wrap(function _callee17$(_context17) {
               while (1) switch (_context17.prev = _context17.next) {
                 case 0:
@@ -558,14 +538,16 @@ var AdminController = /*#__PURE__*/function (_Controller) {
                   return _context17.abrupt("return", res.error(_error.NOT_EXISTS));
                 case 5:
                   _context17.next = 7;
-                  return item.modifyStatusAvailable(req.user.id);
+                  return _this4.beforeModify(req.body);
                 case 7:
-                  _context17.next = 9;
+                  data = _context17.sent;
+                  item = _this4.methodPutModify(item, data, req.user);
+                  _context17.next = 11;
                   return _this4.afterModify(item);
-                case 9:
+                case 11:
                   item = _context17.sent;
                   return _context17.abrupt("return", res.success(item, _this4.guardResponse, _this4.allowResponse));
-                case 11:
+                case 13:
                 case "end":
                   return _context17.stop();
               }
@@ -578,12 +560,12 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       };
     }
   }, {
-    key: "putModifyStatusUnavailable",
-    value: function putModifyStatusUnavailable() {
+    key: "putModifyStatusAvailable",
+    value: function putModifyStatusAvailable() {
       var _this5 = this;
       return {
         disabled: !this.roles.UPDATE,
-        path: '/unavailable/:id([a-zA-Z0-9]+)',
+        path: '/available/:id([a-zA-Z0-9]+)',
         method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(req, res) {
             var item;
@@ -601,7 +583,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
                   return _context18.abrupt("return", res.error(_error.NOT_EXISTS));
                 case 5:
                   _context18.next = 7;
-                  return item.modifyStatusUnavailable(req.body.message, req.user.id);
+                  return item.modifyStatusAvailable(req.user.id);
                 case 7:
                   _context18.next = 9;
                   return _this5.afterModify(item);
@@ -621,12 +603,12 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       };
     }
   }, {
-    key: "putModifyStatusWaiting",
-    value: function putModifyStatusWaiting() {
+    key: "putModifyStatusUnavailable",
+    value: function putModifyStatusUnavailable() {
       var _this6 = this;
       return {
         disabled: !this.roles.UPDATE,
-        path: '/waiting/:id([a-zA-Z0-9]+)',
+        path: '/unavailable/:id([a-zA-Z0-9]+)',
         method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(req, res) {
             var item;
@@ -644,7 +626,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
                   return _context19.abrupt("return", res.error(_error.NOT_EXISTS));
                 case 5:
                   _context19.next = 7;
-                  return item.modifyStatusWaiting(req.user.id);
+                  return item.modifyStatusUnavailable(req.body.message, req.user.id);
                 case 7:
                   _context19.next = 9;
                   return _this6.afterModify(item);
@@ -663,21 +645,64 @@ var AdminController = /*#__PURE__*/function (_Controller) {
         }()]
       };
     }
+  }, {
+    key: "putModifyStatusWaiting",
+    value: function putModifyStatusWaiting() {
+      var _this7 = this;
+      return {
+        disabled: !this.roles.UPDATE,
+        path: '/waiting/:id([a-zA-Z0-9]+)',
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
+          var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(req, res) {
+            var item;
+            return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+              while (1) switch (_context20.prev = _context20.next) {
+                case 0:
+                  _context20.next = 2;
+                  return _this7.repository.findOneById(req.params.id);
+                case 2:
+                  item = _context20.sent;
+                  if (item) {
+                    _context20.next = 5;
+                    break;
+                  }
+                  return _context20.abrupt("return", res.error(_error.NOT_EXISTS));
+                case 5:
+                  _context20.next = 7;
+                  return item.modifyStatusWaiting(req.user.id);
+                case 7:
+                  _context20.next = 9;
+                  return _this7.afterModify(item);
+                case 9:
+                  item = _context20.sent;
+                  return _context20.abrupt("return", res.success(item, _this7.guardResponse, _this7.allowResponse));
+                case 11:
+                case "end":
+                  return _context20.stop();
+              }
+            }, _callee20);
+          }));
+          return function (_x36, _x37) {
+            return _ref16.apply(this, arguments);
+          };
+        }()]
+      };
+    }
   }, {
     key: "afterDelete",
     value: function () {
-      var _afterDelete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(item) {
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _afterDelete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(item) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              return _context20.abrupt("return", item);
+              return _context21.abrupt("return", item);
             case 1:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee20);
+        }, _callee21);
       }));
-      function afterDelete(_x36) {
+      function afterDelete(_x38) {
         return _afterDelete.apply(this, arguments);
       }
       return afterDelete;
@@ -703,18 +728,18 @@ var AdminController = /*#__PURE__*/function (_Controller) {
   }, {
     key: "afterDestroy",
     value: function () {
-      var _afterDestroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(item) {
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _afterDestroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(item) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              return _context21.abrupt("return", item);
+              return _context22.abrupt("return", item);
             case 1:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee21);
+        }, _callee22);
       }));
-      function afterDestroy(_x37) {
+      function afterDestroy(_x39) {
         return _afterDestroy.apply(this, arguments);
       }
       return afterDestroy;

package/package.json

@@ -1 +1 @@
-{"name":"@azteam/express","version":"1.2.427","license":"MIT","author":"toda <sp.azsolution.net@gmail.com>","main":"./lib/index.js","module":"./src/index.js","scripts":{"prepublishOnly":"babel src --delete-dir-on-start -d lib"},"dependencies":{"@azteam/constant":"1.0.11","@azteam/crypto":"1.0.38","@azteam/error":"1.0.37","@azteam/http-client":"1.0.116","@azteam/util":"1.0.44","@azteam/validator":"1.0.26","@grpc/grpc-js":"1.6.7","@grpc/proto-loader":"0.6.12","@socket.io/redis-adapter":"7.2.0","body-parser":"1.19.0","compression":"1.7.4","cookie-parser":"1.4.4","cors":"2.8.4","eiows":"4.1.2","ejs":"3.1.8","etag":"1.8.1","express":"4.17.1","express-async-errors":"3.1.1","express-rate-limit":"5.1.3","helmet":"3.21.2","jsonwebtoken":"9.0.0","lodash":"4.17.21","method-override":"3.0.0","morgan":"1.10.0","pluralize":"8.0.0","psl":"1.8.0","socket.io":"4.4.1","ua-parser-js":"1.0.32"}}
+{"name":"@azteam/express","version":"1.2.430","license":"MIT","author":"toda <sp.azsolution.net@gmail.com>","main":"./lib/index.js","module":"./src/index.js","scripts":{"prepublishOnly":"babel src --delete-dir-on-start -d lib"},"dependencies":{"@azteam/constant":"1.0.11","@azteam/crypto":"1.0.38","@azteam/error":"1.0.37","@azteam/http-client":"1.0.116","@azteam/util":"1.0.44","@azteam/validator":"1.0.26","@grpc/grpc-js":"1.6.7","@grpc/proto-loader":"0.6.12","@socket.io/redis-adapter":"7.2.0","body-parser":"1.19.0","compression":"1.7.4","cookie-parser":"1.4.4","cors":"2.8.4","eiows":"4.1.2","ejs":"3.1.8","etag":"1.8.1","express":"4.17.1","express-async-errors":"3.1.1","express-rate-limit":"5.1.3","helmet":"3.21.2","jsonwebtoken":"9.0.0","lodash":"4.17.21","method-override":"3.0.0","morgan":"1.10.0","pluralize":"8.0.0","psl":"1.8.0","socket.io":"4.4.1","ua-parser-js":"1.0.32"}}

package/src/controller/AdminController.js

@@ -76,6 +76,19 @@ class AdminController extends Controller {
         ];
     }
 
+    getFilterOption() {
+        return {
+            disabled: !this.roles.READ,
+            path: '/filter_option',
+            method: [
+                adminRoleMiddleware([this.roles.READ], this.roleMiddlewareOptions),
+                async (req, res) => {
+                    return res.success(this.paginateOptions);
+                },
+            ],
+        };
+    }
+
     methodGetAll = async (req, res) => {
         const data = await this.repository.findAll(req.query, {
             limit: 2000,