Update 2024 (#39)

* feat : add preparator user * fix eslint compliance * update: change order splitting method (now by needsPreparation) * Update src/controllers/order/create.ts Co-authored-by: Zalko <88582103+Zalk0@users.noreply.github.com> --------- Co-authored-by: Zalko <88582103+Zalk0@users.noreply.github.com>
ungdev · Sep 11, 2024 · b426c15 · b426c15
1 parent 57472ba
commit b426c15
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 4 deletions.
diff --git a/.env.example b/.env.example
@@ -19,6 +19,7 @@ APP_PIN_TV=123456
 APP_PIN_SELLER=147258
 APP_PIN_PIZZA=741852
 APP_PIN_ADMIN=159753
+APP_PIN_PREPARATOR=000000
 
 # Envoie un message sur Slack si activé à chaque commande
 SLACK_ENABLED=false

diff --git a/src/controllers/order/create.ts b/src/controllers/order/create.ts
@@ -56,7 +56,7 @@ const create = async (req: BodyRequest<Body>, res: Response) => {
       })
       .reduce(
         (acc, item) => {
-          if (item.item.category.key !== 'pizzas') {
+          if (item.item.category.needsPreparation) {
             acc[0].push(item);
           } else {
             acc[1].push(item);

diff --git a/src/controllers/order/dispatch.ts b/src/controllers/order/dispatch.ts
@@ -22,7 +22,7 @@ const dispatch = async (req: BodyRequest<BuckResponse>, res: Response<unknown, O
 
     const separatedItems = items.reduce(
       (acc, item) => {
-        acc[Number(item.category.key === 'pizzas')].push(item);
+        acc[Number(item.category.needsPreparation === false)].push(item);
         return acc;
       },
       [[], []] as [Partial<Item>[], Partial<Item>[]],

diff --git a/src/controllers/order/index.ts b/src/controllers/order/index.ts
@@ -4,6 +4,7 @@ import list from './list';
 import dispatch from './dispatch';
 import editStatus from './editStatus';
 import hasPermission from '../../middlewares/hasPermission';
+import hasPermissionInList from '../../middlewares/hasPermissionInList';
 import { OrderUpdate } from '../../types';
 import isBuck from '../../middlewares/isBuck';
 import isAuth from '../../middlewares/isAuth';
@@ -14,8 +15,8 @@ export default () => {
   router.get('/', isAuth(), list);
   router.post('/', isAuth(), hasPermission('sell'), create);
   router.post('/dispatch', isBuck, dispatch);
-  router.patch('/:id/upgrade', isAuth(), hasPermission('pizza'), editStatus(OrderUpdate.UPGRADE));
-  router.patch('/:id/downgrade', isAuth(), hasPermission('pizza'), editStatus(OrderUpdate.DOWNGRADE));
+  router.patch('/:id/upgrade', isAuth(), hasPermissionInList(['pizza','prepare']), editStatus(OrderUpdate.UPGRADE));
+  router.patch('/:id/downgrade', isAuth(), hasPermissionInList(['pizza','prepare']), editStatus(OrderUpdate.DOWNGRADE));
 
   return router;
 };
diff --git a/src/middlewares/hasPermissionInList.ts b/src/middlewares/hasPermissionInList.ts
@@ -0,0 +1,33 @@
+import { Response, NextFunction, Request } from 'express';
+import jwt from 'jsonwebtoken';
+import getToken from '../utils/getToken';
+import { Token, Permission } from '../types';
+import { unauthorized, unauthenticated } from '../utils/responses';
+import errorHandler from '../utils/errorHandler';
+
+export default (permissions: Array<string>) => async (req: Request, res: Response, next: NextFunction) => {
+  try {
+    const token = getToken(req);
+    if (token) {
+      const decoded = jwt.verify(token, process.env.APP_TOKEN_SECRET) as Token;
+
+      req.user = decoded;
+
+      if (!permissions) {
+        return next();
+      }
+
+      if (decoded.permissions === Permission.ADMIN) {
+        return next();
+      }
+
+      const hasPermission: boolean = permissions.some((perm) => perm === decoded.permissions)
+      if (hasPermission) return next();
+      return unauthorized(res);
+    }
+
+    return unauthenticated(res);
+  } catch (err) {
+    return errorHandler(res, err);
+  }
+};
diff --git a/src/types.ts b/src/types.ts
@@ -22,6 +22,7 @@ export enum Permission {
   ADMIN = 'admin',
   SELLER = 'seller',
   PIZZA = 'pizza',
+  PREPARATOR = 'preparator'
 }
 
 export interface Token {