Merge pull request #62 from codeit-moving/release

Release -> main 20241223 17:58 V 1.2.0

Author: WooHyunTak

data/mover.ts

@@ -51,4 +51,17 @@ export const movers = [
     createAt: "2024-11-27T10:15:00.000Z",
     updateAt: "2024-11-27T10:15:00.000Z",
   },
+  {
+    id: 5,
+    nickname: "배진수",
+    services: [1, 3],
+    regions: [82032, 82033],
+    career: 6,
+    description:
+      "6년 경력의 이사 전문가, 안전하고 신속한 이사로 고객 만족을 최우선으로 생각합니다.",
+    introduction: "안전하고 빠른 이사를 보장하는 전문가입니다.",
+    userId: 10,
+    createAt: "2024-11-27T10:15:00.000Z",
+    updateAt: "2024-11-27T10:15:00.000Z",
+  },
 ];

package.json

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

src/controllers/moverController.ts

@@ -131,11 +131,28 @@ router.post(
     try {
       const { customerId } = req.user as { customerId: number };
       const { id: moverId } = req.params;
-      const { favorite = "true" } = req.query;
-      const mover = await moverService.toggleFavorite(
+      const mover = await moverService.moverFavorite(
         customerId,
-        parseInt(moverId),
-        checkBoolean(favorite as string)
+        parseInt(moverId)
+      );
+      return res.status(200).send(mover);
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
+//기사 찜 취소
+router.delete(
+  "/:id/favorite",
+  passport.authenticate("jwt", { session: false }),
+  asyncHandle(async (req, res, next) => {
+    try {
+      const { customerId } = req.user as { customerId: number };
+      const { id: moverId } = req.params;
+      const mover = await moverService.moverFavoriteCancel(
+        customerId,
+        parseInt(moverId)
       );
       return res.status(200).send(mover);
     } catch (error) {

src/controllers/movingRequestController.ts

@@ -152,11 +152,9 @@ router.post(
   passport.authenticate("jwt", { session: false }),
   asyncHandle(async (req, res, next) => {
     try {
-      const { id: movingRequestId } = req.params;
-      const { moverId } = req.query;
+      const { id: moverId } = req.params;
       const { customerId } = req.user as { customerId: number };
       const remainingCount = await movingRequestService.designateMover(
-        parseInt(movingRequestId),
         parseInt(moverId as string),
         customerId
       );
@@ -176,11 +174,11 @@ router.delete(
   passport.authenticate("jwt", { session: false }),
   asyncHandle(async (req, res, next) => {
     try {
-      const { id: movingRequestId } = req.params;
-      const { moverId } = req.query;
+      const { id: moverId } = req.params;
+      const { customerId } = req.user as { customerId: number };
       const remainingCount = await movingRequestService.cancelDesignateMover(
-        parseInt(movingRequestId),
-        parseInt(moverId as string)
+        parseInt(moverId as string),
+        customerId
       );
       return res.status(200).send({
         message: "지정 요청 취소",

src/repositorys/moverRepository.ts

@@ -143,10 +143,20 @@ const getRatingsByMoverIds = async (moverIds: number[]) => {
   return ratings;
 };
 
-const toggleFavorite = async (moverId: number, favorite: object) => {
+const moverFavorite = async (customerId: number, moverId: number) => {
   return prismaClient.mover.update({
     where: { id: moverId },
-    data: { favorite },
+    data: { favorite: { connect: { id: customerId } } },
+    select: {
+      id: true,
+    },
+  });
+};
+
+const moverFavoriteCancel = async (customerId: number, moverId: number) => {
+  return prismaClient.mover.update({
+    where: { id: moverId },
+    data: { favorite: { disconnect: { id: customerId } } },
     select: {
       id: true,
     },
@@ -202,7 +212,8 @@ export default {
   getMoverList,
   getRatingsByMoverIds,
   getMoverById,
-  toggleFavorite,
+  moverFavorite,
+  moverFavoriteCancel,
   getMoverByFavorite,
   createMoverProfile,
 };

src/services/moverService.ts

@@ -201,23 +201,22 @@ const getMoverDetail = async (customerId: number | null, moverId: number) => {
 };
 
 //찜 토글
-const toggleFavorite = async (
-  customerId: number,
-  moverId: number,
-  favorite: boolean | undefined
-) => {
-  const favoriteData: FavoriteData = {};
-  if (favorite) {
-    favoriteData.connect = {
-      id: customerId,
-    };
-  } else {
-    favoriteData.disconnect = {
-      id: customerId,
+const moverFavorite = async (customerId: number, moverId: number) => {
+  const mover = await moverRepository.moverFavorite(customerId, moverId);
+  if (!mover) {
+    const error: CustomError = new Error("Not Found");
+    error.status = 404;
+    error.data = {
+      message: "기사 정보를 찾을 수 없습니다.",
     };
+    throw error;
   }
 
-  const mover = await moverRepository.toggleFavorite(moverId, favoriteData);
+  return { ...mover, isFavorite: true };
+};
+
+const moverFavoriteCancel = async (customerId: number, moverId: number) => {
+  const mover = await moverRepository.moverFavoriteCancel(customerId, moverId);
   if (!mover) {
     const error: CustomError = new Error("Not Found");
     error.status = 404;
@@ -226,8 +225,7 @@ const toggleFavorite = async (
     };
     throw error;
   }
-
-  return { ...mover, isFavorite: favorite };
+  return { ...mover, isFavorite: false };
 };
 
 const getMover = async (moverId: number) => {
@@ -298,7 +296,8 @@ const createMoverProfile = async (profile: Profile) => {
 export default {
   getMoverList,
   getMoverDetail,
-  toggleFavorite,
+  moverFavorite,
+  moverFavoriteCancel,
   getMoverByFavorite,
   getMover,
   updateMoverProfile,

src/services/movingRequestService.ts

@@ -380,26 +380,32 @@ const createMovingRequest = async (
 };
 
 //이사요청 지정
-const designateMover = async (
-  movingRequestId: number,
-  moverId: number,
-  customerId: number
-) => {
-  //지정 가능 인원 조회
-  const designateCountPromise =
-    movingRequestRepository.getDesignateCount(movingRequestId);
+const designateMover = async (moverId: number, customerId: number) => {
+  const activeRequest = await movingRequestRepository.getActiveRequest(
+    customerId
+  );
 
-  const activeRequestPromise =
-    movingRequestRepository.getActiveRequest(customerId);
+  if (!activeRequest) {
+    const error: CustomError = new Error("Bad Request");
+    error.status = 422;
+    error.data = {
+      message: "일반 견적 요청을 먼저 진행해 주세요.",
+    };
+    throw error;
+  }
+
+  //지정 가능 인원 조회
+  const designateCountPromise = movingRequestRepository.getDesignateCount(
+    activeRequest.id
+  );
 
   const designatedMoversPromise = movingRequestRepository.getDesignatedMovers(
-    movingRequestId,
+    activeRequest.id,
     moverId
   );
 
-  const [result, activeRequest, designatedMovers] = await Promise.all([
+  const [result, designatedMovers] = await Promise.all([
     designateCountPromise,
-    activeRequestPromise,
     designatedMoversPromise,
   ]);
 
@@ -412,15 +418,6 @@ const designateMover = async (
     throw error;
   }
 
-  if (!activeRequest) {
-    const error: CustomError = new Error("Bad Request");
-    error.status = 400;
-    error.data = {
-      message: "일반 견적 요청을 먼저 진행해 주세요.",
-    };
-    throw error;
-  }
-
   //지정 가능 인원 초과 체크
   if (!result || result._count.mover >= 3) {
     const error: CustomError = new Error("Bad Request");
@@ -433,7 +430,7 @@ const designateMover = async (
 
   //이사요청 지정
   const movingRequest = await movingRequestRepository.updateDesignated(
-    movingRequestId,
+    activeRequest.id,
     moverId
   );
 
@@ -450,12 +447,22 @@ const designateMover = async (
 };
 
 //이사요청 지정 취소
-const cancelDesignateMover = async (
-  movingRequestId: number,
-  moverId: number
-) => {
+const cancelDesignateMover = async (moverId: number, customerId: number) => {
+  const activeRequest = await movingRequestRepository.getActiveRequest(
+    customerId
+  );
+
+  if (!activeRequest) {
+    const error: CustomError = new Error("Bad Request");
+    error.status = 422;
+    error.data = {
+      message: "일반 견적 요청을 먼저 진행해 주세요.",
+    };
+    throw error;
+  }
+
   const designatedMovers = await movingRequestRepository.getDesignatedMovers(
-    movingRequestId,
+    activeRequest.id,
     moverId
   );
 
@@ -470,7 +477,7 @@ const cancelDesignateMover = async (
 
   //이사요청 지정 취소
   const movingRequest = await movingRequestRepository.updateDesignatedCancel(
-    movingRequestId,
+    activeRequest.id,
     moverId
   );