Merge pull request #55 from codeit-moving/release

Release -> main 20241220 18:03 V1

Author: WooHyunTak

data/movingRequest.ts

@@ -1,67 +1,72 @@
 export const movingRequest = [
   {
     id: 1,
-    serviceType: 1,
+    service: 1,
     movingDate: "2024-12-05T10:00:00Z",
     pickupAddress: "123 Maple St, City A",
     dropOffAddress: "456 Oak Rd, City B",
     requestCount: 0,
     designateCount: 0,
     isDesignated: false,
-    createAt: "2024-11-27T00:00:00Z",
-    updateAt: "2024-11-27T00:00:00Z",
+    createAt: "2024-12-27T00:00:00Z",
+    updateAt: "2024-12-27T00:00:00Z",
     customerId: 1,
+    region: 8202,
   },
   {
     id: 2,
-    serviceType: 2,
+    service: 2,
     movingDate: "2024-12-10T09:30:00Z",
     pickupAddress: "789 Pine Ave, City C",
     dropOffAddress: "101 Birch Ln, City D",
     requestCount: 0,
     designateCount: 0,
     isDesignated: false,
-    createAt: "2024-11-27T00:00:00Z",
-    updateAt: "2024-11-27T00:00:00Z",
+    createAt: "2024-12-27T00:00:00Z",
+    updateAt: "2024-12-27T00:00:00Z",
     customerId: 2,
+    region: 82031,
   },
   {
     id: 3,
-    serviceType: 1,
-    movingDate: "2024-12-12T11:00:00Z",
+    service: 1,
+    movingDate: "2024-12-12T12:00:00Z",
     pickupAddress: "234 Cedar Blvd, City E",
     dropOffAddress: "567 Elm St, City F",
     requestCount: 0,
     designateCount: 0,
     isDesignated: false,
-    createAt: "2024-11-27T00:00:00Z",
-    updateAt: "2024-11-27T00:00:00Z",
+    createAt: "2024-12-27T00:00:00Z",
+    updateAt: "2024-12-27T00:00:00Z",
     customerId: 3,
+    region: 82032,
   },
   {
     id: 4,
-    serviceType: 3,
+    service: 3,
     movingDate: "2024-12-15T14:00:00Z",
     pickupAddress: "456 Cherry Blvd, City G",
     dropOffAddress: "789 Walnut St, City H",
     requestCount: 0,
     designateCount: 0,
     isDesignated: false,
-    createAt: "2024-11-27T00:00:00Z",
-    updateAt: "2024-11-27T00:00:00Z",
+    createAt: "2024-12-27T00:00:00Z",
+    updateAt: "2024-12-27T00:00:00Z",
     customerId: 4,
+    region: 82033,
   },
   {
     id: 5,
-    serviceType: 2,
+    service: 2,
     movingDate: "2024-12-20T13:30:00Z",
-    pickupAddress: "111 Maple Rd, City I",
+    pickupAddress: "121 Maple Rd, City I",
     dropOffAddress: "222 Pine St, City J",
     requestCount: 0,
     designateCount: 0,
     isDesignated: false,
-    createAt: "2024-11-27T00:00:00Z",
-    updateAt: "2024-11-27T00:00:00Z",
+    createAt: "2024-12-27T00:00:00Z",
+    updateAt: "2024-12-27T00:00:00Z",
     customerId: 5,
+    region: 82033,
   },
 ];

data/seed.ts

@@ -9,48 +9,48 @@ import { PrismaClient } from "@prisma/client";
 const prismaClient = new PrismaClient();
 
 async function main() {
-  // 사용자 데이터 시딩
+  // 견적 요청 데이터 삭제 (가장 먼저 삭제)
+  await prismaClient.movingRequest.deleteMany();
+
+  // 기사, 고객, 서비스, 리전 데이터 삭제
+  await prismaClient.mover.deleteMany();
+  await prismaClient.customer.deleteMany();
+  await prismaClient.service.deleteMany();
+  await prismaClient.region.deleteMany();
+
+  // 사용자 데이터 삭제 (마지막에 삭제)
   await prismaClient.user.deleteMany();
+
+  // 사용자 데이터 시딩
   await prismaClient.user.createMany({
     data: users,
     skipDuplicates: true,
   });
 
   // 고객 데이터 시딩
-  await prismaClient.customer.deleteMany();
   await prismaClient.customer.createMany({
     data: customers,
     skipDuplicates: true,
   });
 
   // 기사 데이터 시딩
-  await prismaClient.mover.deleteMany();
   await prismaClient.mover.createMany({
     data: movers,
     skipDuplicates: true,
   });
 
   // 서비스 데이터 시딩
-  await prismaClient.service.deleteMany();
   await prismaClient.service.createMany({
     data: services,
     skipDuplicates: true,
   });
 
   // 리전 데이터 시딩
-  await prismaClient.region.deleteMany();
   await prismaClient.region.createMany({
     data: regions,
     skipDuplicates: true,
   });
 
-  // 견적 요청 데이터 시딩
-  await prismaClient.movingRequest.deleteMany();
-  await prismaClient.movingRequest.createMany({
-    data: movingRequest,
-    skipDuplicates: true,
-  });
-
   console.log("Seeding completed!");
 }
 

