v1.0.1

.sql/.sql

@@ -26,7 +26,6 @@ CREATE TABLE "mock" (
     "title" TEXT NOT NULL,
     "description" TEXT NOT NULL,
     "quiz_count" INTEGER NOT NULL,
-    "like_count" INTEGER DEFAULT 0 NOT NULL,
     "created_at" TIMESTAMP NOT NULL,
     "updated_at" TIMESTAMP DEFAULT NOW() NOT NULL,
     "is_deleted" BOOLEAN DEFAULT FALSE NOT NULL

index.ts

@@ -13,6 +13,7 @@ import express from 'express'
 configDotenv()
 
 const app = express()
+
 app.use(
   cors({
     origin: process.env.FRONTEND_SERVER_URL,

package.json

@@ -23,12 +23,10 @@
     "#error/*": "./dist/src/core/error/*.js"
   },
   "dependencies": {
-    "@types/crypto-js": "4.2.2",
     "@upstash/redis": "1.34.4",
     "cookie-parser": "1.4.7",
     "cors": "2.8.5",
     "crypto-js": "4.2.0",
-    "crypto-ts": "1.0.2",
     "dotenv": "16.4.7",
     "express": "4.21.2",
     "jsonwebtoken": "9.0.2",
@@ -40,6 +38,7 @@
   "devDependencies": {
     "@types/cookie-parser": "1.4.8",
     "@types/cors": "2.8.17",
+    "@types/crypto-js": "^4.2.2",
     "@types/express": "5.0.0",
     "@types/jsonwebtoken": "9.0.8",
     "@types/multer": "1.4.12",

src/core/error/ErrorRegistry.ts

@@ -98,6 +98,11 @@ export default class ErrorRegistry {
     'MU001',
     '지원하지 않는 파일 형식입니다',
   )
+  static readonly OUT_OF_UPLOAD_LIMIT = new CustomError(
+    400,
+    'MU002',
+    '파일 업로드 개수를 초과했습니다',
+  )
 
   // Like(LI)
   static readonly DUPLICATE_LIKE = new CustomError(

src/core/util/Regex/index.ts

@@ -1,22 +1,17 @@
 export default class Regex {
   public static readonly ID = /^(?=.*[a-zA-Z])[a-zA-Z0-9]{5,16}$/
-  public static readonly EMAIL =
-    /^[a-zA-Z0-9._%+-]{1,20}@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
-  public static readonly NICKNAME =
-    /^(?=.*[가-힣a-zA-Z])[가-힣a-zA-Z0-9]{2,12}$/
-  public static readonly TITLE = /^[가-힣a-zA-Z0-9]{2,50}$/
-  public static readonly DESCRIPTION = /^[가-힣a-zA-Z0-9]{2,500}$/
-  public static readonly SUBJECT = /^(?=.*[가-힣a-zA-Z])[가-힣a-zA-Z0-9]{2,50}$/
-  public static readonly QUIZ_COUNT = /^(10|[1-9])$/
-  public static readonly CONTENT = /^[가-힣a-zA-Z0-9]{2,500}$/
-  public static readonly TEXT_ANSWER =
-    /^[가-힣a-zA-Z0-9!@#$%^&*()_+={}\[\]:;"'<>,.?~`-]{1,100}$/
-  public static readonly SEARCH = /^[가-힣a-zA-Z0-9]{2,100}$/
-  public static readonly TIER = /^(DIAMOND|PLATINUM|GOLD|SILVER|BRONZE)$/
-  public static readonly FILE =
-    /^(?:[^\s]+\.jpg|[^\s]+\.png)(,(?:[^\s]+\.jpg|[^\s]+\.png)){0,4}$/
   public static readonly PASSWORD =
     /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z0-9!@#$%^&*()_+={}\[\]:;"'<>,.?~`-]{8,16}$/
+
+  public static readonly EMAIL =
+    /^[a-zA-Z0-9._%+-]{1,20}@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,100}$/
+
+  public static readonly NICKNAME = /^.{2,12}$/
+  public static readonly SUBJECT = /^.{1,50}$/
+  public static readonly TITLE = /^.{1,50}$/
+  public static readonly DESCRIPTION = /^.{0,1000}$/
+  public static readonly CONTENT = /^.{0,10000}$/
+  public static readonly TIER = /^(DIAMOND|PLATINUM|GOLD|SILVER|BRONZE)$/
   public static readonly UUID =
-    /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
 }

src/core/util/multipartParser/index.ts

@@ -40,10 +40,26 @@ const multipartParser = (contentType: string, limit: number) => {
         }
       }
 
-      const uploadUrls = req.files.map((file) => {
-        const multerFile = file as Express.MulterS3.File
-        return replaceBaseUrl(multerFile.location)
-      })
+      const uploadUrls = []
+      if (req.body.existingUrls) {
+        const existingUrls = req.body.existingUrls.split(',')
+        existingUrls.forEach((url: string) => {
+          if (!url.startsWith(newBaseUrl)) {
+            return next(ErrorRegistry.INVALID_INPUT_FORMAT)
+          }
+        })
+        if (existingUrls.length + req.files.length > limit) {
+          return next(ErrorRegistry.OUT_OF_UPLOAD_LIMIT)
+        }
+        uploadUrls.push(...existingUrls)
+      }
+
+      uploadUrls.push(
+        ...req.files.map((file) => {
+          const multerFile = file as Express.MulterS3.File
+          return replaceBaseUrl(multerFile.location)
+        }),
+      )
 
       req.body = { ...req.body, uploadUrls }
       next()

src/like/entity/dao/frontend/request/path/ArticleIdxPath.ts

@@ -10,7 +10,7 @@ export default class ArticleIdxPath {
   public idx: UUID
 
   constructor(params: ArticleIdxPathParams) {
-    if (!new RegExp(Regex.UUID).test(params.idx)) {
+    if (!Regex.UUID.test(params.idx)) {
       throw ErrorRegistry.INVALID_INPUT_FORMAT
     }
     this.idx = params.idx

src/like/router/index.ts

@@ -1,8 +1,6 @@
 import express from 'express'
-import { addRouter } from './addRouter.js'
-import { deleteRouter } from './deleteRouter.js'
+import { likeItemRouter } from './likeItemRouter.js'
 
 export const likeRouter = express.Router()
 
-likeRouter.use('/add', addRouter)
-likeRouter.use('/delete', deleteRouter)
+likeRouter.use('/', likeItemRouter)

src/like/router/deleteRouter.ts → src/like/router/likeItemRouter.ts

@@ -3,9 +3,24 @@ import express from 'express'
 import ArticleIdxPath from '../entity/dao/frontend/request/path/ArticleIdxPath.js'
 import LikeService from '../service/LikeService.js'
 
-export const deleteRouter = express.Router()
+export const likeItemRouter = express.Router()
 
-deleteRouter.delete(
+likeItemRouter.post(
+  '/:idx',
+  controller(
+    'login',
+    null,
+    ArticleIdxPath,
+    null,
+    null,
+  )(async (req, res) => {
+    return res.send(
+      await LikeService.addLikeToArticle(req.memberIdx, req.params.idx),
+    )
+  }),
+)
+
+likeItemRouter.delete(
   '/:idx',
   controller(
     'login',

src/member/entity/dao/db/ProfileResultFromDB.ts

@@ -1,3 +1,5 @@
 export default interface ProfileResultFromDB {
   nickname: string
+  role: string
+  idx: number
 }

src/member/entity/dao/frontend/request/FindIdRequest.ts

@@ -1,4 +1,5 @@
 import ErrorRegistry from '#error/ErrorRegistry'
+import Regex from '#util/Regex'
 interface FindIdRequestParams {
   email: string
 }
@@ -7,10 +8,9 @@ export default class FindIdRequest {
   public email: string
 
   constructor(params: FindIdRequestParams) {
-    if (!params.email || params.email.length > 100) {
+    if (!Regex.EMAIL.test(params.email)) {
       throw ErrorRegistry.INVALID_INPUT_FORMAT
     }
     this.email = params.email
   }
 }
-;``

src/member/entity/dao/frontend/request/FindPasswordRequest.ts

@@ -1,4 +1,5 @@
 import ErrorRegistry from '#error/ErrorRegistry'
+import Regex from '#util/Regex'
 interface FindPasswordRequestParams {
   id: string
   email: string
@@ -9,15 +10,17 @@ export default class FindPasswordRequest {
   public email: string
 
   constructor(params: FindPasswordRequestParams) {
-    if (
-      !params.id ||
-      !params.email ||
-      params.id.length > 100 ||
-      params.email.length > 100
-    ) {
+    if (!params.id) {
+      throw ErrorRegistry.INVALID_INPUT_FORMAT
+    }
+    if (params.id.length > 16) {
       throw ErrorRegistry.INVALID_INPUT_FORMAT
     }
     this.id = params.id
+
+    if (!Regex.EMAIL.test(params.email)) {
+      throw ErrorRegistry.INVALID_INPUT_FORMAT
+    }
     this.email = params.email
   }
 }

src/member/entity/dao/frontend/request/NicknameChangeRequest.ts

@@ -9,7 +9,7 @@ export default class NicknameChangeRequest {
   public nickname: string
 
   constructor(params: NicknameChangeRequestParams) {
-    if (!new RegExp(Regex.NICKNAME).test(params.nickname)) {
+    if (!Regex.NICKNAME.test(params.nickname)) {
       throw ErrorRegistry.INVALID_INPUT_FORMAT
     }
     this.nickname = params.nickname

src/member/entity/dao/frontend/request/NormalLoginRequest.ts

@@ -9,16 +9,20 @@ export default class NormalLoginRequest {
   public id: string
   public password: string
   constructor(params: NormalLoginRequestParams) {
-    if (
-      !params.id ||
-      !params.password ||
-      params.id.length > 100 ||
-      params.password.length > 100
-    ) {
+    if (!params.id) {
+      throw ErrorRegistry.INVALID_INPUT_FORMAT
+    }
+    if (params.id.length > 16) {
       throw ErrorRegistry.INVALID_INPUT_FORMAT
     }
-
     this.id = params.id
+
+    if (!params.password) {
+      throw ErrorRegistry.INVALID_INPUT_FORMAT
+    }
+    if (params.password.length > 16) {
+      throw ErrorRegistry.INVALID_INPUT_FORMAT
+    }
     this.password = params.password
   }
 }