Merge branch 'dev' into #450-택시비용-보여주기

src/modules/patterns.js

@@ -15,5 +15,7 @@ module.exports = {
   chat: {
     chatImgType: RegExp("^(image/png|image/jpg|image/jpeg)$"),
     chatSendType: RegExp("^(text|account)$"),
+    chatContent: RegExp("^\\s{0,}\\S{1}[\\s\\S]{0,}$"), // 왼쪽 공백 제외 최소 1개 문자
+    chatContentLength: RegExp("^[\\s\\S]{1,140}$"), // 공백 포함 최대 140문자
   },
 };

src/routes/chats.js

@@ -1,6 +1,8 @@
 const express = require("express");
 const { body } = require("express-validator");
 const validator = require("../middlewares/validator");
+const { validateBody } = require("../middlewares/zod");
+const { chatsZod } = require("./docs/schemas/chatsSchema");
 const patterns = require("../modules/patterns");
 
 const router = express.Router();
@@ -47,10 +49,7 @@ router.post(
  */
 router.post(
   "/send",
-  body("roomId").isMongoId(),
-  body("type").matches(patterns.chat.chatSendType),
-  body("content").isString(),
-  validator,
+  validateBody(chatsZod.sendChatHandler),
   chatsHandlers.sendChatHandler
 );
 

src/routes/docs/schemas/chatsSchema.js

@@ -0,0 +1,15 @@
+const { z } = require("zod");
+const { zodToSchemaObject } = require("../utils");
+const { objectId, chat } = require("../../../modules/patterns");
+
+const chatsZod = {
+  sendChatHandler: z.object({
+    roomId: z.string().regex(objectId),
+    type: z.string().regex(chat.chatSendType),
+    content: z.string().regex(chat.chatContent).regex(chat.chatContentLength),
+  }),
+};
+
+const chatsSchema = zodToSchemaObject(chatsZod);
+
+module.exports = { chatsZod, chatsSchema };

src/routes/docs/swaggerDocs.js

@@ -1,6 +1,7 @@
 const { reportsSchema } = require("./schemas/reportsSchema");
 const { roomsSchema } = require("./schemas/roomsSchema");
 const { fareSchema } = require("./schemas/fareSchema");
+const { chatsSchema } = require("./schemas/chatsSchema");
 const reportsDocs = require("./reports");
 const logininfoDocs = require("./logininfo");
 const locationsDocs = require("./locations");
@@ -93,6 +94,7 @@ const swaggerDocs = {
       ...reportsSchema,
       ...roomsSchema,
       ...fareSchema,
+      ...chatsSchema,
     },
   },
 };