Merge pull request #95 from codeit-moving/dev

Dev -> release 20241230 callback next 처리

Author: WooHyunTak

src/controllers/oauthController.ts

@@ -87,7 +87,7 @@ router.get(
   })
 );
 
-const handleOAuthCallback: RequestHandler = (req, res) => {
+const handleOAuthCallback: RequestHandler = (req, res, next) => {
   if (!req.user) {
     return res.redirect("/login");
   }
@@ -120,7 +120,7 @@ const handleOAuthCallback: RequestHandler = (req, res) => {
       redirectUrl: FRONTEND_URL + redirectUrls[userType],
       redirect: true,
     };
-    throw error;
+    next(error);
   }
 };
 

src/services/movingRequestService.ts

@@ -5,6 +5,7 @@ import quoteRepository from "../repositorys/quoteRepository";
 import processQuotes from "../utils/quote/processQuoteData";
 import notificationRepository from "../repositorys/notificationRepository";
 import moverRepository from "../repositorys/moverRepository";
+import { object } from "superstruct";
 
 interface queryString {
   limit: number;
@@ -167,7 +168,7 @@ const getMovingRequestListByMover = async (
   moverId: number,
   query: queryString
 ) => {
-  const { limit, cursor, orderBy } = query;
+  const { limit, cursor, orderBy, isQuoted } = query;
   const whereCondition: WhereCondition = setWhereCondition(query, moverId);
   const orderByQuery = setOrderBy(orderBy);
 
@@ -186,18 +187,52 @@ const getMovingRequestListByMover = async (
     in: regions,
   };
 
-  const countCondition = {
-    quote: whereCondition.quote,
-    OR: whereCondition.OR,
-    AND: whereCondition.AND,
+  const countCondition: WhereCondition = {
     movingDate: whereCondition.movingDate,
     region: whereCondition.region,
   };
 
+  if (isQuoted) {
+    countCondition.OR = [
+      {
+        quote: {
+          some: {
+            moverId,
+          },
+        },
+      },
+      {
+        isRejected: {
+          some: {
+            id: moverId,
+          },
+        },
+      },
+    ];
+  } else {
+    countCondition.AND = [
+      {
+        quote: {
+          none: {
+            moverId,
+          },
+        },
+      },
+      {
+        isRejected: {
+          none: {
+            id: moverId,
+          },
+        },
+      },
+    ];
+  }
+
   const serviceCountsPromise =
     movingRequestRepository.getMovingRequestCountByServices(countCondition);
 
-  const totalCountPromise = movingRequestRepository.getTotalCount();
+  const totalCountPromise =
+    movingRequestRepository.getTotalCount(countCondition);
   const designatedCountPromise =
     movingRequestRepository.getMovingRequestCountByDesignated(moverId);