refact: organize packages by domain

YAPP-Github · Jan 11, 2025 · ccd66c3 · ccd66c3
1 parent a37f65c
commit ccd66c3
Show file tree

Hide file tree

Showing 26 changed files with 42 additions and 38 deletions.
diff --git a/src/main/kotlin/com/dobby/backend/application/mapper/SignupMapper.kt b/src/main/kotlin/com/dobby/backend/application/mapper/SignupMapper.kt
@@ -1,6 +1,6 @@
 package com.dobby.backend.application.mapper
-import com.dobby.backend.application.usecase.signup.CreateResearcherUseCase
-import com.dobby.backend.application.usecase.signup.CreateParticipantUseCase
+import com.dobby.backend.application.usecase.member.CreateResearcherUseCase
+import com.dobby.backend.application.usecase.member.CreateParticipantUseCase
 import com.dobby.backend.domain.model.member.Participant
 import com.dobby.backend.domain.model.member.Researcher
 import com.dobby.backend.infrastructure.database.entity.member.MemberEntity

diff --git a/src/main/kotlin/com/dobby/backend/application/mapper/VerificationMapper.kt b/src/main/kotlin/com/dobby/backend/application/mapper/VerificationMapper.kt
@@ -1,7 +1,7 @@
 package com.dobby.backend.application.mapper
 
-import com.dobby.backend.application.usecase.signup.email.EmailCodeSendUseCase
-import com.dobby.backend.application.usecase.signup.email.EmailVerificationUseCase
+import com.dobby.backend.application.usecase.member.email.EmailCodeSendUseCase
+import com.dobby.backend.application.usecase.member.email.EmailVerificationUseCase
 import com.dobby.backend.infrastructure.database.entity.VerificationEntity
 import com.dobby.backend.infrastructure.database.entity.enum.VerificationStatus
 import com.dobby.backend.presentation.api.dto.request.signup.EmailSendRequest

diff --git a/src/main/kotlin/com/dobby/backend/application/service/AuthService.kt b/src/main/kotlin/com/dobby/backend/application/service/AuthService.kt
@@ -1,8 +1,9 @@
 package com.dobby.backend.application.service
 
-import com.dobby.backend.application.usecase.*
 import com.dobby.backend.application.usecase.auth.FetchGoogleUserInfoUseCase
 import com.dobby.backend.application.usecase.auth.FetchNaverUserInfoUseCase
+import com.dobby.backend.application.usecase.auth.GenerateTestTokenUseCase
+import com.dobby.backend.application.usecase.auth.GenerateTokenWithRefreshTokenUseCase
 import org.springframework.stereotype.Service
 
 @Service

diff --git a/src/main/kotlin/com/dobby/backend/application/service/EmailService.kt b/src/main/kotlin/com/dobby/backend/application/service/EmailService.kt
@@ -1,7 +1,7 @@
 package com.dobby.backend.application.service
 
-import com.dobby.backend.application.usecase.signup.email.EmailCodeSendUseCase
-import com.dobby.backend.application.usecase.signup.email.EmailVerificationUseCase
+import com.dobby.backend.application.usecase.member.email.EmailCodeSendUseCase
+import com.dobby.backend.application.usecase.member.email.EmailVerificationUseCase
 import jakarta.transaction.Transactional
 import org.springframework.stereotype.Service
 

diff --git a/src/main/kotlin/com/dobby/backend/application/service/SignupService.kt b/src/main/kotlin/com/dobby/backend/application/service/SignupService.kt
@@ -1,8 +1,8 @@
 package com.dobby.backend.application.service
 
-import com.dobby.backend.application.usecase.signup.CreateParticipantUseCase
-import com.dobby.backend.application.usecase.signup.CreateResearcherUseCase
-import com.dobby.backend.application.usecase.signup.VerifyResearcherEmailUseCase
+import com.dobby.backend.application.usecase.member.CreateParticipantUseCase
+import com.dobby.backend.application.usecase.member.CreateResearcherUseCase
+import com.dobby.backend.application.usecase.member.VerifyResearcherEmailUseCase
 import com.dobby.backend.domain.exception.SignupOauthEmailDuplicateException
 import com.dobby.backend.domain.gateway.MemberGateway
 import com.dobby.backend.infrastructure.database.entity.enum.MemberStatus

diff --git a/...ation/usecase/GenerateTestTokenUseCase.kt → .../usecase/auth/GenerateTestTokenUseCase.kt b/...ation/usecase/GenerateTestTokenUseCase.kt → .../usecase/auth/GenerateTestTokenUseCase.kt
@@ -1,5 +1,6 @@
-package com.dobby.backend.application.usecase
+package com.dobby.backend.application.usecase.auth
 
