Merge pull request #38 from codeit-moving/dev

WooHyunTak · web-flow · commit 4f3b610e54fc · 2024-12-17T17:17:18.000+09:00
Dev -&gt; main 20241217 17:16 프론트 요청사항 및 유저 기능 수정
diff --git a/src/controllers/authController.ts b/src/controllers/authController.ts
@@ -2,8 +2,9 @@ import { Router } from "express";
 import authService from "../services/authService";
 import { asyncHandle } from "../utils/asyncHandler";
 import cookieConfig from "../config/cookie.config";
-import createToken from "../utils/token.utils";
+import createToken, { Payload } from "../utils/token.utils";
 import upload from "../utils/multer";
+import passport from "passport";
 
 const router = Router();
 
@@ -75,18 +76,19 @@ router.post(
   upload.single("imageUrl"),
   asyncHandle(async (req, res, next) => {
     try {
-      const SignUpCustomer: SignUpCustomer = {
+      const signUpCustomer: SignUpCustomer = {
         ...req.body,
         imageUrl: req.file!,
         services: Array.isArray(req.body.services)
-          ? req.body.services
-          : JSON.parse(req.body.services),
+          ? req.body.services.map(Number)
+          : JSON.parse(req.body.services).map(Number),
         regions: Array.isArray(req.body.regions)
-          ? req.body.regions
-          : JSON.parse(req.body.regions),
+          ? req.body.regions.map(Number)
+          : JSON.parse(req.body.regions).map(Number),
         isOAuth: req.body.isOAuth === "true",
       };
-      await authService.signUpCustomer(SignUpCustomer);
+
+      await authService.signUpCustomer(signUpCustomer);
       res.status(204).send();
     } catch (error) {
       next(error);
@@ -99,7 +101,18 @@ router.post(
   upload.single("imageUrl"),
   asyncHandle(async (req, res, next) => {
     try {
-      const SignUpMover: SignUpMover = req.body;
+      const SignUpMover: SignUpMover = {
+        ...req.body,
+        imageUrl: req.file!,
+        services: Array.isArray(req.body.services)
+          ? req.body.services.map(Number)
+          : JSON.parse(req.body.services).map(Number),
+        regions: Array.isArray(req.body.regions)
+          ? req.body.regions.map(Number)
+          : JSON.parse(req.body.regions).map(Number),
+        isOAuth: req.body.isOAuth === "true",
+        career: Number(req.body.career),
+      };
       await authService.signUpMover(SignUpMover);
       res.status(204).send();
     } catch (error) {
@@ -108,4 +121,32 @@ router.post(
   })
 );
 
+router.post(
+  "/validate",
+  asyncHandle(async (req, res, next) => {
+    try {
+      const { email, phoneNumber } = req.body;
+      await authService.validate(email, phoneNumber);
+      res.status(204).send();
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
+router.post(
+  "/refresh",
+  passport.authenticate("refresh-token", { session: false }),
+  asyncHandle(async (req, res, next) => {
+    try {
+      const user = req.user as Payload;
+      const accessToken = createToken(user, "access");
+      res.cookie("accessToken", accessToken, cookieConfig.accessTokenOption);
+      res.status(204).send();
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
 export default router;
diff --git a/src/controllers/customerController.ts b/src/controllers/customerController.ts
@@ -17,12 +17,16 @@ router.post(
       const profile = {
         userId: userId,
         imageUrl: req.file!,
-        services: Array.isArray(req.body.services)
-          ? req.body.services
-          : JSON.parse(req.body.services),
-        regions: Array.isArray(req.body.regions)
-          ? req.body.regions
-          : JSON.parse(req.body.regions), //postman으로 테스트하였는데 문자 배열로 인식하는 것 같아 임시 코드 작성 수정예정
+        regions: req.body.regions
+          ? Array.isArray(req.body.regions)
+            ? req.body.regions.map(Number)
+            : JSON.parse(req.body.regions).map(Number)
+          : [],
+        services: req.body.services
+          ? Array.isArray(req.body.services)
+            ? req.body.services.map(Number)
+            : JSON.parse(req.body.services).map(Number)
+          : [],
       };
       await customerService.createCustomerProfile(profile);
       res.status(204).send();
@@ -39,7 +43,16 @@ router.patch(
   asyncHandle(async (req, res, next) => {
     try {
       const userId = (req.user as Payload).id;
-      const profile = { ...req.body, imageUrl: req.file };
+      const profile = {
+        ...req.body,
+        imageUrl: req.file,
+        regions: req.body.regions
+          ? JSON.parse(req.body.regions).map(Number)
+          : [],
+        services: req.body.services
+          ? JSON.parse(req.body.services).map(Number)
+          : [],
+      };
       await customerService.updateCustomerProfile(userId, profile);
       res.status(204).send();
     } catch (error) {
diff --git a/src/controllers/movingRequestController.ts b/src/controllers/movingRequestController.ts
@@ -9,11 +9,11 @@ const router = express.Router();
 
 //이사요청 목록 조회
 router.get(
-  "/",
-  // passport.authenticate("jwt", { session: false }),
+  "/my-mover",
+  passport.authenticate("jwt", { session: false }),
   asyncHandle(async (req, res, next) => {
     try {
-      // const { customerId } = req.user as { customerId: number };
+      const { moverId } = req.user as { moverId: number };
 
       const {
         limit = "10",
@@ -24,17 +24,18 @@ router.get(
         houseMove = "false",
         officeMove = "false",
         orderBy = "resent",
+        isQuoted = "false",
       } = req.query;
       const parseLimit = parseInt(limit as string);
       const parseCursor = parseInt(cursor as string);
       const parseIsDesignated = checkBoolean(isDesignated as string);
       const parseSmallMove = checkBoolean(smallMove as string);
       const parseHouseMove = checkBoolean(houseMove as string);
       const parseOfficeMove = checkBoolean(officeMove as string);
+      const parseIsQuoted = checkBoolean(isQuoted as string);
 
-      const movingRequestList = await movingRequestService.getMovingRequestList(
-        1,
-        {
+      const movingRequestList =
+        await movingRequestService.getMovingRequestListByMover(moverId, {
           limit: parseLimit,
           isDesignated: parseIsDesignated,
           cursor: parseCursor,
@@ -43,8 +44,8 @@ router.get(
           houseMove: parseHouseMove || false,
           officeMove: parseOfficeMove || false,
           orderBy: orderBy as string,
-        }
-      );
+          isQuoted: parseIsQuoted || false,
+        });
       return res.status(200).send(movingRequestList);
     } catch (error) {
       next(error);
diff --git a/src/repositorys/movingRequestRepository.ts b/src/repositorys/movingRequestRepository.ts
@@ -26,19 +26,72 @@ const getMovingRequestCountByCustomer = (customerId: number) => {
   });
 };
 
+//이사요청 서비스별 카운트 조회
+const getMovingRequestCountByServices = async (where: WhereCondition) => {
+  const counts = await prismaClient.movingRequest.groupBy({
+    where,
+    by: ["service"],
+    _count: {
+      service: true,
+    },
+  });
+
+  // 초기값 설정
+  const result = {
+    smallMove: 0, // service: 1
+    houseMove: 0, // service: 2
+    officeMove: 0, // service: 3
+  };
+
+  // 각 서비스 타입별로 카운트 할당
+  counts.forEach((count) => {
+    switch (count.service) {
+      case 1:
+        result.smallMove = count._count.service;
+        break;
+      case 2:
+        result.houseMove = count._count.service;
+        break;
+      case 3:
+        result.officeMove = count._count.service;
+        break;
+    }
+  });
+
+  return result;
+};
+
+const getMovingRequestCountByDesignated = async (
+  where: WhereCondition,
+  moverId: number
+) => {
+  return prismaClient.movingRequest.count({
+    where: {
+      ...where,
+      mover: {
+        some: {
+          id: moverId,
+        },
+      },
+    },
+  });
+};
+
+const getTotalCount = async (where: WhereCondition) => {
+  return prismaClient.movingRequest.count({
+    where,
+  });
+};
+
 //이사요청 목록 조회
-const getMovingRequestList = (
-  customerId: number,
+const getMovingRequestListByMover = (
   query: CursorQueryString,
   where: WhereCondition
 ) => {
   const { limit, cursor, orderBy } = query;
 
   return prismaClient.movingRequest.findMany({
-    where: {
-      customerId,
-      ...where,
-    },
+    where,
     orderBy,
     take: limit,
     skip: cursor ? 1 : 0, //커서 자신을 스킵하기 위함
@@ -263,7 +316,7 @@ const getActiveRequest = (customerId: number) => {
 };
 
 export default {
-  getMovingRequestList,
+  getMovingRequestList: getMovingRequestListByMover,
   createMovingRequest,
   updateDesignated,
   updateDesignatedCancel,
@@ -272,4 +325,7 @@ export default {
   getMovingRequestById,
   getMovingRequestListByCustomer,
   getMovingRequestCountByCustomer,
+  getMovingRequestCountByServices,
+  getMovingRequestCountByDesignated,
+  getTotalCount,
 };
diff --git a/src/schedules/notifications.ts b/src/schedules/notifications.ts
@@ -27,15 +27,32 @@ interface ConfirmedQuote {
   };
 }
 
+const extractLocationInfo = (address: string) => {
+  // 시/도와 시/군/구를 추출하는 정규식
+  const match = address.match(/([가-힣]+)\s([가-힣]+시[가-힣]*)/);
+  if (!match) return address;
+
+  const province = match[1]; // 첫 번째 그룹 (시/도)
+  const city = match[2].replace(/시.*$/, ""); // 두 번째 그룹에서 '시' 이후 제거
+
+  return `${province}(${city})`;
+};
+
 const setMessage = async (confirmedQuote: ConfirmedQuote) => {
+  const pickupLocation = extractLocationInfo(
+    confirmedQuote.movingRequest.pickupAddress
+  );
+  const dropOffLocation = extractLocationInfo(
+    confirmedQuote.movingRequest.dropOffAddress
+  );
   return [
     {
-      content: `내일은 ,${confirmedQuote.movingRequest.pickupAddress} -> ${confirmedQuote.movingRequest.dropOffAddress} 이사 예정일,이에요.`,
+      content: `내일은 ,${pickupLocation} -> ${dropOffLocation} 이사 예정일,이에요.`,
       isRead: false,
       userId: confirmedQuote.mover.user.id,
     },
     {
-      content: `내일은 ,${confirmedQuote.movingRequest.pickupAddress} -> ${confirmedQuote.movingRequest.dropOffAddress} 이사 예정일,이에요.`,
+      content: `내일은 ,${pickupLocation} -> ${dropOffLocation} 이사 예정일,이에요.`,
       isRead: false,
       userId: confirmedQuote.customer.user.id,
     },
diff --git a/src/services/authService.ts b/src/services/authService.ts
@@ -44,9 +44,7 @@ const signIn = async ({ email, password }: SignInData) => {
     throw error;
   }
 
-  // const isPasswordValid = await bcrypt.compare(password, user.password!);
-
-  const isPasswordValid = password === user.password;
+  const isPasswordValid = await bcrypt.compare(password, user.password!); //패스워드 검증
 
   if (!isPasswordValid) {
     const error: CustomError = new Error("Unauthorized");
@@ -87,9 +85,12 @@ const signUpCustomer = async (customer: SignUpCustomer) => {
       }
     }
 
+    const hashedPassword = await bcrypt.hash(customer.password, 10);
+
     const customerData = {
       ...customer,
       imageUrl,
+      password: hashedPassword,
     };
 
     const result = await userRepository.createCustomer(customerData);
@@ -125,9 +126,12 @@ const signUpMover = async (mover: SignUpMover) => {
       }
     }
 
+    const hashedPassword = await bcrypt.hash(mover.password, 10);
+
     const moverData = {
       ...mover,
       imageUrl,
+      password: hashedPassword,
     };
     const result = await userRepository.createMover(moverData);
 
@@ -137,4 +141,28 @@ const signUpMover = async (mover: SignUpMover) => {
   }
 };
 
-export default { signIn, signUpCustomer, signUpMover };
+const validate = async (email: string, phoneNumber: string) => {
+  const user = await userRepository.existingUser(email, phoneNumber);
+
+  if (user) {
+    const error: CustomError = new Error("Conflict");
+    if (user.email === email) {
+      error.status = 409;
+      error.data = {
+        message: "이미 존재하는 이메일입니다.",
+      };
+      throw error;
+    }
+    if (user.phoneNumber === phoneNumber) {
+      error.status = 409;
+      error.data = {
+        message: "이미 존재하는 전화번호입니다.",
+      };
+      throw error;
+    }
+  }
+
+  return user;
+};
+
+export default { signIn, signUpCustomer, signUpMover, validate };
diff --git a/src/services/movingRequestService.ts b/src/services/movingRequestService.ts
diff --git a/src/services/userService.ts b/src/services/userService.ts
