Merge pull request #104 from Noorin99/Noorin99/issue100

Fix bugs

src/docs/admin.yaml

@@ -74,10 +74,6 @@ components:
           type: string
         role:
           type: string
-        paymentMethod:
-          type: array
-          items:
-            $ref: '#/components/schemas/PaymentMethod'
         cookerStatus:
           type: string
         paymentMethodStatus:

src/docs/auth.yaml

@@ -277,8 +277,27 @@ components:
     Register2Request:
       type: object
       properties:
-        address:
-          $ref: '#/components/schemas/IAddress'
+        streetName:
+          type: string
+          example: Main Street
+        streetNumber:
+          type: number
+          example: 123
+        flatNumber:
+          type: number
+          example: 4
+        district:
+          type: string
+          example: Downtown
+        city:
+          type: string
+          example: New York
+        state:
+          type: string
+          example: NY
+        zip:
+          type: number
+          example: 10001
         phone:
           type: string
           example: '+905342338743'

src/docs/order.yaml

@@ -48,7 +48,7 @@ paths:
         '500':
           description: Internal server error
 
-  /api/orders/{id}/cancel:
+  /api/orders/{orderId}/cancel:
     put:
       summary: Cancel an order by ID
       parameters:

src/docs/passwordReset.yaml

@@ -62,7 +62,7 @@ paths:
               properties:
                 token:
                   type: string
-                  example: 7078782a39fe4fcabeee567772933d44c5ff98600ec343802d2900f43a973515
+                  example: 0a9bb0df7db8c3a96b6a80313245beaa25c97866517b51c4d890040c3c8e89e5
                 password:
                   type: string
                   format: password

src/docs/review.yaml

@@ -31,7 +31,7 @@ paths:
                   type: string
                   description: The comment about the food item.
                   example: Delicious!
-                userId:
+                customerId:
                   type: string
                   description: The ID of the user creating the review.
                   example: 60f7ea20a8b1c72f9a56c3f2

src/middlewares/error-handling.ts

@@ -1,9 +1,15 @@
-import { Request, Response } from 'express';
+import { NextFunction, Request, Response } from 'express';
 import customError from '../errors/customErrors';
 
-const errorHandler = (err: Error, req: Request, res: Response) => {
+const errorHandler = (
+  err: Error,
+  req: Request,
+  res: Response,
+  next: NextFunction
+) => {
   if (err instanceof customError) {
     res.status(err.errorCode).send({ errors: err.serializeErrors() });
+    next();
   } else {
     res.send(err);
   }

src/routes/admin.ts

@@ -1,20 +1,19 @@
 import express from 'express';
 import adminController from '../controllers/admin';
-import { authenticate } from '../middlewares/authentication';
-import checkRole from '../middlewares/authorization';
+import { isAuthenticated, checkRole } from '../middlewares/isAuth';
 
 const router = express.Router();
 
 router.get(
   '/cooker',
-  authenticate,
+  isAuthenticated,
   checkRole('admin'),
   adminController.getCooker
 );
 
 router.get(
   '/customers',
-  authenticate,
+  isAuthenticated,
   checkRole('admin'),
   adminController.getCustomers
 );