+import com.dobby.backend.application.usecase.UseCase
 import com.dobby.backend.domain.gateway.MemberGateway
 import com.dobby.backend.domain.gateway.TokenGateway
 import com.dobby.backend.domain.model.member.Member

diff --git a/...e/GenerateTokenWithRefreshTokenUseCase.kt → ...h/GenerateTokenWithRefreshTokenUseCase.kt b/...e/GenerateTokenWithRefreshTokenUseCase.kt → ...h/GenerateTokenWithRefreshTokenUseCase.kt
@@ -1,5 +1,6 @@
-package com.dobby.backend.application.usecase
+package com.dobby.backend.application.usecase.auth
 
+import com.dobby.backend.application.usecase.UseCase
 import com.dobby.backend.domain.gateway.MemberGateway
 import com.dobby.backend.domain.gateway.TokenGateway
 import com.dobby.backend.domain.model.member.Member

diff --git a/...secase/signup/CreateParticipantUseCase.kt → ...secase/member/CreateParticipantUseCase.kt b/...secase/signup/CreateParticipantUseCase.kt → ...secase/member/CreateParticipantUseCase.kt
@@ -1,4 +1,4 @@
-package com.dobby.backend.application.usecase.signup
+package com.dobby.backend.application.usecase.member
 
 import com.dobby.backend.application.mapper.SignupMapper
 import com.dobby.backend.application.usecase.UseCase

diff --git a/...usecase/signup/CreateResearcherUseCase.kt → ...usecase/member/CreateResearcherUseCase.kt b/...usecase/signup/CreateResearcherUseCase.kt → ...usecase/member/CreateResearcherUseCase.kt
@@ -1,4 +1,4 @@
-package com.dobby.backend.application.usecase.signup
+package com.dobby.backend.application.usecase.member
 
 import com.dobby.backend.application.mapper.SignupMapper
 import com.dobby.backend.application.usecase.UseCase

diff --git a/...se/signup/VerifyResearcherEmailUseCase.kt → ...se/member/VerifyResearcherEmailUseCase.kt b/...se/signup/VerifyResearcherEmailUseCase.kt → ...se/member/VerifyResearcherEmailUseCase.kt
@@ -1,4 +1,4 @@
-package com.dobby.backend.application.usecase.signup
+package com.dobby.backend.application.usecase.member
 
 
 import com.dobby.backend.application.usecase.UseCase

diff --git a/...case/signup/email/EmailCodeSendUseCase.kt → ...case/member/email/EmailCodeSendUseCase.kt b/...case/signup/email/EmailCodeSendUseCase.kt → ...case/member/email/EmailCodeSendUseCase.kt
@@ -1,4 +1,4 @@
-package com.dobby.backend.application.usecase.signup.email
+package com.dobby.backend.application.usecase.member.email
 
 import com.dobby.backend.application.mapper.VerificationMapper
 import com.dobby.backend.application.usecase.UseCase

diff --git a/.../signup/email/EmailVerificationUseCase.kt → .../member/email/EmailVerificationUseCase.kt b/.../signup/email/EmailVerificationUseCase.kt → .../member/email/EmailVerificationUseCase.kt
@@ -1,4 +1,4 @@
-package com.dobby.backend.application.usecase.signup.email
+package com.dobby.backend.application.usecase.member.email
 
 import com.dobby.backend.application.mapper.VerificationMapper
 import com.dobby.backend.application.usecase.UseCase

diff --git a/src/main/kotlin/com/dobby/backend/presentation/api/controller/AuthController.kt b/src/main/kotlin/com/dobby/backend/presentation/api/controller/AuthController.kt
@@ -6,7 +6,7 @@ import com.dobby.backend.infrastructure.database.entity.enum.RoleType
 import com.dobby.backend.presentation.api.dto.request.auth.google.GoogleOauthLoginRequest
 import com.dobby.backend.presentation.api.dto.request.auth.MemberRefreshTokenRequest
 import com.dobby.backend.presentation.api.dto.request.auth.NaverOauthLoginRequest
-import com.dobby.backend.presentation.api.dto.response.MemberResponse
+import com.dobby.backend.presentation.api.dto.response.member.MemberResponse
 import com.dobby.backend.presentation.api.dto.response.auth.TestMemberSignInResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag

