chore: 패키지 구조 개선

9oormthon-univ · Mar 16, 2024 · b88fc88 · b88fc88
1 parent 266069d
commit b88fc88
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 38 deletions.
diff --git a/src/main/kotlin/com/vacgom/backend/application/auth/AuthFactory.kt b/src/main/kotlin/com/vacgom/backend/application/auth/AuthFactory.kt
@@ -2,7 +2,7 @@ package com.vacgom.backend.application.auth
 
 import com.vacgom.backend.domain.auth.AuthConnector
 import com.vacgom.backend.domain.auth.AuthUriGenerator
-import com.vacgom.backend.domain.member.constants.ProviderType
+import com.vacgom.backend.domain.auth.constants.ProviderType
 import com.vacgom.backend.global.exception.error.BusinessException
 import com.vacgom.backend.global.security.exception.AuthError
 import org.springframework.stereotype.Component

diff --git a/src/main/kotlin/com/vacgom/backend/application/auth/AuthService.kt b/src/main/kotlin/com/vacgom/backend/application/auth/AuthService.kt
@@ -1,10 +1,10 @@
 package com.vacgom.backend.application.auth
 
 import com.vacgom.backend.application.auth.dto.MemberResponse
+import com.vacgom.backend.domain.auth.constants.ProviderType
+import com.vacgom.backend.domain.auth.constants.Role
 import com.vacgom.backend.domain.member.Member
-import com.vacgom.backend.domain.member.constants.ProviderType
-import com.vacgom.backend.domain.member.constants.Role
-import com.vacgom.backend.infrastructure.member.MemberRepository
+import com.vacgom.backend.infrastructure.member.persistence.MemberRepository
 import jakarta.transaction.Transactional
 import org.springframework.http.HttpHeaders
 import org.springframework.stereotype.Service

diff --git a/src/main/kotlin/com/vacgom/backend/application/auth/dto/KakaoMemberResponse.kt b/src/main/kotlin/com/vacgom/backend/application/auth/dto/KakaoMemberResponse.kt
@@ -0,0 +1,5 @@
+package com.vacgom.backend.application.auth.dto
+
+data class KakaoMemberResponse(
+        var id: Long
+)
diff --git a/src/main/kotlin/com/vacgom/backend/application/auth/dto/LoginResponse.kt b/src/main/kotlin/com/vacgom/backend/application/auth/dto/LoginResponse.kt
@@ -0,0 +1,6 @@
+package com.vacgom.backend.application.auth.dto
+
+data class LoginResponse(
+        val member: MemberResponse,
+        val token: TokenResponse
+)
diff --git a/src/main/kotlin/com/vacgom/backend/application/auth/dto/MemberResponse.kt b/src/main/kotlin/com/vacgom/backend/application/auth/dto/MemberResponse.kt
@@ -1,6 +1,6 @@
 package com.vacgom.backend.application.auth.dto
 
-import com.vacgom.backend.domain.member.constants.Role
+import com.vacgom.backend.domain.auth.constants.Role
 import java.util.*
 
 data class MemberResponse(

diff --git a/...ackend/application/auth/dto/OauthToken.kt → ...pplication/auth/dto/OauthTokenResponse.kt b/...ackend/application/auth/dto/OauthToken.kt → ...pplication/auth/dto/OauthTokenResponse.kt
@@ -4,4 +4,4 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
 
 @JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy::class)
-data class OauthToken(val accessToken: String)
+data class OauthTokenResponse(val accessToken: String)
diff --git a/src/main/kotlin/com/vacgom/backend/domain/auth/AuthConnector.kt b/src/main/kotlin/com/vacgom/backend/domain/auth/AuthConnector.kt
@@ -1,11 +1,11 @@
 package com.vacgom.backend.domain.auth
 
-import com.vacgom.backend.application.auth.dto.OauthToken
-import com.vacgom.backend.domain.member.constants.ProviderType
-import com.vacgom.backend.infrastructure.auth.kakao.model.KakaoMemberInfo
+import com.vacgom.backend.application.auth.dto.KakaoMemberResponse
+import com.vacgom.backend.application.auth.dto.OauthTokenResponse
+import com.vacgom.backend.domain.auth.constants.ProviderType
 
 interface AuthConnector {
     fun isSupported(provider: ProviderType): Boolean
-    fun fetchOauthToken(code: String): OauthToken
-    fun fetchMemberInfo(accessToken: String): KakaoMemberInfo
+    fun fetchOauthToken(code: String): OauthTokenResponse
+    fun fetchMemberInfo(accessToken: String): KakaoMemberResponse
 }
