From ae9e79cf380c1382dee7dca84a32f319395ff318 Mon Sep 17 00:00:00 2001 From: seeunjang Date: Tue, 21 May 2024 16:00:44 +0900 Subject: [PATCH 1/8] =?UTF-8?q?refactor=20:=20Experience=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=B9=88=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95(#1?= =?UTF-8?q?22)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/ExperienceServiceConfiguration.kt | 36 +++++++++++++++++++ .../experience/service/ExperienceAppender.kt | 2 -- .../experience/service/ExperienceModifier.kt | 2 -- .../experience/service/ExperienceReader.kt | 2 -- .../experience/service/ExperienceRemover.kt | 2 -- 5 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/config/ExperienceServiceConfiguration.kt diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/config/ExperienceServiceConfiguration.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/config/ExperienceServiceConfiguration.kt new file mode 100644 index 00000000..7dbb73b4 --- /dev/null +++ b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/config/ExperienceServiceConfiguration.kt @@ -0,0 +1,36 @@ +package com.bamyanggang.domainmodule.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) + } + +} diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceAppender.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceAppender.kt index a0fc6ee7..c3990996 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceAppender.kt +++ b/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, ) { diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceModifier.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceModifier.kt index 23ab9b5a..de6d826e 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceModifier.kt +++ b/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 ) { diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceReader.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceReader.kt index 1fd938c1..f4a86159 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceReader.kt +++ b/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 ) { diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceRemover.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceRemover.kt index 785305ce..98cc3aa8 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/service/ExperienceRemover.kt +++ b/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, ) { From ca22485ee1f5d403a453a6a73ff9324bb073dbd8 Mon Sep 17 00:00:00 2001 From: seeunjang Date: Tue, 21 May 2024 16:01:02 +0900 Subject: [PATCH 2/8] =?UTF-8?q?refactor=20:=20StrongPoint=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=B9=88=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95(#1?= =?UTF-8?q?22)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/StrongPointServiceConfiguration.kt | 30 +++++++++++++++++++ .../service/StrongPointAppender.kt | 2 -- .../strongpoint/service/StrongPointReader.kt | 2 -- .../strongpoint/service/StrongPointRemover.kt | 2 -- 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt new file mode 100644 index 00000000..f84d8490 --- /dev/null +++ b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt @@ -0,0 +1,30 @@ +package com.bamyanggang.domainmodule.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) + } + +} diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointAppender.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointAppender.kt index df855f8b..9f385a48 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointAppender.kt +++ b/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 ) { diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointReader.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointReader.kt index 857d30f3..ce9165bc 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointReader.kt +++ b/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 ) { diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointRemover.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointRemover.kt index b8d856ea..b787e758 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/service/StrongPointRemover.kt +++ b/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 ) { From 5fecd36c8eb1f89c11fea4cba57de28410ccadb3 Mon Sep 17 00:00:00 2001 From: seeunjang Date: Tue, 21 May 2024 16:01:13 +0900 Subject: [PATCH 3/8] =?UTF-8?q?refactor=20:=20Tag=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=B9=88=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95(#122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tag/config/TagServiceConfiguration.kt | 30 +++++++++++++++++++ .../domain/tag/service/TagAppender.kt | 2 -- .../domain/tag/service/TagReader.kt | 2 -- .../domain/tag/service/TagRemover.kt | 2 -- 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/config/TagServiceConfiguration.kt diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/config/TagServiceConfiguration.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/config/TagServiceConfiguration.kt new file mode 100644 index 00000000..13752fc5 --- /dev/null +++ b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/config/TagServiceConfiguration.kt @@ -0,0 +1,30 @@ +package com.bamyanggang.domainmodule.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) + } + +} diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagAppender.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagAppender.kt index 83fe8fbb..cb99fc57 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagAppender.kt +++ b/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 ) { diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagReader.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagReader.kt index 10383bc9..3846368f 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagReader.kt +++ b/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 ) { diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagRemover.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagRemover.kt index 367b436f..f7c6ed38 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/service/TagRemover.kt +++ b/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 ) { From bde04b02a7b4dfd4e57bb6493ad6d713e9eaa343 Mon Sep 17 00:00:00 2001 From: seeunjang Date: Tue, 21 May 2024 16:08:11 +0900 Subject: [PATCH 4/8] =?UTF-8?q?refactor=20:=20HttpStatus=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20ExceptionHandler=EC=97=90=EC=84=9C=20=EB=B0=98?= =?UTF-8?q?=ED=99=98=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95(#122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/application/exception/AuthException.kt | 13 +++++-------- .../commonmodule/exception/CustomException.kt | 6 +----- .../commonmodule/exception/ExceptionHandler.kt | 2 +- .../exception/JobDescriptionException.kt | 7 ++----- .../strongpoint/exception/StrongPointException.kt | 7 ++----- .../domain/tag/exception/TagException.kt | 11 ++++------- .../common/exception/PersistenceException.java | 9 ++++----- .../com/bamyanggang/jwt/exception/JwtException.kt | 13 +++++-------- 8 files changed, 24 insertions(+), 44 deletions(-) diff --git a/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/user/application/exception/AuthException.kt b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/user/application/exception/AuthException.kt index 78f0b85a..1cbc8f83 100644 --- a/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/user/application/exception/AuthException.kt +++ b/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" } -} \ No newline at end of file +} diff --git a/Common-Module/src/main/kotlin/com/bamyanggang/commonmodule/exception/CustomException.kt b/Common-Module/src/main/kotlin/com/bamyanggang/commonmodule/exception/CustomException.kt index 042ae06a..2cb25ef9 100644 --- a/Common-Module/src/main/kotlin/com/bamyanggang/commonmodule/exception/CustomException.kt +++ b/Common-Module/src/main/kotlin/com/bamyanggang/commonmodule/exception/CustomException.kt @@ -1,11 +1,9 @@ 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) { @@ -13,8 +11,6 @@ abstract class CustomException( 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 = "예상하지 못한 오류가 발생했습니다." @@ -22,4 +18,4 @@ abstract class CustomException( const val DEFAULT_CODE_NUMBER_PAD_CHAR = '0' } -} \ No newline at end of file +} diff --git a/Common-Module/src/main/kotlin/com/bamyanggang/commonmodule/exception/ExceptionHandler.kt b/Common-Module/src/main/kotlin/com/bamyanggang/commonmodule/exception/ExceptionHandler.kt index d2bf899b..17b320a3 100644 --- a/Common-Module/src/main/kotlin/com/bamyanggang/commonmodule/exception/ExceptionHandler.kt +++ b/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 { - return ResponseEntity(ErrorResponse(e.code, e.message), e.httpStatusCode) + return ResponseEntity(ErrorResponse(e.code, e.message), HttpStatus.BAD_REQUEST) } @ExceptionHandler(Exception::class) diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/jobDescription/exception/JobDescriptionException.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/jobDescription/exception/JobDescriptionException.kt index cc2d8a2a..ec591792 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/jobDescription/exception/JobDescriptionException.kt +++ b/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" diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/exception/StrongPointException.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/exception/StrongPointException.kt index 2f2d655d..d5c253c7 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/exception/StrongPointException.kt +++ b/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" diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/exception/TagException.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/exception/TagException.kt index 1a607480..cec0706e 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/exception/TagException.kt +++ b/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" diff --git a/Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/common/exception/PersistenceException.java b/Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/common/exception/PersistenceException.java index f867e191..1ae86182 100644 --- a/Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/common/exception/PersistenceException.java +++ b/Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/common/exception/PersistenceException.java @@ -1,19 +1,18 @@ package com.bamyanggang.persistence.common.exception; import com.bamyanggang.commonmodule.exception.CustomException; -import org.springframework.http.HttpStatus; public class PersistenceException extends CustomException { public static final String CODE_PREFIX = "PERSISTENCE"; - public PersistenceException(int errorCode, HttpStatus httpStatusCode, String message) { - super(CODE_PREFIX, errorCode, httpStatusCode, message); + public PersistenceException(int errorCode, String message) { + super(CODE_PREFIX, errorCode, message); } public static class NotFound extends PersistenceException { public NotFound() { - super(1, HttpStatus.NOT_FOUND, "해당 데이터를 찾을 수 없습니다."); + super(1, "해당 데이터를 찾을 수 없습니다."); } } -} \ No newline at end of file +} diff --git a/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/exception/JwtException.kt b/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/exception/JwtException.kt index ad34316c..4932eda1 100644 --- a/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/exception/JwtException.kt +++ b/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/exception/JwtException.kt @@ -1,26 +1,23 @@ package com.bamyanggang.jwt.exception import com.bamyanggang.commonmodule.exception.CustomException -import org.springframework.http.HttpStatus -import org.springframework.http.HttpStatusCode sealed class JwtException( errorCode: Int, - httpStatusCode: HttpStatusCode, message: String, -) : CustomException(CODE_PREFIX, errorCode, httpStatusCode , message) { +) : CustomException(CODE_PREFIX, errorCode, message) { class InvalidTokenException(message: String = "유효하지 않은 토큰입니다.") : - JwtException(errorCode = 1, httpStatusCode = HttpStatus.BAD_REQUEST, message = message) + JwtException(errorCode = 1, message = message) class ExpiredTokenException(message: String = "만료된 토큰입니다.") : - JwtException(errorCode = 2, httpStatusCode = HttpStatus.BAD_REQUEST, message = message) + JwtException(errorCode = 2, message = message) class TokenNotFoundException(message: String = "토큰이 존재하지 않습니다.") : - JwtException(errorCode = 3, httpStatusCode = HttpStatus.BAD_REQUEST, message = message) + JwtException(errorCode = 3, message = message) companion object { const val CODE_PREFIX = "JWT" } -} \ No newline at end of file +} From 0a8a9218de07b1571d47bfb80a6e00ec174c67e2 Mon Sep 17 00:00:00 2001 From: seeunjang Date: Tue, 21 May 2024 16:48:51 +0900 Subject: [PATCH 5/8] =?UTF-8?q?chore=20:=20Configuration=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=9D=B4=EB=8F=99(#122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bookmark/config/BookmarkServiceConfiguration.kt | 2 +- .../domain/experience/config/ExperienceServiceConfiguration.kt | 2 +- .../jobDescription/config/JobDescriptionServiceConfiguration.kt | 2 +- .../strongpoint/config/StrongPointServiceConfiguration.kt | 2 +- .../apimodule}/domain/tag/config/TagServiceConfiguration.kt | 2 +- .../apimodule}/domain/user/config/UserServiceConfiguration.kt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename {Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule => Api-Module/src/main/kotlin/com/bamyanggang/apimodule}/domain/bookmark/config/BookmarkServiceConfiguration.kt (93%) rename {Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule => Api-Module/src/main/kotlin/com/bamyanggang/apimodule}/domain/experience/config/ExperienceServiceConfiguration.kt (94%) rename {Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule => Api-Module/src/main/kotlin/com/bamyanggang/apimodule}/domain/jobDescription/config/JobDescriptionServiceConfiguration.kt (95%) rename {Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule => Api-Module/src/main/kotlin/com/bamyanggang/apimodule}/domain/strongpoint/config/StrongPointServiceConfiguration.kt (93%) rename {Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule => Api-Module/src/main/kotlin/com/bamyanggang/apimodule}/domain/tag/config/TagServiceConfiguration.kt (93%) rename {Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule => Api-Module/src/main/kotlin/com/bamyanggang/apimodule}/domain/user/config/UserServiceConfiguration.kt (95%) diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/bookmark/config/BookmarkServiceConfiguration.kt b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/bookmark/config/BookmarkServiceConfiguration.kt similarity index 93% rename from Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/bookmark/config/BookmarkServiceConfiguration.kt rename to Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/bookmark/config/BookmarkServiceConfiguration.kt index 1f464be4..b77bd4af 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/bookmark/config/BookmarkServiceConfiguration.kt +++ b/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 diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/config/ExperienceServiceConfiguration.kt b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/experience/config/ExperienceServiceConfiguration.kt similarity index 94% rename from Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/config/ExperienceServiceConfiguration.kt rename to Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/experience/config/ExperienceServiceConfiguration.kt index 7dbb73b4..966c89be 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/experience/config/ExperienceServiceConfiguration.kt +++ b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/experience/config/ExperienceServiceConfiguration.kt @@ -1,4 +1,4 @@ -package com.bamyanggang.domainmodule.domain.experience.config +package com.bamyanggang.apimodule.domain.experience.config import com.bamyanggang.domainmodule.domain.experience.repository.ExperienceRepository import com.bamyanggang.domainmodule.domain.experience.service.ExperienceAppender diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/jobDescription/config/JobDescriptionServiceConfiguration.kt b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/jobDescription/config/JobDescriptionServiceConfiguration.kt similarity index 95% rename from Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/jobDescription/config/JobDescriptionServiceConfiguration.kt rename to Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/jobDescription/config/JobDescriptionServiceConfiguration.kt index ab4d9722..0a711013 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/jobDescription/config/JobDescriptionServiceConfiguration.kt +++ b/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 diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt similarity index 93% rename from Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt rename to Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt index f84d8490..3f20dc44 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt +++ b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/strongpoint/config/StrongPointServiceConfiguration.kt @@ -1,4 +1,4 @@ -package com.bamyanggang.domainmodule.domain.strongpoint.config +package com.bamyanggang.apimodule.domain.strongpoint.config import com.bamyanggang.domainmodule.domain.strongpoint.repository.StrongPointRepository import com.bamyanggang.domainmodule.domain.strongpoint.service.StrongPointAppender diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/config/TagServiceConfiguration.kt b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/tag/config/TagServiceConfiguration.kt similarity index 93% rename from Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/config/TagServiceConfiguration.kt rename to Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/tag/config/TagServiceConfiguration.kt index 13752fc5..690995e2 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/tag/config/TagServiceConfiguration.kt +++ b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/tag/config/TagServiceConfiguration.kt @@ -1,4 +1,4 @@ -package com.bamyanggang.domainmodule.domain.tag.config +package com.bamyanggang.apimodule.domain.tag.config import com.bamyanggang.domainmodule.domain.tag.repository.TagRepository import com.bamyanggang.domainmodule.domain.tag.service.TagAppender diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/config/UserServiceConfiguration.kt b/Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/user/config/UserServiceConfiguration.kt similarity index 95% rename from Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/config/UserServiceConfiguration.kt rename to Api-Module/src/main/kotlin/com/bamyanggang/apimodule/domain/user/config/UserServiceConfiguration.kt index 7f3f537a..802826bd 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/config/UserServiceConfiguration.kt +++ b/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 From 7cbf1ea363bce8ada8f221537351e2e64945d73d Mon Sep 17 00:00:00 2001 From: seeunjang Date: Tue, 21 May 2024 16:49:15 +0900 Subject: [PATCH 6/8] =?UTF-8?q?chore=20:=20Domain-Module=20web=20=EC=9D=98?= =?UTF-8?q?=EC=A1=B4=EC=84=B1=20=EC=A0=9C=EA=B1=B0(#122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Domain-Module/build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/Domain-Module/build.gradle.kts b/Domain-Module/build.gradle.kts index 869dff11..0957b091 100644 --- a/Domain-Module/build.gradle.kts +++ b/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"))) } From acadeab331cd1d03bf48a6ea233fdbba47d1b654 Mon Sep 17 00:00:00 2001 From: seeunjang Date: Tue, 21 May 2024 17:04:12 +0900 Subject: [PATCH 7/8] =?UTF-8?q?refactor=20:=20User,Token=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EB=A7=A4=ED=95=91=20=EB=B0=A9=EC=8B=9D=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=9E=90=EB=A1=9C=20=EC=88=98=EC=A0=95(#122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/aggregate/Token.kt | 16 ---------- .../domain/user/aggregate/User.kt | 31 +------------------ .../persistence/user/mapper/UserMapper.java | 6 ++-- 3 files changed, 5 insertions(+), 48 deletions(-) diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/aggregate/Token.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/aggregate/Token.kt index d92c0758..68f8193b 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/aggregate/Token.kt +++ b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/aggregate/Token.kt @@ -25,22 +25,6 @@ class Token( updatedAt = LocalDateTime.now(), ) } - - fun toDomain( - id: UUID, - userId: UUID, - value: String, - createdAt: LocalDateTime, - updatedAt: LocalDateTime, - ): Token { - return Token( - id = id, - userId = userId, - value = value, - createdAt = createdAt, - updatedAt = updatedAt, - ) - } } } diff --git a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/aggregate/User.kt b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/aggregate/User.kt index 5b6fb002..a0a29ad2 100644 --- a/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/aggregate/User.kt +++ b/Domain-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/aggregate/User.kt @@ -75,35 +75,6 @@ data class User ( updatedAt = LocalDateTime.now(), ) } - - fun toDomain( - id: UUID, - socialId: String, - profileImgUrl: String, - provider: SocialLoginProvider, - email: String, - nickName: String, - jobSearchStatus: String?, - desiredJob: String?, - goal: String?, - dream: String?, - createdAt: LocalDateTime, - updatedAt: LocalDateTime - ): User { - return User( - id = id, - socialId = socialId, - profileImgUrl = profileImgUrl, - provider = provider, - email = email, - nickName = nickName, - jobSearchStatus = jobSearchStatus, - desiredJob = desiredJob, - goal = goal, - dream = dream, - createdAt = createdAt, - updatedAt = updatedAt - ) - } } + } diff --git a/Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/user/mapper/UserMapper.java b/Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/user/mapper/UserMapper.java index 036b48a6..eff4ca4e 100644 --- a/Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/user/mapper/UserMapper.java +++ b/Infrastructure-Module/persistence/src/main/java/com/bamyanggang/persistence/user/mapper/UserMapper.java @@ -27,7 +27,8 @@ public UserJpaEntity toJpaEntity(User user) { } public User toDomainEntity(UserJpaEntity userJpaEntity) { - return User.Companion.toDomain(userJpaEntity.getUserId(), + return new User( + userJpaEntity.getUserId(), userJpaEntity.getSocialId(), userJpaEntity.getProfileImgUrl(), userJpaEntity.getProvider(), @@ -53,7 +54,8 @@ public TokenJpaEntity toJpaEntity(Token token) { } public Token toDomainEntity(TokenJpaEntity tokenJpaEntity) { - return Token.Companion.toDomain(tokenJpaEntity.getId(), + return new Token( + tokenJpaEntity.getId(), tokenJpaEntity.getUserId(), tokenJpaEntity.getValue(), tokenJpaEntity.getCreatedAt(), From ad60b405d7f44d84464161e8bff636a62d32983f Mon Sep 17 00:00:00 2001 From: seeunjang Date: Tue, 21 May 2024 17:12:44 +0900 Subject: [PATCH 8/8] =?UTF-8?q?test=20:=20TagControllerTest=20=EC=88=98?= =?UTF-8?q?=EC=A0=95(#122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apimodule/domain/tag/presentation/TagControllerTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Api-Module/src/test/kotlin/com/bamyanggang/apimodule/domain/tag/presentation/TagControllerTest.kt b/Api-Module/src/test/kotlin/com/bamyanggang/apimodule/domain/tag/presentation/TagControllerTest.kt index 3cccd759..1c2d213d 100644 --- a/Api-Module/src/test/kotlin/com/bamyanggang/apimodule/domain/tag/presentation/TagControllerTest.kt +++ b/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("엑세스 토큰")