Merge pull request #59 from codeit-moving/release

Release -> main 20241223 11:24

Author: WooHyunTak

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0",
+  "version": "1.1.0",
   "dependencies": {
     "@aws-sdk/s3-request-presigner": "^3.691.0",
     "@prisma/client": "^5.20.0",

package.json

@@ -15,6 +15,7 @@ import session from "express-session";
 import cookieConfig from "./config/cookie.config";
 import customerRouter from "./controllers/customerController";
 import userRouter from "./controllers/userController";
+import reviewRouter from "./controllers/reviewController";
 import notificationRouter from "./controllers/notificationController";
 
 import confirmedQuoteRouter from "./controllers/confirmedQuoteController";
@@ -77,7 +78,7 @@ app.use("/oauth", oauthRouter);
 app.use("/customers", customerRouter);
 app.use("/users", userRouter);
 app.use("/notifications", notificationRouter);
-
+app.use("/reviews", reviewRouter);
 app.use(errorHandler); //전체 에러 핸들링 미들웨어
 
 app.listen(PORT || 3000, () => console.log("Server Started"));

src/app.ts

@@ -7,7 +7,26 @@ import quoteValidation from "../middlewares/validations/quote";
 
 const router = express.Router();
 
-// 견적서 생성 엔드포인트를 정의
+//견적서 상세 조회
+router.get(
+  "/:id",
+  passport.authenticate("jwt", { session: false }),
+  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(
   "/",
   passport.authenticate("jwt", { session: false }),
@@ -24,16 +43,11 @@ router.post(
       comment
     );
 
-    // 견적서가 성공적으로 생성되었다는 응답을 보내요.
-    return res.status(201).json({
-      success: true,
-      message: "견적서가 성공적으로 생성되었습니다.",
-      data: quote, // 생성된 견적서 정보를 포함
-    });
+    return res.status(201).send(quote);
   })
 );
 
-// 기사님이 작성한 견적서 목록을 조회하는 엔드포인트를 정의
+// (기사님이 작성한) 견적서 목록 조회
 router.get(
   "/mover",
   passport.authenticate("jwt", { session: false }),
@@ -56,19 +70,20 @@ router.get(
 
     // 기본값 설정
     const limit = Number(req.query.limit) || 10;
-    const cursor = req.query.cursor ? Number(req.query.cursor) : null;
-
-    const quotes = await quoteService.getQuoteList(moverId, { limit, cursor });
+    const nextCursorId = req.query.nextCursorId
+      ? Number(req.query.nextCursorId)
+      : null;
 
-    return res.status(200).json({
-      success: true,
-      message: "견적서 목록 조회 성공",
-      data: quotes,
+    const quotes = await quoteService.getQuoteList(moverId, {
+      limit,
+      cursor: nextCursorId, // 내부적으로는 cursor로 사용
     });
+
+    return res.status(200).send(quotes);
   })
 );
 
-// 기사님이 작성한 특정 견적서의 상세 정보를 조회하는 엔드포인트를 정의
+// (기사님이 작성한)특정 견적서 상세 조회
 router.get(
   "/mover/:quoteId",
   passport.authenticate("jwt", { session: false }),
@@ -101,11 +116,7 @@ router.get(
 
     const quote = await quoteService.getQuoteDetail(moverId, quoteId, cost);
 
-    return res.status(200).json({
-      success: true,
-      message: "견적서 상세 조회 성공",
-      data: quote,
-    });
+    return res.status(200).send(quote);
   })
 );
 
@@ -133,13 +144,13 @@ router.post(
     const result = await quoteService.rejectRequest(moverId, movingRequestId);
 
     // 응답 추가
-    res.status(200).json(result);
+    res.status(200).send(result);
   })
 );
 
 // (기사님이) 반려한 이사 요청 목록 조회
 router.get(
-  "/mover/reject",
+  "/mover/rejected",
   passport.authenticate("jwt", { session: false }),
   asyncHandle(async (req, res, next) => {
     const user = req.user as any;
@@ -158,37 +169,18 @@ router.get(
 
     // 쿼리 파라미터 처리 (페이지네이션)
     const limit = parseInt(req.query.limit as string) || 10;
-    const cursor = req.query.cursor
-      ? parseInt(req.query.cursor as string)
+    const nextCursorId = req.query.nextCursorId
+      ? Number(req.query.nextCursorId)
       : null;
 
     // 서비스 호출
     const result = await quoteService.getRejectedRequestList(moverId, {
       limit,
-      cursor,
+      cursor: nextCursorId,
     });
 
     // 응답
-    res.status(200).json(result);
-  })
-);
-
-//견적서 상세 조회
-router.get(
-  "/:id",
-  passport.authenticate("jwt", { session: false }),
-  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);
-    }
+    res.status(200).send(result);
   })
 );
 

