Merge pull request #81 from codeit-moving/dev

Dev -> release 20241227 14:26 리팩토링

Author: WooHyunTak

src/controllers/quoteController.ts

@@ -8,26 +8,6 @@ import { isCustomer } from "../middlewares/authMiddleware";
 
 const router = express.Router();
 
-//견적서 상세 조회
-router.get(
-  "/:id",
-  passport.authenticate("jwt", { session: false }),
-  isCustomer,
-  asyncHandle(async (req, res, next) => {
-    try {
-      const { customerId } = req.user as { customerId: number };
-      const { id: quoteId } = req.params;
-      const quote = await quoteService.getQuoteById(
-        customerId,
-        parseInt(quoteId)
-      );
-      return res.status(200).send(quote);
-    } catch (error) {
-      next(error);
-    }
-  })
-);
-
 // 견적서 생성하기
 router.post(
   "/",
@@ -186,4 +166,24 @@ router.get(
   })
 );
 
+//견적서 상세 조회
+router.get(
+  "/:id",
+  passport.authenticate("jwt", { session: false }),
+  isCustomer,
+  asyncHandle(async (req, res, next) => {
+    try {
+      const { customerId } = req.user as { customerId: number };
+      const { id: quoteId } = req.params;
+      const quote = await quoteService.getQuoteById(
+        customerId,
+        parseInt(quoteId)
+      );
+      return res.status(200).send(quote);
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
 export default router; // 설정한 라우터를 내보내서 다른 파일에서 사용할 수 있게 해요.

src/middlewares/authMiddleware.ts

@@ -67,7 +67,6 @@ export const isCustomer = async (
     moverId?: number;
   };
   const findUser = await userRepository.findById(user.id);
-
   if (!findUser) {
     const error: CustomError = new Error("Unauthorized");
     error.status = 403;
@@ -110,7 +109,6 @@ export const isMover = async (
     };
     return next(error);
   }
-
   if (!user?.moverId) {
     const error: CustomError = new Error("Unauthorized");
     error.status = 403;