Merge branch 'develop' into main

.gitignore

@@ -189,3 +189,4 @@ gradle-app.setting
 docker/data
 src/main/resources/application.yml
 
+dev.application.yml

build.gradle.kts

@@ -36,8 +36,8 @@ dependencies {
 
     // r2dbc
     implementation("org.springframework.boot:spring-boot-starter-data-r2dbc:3.0.4")
-    implementation("org.postgresql:r2dbc-postgresql:1.0.1.RELEASE")
-    runtimeOnly("org.postgresql:postgresql")
+    implementation("org.postgresql:r2dbc-postgresql:1.0.7.RELEASE")
+    implementation("org.postgresql:postgresql:42.7.4")
 
     // feign client
     implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
@@ -50,7 +50,7 @@ dependencies {
     implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
 
     // validation
-    implementation("org.hibernate.validator:hibernate-validator:8.0.0.Final")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
 
     // jwt
     implementation("io.jsonwebtoken:jjwt-api:$jwtVersion")
@@ -93,6 +93,10 @@ dependencies {
     jooqCodegen("org.jooq:jooq-meta-kotlin:${jooqVersion}")
     // workaround of array type codegen, see: https://github.com/jOOQ/jOOQ/issues/13322
     jooqCodegen("com.h2database:h2:2.3.232")
+
+    // flyway
+    implementation("org.flywaydb:flyway-core:10.22.0")
+    implementation("org.flywaydb:flyway-database-postgresql:10.22.0")
 }
 
 jooq {
@@ -125,7 +129,7 @@ jooq {
                             // - ? matches a single character in a directory / file name
                             property {
                                 key = "scripts"
-                                value = "src/main/resources/schema.sql"
+                                value = "src/main/resources/db/jooq/schema.sql"
                             }
 
                             // The sort order of the scripts within a directory, where:

src/main/kotlin/com/devooks/backend/auth/v1/controller/AuthController.kt

@@ -20,6 +20,7 @@ import com.devooks.backend.auth.v1.service.OauthService
 import com.devooks.backend.auth.v1.service.TokenService
 import com.devooks.backend.member.v1.domain.Member
 import com.devooks.backend.member.v1.service.MemberService
+import jakarta.validation.Valid
 import java.util.*
 import org.springframework.transaction.annotation.Transactional
 import org.springframework.web.bind.annotation.PostMapping
@@ -38,6 +39,7 @@ class AuthController(
 
     @PostMapping("/login")
     override suspend fun login(
+        @Valid
         @RequestBody
         request: LoginRequest,
     ): LoginResponse {
@@ -51,6 +53,7 @@ class AuthController(
     @Transactional
     @PostMapping("/logout")
     override suspend fun logout(
+        @Valid
         @RequestBody
         request: LogoutRequest,
     ): LogoutResponse {
@@ -62,6 +65,7 @@ class AuthController(
 
     @PostMapping("/reissue")
     override suspend fun reissue(
+        @Valid
         @RequestBody
         request: ReissueRequest,
     ): ReissueResponse {
@@ -72,6 +76,7 @@ class AuthController(
 
     @PostMapping("/check/email")
     override suspend fun checkEmail(
+        @Valid
         @RequestBody
         request: CheckEmailRequest,
     ): CheckEmailResponse {

src/main/kotlin/com/devooks/backend/auth/v1/controller/AuthControllerDocs.kt

@@ -35,9 +35,7 @@ interface AuthControllerDocs {
             ),
             ApiResponse(
                 responseCode = "400",
-                description =
-                "- AUTH-400-1 : 인증 코드(authorizationCode)가 NULL이거나 빈 문자일 경우\n" +
-                        "- AUTH-400-2 : 인증 유형(oauthType)이 NAVER, KAKAO, GOOGLE 이 아닐 경우 ",
+                description = "- COMMON-400-0 : 유효하지 않은 요청입니다.",
                 content = arrayOf(
                     Content(
                         mediaType = APPLICATION_JSON_VALUE,
@@ -102,8 +100,7 @@ interface AuthControllerDocs {
             ),
             ApiResponse(
                 responseCode = "400",
-                description =
-                "- AUTH-400-3 : 리프래시 토큰(refreshToken)이 NULL이거나 빈 문자일 경우",
+                description = "- COMMON-400-0 : 유효하지 않은 요청입니다.",
                 content = arrayOf(
                     Content(
                         mediaType = APPLICATION_JSON_VALUE,
@@ -152,8 +149,7 @@ interface AuthControllerDocs {
             ),
             ApiResponse(
                 responseCode = "400",
-                description =
-                "- AUTH-400-3 : 리프래시 토큰(refreshToken)이 NULL이거나 빈 문자일 경우",
+                description = "- COMMON-400-0 : 유효하지 않은 요청입니다.",
                 content = arrayOf(
                     Content(
                         mediaType = APPLICATION_JSON_VALUE,
@@ -214,9 +210,7 @@ interface AuthControllerDocs {
             ),
             ApiResponse(
                 responseCode = "400",
-                description =
-                "- AUTH-400-16 : 이메일 값이 존재하지 않을 경우" +
-                        "- AUTH-400-17 : 이메일 형식이 아닐 경우",
+                description = "- COMMON-400-0 : 유효하지 않은 요청입니다.",
                 content = arrayOf(
                     Content(
                         mediaType = APPLICATION_JSON_VALUE,

src/main/kotlin/com/devooks/backend/auth/v1/dto/CheckEmailRequest.kt

@@ -1,14 +1,12 @@
 package com.devooks.backend.auth.v1.dto
 
-import com.devooks.backend.member.v1.error.validateEmail
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.Pattern
 
 data class CheckEmailRequest(
-    @Schema(description = "이메일", required = true, nullable = false)
-    val email: String?,
+    @field:Pattern(regexp = "^[A-Za-z0-9+_.-]+@[A-Za-z0-9]+\\.[A-Za-z]+$")
+    @Schema(description = "이메일", required = true)
+    val email: String,
 ) {
-    fun toCommand() =
-        CheckEmailCommand(
-            email = email.validateEmail()
-        )
+    fun toCommand() = CheckEmailCommand(email = email)
 }

src/main/kotlin/com/devooks/backend/auth/v1/dto/LoginRequest.kt

@@ -1,23 +1,19 @@
 package com.devooks.backend.auth.v1.dto
 
-import com.devooks.backend.auth.v1.error.validateAuthorizationCode
-import com.devooks.backend.auth.v1.error.validateOauthType
+import com.devooks.backend.auth.v1.domain.OauthType
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.NotBlank
 
 data class LoginRequest(
-    @Schema(description = "OAuth2 인증 코드", required = true, nullable = false)
-    val authorizationCode: String?,
-    @Schema(
-        description = "OAuth2 인증 유형 (ex. NAVER, KAKAO, GOOGLE)",
-        required = true,
-        nullable = false,
-        example = "NAVER"
-    )
-    val oauthType: String?,
+    @field:NotBlank
+    @Schema(description = "OAuth2 인증 코드", required = true)
+    val authorizationCode: String,
+    @Schema(description = "OAuth2 인증 유형 (ex. NAVER, KAKAO, GOOGLE)", required = true)
+    val oauthType: OauthType,
 ) {
     fun toCommand(): LoginCommand =
         LoginCommand(
-            authorizationCode = authorizationCode.validateAuthorizationCode(),
-            oauthType = oauthType.validateOauthType()
+            authorizationCode = authorizationCode,
+            oauthType = oauthType
         )
 }

src/main/kotlin/com/devooks/backend/auth/v1/dto/LogoutRequest.kt

@@ -1,14 +1,13 @@
 package com.devooks.backend.auth.v1.dto
 
-import com.devooks.backend.auth.v1.error.validateRefreshToken
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.NotBlank
 
 data class LogoutRequest(
-    @Schema(description = "Refresh 토큰", required = true, nullable = false)
-    val refreshToken: String?,
+    @field:NotBlank
+    @Schema(description = "Refresh 토큰", required = true)
+    val refreshToken: String,
 ) {
     fun toCommand(): LogoutCommand =
-        LogoutCommand(
-            refreshToken = refreshToken.validateRefreshToken()
-        )
+        LogoutCommand(refreshToken = refreshToken)
 }

src/main/kotlin/com/devooks/backend/auth/v1/dto/ReissueRequest.kt

@@ -1,14 +1,12 @@
 package com.devooks.backend.auth.v1.dto
 
-import com.devooks.backend.auth.v1.error.validateRefreshToken
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.NotBlank
 
 data class ReissueRequest(
-    @Schema(description = "리프래시 토큰", required = true, nullable = false)
-    val refreshToken: String?,
+    @field:NotBlank
+    @Schema(description = "리프래시 토큰", required = true)
+    val refreshToken: String,
 ) {
-    fun toCommand(): ReissueCommand =
-        ReissueCommand(
-            refreshToken = refreshToken.validateRefreshToken()
-        )
+    fun toCommand(): ReissueCommand = ReissueCommand(refreshToken = refreshToken)
 }

src/main/kotlin/com/devooks/backend/auth/v1/error/AuthError.kt

@@ -2,19 +2,12 @@ package com.devooks.backend.auth.v1.error
 
 import com.devooks.backend.common.exception.GeneralException
 import org.springframework.http.HttpStatus
-import org.springframework.http.HttpStatus.BAD_REQUEST
 import org.springframework.http.HttpStatus.CONFLICT
 import org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR
 import org.springframework.http.HttpStatus.NOT_FOUND
 import org.springframework.http.HttpStatus.UNAUTHORIZED
 
 enum class AuthError(val exception: GeneralException) {
-    // 400
-    REQUIRED_AUTHORIZATION_CODE(GeneralException("AUTH-400-1", BAD_REQUEST, "인증 코드가 반드시 필요합니다.")),
-    INVALID_OAUTH_TYPE(GeneralException("AUTH-400-2", BAD_REQUEST, "인증 유형은 NAVER, KAKAO, GOOGLE 만 가능합니다.")),
-    REQUIRED_TOKEN(GeneralException("AUTH-400-3", BAD_REQUEST, "토큰이 반드시 필요합니다.")),
-    REQUIRED_OAUTH_ID(GeneralException("AUTH-400-4", BAD_REQUEST, "인증 식별자는 반드시 필요합니다.")),
-
     // 401
     EXPIRED_TOKEN(GeneralException("AUTH-401-1", UNAUTHORIZED, "만료된 토큰입니다.")),
     INVALID_REFRESH_TOKEN(GeneralException("AUTH-401-2", UNAUTHORIZED, "유효하지 않는 리프래시 토큰입니다.")),

src/main/kotlin/com/devooks/backend/common/config/cors/CorsGlobalConfig.kt

@@ -11,8 +11,8 @@ class CorsGlobalConfig : WebFluxConfigurer {
         registry
             .addMapping("/**")
             .allowedOrigins("http://localhost:3000", "http://localhost:3001")
-            .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
-            .allowedHeaders("Authorization", "Content-Type", "X-Requested-With")
+            .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")
+            .allowedHeaders("Authorization", "Content-Type", "X-Requested-With", "Accepts")
             .allowCredentials(true)
     }
-}
+}

src/main/kotlin/com/devooks/backend/common/config/database/R2dbcConfiguration.kt

@@ -7,12 +7,10 @@ import io.r2dbc.spi.ConnectionFactoryOptions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.core.convert.converter.Converter
-import org.springframework.core.io.ClassPathResource
 import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration
 import org.springframework.data.r2dbc.convert.R2dbcCustomConversions
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories
 import org.springframework.r2dbc.connection.init.ConnectionFactoryInitializer
-import org.springframework.r2dbc.connection.init.ResourceDatabasePopulator
 
 @Configuration
 @EnableR2dbcRepositories
@@ -43,11 +41,5 @@ class R2dbcConfiguration(
         ConnectionFactoryInitializer()
             .apply {
                 setConnectionFactory(connectionFactory())
-                setDatabasePopulator(
-                    ResourceDatabasePopulator(
-                        ClassPathResource("schema.sql"),
-                        ClassPathResource("data.sql")
-                    )
-                )
             }
 }

src/main/kotlin/com/devooks/backend/common/domain/Image.kt

@@ -6,22 +6,14 @@ import java.util.*
 class Image(
     val base64Raw: String,
     val extension: ImageExtension,
-    val byteSize: Long,
+    val byteSize: Int,
     val order: Int
 ) {
 
     fun convertDecodedImage(): ByteArray =
         runCatching {
-            Base64.getMimeDecoder().decode(base64Raw)
+            Base64.getDecoder().decode(base64Raw)
         }.getOrElse {
             throw CommonError.FAIL_SAVE_IMAGE.exception
         }
-
-    companion object {
-        private const val MAX_BYTE_SIZE = 50_000_000
-
-        fun Long?.validateByteSize(): Long =
-            this?.takeIf { it <= MAX_BYTE_SIZE }
-                ?: throw CommonError.INVALID_BYTE_SIZE.exception
-    }
-}
+}

src/main/kotlin/com/devooks/backend/common/domain/ImageExtension.kt

@@ -1,22 +1,10 @@
 package com.devooks.backend.common.domain
 
-import com.devooks.backend.common.error.CommonError
 import java.util.*
 
 enum class ImageExtension {
     JPG, PNG, JPEG;
 
     override fun toString(): String =
         this.name.lowercase(Locale.getDefault())
-
-    companion object {
-        fun String?.validateImageExtension(): ImageExtension =
-            runCatching {
-                this?.takeIf { it.isNotBlank() }
-                    ?.let { ImageExtension.valueOf(it.uppercase()) }
-                    ?: throw CommonError.INVALID_IMAGE_EXTENSION.exception
-            }.getOrElse {
-                throw CommonError.INVALID_IMAGE_EXTENSION.exception
-            }
-    }
 }