src/controllers/quoteController.ts

@@ -0,0 +1,113 @@
+import { Router } from "express";
+import passport from "passport";
+import { asyncHandle } from "../utils/asyncHandler";
+import reviewService from "../services/reviewService";
+import customError from "../utils/interfaces/customError";
+
+const router = Router();
+
+// 리뷰 목록 조회 (기사 상세페이지용)
+router.get(
+  "/mover/:moverId",
+  asyncHandle(async (req, res) => {
+    const moverId = parseInt(req.params.moverId);
+    const { pageSize, pageNum } = req.query;
+
+    const result = await reviewService.getMoverReviewsList(moverId, {
+      pageSize: pageSize ? parseInt(pageSize as string) : undefined,
+      pageNum: pageNum ? parseInt(pageNum as string) : undefined,
+    });
+
+    res.status(200).send(result);
+  })
+);
+
+// 내가 작성한 리뷰 목록 조회
+router.get(
+  "/me",
+  passport.authenticate("jwt", { session: false }),
+  asyncHandle(async (req, res) => {
+    const user = req.user as any;
+    const customerId = user.customerId;
+
+    if (!customerId) {
+      const error: customError = new Error("Bad Request");
+      error.status = 400;
+      error.message = "고객 ID가 필요합니다.";
+      throw error;
+    }
+
+    const { pageSize, pageNum } = req.query;
+
+    const result = await reviewService.getMyReviewsList(customerId, {
+      pageSize: pageSize ? parseInt(pageSize as string) : undefined,
+      pageNum: pageNum ? parseInt(pageNum as string) : undefined,
+    });
+
+    res.status(200).send(result);
+  })
+);
+
+// 리뷰 생성하기
+router.post(
+  "/",
+  passport.authenticate("jwt", { session: false }),
+  asyncHandle(async (req, res) => {
+    const user = req.user as any;
+    const customerId = user.customerId;
+
+    if (!customerId) {
+      const error: customError = new Error("Bad Request");
+      error.status = 400;
+      error.message = "고객 ID가 필요합니다.";
+      throw error;
+    }
+
+    const { confirmedQuoteId, moverId, rating, content, imageUrl } = req.body;
+
+    if (!confirmedQuoteId || !moverId || !rating) {
+      const error: customError = new Error("Bad Request");
+      error.status = 400;
+      error.message = "필수 항목이 누락되었습니다.";
+      throw error;
+    }
+
+    const result = await reviewService.createNewReview(customerId, {
+      confirmedQuoteId,
+      moverId,
+      rating,
+      content,
+      imageUrl,
+    });
+
+    res.status(200).send(result);
+  })
+);
+
+// 작성 가능한 리뷰 목록 조회
+router.get(
+  "/available",
+  passport.authenticate("jwt", { session: false }),
+  asyncHandle(async (req, res) => {
+    const user = req.user as any;
+    const customerId = user.customerId;
+
+    if (!customerId) {
+      const error: customError = new Error("Bad Request");
+      error.status = 400;
+      error.message = "고객 ID가 필요합니다.";
+      throw error;
+    }
+
+    const { pageSize, pageNum } = req.query;
+
+    const result = await reviewService.getAvailableReviewsList(customerId, {
+      pageSize: pageSize ? parseInt(pageSize as string) : undefined,
+      pageNum: pageNum ? parseInt(pageNum as string) : undefined,
+    });
+
+    res.status(200).send(result);
+  })
+);
+
+export default router;

src/controllers/reviewController.ts

@@ -203,6 +203,7 @@ const getQuoteListByMoverId = (moverId: number, options: PaginationOptions) => {
       id: true,
       cost: true,
       comment: true,
+      createAt: true,
       movingRequest: {
         select: {
           service: true, // service로 매핑 필요