Merge pull request #133 from KUSITMS-29th-TEAM-B/refactor/flight-122

refactor : 도메인 모듈 web 의존성 제거

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/bookmark/config/BookmarkServiceConfiguration.kt → Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/bookmark/config/BookmarkServiceConfiguration.kt

@@ -1,4 +1,4 @@
-package com.bamyanggang.domainmodule.domain.bookmark.config
+package com.bamyanggang.apimodule.domain.bookmark.config
 
 import com.bamyanggang.domainmodule.domain.bookmark.repository.BookmarkRepository
 import com.bamyanggang.domainmodule.domain.bookmark.service.BookmarkAppender

Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/experience/config/ExperienceServiceConfiguration.kt

@@ -0,0 +1,36 @@
+package com.bamyanggang.apimodule.domain.experience.config
+
+import com.bamyanggang.domainmodule.domain.experience.repository.ExperienceRepository
+import com.bamyanggang.domainmodule.domain.experience.service.ExperienceAppender
+import com.bamyanggang.domainmodule.domain.experience.service.ExperienceModifier
+import com.bamyanggang.domainmodule.domain.experience.service.ExperienceReader
+import com.bamyanggang.domainmodule.domain.experience.service.ExperienceRemover
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class ExperienceServiceConfiguration(
+    private val experienceRepository: ExperienceRepository
+) {
+
+    @Bean
+    fun experienceAppender(): ExperienceAppender {
+        return ExperienceAppender(experienceRepository)
+    }
+
+    @Bean
+    fun experienceModifier(): ExperienceModifier {
+        return ExperienceModifier(experienceRepository)
+    }
+
+    @Bean
+    fun experienceReader(): ExperienceReader {
+        return ExperienceReader(experienceRepository)
+    }
+
+    @Bean
+    fun experienceRemover(): ExperienceRemover {
+        return ExperienceRemover(experienceRepository)
+    }
+
+}

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/jobDescription/config/JobDescriptionServiceConfiguration.kt → Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/jobDescription/config/JobDescriptionServiceConfiguration.kt

@@ -1,4 +1,4 @@
-package com.bamyanggang.domainmodule.domain.jobDescription.config
+package com.bamyanggang.apimodule.domain.jobDescription.config
 
 import com.bamyanggang.domainmodule.domain.jobDescription.repository.ApplyRepository
 import com.bamyanggang.domainmodule.domain.jobDescription.repository.JobDescriptionRepository

Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt

@@ -0,0 +1,30 @@
+package com.bamyanggang.apimodule.domain.strongpoint.config
+
+import com.bamyanggang.domainmodule.domain.strongpoint.repository.StrongPointRepository
+import com.bamyanggang.domainmodule.domain.strongpoint.service.StrongPointAppender
+import com.bamyanggang.domainmodule.domain.strongpoint.service.StrongPointReader
+import com.bamyanggang.domainmodule.domain.strongpoint.service.StrongPointRemover
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class StrongPointServiceConfiguration(
+    private val strongPointRepository: StrongPointRepository
+) {
+
+    @Bean
+    fun strongPointAppender(): StrongPointAppender {
+        return StrongPointAppender(strongPointRepository)
+    }
+
+    @Bean
+    fun strongPointReader(): StrongPointReader {
+        return StrongPointReader(strongPointRepository)
+    }
+
+    @Bean
+    fun strongPointModifier(): StrongPointRemover{
+        return StrongPointRemover(strongPointRepository)
+    }
+
+}

Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/tag/config/TagServiceConfiguration.kt

@@ -0,0 +1,30 @@
+package com.bamyanggang.apimodule.domain.tag.config
+
+import com.bamyanggang.domainmodule.domain.tag.repository.TagRepository
+import com.bamyanggang.domainmodule.domain.tag.service.TagAppender
+import com.bamyanggang.domainmodule.domain.tag.service.TagReader
+import com.bamyanggang.domainmodule.domain.tag.service.TagRemover
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class TagServiceConfiguration(
+    private val tagRepository: TagRepository
+) {
+
+    @Bean
+    fun tagAppender(): TagAppender {
+        return TagAppender(tagRepository)
+    }
+
+    @Bean
+    fun tagReader(): TagReader {
+        return TagReader(tagRepository)
+    }
+
+    @Bean
+    fun tagModifier(): TagRemover {
+        return TagRemover(tagRepository)
+    }
+
+}

Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/user/application/exception/AuthException.kt

