Merge pull request #32 from codeit-moving/dev

Dev -> main 20241216 13:58 formData 테스트

Author: WooHyunTak

.gitignore

@@ -10,4 +10,6 @@ deploy.sh
 
 .main.yml
 
-.http
+.http
+
+ERD.md

package-lock.json

@@ -28,6 +28,7 @@
     "jsonwebtoken": "^9.0.2",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "^3.0.1",
+    "node-cron": "^3.0.3",
     "passport": "^0.7.0",
     "passport-custom": "^1.1.1",
     "passport-jwt": "^4.0.1",
@@ -44,6 +45,7 @@
     "@mermaid-js/mermaid-cli": "^11.4.0",
     "@types/dompurify": "^3.2.0",
     "@types/jest": "^29.5.14",
+    "@types/node-cron": "^3.0.11",
     "babel-jest": "^29.7.0",
     "jest": "^29.7.0",
     "nodemon": "^3.1.4",

package.json

@@ -18,7 +18,6 @@ erDiagram
 }
 "Customer" {
   Int id PK
-  String imageUrl "nullable"
   Int services
   Int regions
   DateTime createAt
@@ -28,7 +27,6 @@ erDiagram
 "Mover" {
   Int id PK
   String nickname
-  String imageUrl "nullable"
   Int services
   Int regions
   Int career
@@ -112,6 +110,15 @@ erDiagram
   Int reviewId FK
   Int moverId FK
 }
+"ProfileImage" {
+  Int id PK
+  String imageUrl
+  Boolean status
+  DateTime createAt
+  DateTime updateAt
+  Int customerId FK "nullable"
+  Int moverId FK "nullable"
+}
 "_CustomerToMover" {
   String A FK
   String B FK
@@ -135,6 +142,8 @@ erDiagram
 "notification" }o--|| "User" : user
 "ReviewComment" }o--|| "Review" : review
 "ReviewComment" }o--|| "Mover" : mover
+"ProfileImage" }o--o| "Customer" : customer
+"ProfileImage" }o--o| "Mover" : mover
 "_CustomerToMover" }o--|| "Customer" : Customer
 "_CustomerToMover" }o--|| "Mover" : Mover
 "_MoverToMovingRequest" }o--|| "Mover" : Mover
@@ -157,7 +166,6 @@ erDiagram
 
 **Properties**
   - `id`: 
-  - `imageUrl`: 
   - `services`: 
   - `regions`: 
   - `createAt`: 
@@ -169,7 +177,6 @@ erDiagram
 **Properties**
   - `id`: 
   - `nickname`: 
-  - `imageUrl`: 
   - `services`: 
   - `regions`: 
   - `career`: 
@@ -269,6 +276,17 @@ erDiagram
   - `reviewId`: 
   - `moverId`: 
 