diff --git a/src/main/kotlin/com/dobby/backend/presentation/api/controller/EmailController.kt b/src/main/kotlin/com/dobby/backend/presentation/api/controller/EmailController.kt
@@ -3,8 +3,8 @@ package com.dobby.backend.presentation.api.controller
 import com.dobby.backend.application.service.EmailService
 import com.dobby.backend.presentation.api.dto.request.signup.EmailSendRequest
 import com.dobby.backend.presentation.api.dto.request.signup.EmailVerificationRequest
-import com.dobby.backend.presentation.api.dto.response.signup.EmailSendResponse
-import com.dobby.backend.presentation.api.dto.response.signup.EmailVerificationResponse
+import com.dobby.backend.presentation.api.dto.response.member.EmailSendResponse
+import com.dobby.backend.presentation.api.dto.response.member.EmailVerificationResponse
 import com.dobby.backend.presentation.api.mapper.EmailMapper
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag

diff --git a/src/main/kotlin/com/dobby/backend/presentation/api/controller/SignupController.kt b/src/main/kotlin/com/dobby/backend/presentation/api/controller/SignupController.kt
@@ -3,7 +3,7 @@ package com.dobby.backend.presentation.api.controller
 import com.dobby.backend.application.service.SignupService
 import com.dobby.backend.presentation.api.dto.request.signup.ParticipantSignupRequest
 import com.dobby.backend.presentation.api.dto.request.signup.ResearcherSignupRequest
-import com.dobby.backend.presentation.api.dto.response.signup.SignupResponse
+import com.dobby.backend.presentation.api.dto.response.member.SignupResponse
 import com.dobby.backend.presentation.api.mapper.SignupMapper
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag

diff --git a/src/main/kotlin/com/dobby/backend/presentation/api/dto/response/auth/MemberSignInResponse.kt b/src/main/kotlin/com/dobby/backend/presentation/api/dto/response/auth/MemberSignInResponse.kt
@@ -1,6 +1,6 @@
 package com.dobby.backend.presentation.api.dto.response.auth
 
-import com.dobby.backend.presentation.api.dto.response.MemberResponse
+import com.dobby.backend.presentation.api.dto.response.member.MemberResponse
 import io.swagger.v3.oas.annotations.media.Schema
 
 @Schema(description = "로그인 결과 DTO")

diff --git a/src/main/kotlin/com/dobby/backend/presentation/api/dto/response/auth/OauthLoginResponse.kt b/src/main/kotlin/com/dobby/backend/presentation/api/dto/response/auth/OauthLoginResponse.kt
@@ -1,6 +1,6 @@
 package com.dobby.backend.presentation.api.dto.response.auth
 
-import com.dobby.backend.presentation.api.dto.response.MemberResponse
+import com.dobby.backend.presentation.api.dto.response.member.MemberResponse
 import io.swagger.v3.oas.annotations.media.Schema
 import lombok.Getter
 

diff --git a/.../dto/response/signup/EmailSendResponse.kt → .../dto/response/member/EmailSendResponse.kt b/.../dto/response/signup/EmailSendResponse.kt → .../dto/response/member/EmailSendResponse.kt
@@ -1,4 +1,4 @@
-package com.dobby.backend.presentation.api.dto.response.signup
+package com.dobby.backend.presentation.api.dto.response.member
 
 import io.swagger.v3.oas.annotations.media.Schema
 

diff --git a/...ponse/signup/EmailVerificationResponse.kt → ...ponse/member/EmailVerificationResponse.kt b/...ponse/signup/EmailVerificationResponse.kt → ...ponse/member/EmailVerificationResponse.kt
@@ -1,4 +1,4 @@
-package com.dobby.backend.presentation.api.dto.response.signup
+package com.dobby.backend.presentation.api.dto.response.member
 
 import io.swagger.v3.oas.annotations.media.Schema
 

diff --git a/...tation/api/dto/response/MemberResponse.kt → ...api/dto/response/member/MemberResponse.kt b/...tation/api/dto/response/MemberResponse.kt → ...api/dto/response/member/MemberResponse.kt
@@ -1,4 +1,4 @@
-package com.dobby.backend.presentation.api.dto.response
+package com.dobby.backend.presentation.api.dto.response.member
 
 import com.dobby.backend.domain.model.member.Member
 import com.dobby.backend.infrastructure.database.entity.enum.ProviderType

diff --git a/...api/dto/response/signup/SignupResponse.kt → ...api/dto/response/member/SignupResponse.kt b/...api/dto/response/signup/SignupResponse.kt → ...api/dto/response/member/SignupResponse.kt
@@ -1,6 +1,5 @@
-package com.dobby.backend.presentation.api.dto.response.signup
+package com.dobby.backend.presentation.api.dto.response.member
 