diff --git a/src/main/kotlin/com/vacgom/backend/domain/auth/AuthUriGenerator.kt b/src/main/kotlin/com/vacgom/backend/domain/auth/AuthUriGenerator.kt
@@ -1,6 +1,6 @@
 package com.vacgom.backend.domain.auth
 
-import com.vacgom.backend.domain.member.constants.ProviderType
+import com.vacgom.backend.domain.auth.constants.ProviderType
 import java.net.URI
 
 interface AuthUriGenerator {

diff --git a/...gom/backend/domain/member/RefreshToken.kt → ...acgom/backend/domain/auth/RefreshToken.kt b/...gom/backend/domain/member/RefreshToken.kt → ...acgom/backend/domain/auth/RefreshToken.kt
@@ -1,5 +1,6 @@
-package com.vacgom.backend.domain.member
+package com.vacgom.backend.domain.auth
 
+import com.vacgom.backend.domain.member.Member
 import jakarta.persistence.*
 import java.time.LocalDateTime
 

diff --git a/...d/domain/member/constants/ProviderType.kt → ...end/domain/auth/constants/ProviderType.kt b/...d/domain/member/constants/ProviderType.kt → ...end/domain/auth/constants/ProviderType.kt
@@ -1,4 +1,4 @@
-package com.vacgom.backend.domain.member.constants
+package com.vacgom.backend.domain.auth.constants
 
 import com.vacgom.backend.global.exception.error.BusinessException
 import com.vacgom.backend.global.security.exception.AuthError

diff --git a/...m/backend/domain/member/constants/Role.kt → ...gom/backend/domain/auth/constants/Role.kt b/...m/backend/domain/member/constants/Role.kt → ...gom/backend/domain/auth/constants/Role.kt
@@ -1,4 +1,4 @@
-package com.vacgom.backend.domain.member.constants
+package com.vacgom.backend.domain.auth.constants
 
 enum class Role {
     ROLE_TEMP_USER,

diff --git a/src/main/kotlin/com/vacgom/backend/domain/member/Member.kt b/src/main/kotlin/com/vacgom/backend/domain/member/Member.kt
@@ -1,7 +1,7 @@
 package com.vacgom.backend.domain.member
 
-import com.vacgom.backend.domain.member.constants.ProviderType
-import com.vacgom.backend.domain.member.constants.Role
+import com.vacgom.backend.domain.auth.constants.ProviderType
+import com.vacgom.backend.domain.auth.constants.Role
 import com.vacgom.backend.global.auditing.BaseEntity
 import jakarta.persistence.*
 import org.hibernate.annotations.GenericGenerator
@@ -20,6 +20,6 @@ class Member(
     @GenericGenerator(name = "uuid2", strategy = "uuid2")
     @Column(columnDefinition = "BINARY(16)", name = "member_id")
     var id: UUID? = null
-    
+
     var name: String? = null
 }
diff --git a/src/main/kotlin/com/vacgom/backend/infrastructure/auth/kakao/KakaoAuthConnector.kt b/src/main/kotlin/com/vacgom/backend/infrastructure/auth/kakao/KakaoAuthConnector.kt
@@ -1,12 +1,12 @@
 package com.vacgom.backend.infrastructure.auth.kakao
 
-import com.vacgom.backend.application.auth.dto.OauthToken
-import com.vacgom.backend.application.auth.property.KakaoProperties
+import com.vacgom.backend.application.auth.dto.KakaoMemberResponse
+import com.vacgom.backend.application.auth.dto.OauthTokenResponse
 import com.vacgom.backend.domain.auth.AuthConnector
-import com.vacgom.backend.domain.member.constants.ProviderType
+import com.vacgom.backend.domain.auth.constants.ProviderType
 import com.vacgom.backend.global.exception.error.BusinessException
 import com.vacgom.backend.global.security.exception.AuthError
-import com.vacgom.backend.infrastructure.auth.kakao.model.KakaoMemberInfo
+import com.vacgom.backend.infrastructure.auth.kakao.model.KakaoProperties
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpMethod
@@ -26,7 +26,7 @@ class KakaoAuthConnector(
         return provider.isKakao()
     }
 
-    override fun fetchOauthToken(code: String): OauthToken {
+    override fun fetchOauthToken(code: String): OauthTokenResponse {
         val headers = createHttpHeaders()
         val body: MultiValueMap<String, String> = LinkedMultiValueMap()
 
@@ -41,14 +41,14 @@ class KakaoAuthConnector(
             restTemplate.postForObject(
                     kakaoProperties.tokenEndpoint!!,
                     request,
-                    OauthToken::class.java
+                    OauthTokenResponse::class.java
             )!!
         } catch (exception: RestClientException) {
             throw BusinessException(AuthError.KAKAO_OAUTH_ERROR)
         }
     }
 
-    override fun fetchMemberInfo(accessToken: String): KakaoMemberInfo {
+    override fun fetchMemberInfo(accessToken: String): KakaoMemberResponse {
         val headers = createHttpHeaders()
         headers.set("Authorization", "Bearer $accessToken")
 
@@ -58,7 +58,7 @@ class KakaoAuthConnector(
                     kakaoProperties.userinfoEndpoint!!,
                     HttpMethod.GET,
                     request,
-                    KakaoMemberInfo::class.java
+                    KakaoMemberResponse::class.java
             ).body ?: throw BusinessException(AuthError.KAKAO_OAUTH_ERROR)
         } catch (exception: RestClientException) {
             println("e = ${exception}")

diff --git a/src/main/kotlin/com/vacgom/backend/infrastructure/auth/kakao/KakaoUriGenerator.kt b/src/main/kotlin/com/vacgom/backend/infrastructure/auth/kakao/KakaoUriGenerator.kt
@@ -1,8 +1,8 @@
 package com.vacgom.backend.infrastructure.auth.kakao
 
-import com.vacgom.backend.application.auth.property.KakaoProperties
 import com.vacgom.backend.domain.auth.AuthUriGenerator
-import com.vacgom.backend.domain.member.constants.ProviderType
+import com.vacgom.backend.domain.auth.constants.ProviderType
+import com.vacgom.backend.infrastructure.auth.kakao.model.KakaoProperties
 import org.springframework.stereotype.Component
 import org.springframework.web.util.UriComponentsBuilder
 import java.net.URI

diff --git a/src/main/kotlin/com/vacgom/backend/infrastructure/auth/kakao/model/KakaoMemberInfo.kt b/src/main/kotlin/com/vacgom/backend/infrastructure/auth/kakao/model/KakaoMemberInfo.kt
diff --git a/...lication/auth/property/KakaoProperties.kt → ...cture/auth/kakao/model/KakaoProperties.kt b/...lication/auth/property/KakaoProperties.kt → ...cture/auth/kakao/model/KakaoProperties.kt
@@ -1,4 +1,4 @@
-package com.vacgom.backend.application.auth.property
+package com.vacgom.backend.infrastructure.auth.kakao.model
 
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Component

diff --git a/...tructure/member/RefreshTokenRepository.kt → ...uth/persistence/RefreshTokenRepository.kt b/...tructure/member/RefreshTokenRepository.kt → ...uth/persistence/RefreshTokenRepository.kt
@@ -1,6 +1,6 @@
-package com.vacgom.backend.infrastructure.member
+package com.vacgom.backend.infrastructure.auth.persistence
 
-import com.vacgom.backend.domain.member.RefreshToken
+import com.vacgom.backend.domain.auth.RefreshToken
 import org.springframework.data.jpa.repository.JpaRepository
 import java.util.*
 

diff --git a/...infrastructure/member/MemberRepository.kt → ...re/member/persistence/MemberRepository.kt b/...infrastructure/member/MemberRepository.kt → ...re/member/persistence/MemberRepository.kt
@@ -1,7 +1,7 @@
-package com.vacgom.backend.infrastructure.member
+package com.vacgom.backend.infrastructure.member.persistence
 
+import com.vacgom.backend.domain.auth.constants.ProviderType
 import com.vacgom.backend.domain.member.Member
-import com.vacgom.backend.domain.member.constants.ProviderType
 import org.springframework.data.jpa.repository.JpaRepository
 import java.util.*