package.json

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

src/controllers/moverController.ts

@@ -29,7 +29,6 @@ router.get(
       if (req.user) {
         customerId = (req.user as { customerId: number | null }).customerId;
       }
-
       const {
         nextCursorId = "0",
         order = "",
@@ -64,6 +63,43 @@ router.get(
   })
 );
 
+router.get(
+  "/my-profile",
+  passport.authenticate("jwt", { session: false }),
+  asyncHandle(async (req, res, next) => {
+    try {
+      const { moverId } = req.user as { moverId: number };
+      console.log(moverId);
+      const mover = await moverService.getMover(moverId);
+      return res.status(200).send(mover);
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
+//찜한 기사 목록 조회
+router.get(
+  "/favorite-list",
+  passport.authenticate("jwt", { session: false }),
+  asyncHandle(async (req, res, next) => {
+    try {
+      const { limit = "10", nextCursorId = "0" } = req.query;
+      const parseLimit = parseInt(limit as string);
+      const parseNextCursorId = parseInt(nextCursorId as string);
+      const { customerId } = req.user as { customerId: number };
+      const movers = await moverService.getMoverByFavorite(
+        customerId,
+        parseLimit,
+        parseNextCursorId
+      );
+      return res.status(200).send(movers);
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
 //기사 상세 조회
 router.get(
   "/:id",
@@ -108,42 +144,6 @@ router.post(
   })
 );
 
-//찜한 기사 목록 조회
-router.get(
-  "/favorite-list",
-  passport.authenticate("jwt", { session: false }),
-  asyncHandle(async (req, res, next) => {
-    try {
-      const { limit = "10", nextCursorId = "0" } = req.query;
-      const parseLimit = parseInt(limit as string);
-      const parseNextCursorId = parseInt(nextCursorId as string);
-      const { customerId } = req.user as { customerId: number };
-      const movers = await moverService.getMoverByFavorite(
-        customerId,
-        parseLimit,
-        parseNextCursorId
-      );
-      return res.status(200).send(movers);
-    } catch (error) {
-      next(error);
-    }
-  })
-);
-
-router.get(
-  "/my-profile",
-  passport.authenticate("jwt", { session: false }),
-  asyncHandle(async (req, res, next) => {
-    try {
-      const { moverId } = req.user as { moverId: number };
-      const mover = await moverService.getMover(moverId);
-      res.status(200).send(mover);
-    } catch (error) {
-      next(error);
-    }
-  })
-);
-
 router.patch(
   "/",
   passport.authenticate("jwt", { session: false }),

src/controllers/movingRequestController.ts

@@ -24,7 +24,7 @@ router.get(
         houseMove = "false",
         officeMove = "false",
         orderBy = "resent",
-        isQuoted = "false",
+        isQuoted = "",
         isPastRequest = "false",
       } = req.query;
       const parseLimit = parseInt(limit as string);
@@ -46,7 +46,7 @@ router.get(
           houseMove: parseHouseMove || false,
           officeMove: parseOfficeMove || false,
           orderBy: orderBy as string,
-          isQuoted: parseIsQuoted || false,
+          isQuoted: parseIsQuoted,
           isPastRequest: parsePastRequest || false,
         });
       return res.status(200).send(movingRequestList);

src/repositorys/moverRepository.ts

@@ -58,7 +58,7 @@ const getMoverList = (
   return prismaClient.mover.findMany({
     orderBy,
     where,
-    take: limit + 1,
+    take: limit + 1, //커서 페이지 넘버 계산을 위해 1개 더 조회
     skip: cursor ? 1 : 0, //커서 자신을 스킵하기 위함
     cursor: cursor ? { id: cursor } : undefined,
     select: {

src/repositorys/movingRequestRepository.ts

@@ -122,6 +122,11 @@ const getMovingRequestListByMover = (
           },
         },
       },
+      isRejected: {
+        select: {
+          id: true,
+        },
+      },
     },
   });
 };
@@ -315,6 +320,26 @@ const getActiveRequest = (customerId: number) => {
   });
 };
 
+const getDesignatedMovers = (movingRequestId: number, moverId: number) => {
+  return prismaClient.movingRequest.findUnique({
+    where: {
+      id: movingRequestId,
+      mover: {
+        some: {
+          id: moverId,
+        },
+      },
+    },
+    select: {
+      mover: {
+        select: {
+          id: true,
+        },
+      },
+    },
+  });
+};
+
 export default {
   getMovingRequestListByMover,
   createMovingRequest,
@@ -328,4 +353,5 @@ export default {
   getMovingRequestCountByServices,
   getMovingRequestCountByDesignated,
   getTotalCount,
+  getDesignatedMovers,
 };