Merge pull request #49 from codeit-moving/dev

Dev -> main 20241220 프론트요청 반영 & 유조기능 수정

Author: WooHyunTak

package-lock.json

@@ -56,6 +56,7 @@ erDiagram
   Int id PK
   Int service
   DateTime movingDate
+  Int region
   String pickupAddress
   String dropOffAddress
   Int requestCount
@@ -212,6 +213,7 @@ erDiagram
   - `id`: 
   - `service`: 
   - `movingDate`: 
+  - `region`: 
   - `pickupAddress`: 
   - `dropOffAddress`: 
   - `requestCount`: 

prisma/ERD.md

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "MovingRequest" ADD COLUMN     "region" INTEGER NOT NULL DEFAULT 0;

prisma/migrations/20241219083653_update_moving_request/migration.sql

@@ -5,23 +5,20 @@ const accessTokenOption: CookieOptions = {
   secure: true,
   sameSite: "none",
   maxAge: 1000 * 60 * 60, // 1시간
-  path: "/",
 };
 
 const refreshTokenOption: CookieOptions = {
   httpOnly: true,
   secure: true,
   sameSite: "none",
   maxAge: 1000 * 60 * 60 * 24 * 7, // 7일
-  path: "/auth/refresh",
 };
 
 const clearCookieOption: CookieOptions = {
   httpOnly: true,
   secure: true,
   sameSite: "none",
   maxAge: 0,
-  path: "/",
 };
 
 const sessionOption: CookieOptions = {

src/config/cookie.config.ts

@@ -25,6 +25,7 @@ router.get(
         officeMove = "false",
         orderBy = "resent",
         isQuoted = "false",
+        isPastRequest = "false",
       } = req.query;
       const parseLimit = parseInt(limit as string);
       const parseCursor = parseInt(cursor as string);
@@ -33,6 +34,7 @@ router.get(
       const parseHouseMove = checkBoolean(houseMove as string);
       const parseOfficeMove = checkBoolean(officeMove as string);
       const parseIsQuoted = checkBoolean(isQuoted as string);
+      const parsePastRequest = checkBoolean(isPastRequest as string);
 
       const movingRequestList =
         await movingRequestService.getMovingRequestListByMover(moverId, {
@@ -45,6 +47,7 @@ router.get(
           officeMove: parseOfficeMove || false,
           orderBy: orderBy as string,
           isQuoted: parseIsQuoted || false,
+          isPastRequest: parsePastRequest || false,
         });
       return res.status(200).send(movingRequestList);
     } catch (error) {
@@ -122,15 +125,18 @@ router.post(
   asyncHandle(async (req, res, next) => {
     try {
       const { customerId } = req.user as { customerId: number };
-      const { service, movingDate, pickupAddress, dropOffAddress } = req.body;
+      const { service, movingDate, pickupAddress, dropOffAddress, region } =
+        req.body;
       const date = new Date(movingDate);
+      const parseRegion = parseInt(region as string);
       const movingRequest = await movingRequestService.createMovingRequest(
         customerId,
         {
           service,
           movingDate: date,
           pickupAddress,
           dropOffAddress,
+          region: parseRegion,
         }
       );
       return res.status(201).send(movingRequest);

src/controllers/movingRequestController.ts

@@ -26,8 +26,8 @@ passport.use(
     const token = req.cookies["accessToken"];
 
     if (!token) {
-      const error: CustomError = new Error("Unauthorized");
-      error.status = 401;
+      const error: CustomError = new Error("Token missing");
+      error.status = 403;
       error.data = {
         message: "토큰이 존재하지 않습니다.",
       };
@@ -38,8 +38,8 @@ passport.use(
       const decoded = jwt.verify(token, JWT_SECRET);
       return done(null, decoded); // 토큰이 있고 유효하면 유저 정보 반환
     } catch (err) {
-      const error: CustomError = new Error("Unauthorized");
-      error.status = 401;
+      const error: CustomError = new Error("Invalid token");
+      error.status = 403;
       error.data = {
         message: "유효하지 않은 토큰입니다.",
       };
@@ -71,8 +71,8 @@ passport.use(
     const refreshToken = req.cookies["refreshToken"];
 
     if (!refreshToken) {
-      const error: CustomError = new Error("Unauthorized");
-      error.status = 401;
+      const error: CustomError = new Error("Token missing");
+      error.status = 403;
       error.data = {
         message: "리프레시 토큰이 존재하지 않습니다.",
       };
@@ -83,8 +83,8 @@ passport.use(
       const decoded = jwt.verify(refreshToken, REFRESH_SECRET);
       return done(null, decoded);
     } catch (err) {
-      const error: CustomError = new Error("Unauthorized");
-      error.status = 401;
+      const error: CustomError = new Error("Invalid token");
+      error.status = 403;
       error.data = {
         message: "유효하지 않은 리프레시 토큰입니다.",
       };

src/middlewares/passport.ts

@@ -2,7 +2,8 @@ import { RequestHandler } from "express";
 import customError from "../../utils/interfaces/customError";
 
 const createMovingRequestValidation: RequestHandler = (req, res, next) => {
-  const { service, movingDate, pickupAddress, dropOffAddress } = req.body;
+  const { service, movingDate, pickupAddress, dropOffAddress, region } =
+    req.body;
 
   if (!service || typeof service !== "number" || service < 1 || service > 3) {
     const error: customError = new Error("Bad Request");
@@ -45,6 +46,16 @@ const createMovingRequestValidation: RequestHandler = (req, res, next) => {
     return next(error);
   }
 
+  if (!region || typeof region !== "number") {
+    const error: customError = new Error("Bad Request");
+    error.status = 400;
+    error.message = "Bad Request";
+    error.data = {
+      message: "지역코드가 올바르지 않습니다.",
+    };
+    return next(error);
+  }
+
   next();
 };
 

src/middlewares/validations/movingRequest.ts

@@ -27,7 +27,7 @@ const getMovingRequestCountByCustomer = (customerId: number) => {
 };
 
 //이사요청 서비스별 카운트 조회
-const getMovingRequestCountByServices = async (where: WhereCondition) => {
+const getMovingRequestCountByServices = async (where: WhereCondition = {}) => {
   const counts = await prismaClient.movingRequest.groupBy({
     where,
     by: ["service"],
@@ -62,8 +62,8 @@ const getMovingRequestCountByServices = async (where: WhereCondition) => {
 };
 
 const getMovingRequestCountByDesignated = async (
-  where: WhereCondition,
-  moverId: number
+  moverId: number,
+  where: WhereCondition = {}
 ) => {
   return prismaClient.movingRequest.count({
     where: {
@@ -77,7 +77,7 @@ const getMovingRequestCountByDesignated = async (
   });
 };
 
-const getTotalCount = async (where: WhereCondition) => {
+const getTotalCount = async (where: WhereCondition = {}) => {
   return prismaClient.movingRequest.count({
     where,
   });
@@ -93,7 +93,7 @@ const getMovingRequestListByMover = (
   return prismaClient.movingRequest.findMany({
     where,
     orderBy,
-    take: limit,
+    take: limit + 1, //커서 페이지 넘버 계산을 위해 1개 더 조회
     skip: cursor ? 1 : 0, //커서 자신을 스킵하기 위함
     cursor: cursor ? { id: cursor } : undefined,
     select: {
@@ -316,7 +316,7 @@ const getActiveRequest = (customerId: number) => {
 };
 
 export default {
-  getMovingRequestList: getMovingRequestListByMover,
+  getMovingRequestListByMover,
   createMovingRequest,
   updateDesignated,
   updateDesignatedCancel,

src/repositorys/movingRequestRepository.ts

@@ -47,7 +47,7 @@ const signIn = async ({ email, password }: SignInData) => {
   const isPasswordValid = await bcrypt.compare(password, user.password!); //패스워드 검증
 
   if (!isPasswordValid) {
-    const error: CustomError = new Error("Unauthorized");
+    const error: CustomError = new Error("Invalid password");
     error.status = 401;
     error.data = {
       message: "비밀번호가 일치하지 않습니다.",
@@ -181,7 +181,7 @@ const validatePassword = async (userId: number, password: string) => {
   }
 
   if (!decodedPassword) {
-    const error: CustomError = new Error("Unauthorized");
+    const error: CustomError = new Error("Invalid password");
     error.status = 401;
     error.data = {
       message: "비밀번호가 일치하지 않습니다.",