+### `ProfileImage`
+
+**Properties**
+  - `id`: 
+  - `imageUrl`: 
+  - `status`: 
+  - `createAt`: 
+  - `updateAt`: 
+  - `customerId`: 
+  - `moverId`: 
+
 ### `_CustomerToMover`
 Pair relationship table between [Customer](#Customer) and [Mover](#Mover)
 

prisma/ERD.md

@@ -18,6 +18,7 @@ import userRouter from "./controllers/userController";
 import notificationRouter from "./controllers/notificationController";
 
 import confirmedQuoteRouter from "./controllers/confirmedQuoteController";
+import { initNotification } from "./schedules/notifications";
 const app = express();
 
 //CORS 설정
@@ -40,6 +41,7 @@ const corsOptions: CorsOptions = {
 
 // Express app에 CORS 적용
 app.use(cors(corsOptions));
+app.use(express.urlencoded({ extended: true }));
 
 //미들웨어
 app.use(express.json()); //json parse
@@ -57,6 +59,9 @@ app.use(
 app.use(passport.initialize());
 app.use(passport.session());
 
+//알림 스케줄 등록
+initNotification();
+
 //라우터 모음 -> 컨트롤러
 app.use("/services", serviceRouter);
 app.use("/regions", regionRouter);

src/app.ts

@@ -16,7 +16,18 @@ router.post(
         quoteId: parseInt(id),
         customerId,
       });
-      res.status(201).json(confirmedQuote);
+
+      const resData = {
+        message: "견적서 확정 완료",
+        data: {
+          id: confirmedQuote.id,
+          movingRequestId: confirmedQuote.movingRequest.id,
+          quoteId: confirmedQuote.quote.id,
+          moverId: confirmedQuote.mover.id,
+        },
+      };
+
+      res.status(201).send(resData);
     } catch (error) {
       next(error);
     }

src/controllers/confirmedQuoteController.ts

@@ -3,6 +3,7 @@ import { asyncHandle } from "../utils/asyncHandler";
 import express from "express";
 import checkBoolean from "../utils/checkBoolean";
 import passport from "passport";
+import { optionalJwtAuth } from "../middlewares/authMiddleware";
 
 interface queryString {
   nextCursorId: string;
@@ -19,7 +20,7 @@ const router = express.Router();
 //기사 목록 조회
 router.get(
   "/",
-  passport.authenticate("jwt-optional", { session: false }),
+  optionalJwtAuth,
   asyncHandle(async (req, res, next) => {
     try {
       let customerId: number | null = null;
@@ -64,7 +65,7 @@ router.get(
 //기사 상세 조회
 router.get(
   "/:id",
-  passport.authenticate("jwt-optional", { session: false }),
+  optionalJwtAuth,
   asyncHandle(async (req, res, next) => {
     try {
       let customerId: number | null = null;

src/controllers/moverController.ts

@@ -10,22 +10,39 @@ const router = express.Router();
 //이사요청 목록 조회
 router.get(
   "/",
-  passport.authenticate("jwt", { session: false }),
+  // passport.authenticate("jwt", { session: false }),
   asyncHandle(async (req, res, next) => {
     try {
-      const { customerId } = req.user as { customerId: number };
+      // const { customerId } = req.user as { customerId: number };
 
-      const { limit = "10", isCompleted = "", cursor = "0" } = req.query;
+      const {
+        limit = "10",
+        isDesignated = "",
+        cursor = "0",
+        keyword = "",
+        smallMove = "false",
+        houseMove = "false",
+        officeMove = "false",
+        orderBy = "resent",
+      } = req.query;
       const parseLimit = parseInt(limit as string);
       const parseCursor = parseInt(cursor as string);
-      const parseIsCompleted = checkBoolean(isCompleted 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 movingRequestList = await movingRequestService.getMovingRequestList(
-        customerId,
+        1,
         {
           limit: parseLimit,
-          isCompleted: parseIsCompleted,
+          isDesignated: parseIsDesignated,
           cursor: parseCursor,
+          keyword: keyword as string,
+          smallMove: parseSmallMove || false,
+          houseMove: parseHouseMove || false,
+          officeMove: parseOfficeMove || false,
+          orderBy: orderBy as string,
         }
       );
       return res.status(200).send(movingRequestList);

src/controllers/movingRequestController.ts

@@ -173,4 +173,23 @@ router.get(
   })
 );
 
+//견적서 상세 조회
+router.get(
+  "/:id",
+  passport.authenticate("jwt", { session: false }),
+  asyncHandle(async (req, res, next) => {
+    try {
+      const { customerId } = req.user as { customerId: number };
+      const { id: quoteId } = req.params;
+      const quote = await quoteService.getQuoteById(
+        customerId,
+        parseInt(quoteId)
+      );
+      return res.status(200).send(quote);
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
 export default router; // 설정한 라우터를 내보내서 다른 파일에서 사용할 수 있게 해요.

src/controllers/quoteController.ts

@@ -1,6 +1,14 @@
 // 테스트를 위한 임시 파일
 
 import { Request, Response, NextFunction } from "express";
+import passport from "passport";
+import CustomError from "../utils/interfaces/customError";
+
+interface authUser {
+  id: number;
+  customerId: number;
+  moverId: number;
+}
 
 export interface AuthenticatedRequest extends Request {
   user?: {
@@ -18,3 +26,30 @@ export const authenticate = (
   (req as AuthenticatedRequest).user = { id: 1 };
   next();
 };
+
+export const optionalJwtAuth = (
+  req: Request,
+  res: Response,
+  next: NextFunction
+) => {
+  passport.authenticate(
+    "jwt-optional",
+    { session: false },
+    (err: CustomError, user: authUser) => {
+      // 토큰이 없는 경우 (user가 null)이거나 정상적인 경우 통과
+      if (!user || (user && !err)) {
+        req.user = user;
+        return next();
+      }
+
+      // 토큰이 유효하지 않은 경우에만 에러 반환
+      if (err) {
+        err.status = 401;
+        err.data = {
+          message: "유효하지 않는 토큰입니다.",
+        };
+        return next(err);
+      }
+    }
+  )(req, res, next);
+};