@@ -1,26 +1,23 @@
 package com.bamyanggang.apimodule.domain.user.application.exception
 
 import com.bamyanggang.commonmodule.exception.CustomException
-import org.springframework.http.HttpStatus
-import org.springframework.http.HttpStatusCode
 
 sealed class AuthException (
     errorCode: Int,
-    httpStatusCode: HttpStatusCode,
     message: String,
-) : CustomException(CODE_PREFIX, errorCode, httpStatusCode , message) {
+) : CustomException(CODE_PREFIX, errorCode, message) {
 
         class OAuthFailed(message: String = "OAuth 인증에 실패하였습니다.") :
-            AuthException(errorCode = 1, httpStatusCode = HttpStatus.BAD_REQUEST, message = message)
+            AuthException(errorCode = 1, message = message)
 
         class KakaoUserInfoRetrievalException(message: String = "카카오 사용자 정보를 가져오는데 실패했습니다.") :
-            AuthException(errorCode = 2, httpStatusCode = HttpStatus.BAD_REQUEST, message = message)
+            AuthException(errorCode = 2, message = message)
 
         class GoogleUserInfoRetrievalException(message: String = "구글 사용자 정보를 가져오는데 실패했습니다.") :
-            AuthException(errorCode = 3, httpStatusCode = HttpStatus.BAD_REQUEST, message = message)
+            AuthException(errorCode = 3, message = message)
 
         companion object {
             const val CODE_PREFIX = "AUTH"
         }
 
-}
+}

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/config/UserServiceConfiguration.kt → Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/user/config/UserServiceConfiguration.kt

@@ -1,4 +1,4 @@
-package com.bamyanggang.domainmodule.domain.user.config
+package com.bamyanggang.apimodule.domain.user.config
 
 import com.bamyanggang.domainmodule.domain.user.repository.TokenRepository
 import com.bamyanggang.domainmodule.domain.user.repository.UserRepository

Api-Module/src/test/kotlin/com/bamyanggang/apimodule/domain/tag/presentation/TagControllerTest.kt

