Merge pull request #105 from codeit-moving/dev

Dev -> Release 20241230 20:55

Author: WooHyunTak

src/controllers/reviewController.ts

@@ -122,7 +122,6 @@ router.get(
       pageNum: pageNum ? parseInt(pageNum as string) : undefined,
     });
 
-    console.log(result);
     res.status(200).send(result);
   })
 );

src/repositorys/confirmedQuoteRepository.ts

@@ -100,4 +100,79 @@ const findAllByDay = (day: Date) => {
   });
 };
 
-export default { CreateConfirmedQuote, findAllByDay };
+const getAvailableReviewCount = (customerId: number) => {
+  return prismaClient.confirmedQuote.count({
+    where: {
+      customerId,
+      review: {
+        none: {},
+      },
+      movingRequest: {
+        movingDate: {
+          lt: new Date(),
+        },
+      },
+    },
+  });
+};
+
+const getAvailableReviewList = (
+  customerId: number,
+  query: { pageSize: number; pageNum: number }
+) => {
+  return prismaClient.confirmedQuote.findMany({
+    where: {
+      customerId,
+      movingRequest: {
+        movingDate: {
+          lt: new Date(),
+        },
+      },
+    },
+    take: query.pageSize || 6,
+    skip: (query.pageNum - 1) * (query.pageSize || 6),
+    select: {
+      id: true,
+      movingRequest: {
+        select: {
+          service: true,
+          movingDate: true,
+          mover: {
+            select: {
+              id: true,
+            },
+          },
+        },
+      },
+      quote: {
+        select: {
+          cost: true,
+        },
+      },
+      mover: {
+        select: {
+          id: true,
+          nickname: true,
+          imageUrl: {
+            orderBy: {
+              createAt: "desc",
+            },
+            where: {
+              status: true,
+            },
+            select: {
+              imageUrl: true,
+            },
+          },
+        },
+      },
+    },
+  });
+};
+
+export default {
+  CreateConfirmedQuote,
+  findAllByDay,
+  getAvailableReviewCount,
+  getAvailableReviewList,
+};

src/repositorys/quoteRepository.ts

@@ -2,8 +2,8 @@ import prismaClient from "../utils/prismaClient";
 import { QuoteQueryString } from "../utils/quote/types";
 
 interface PaginationOptions {
-  limit?: number;
-  cursor?: number | null;
+  limit: number;
+  cursor: number | null;
 }
 
 const getQuoteCountByMovingRequestId = (movingRequestId: number) => {
@@ -197,7 +197,8 @@ const getQuoteListByMoverId = (moverId: number, options: PaginationOptions) => {
       createAt: "desc", // 최신 순 정렬
     },
     // 페이지네이션 코드 추가
-    take: options.limit,
+    take: options.limit + 1,
+    skip: options.cursor ? 1 : 0,
     cursor: options.cursor ? { id: options.cursor } : undefined,
     select: {
       id: true,

src/repositorys/reviewRepository.ts

@@ -168,6 +168,7 @@ const getAvailableReviewList = (
     select: {
       id: true,
       imageUrl: true,
+      content: true,
       mover: {
         // 여기에 mover 정보 추가
         select: {

src/services/movingRequestService.ts

@@ -137,11 +137,8 @@ const setWhereCondition = (query: queryString, moverId: number) => {
     // pastRequest가 true면 모든 날짜 조회 (where 조건 없음)
   } else {
     // pastRequest가 false면 오늘 자정 이후의 요청만 조회
-    const today = new Date();
-    today.setHours(0, 0, 0, 0);
-
     where.movingDate = {
-      gt: today,
+      gt: new Date(),
     };
   }
 
@@ -168,7 +165,7 @@ const getMovingRequestListByMover = async (
   moverId: number,
   query: queryString
 ) => {
-  const { limit, cursor, orderBy, isQuoted } = query;
+  const { limit, cursor, orderBy, isQuoted, isPastRequest } = query;
   const whereCondition: WhereCondition = setWhereCondition(query, moverId);
   const orderByQuery = setOrderBy(orderBy);
 

src/services/reviewService.ts

@@ -1,3 +1,4 @@
+import confirmedQuoteRepository from "../repositorys/confirmedQuoteRepository";
 import reviewRepository from "../repositorys/reviewRepository";
 import customError from "../utils/interfaces/customError";
 import {
@@ -121,9 +122,14 @@ const getAvailableReviewsList = async (
   const pageSize = query.pageSize || 6;
   const pageNum = query.pageNum || 1;
 
-  const [totalCount, reviews] = await Promise.all([
-    reviewRepository.getAvailableReviewCount(customerId),
-    reviewRepository.getAvailableReviewList(customerId, {
+  const [totalCount, confirmedQuotes] = await Promise.all([
+    // reviewRepository.getAvailableReviewCount(customerId),
+    // reviewRepository.getAvailableReviewList(customerId, {
+    //   pageSize,
+    //   pageNum,
+    // }),
+    confirmedQuoteRepository.getAvailableReviewCount(customerId),
+    confirmedQuoteRepository.getAvailableReviewList(customerId, {
       pageSize,
       pageNum,
     }),
@@ -133,13 +139,16 @@ const getAvailableReviewsList = async (
     currentPage: pageNum,
     totalPages: Math.ceil(totalCount / pageSize),
     totalCount,
-    list: reviews.map((review) => ({
-      ...review,
-      service: review.confirmedQuote.movingRequest.service,
-      isDesignated: review.confirmedQuote.movingRequest.isDesignated,
-      movingDate: review.confirmedQuote.movingRequest.movingDate,
-      nickname: review.mover.nickname,
-      cost: review.confirmedQuote.quote.cost,
+    list: confirmedQuotes.map((confirmedQuote) => ({
+      id: confirmedQuote.mover.id,
+      service: confirmedQuote.movingRequest.service,
+      isDesignated: confirmedQuote.movingRequest.mover.some(
+        (mover) => mover.id === confirmedQuote.mover.id
+      ),
+      movingDate: confirmedQuote.movingRequest.movingDate,
+      nickname: confirmedQuote.mover.nickname,
+      cost: confirmedQuote.quote.cost,
+      imageUrl: confirmedQuote.mover.imageUrl[0]?.imageUrl ?? "",
       confirmedQuote: undefined,
       movingRequest: undefined,
       mover: undefined,