Merge pull request #135 from codeit-moving/release

Release -> Main 20250107 16:35

Author: WooHyunTak

src/controllers/customerController.ts

@@ -2,9 +2,10 @@ import customerService from "../services/customerService";
 import { Router } from "express";
 import { asyncHandle } from "../utils/asyncHandler";
 import passport from "passport";
-import { Payload } from "../utils/token.utils";
+import createToken, { Payload } from "../utils/token.utils";
 import upload from "../utils/multer";
 import { uploadFiles, uploadOptionalFiles } from "../middlewares/uploadFile";
+import cookieConfig from "../config/cookie.config";
 
 const router = Router();
 
@@ -22,7 +23,12 @@ router.post(
         regions: JSON.parse(req.body.regions).map(Number),
         services: JSON.parse(req.body.services).map(Number),
       };
-      await customerService.createCustomerProfile(profile);
+      const { id } = await customerService.createCustomerProfile(profile);
+
+      const payload = { id: userId, customer: { id: id } };
+
+      const accessToken = createToken(payload, "access");
+      res.cookie("accessToken", accessToken, cookieConfig.accessTokenOption);
       res.status(204).send();
     } catch (error) {
       next(error);

src/controllers/moverController.ts

@@ -9,8 +9,9 @@ import {
   optionalJwtAuth,
 } from "../middlewares/authMiddleware";
 import upload from "../utils/multer";
-import { Payload } from "../utils/token.utils";
+import createToken, { Payload } from "../utils/token.utils";
 import { uploadFiles, uploadOptionalFiles } from "../middlewares/uploadFile";
+import cookieConfig from "../config/cookie.config";
 
 interface queryString {
   nextCursorId: string;
@@ -209,7 +210,12 @@ router.post(
         regions: JSON.parse(req.body.regions).map(Number),
         services: JSON.parse(req.body.services).map(Number),
       };
-      await moverService.createMoverProfile(profile);
+      const { id } = await moverService.createMoverProfile(profile);
+
+      const payload = { id: userId, mover: { id: id } };
+
+      const accessToken = createToken(payload, "access");
+      res.cookie("accessToken", accessToken, cookieConfig.accessTokenOption);
       res.status(204).send();
     } catch (error) {
       next(error);

src/controllers/quoteController.ts

@@ -5,6 +5,7 @@ import passport from "passport";
 import customError from "../utils/interfaces/customError";
 import quoteValidation from "../middlewares/validations/quote";
 import { isCustomer } from "../middlewares/authMiddleware";
+import { throwHttpError } from "../utils/constructors/httpError";
 
 const router = express.Router();
 
@@ -41,13 +42,7 @@ router.get(
     const moverId = user.moverId; // user.id를 먼저 확인
 
     if (!moverId) {
-      const error: customError = new Error("Unauthorized");
-      error.status = 401;
-      error.message = "Unauthorized";
-      error.data = {
-        message: "기사 정보를 찾을 수 없습니다.",
-      };
-      throw error;
+      return throwHttpError(401, "기사 정보를 찾을 수 없습니다.");
     }
 
     // 기본값 설정
@@ -75,13 +70,7 @@ router.get(
 
     // moverId 유효성 검사
     if (!moverId) {
-      const error: customError = new Error("Bad Request");
-      error.status = 400;
-      error.message = "Bad Request";
-      error.data = {
-        message: "기사 ID가 필요합니다.",
-      };
-      throw error;
+      return throwHttpError(400, "기사 ID가 필요합니다.");
     }
 
     // 쿼리 파라미터 처리 (페이지네이션)
@@ -112,10 +101,7 @@ router.post(
 
     // 파라미터 검증
     if (!movingRequestId) {
-      const error: customError = new Error("Bad Request");
-      error.status = 400;
-      error.message = "이사 요청 ID가 필요합니다.";
-      throw error;
+      return throwHttpError(400, "이사 요청 ID가 필요합니다.");
     }
 
     const result = await quoteService.rejectRequest(moverId, movingRequestId);
@@ -133,25 +119,13 @@ router.get(
     const moverId = user.moverId;
 
     if (!moverId) {
-      const error: customError = new Error("Unauthorized");
-      error.status = 401;
-      error.message = "Unauthorized";
-      error.data = {
-        message: "기사 정보를 찾을 수 없습니다.",
-      };
-      throw error;
+      return throwHttpError(401, "기사 정보를 찾을 수 없습니다.");
     }
 
     const quoteId = parseInt(req.params.quoteId);
 
     if (isNaN(quoteId)) {
-      const error: customError = new Error("Bad Request");
-      error.status = 400;
-      error.message = "Bad Request";
-      error.data = {
-        message: "올바르지 않은 파라미터입니다.",
-      };
-      throw error;
+      return throwHttpError(400, "올바르지 않은 파라미터입니다.");
     }
 
     const quote = await quoteService.getQuoteDetail(moverId, quoteId);

src/controllers/reviewController.ts

@@ -39,10 +39,7 @@ router.get(
     const customerId = user.customerId;
 
     if (!customerId) {
-      const error: customError = new Error("Bad Request");
-      error.status = 400;
-      error.message = "고객 ID가 필요합니다.";
-      throw error;
+      return throwHttpError(400, "고객 ID가 필요합니다.");
     }
 
     const { pageSize, pageNum } = req.query;
@@ -96,10 +93,7 @@ router.get(
     const customerId = user.customerId;
 
     if (!customerId) {
-      const error: customError = new Error("Bad Request");
-      error.status = 400;
-      error.message = "고객 ID가 필요합니다.";
-      throw error;
+      return throwHttpError(400, "고객 ID가 필요합니다.");
     }
 
     const { pageSize, pageNum } = req.query;

src/middlewares/uploadFile.ts

@@ -46,7 +46,6 @@ export const uploadFiles = asyncHandle(async (req, res, next) => {
     });
 
     req.fileUrls = await Promise.all(uploadPromises);
-    console.log(req.fileUrls);
     next();
   } catch (e) {
     throwHttpError(500, "이미지 업로드 실패");

src/middlewares/validations/quote.ts

@@ -1,37 +1,20 @@
 import { RequestHandler } from "express";
 import customError from "../../utils/interfaces/customError";
+import { throwHttpError } from "../../utils/constructors/httpError";
 
 const createQuoteValidation: RequestHandler = (req, res, next) => {
   const { movingRequestId, cost, comment } = req.body;
 
   if (!movingRequestId || typeof movingRequestId !== "number") {
-    const error: customError = new Error("Bad Request");
-    error.status = 400;
-    error.message = "Bad Request";
-    error.data = {
-      message: "이사 요청 ID가 올바르지 않습니다.",
-    };
-    return next(error);
+    return throwHttpError(400, "이사 요청 ID가 올바르지 않습니다.");
   }
 
   if (!cost || typeof cost !== "number" || cost <= 0) {
-    const error: customError = new Error("Bad Request");
-    error.status = 400;
-    error.message = "Bad Request";
-    error.data = {
-      message: "견적 금액이 올바르지 않습니다.",
-    };
-    return next(error);
+    return throwHttpError(400, "견적 금액이 올바르지 않습니다.");
   }
 
   if (!comment || typeof comment !== "string" || !comment.trim()) {
-    const error: customError = new Error("Bad Request");
-    error.status = 400;
-    error.message = "Bad Request";
-    error.data = {
-      message: "견적 코멘트가 올바르지 않습니다.",
-    };
-    return next(error);
+    return throwHttpError(400, "견적 코멘트가 올바르지 않습니다.");
   }
 
   next();

src/repositorys/movingRequestRepository.ts

@@ -65,11 +65,16 @@ const getMovingRequestCountByServices = async (where: WhereCondition = {}) => {
 
 const getMovingRequestCountByDesignated = async (
   moverId: number,
+  isPastRequest: boolean,
   where: WhereCondition = {}
 ) => {
   return prismaClient.movingRequest.count({
     where: {
       ...where,
+      ...(!isPastRequest ? { movingDate: { gt: new Date() } } : {}),
+      confirmedQuote: {
+        is: null,
+      },
       mover: {
         some: {
           id: moverId,

src/services/moverService.ts

@@ -220,7 +220,6 @@ const updateMoverProfile = async (
   profile: UpdateProfile
 ) => {
   const { imageUrl, ...rest } = profile;
-  console.log(rest);
   try {
     return await imageRepository.updateMoverProfile(
       imageUrl ? imageUrl[0] : undefined,

src/services/movingRequestService.ts

@@ -43,7 +43,7 @@ const setWhereCondition = (query: queryString, moverId: number) => {
     houseMove,
     officeMove,
     isDesignated,
-    isQuoted,
+    isQuoted = false,
     isPastRequest,
   } = query;
   const where: WhereCondition = {};
@@ -93,10 +93,7 @@ const setWhereCondition = (query: queryString, moverId: number) => {
     };
   }
 
-  if (isQuoted === undefined) {
-    where.quote = {};
-    where.isRejected = {};
-  } else if (isQuoted) {
+  if (isQuoted) {
     where.OR = [
       {
         quote: {
@@ -164,7 +161,7 @@ const getMovingRequestListByMover = async (
   moverId: number,
   query: queryString
 ) => {
-  const { limit, cursor, orderBy, isQuoted, isPastRequest } = query;
+  const { limit, cursor, orderBy, isQuoted = false, isPastRequest } = query;
   const whereCondition: WhereCondition = setWhereCondition(query, moverId);
   const orderByQuery = setOrderBy(orderBy);
 
@@ -225,7 +222,10 @@ const getMovingRequestListByMover = async (
   const totalCountPromise =
     movingRequestRepository.getTotalCount(countCondition);
   const designatedCountPromise =
-    movingRequestRepository.getMovingRequestCountByDesignated(moverId);
+    movingRequestRepository.getMovingRequestCountByDesignated(
+      moverId,
+      isPastRequest
+    );
 
   const movingRequestListPromise =
     movingRequestRepository.getMovingRequestListByMover(

src/services/quoteService.ts

@@ -35,13 +35,7 @@ const createQuote = async (
     movingRequestId
   );
   if (!movingRequest) {
-    const error: customError = new Error("Not Found");
-    error.status = 404;
-    error.message = "Not Found";
-    error.data = {
-      message: "존재하지 않는 이사 요청입니다.",
-    };
-    throw error;
+    return throwHttpError(404, "존재하지 않는 이사 요청입니다.");
   }
 
   // 견적서 생성
@@ -68,13 +62,7 @@ const createQuote = async (
 const getQuoteList = async (moverId: number, query: QuoteQueryString) => {
   // moverId 유효성 검사
   if (!moverId) {
-    const error: customError = new Error("Bad Request");
-    error.status = 400;
-    error.message = "Bad Request";
-    error.data = {
-      message: "기사 ID가 필요합니다.",
-    };
-    throw error;
+    return throwHttpError(400, "기사 ID가 필요합니다.");
   }
 
   const { limit, cursor } = query;
@@ -120,13 +108,7 @@ const getQuoteDetail = async (moverId: number, quoteId: number) => {
   const quote = await quoteRepository.getQuoteDetailByMoverId(moverId, quoteId);
 
   if (!quote) {
-    const error: customError = new Error("Not Found");
-    error.status = 404;
-    error.message = "Not Found";
-    error.data = {
-      message: "견적서를 찾을 수 없습니다.",
-    };
-    throw error;
+    return throwHttpError(404, "견적서를 찾을 수 없습니다.");
   }
 
   // 2. 응답 데이터를 가공하여 반환합니다.
@@ -151,13 +133,7 @@ const rejectRequest = async (moverId: number, movingRequestId: number) => {
     movingRequestId
   );
   if (!movingRequest) {
-    const error: customError = new Error("Not Found");
-    error.status = 404;
-    error.message = "Not Found";
-    error.data = {
-      message: "존재하지 않는 이사 요청입니다.",
-    };
-    throw error;
+    return throwHttpError(404, "존재하지 않는 이사 요청입니다.");
   }
 
   // 2. 반려 처리
@@ -179,13 +155,7 @@ const getRejectedRequestList = async (
 ) => {
   // moverId 유효성 검사
   if (!moverId) {
-    const error: customError = new Error("Bad Request");
-    error.status = 400;
-    error.message = "Bad Request";
-    error.data = {
-      message: "기사 ID가 필요합니다.",
-    };
-    throw error;
+    return throwHttpError(400, "기사 ID가 필요합니다.");
   }
 
   const { limit, cursor } = query;