@@ -553,7 +553,7 @@ class TagControllerTest : BaseRestDocsTest() {
         val result = mockMvc.perform(request)
 
         //then
-        result.andExpect(status().isNotFound)
+        result.andExpect(status().isBadRequest)
             .andDo(resultHandler.document(
                 requestHeaders(
                     headerWithName("Authorization").description("엑세스 토큰")

Common-Module/src/main/kotlin/com/bamyanggang/commonmodule/exception/CustomException.kt

@@ -1,25 +1,21 @@
 package com.bamyanggang.commonmodule.exception
 
-import org.springframework.http.HttpStatusCode
 
 abstract class CustomException(
     codePrefix: String = DEFAULT_CODE_PREFIX,
     errorCode: Int,
-    httpStatusCode: HttpStatusCode,
     override val message: String = DEFAULT_MESSAGE,
 ) : RuntimeException(message) {
 
     val code: String = "$codePrefix-${
         errorCode.toString().padStart(DEFAULT_CODE_NUMBER_LENGTH, DEFAULT_CODE_NUMBER_PAD_CHAR)
     }"
 
-    val httpStatusCode: HttpStatusCode = httpStatusCode
-
     companion object {
         const val DEFAULT_CODE_PREFIX = "UNKNOWN"
         const val DEFAULT_MESSAGE = "예상하지 못한 오류가 발생했습니다."
         const val DEFAULT_CODE_NUMBER_LENGTH = 3
         const val DEFAULT_CODE_NUMBER_PAD_CHAR = '0'
     }
 
-}
+}

Common-Module/src/main/kotlin/com/bamyanggang/commonmodule/exception/ExceptionHandler.kt

@@ -11,7 +11,7 @@ class ExceptionHandler {
     private val logger = LoggerFactory.getLogger(ExceptionHandler::class.java)
     @ExceptionHandler(CustomException::class)
     fun handleJwtException(e: CustomException): ResponseEntity<ErrorResponse> {
-        return ResponseEntity(ErrorResponse(e.code, e.message), e.httpStatusCode)
+        return ResponseEntity(ErrorResponse(e.code, e.message), HttpStatus.BAD_REQUEST)
     }
 
     @ExceptionHandler(Exception::class)

Domain-Module/build.gradle.kts

@@ -1,7 +1,5 @@
 dependencies {
     implementation(project(":Common-Module"))
-    //web
-    implementation("org.springframework.boot:spring-boot-starter-web")
     implementation(project(":Support-Module:uuid"))
     testImplementation(testFixtures(project(":Common-Module")))
 }

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceAppender.kt

@@ -4,11 +4,9 @@ import com.bamyanggang.domainmodule.domain.experience.aggregate.Experience
 import com.bamyanggang.domainmodule.domain.experience.aggregate.ExperienceContent
 import com.bamyanggang.domainmodule.domain.experience.aggregate.ExperienceStrongPoint
 import com.bamyanggang.domainmodule.domain.experience.repository.ExperienceRepository
-import org.springframework.stereotype.Service
 import java.time.LocalDateTime
 import java.util.*
 
-@Service
 class ExperienceAppender(
     private val experienceRepository: ExperienceRepository,
 ) {

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceModifier.kt

@@ -4,11 +4,9 @@ import com.bamyanggang.domainmodule.domain.experience.aggregate.Experience
 import com.bamyanggang.domainmodule.domain.experience.aggregate.ExperienceContent
 import com.bamyanggang.domainmodule.domain.experience.aggregate.ExperienceStrongPoint
 import com.bamyanggang.domainmodule.domain.experience.repository.ExperienceRepository
-import org.springframework.stereotype.Service
 import java.time.LocalDateTime
 import java.util.*
 
-@Service
 class ExperienceModifier(
     private val experienceRepository: ExperienceRepository
 ) {

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceReader.kt

@@ -2,10 +2,8 @@ package com.bamyanggang.domainmodule.domain.experience.service
 
 import com.bamyanggang.domainmodule.domain.experience.aggregate.Experience
 import com.bamyanggang.domainmodule.domain.experience.repository.ExperienceRepository
-import org.springframework.stereotype.Service
 import java.util.*
 
-@Service
 class ExperienceReader(
     private val experienceRepository: ExperienceRepository
 ) {

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceRemover.kt

@@ -1,10 +1,8 @@
 package com.bamyanggang.domainmodule.domain.experience.service
 
 import com.bamyanggang.domainmodule.domain.experience.repository.ExperienceRepository
-import org.springframework.stereotype.Service
 import java.util.*
 
-@Service
 class ExperienceRemover(
     private val experienceRepository: ExperienceRepository,
 ) {

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/jobDescription/exception/JobDescriptionException.kt

@@ -1,17 +1,14 @@
 package com.bamyanggang.domainmodule.domain.jobDescription.exception
 
 import com.bamyanggang.commonmodule.exception.CustomException
-import org.springframework.http.HttpStatus
-import org.springframework.http.HttpStatusCode
 
 sealed class JobDescriptionException (
     errorCode: Int,
-    httpStatusCode: HttpStatusCode,
     message: String,
-) : CustomException(CODE_PREFIX, errorCode, httpStatusCode , message) {
+) : CustomException(CODE_PREFIX, errorCode, message) {
 
     class ModifyWriteStatusFailed(message: String = "쓰기 상태 변경에 실패하였습니다.") :
-        JobDescriptionException(errorCode = 1, httpStatusCode = HttpStatus.BAD_REQUEST, message = message)
+        JobDescriptionException(errorCode = 1, message = message)
 
     companion object {
         const val CODE_PREFIX = "AUTH"

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/exception/StrongPointException.kt

@@ -2,17 +2,14 @@ package com.bamyanggang.domainmodule.domain.strongpoint.exception
 
 import com.bamyanggang.commonmodule.exception.CustomException
 import com.bamyanggang.domainmodule.domain.strongpoint.aggregate.StrongPoint
-import org.springframework.http.HttpStatus
-import org.springframework.http.HttpStatusCode
 
 sealed class StrongPointException(
     errorCode: Int,
-    httpStatusCode: HttpStatusCode,
     message: String,
-) : CustomException(CODE_PREFIX, errorCode, httpStatusCode , message) {
+) : CustomException(CODE_PREFIX, errorCode, message) {
 
     class OverCountLimit (message: String = "역량 키워드는 최대 ${StrongPoint.LIMIT}개까지 등록 가능합니다.") :
-    StrongPointException(errorCode = 3, httpStatusCode = HttpStatus.BAD_REQUEST, message = message)
+    StrongPointException(errorCode = 3, message = message)
 
     companion object {
         const val CODE_PREFIX = "STRONG_POINT"

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointAppender.kt

@@ -2,10 +2,8 @@ package com.bamyanggang.domainmodule.domain.strongpoint.service
 
 import com.bamyanggang.domainmodule.domain.strongpoint.aggregate.StrongPoint
 import com.bamyanggang.domainmodule.domain.strongpoint.repository.StrongPointRepository
-import org.springframework.stereotype.Service
 import java.util.*
 
-@Service
 class StrongPointAppender(
     private val strongPointRepository: StrongPointRepository
 ) {

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointReader.kt

@@ -2,10 +2,8 @@ package com.bamyanggang.domainmodule.domain.strongpoint.service
 
 import com.bamyanggang.domainmodule.domain.strongpoint.aggregate.StrongPoint
 import com.bamyanggang.domainmodule.domain.strongpoint.repository.StrongPointRepository
-import org.springframework.stereotype.Service
 import java.util.*
 
-@Service
 class StrongPointReader(
     private val strongPointRepository: StrongPointRepository
 ) {

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointRemover.kt

@@ -2,10 +2,8 @@ package com.bamyanggang.domainmodule.domain.strongpoint.service
 
 import com.bamyanggang.domainmodule.domain.strongpoint.exception.StrongPointExceptionMessage
 import com.bamyanggang.domainmodule.domain.strongpoint.repository.StrongPointRepository
-import org.springframework.stereotype.Service
 import java.util.*
 
-@Service
 class StrongPointRemover(
     private val strongPointRepository: StrongPointRepository
 ) {

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/exception/TagException.kt

@@ -1,23 +1,20 @@
 package com.bamyanggang.domainmodule.domain.tag.exception
 
 import com.bamyanggang.commonmodule.exception.CustomException
-import org.springframework.http.HttpStatus
-import org.springframework.http.HttpStatusCode
 
 sealed class TagException(
     errorCode: Int,
-    httpStatusCode: HttpStatusCode,
     message: String,
-) : CustomException(CODE_PREFIX, errorCode, httpStatusCode , message) {
+) : CustomException(CODE_PREFIX, errorCode, message) {
 
     class DuplicatedTagName(message: String = "태그 이름이 중복됩니다.") :
-        TagException(errorCode = 1, httpStatusCode = HttpStatus.BAD_REQUEST, message = message)
+        TagException(errorCode = 1, message = message)
 
     class OverTagCountLimit(message: String = "태그 개수가 제한 개수보다 많습니다.") :
-        TagException(errorCode = 2, httpStatusCode = HttpStatus.BAD_REQUEST, message = message)
+        TagException(errorCode = 2, message = message)
 
     class NotFoundTag(message: String = "존재하지 않는 태그 입니다.") :
-        TagException(errorCode = 3, httpStatusCode = HttpStatus.NOT_FOUND, message = message)
+        TagException(errorCode = 3, message = message)
 
     companion object {
         const val CODE_PREFIX = "TAG"

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagAppender.kt

@@ -2,10 +2,8 @@ package com.bamyanggang.domainmodule.domain.tag.service
 
 import com.bamyanggang.domainmodule.domain.tag.aggregate.Tag
 import com.bamyanggang.domainmodule.domain.tag.repository.TagRepository
-import org.springframework.stereotype.Service
 import java.util.*
 
-@Service
 class TagAppender(
     private val tagRepository: TagRepository
 ) {

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagReader.kt

@@ -2,10 +2,8 @@ package com.bamyanggang.domainmodule.domain.tag.service
 
 import com.bamyanggang.domainmodule.domain.tag.aggregate.Tag
 import com.bamyanggang.domainmodule.domain.tag.repository.TagRepository
-import org.springframework.stereotype.Service
 import java.util.*
 
-@Service
 class TagReader(
     private val tagRepository: TagRepository
 ) {

Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagRemover.kt

@@ -2,10 +2,8 @@ package com.bamyanggang.domainmodule.domain.tag.service
 
 import com.bamyanggang.domainmodule.domain.tag.exception.TagException
 import com.bamyanggang.domainmodule.domain.tag.repository.TagRepository
-import org.springframework.stereotype.Service
 import java.util.*
 
-@Service
 class TagRemover(
     private val tagRepository: TagRepository
 ) {