-import com.dobby.backend.presentation.api.dto.response.MemberResponse
 import io.swagger.v3.oas.annotations.media.Schema
 
 data class SignupResponse(

diff --git a/src/main/kotlin/com/dobby/backend/presentation/api/mapper/EmailMapper.kt b/src/main/kotlin/com/dobby/backend/presentation/api/mapper/EmailMapper.kt
@@ -1,11 +1,11 @@
 package com.dobby.backend.presentation.api.mapper
 
-import com.dobby.backend.application.usecase.signup.email.EmailCodeSendUseCase
-import com.dobby.backend.application.usecase.signup.email.EmailVerificationUseCase
+import com.dobby.backend.application.usecase.member.email.EmailCodeSendUseCase
+import com.dobby.backend.application.usecase.member.email.EmailVerificationUseCase
 import com.dobby.backend.presentation.api.dto.request.signup.EmailSendRequest
 import com.dobby.backend.presentation.api.dto.request.signup.EmailVerificationRequest
-import com.dobby.backend.presentation.api.dto.response.signup.EmailSendResponse
-import com.dobby.backend.presentation.api.dto.response.signup.EmailVerificationResponse
+import com.dobby.backend.presentation.api.dto.response.member.EmailSendResponse
+import com.dobby.backend.presentation.api.dto.response.member.EmailVerificationResponse
 
 object EmailMapper {
 

diff --git a/src/main/kotlin/com/dobby/backend/presentation/api/mapper/SignupMapper.kt b/src/main/kotlin/com/dobby/backend/presentation/api/mapper/SignupMapper.kt
@@ -1,11 +1,11 @@
 package com.dobby.backend.presentation.api.mapper
 
-import com.dobby.backend.application.usecase.signup.CreateResearcherUseCase
-import com.dobby.backend.application.usecase.signup.CreateParticipantUseCase
+import com.dobby.backend.application.usecase.member.CreateResearcherUseCase
+import com.dobby.backend.application.usecase.member.CreateParticipantUseCase
 import com.dobby.backend.presentation.api.dto.request.signup.ParticipantSignupRequest
 import com.dobby.backend.presentation.api.dto.request.signup.ResearcherSignupRequest
-import com.dobby.backend.presentation.api.dto.response.MemberResponse
-import com.dobby.backend.presentation.api.dto.response.signup.SignupResponse
+import com.dobby.backend.presentation.api.dto.response.member.MemberResponse
+import com.dobby.backend.presentation.api.dto.response.member.SignupResponse
 
 object SignupMapper {
     fun toCreateResearcherInput(req: ResearcherSignupRequest) : CreateResearcherUseCase.Input{

diff --git a/src/test/kotlin/com/dobby/backend/application/service/EmailServiceTest.kt b/src/test/kotlin/com/dobby/backend/application/service/EmailServiceTest.kt
@@ -1,6 +1,6 @@
 package com.dobby.backend.application.service
-import com.dobby.backend.application.usecase.signup.email.EmailCodeSendUseCase
-import com.dobby.backend.application.usecase.signup.email.EmailVerificationUseCase
+import com.dobby.backend.application.usecase.member.email.EmailCodeSendUseCase
+import com.dobby.backend.application.usecase.member.email.EmailVerificationUseCase
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
 import io.mockk.every

diff --git a/src/test/kotlin/com/dobby/backend/application/usecase/GenerateTestTokenUseCaseTest.kt b/src/test/kotlin/com/dobby/backend/application/usecase/GenerateTestTokenUseCaseTest.kt
@@ -1,5 +1,6 @@
 package com.dobby.backend.application.usecase
 
+import com.dobby.backend.application.usecase.auth.GenerateTestTokenUseCase
 import com.dobby.backend.domain.gateway.MemberGateway
 import io.kotest.core.spec.style.BehaviorSpec
 import com.dobby.backend.domain.gateway.TokenGateway

diff --git a/.../kotlin/com/dobby/backend/application/usecase/GenerateTokenWithRefreshTokenUseCaseTest.kt b/.../kotlin/com/dobby/backend/application/usecase/GenerateTokenWithRefreshTokenUseCaseTest.kt
@@ -1,5 +1,6 @@
 package com.dobby.backend.application.usecase
 
+import com.dobby.backend.application.usecase.auth.GenerateTokenWithRefreshTokenUseCase
 import com.dobby.backend.domain.gateway.MemberGateway
 import com.dobby.backend.domain.gateway.TokenGateway
 import com.dobby.backend.domain.model.member.Member