From 14d68bb4fbd6385442ed0e394b76967da15f4052 Mon Sep 17 00:00:00 2001 From: pricelees Date: Sun, 28 Sep 2025 13:40:39 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=9D=B4=EC=A0=84=20CommonAuth=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=B6=84=EB=A6=AC=EB=A5=BC=20=EA=B8=B0?= =?UTF-8?q?=EC=A1=B4=20=ED=81=B4=EB=9E=98=EC=8A=A4=EC=97=90=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomescape/admin/business/AdminService.kt | 4 ++-- .../roomescape/auth/business/AuthService.kt | 14 +++++--------- .../auth/business/LoginHistoryService.kt | 2 +- .../com/sangdol/roomescape/auth/docs/AuthAPI.kt | 2 +- .../persistence/LoginHistoryEntity.kt | 2 +- .../sangdol/roomescape/auth/web/AuthController.kt | 2 +- .../sangdol/roomescape/payment/docs/PaymentAPI.kt | 2 +- .../roomescape/payment/web/PaymentController.kt | 2 +- .../reservation/business/ReservationService.kt | 2 +- .../roomescape/reservation/docs/ReservationAPI.kt | 2 +- .../reservation/web/ReservationController.kt | 2 +- .../roomescape/user/business/UserService.kt | 6 +++--- .../com/sangdol/roomescape/user/docs/UserAPI.kt | 2 +- .../sangdol/roomescape/user/web/UserController.kt | 2 +- .../com/sangdol/roomescape/auth/AuthApiTest.kt | 2 +- .../roomescape/auth/FailOnSaveLoginHistoryTest.kt | 2 +- .../sangdol/roomescape/supports/TestAuthUtil.kt | 2 +- 17 files changed, 24 insertions(+), 28 deletions(-) diff --git a/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt index 4149bc1e..111be701 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt @@ -1,11 +1,11 @@ package com.sangdol.roomescape.admin.business import com.sangdol.common.types.audit.Auditor +import com.sangdol.roomescape.admin.business.dto.AdminLoginCredentials +import com.sangdol.roomescape.admin.business.dto.toCredentials import com.sangdol.roomescape.admin.exception.AdminErrorCode import com.sangdol.roomescape.admin.exception.AdminException import com.sangdol.roomescape.admin.infrastructure.persistence.AdminRepository -import com.sangdol.roomescape.common.dto.AdminLoginCredentials -import com.sangdol.roomescape.common.dto.toCredentials import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.data.repository.findByIdOrNull diff --git a/service/src/main/kotlin/com/sangdol/roomescape/auth/business/AuthService.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/business/AuthService.kt index ff0ca22d..22cff9a8 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/auth/business/AuthService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/business/AuthService.kt @@ -1,19 +1,15 @@ package com.sangdol.roomescape.auth.business -import io.github.oshai.kotlinlogging.KLogger -import io.github.oshai.kotlinlogging.KotlinLogging -import org.springframework.stereotype.Service -import org.springframework.transaction.annotation.Transactional import com.sangdol.roomescape.admin.business.AdminService import com.sangdol.roomescape.auth.exception.AuthErrorCode import com.sangdol.roomescape.auth.exception.AuthException import com.sangdol.roomescape.auth.infrastructure.jwt.JwtUtils -import com.sangdol.roomescape.auth.web.LoginContext -import com.sangdol.roomescape.auth.web.LoginRequest -import com.sangdol.roomescape.auth.web.LoginSuccessResponse -import com.sangdol.roomescape.common.dto.LoginCredentials -import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.auth.web.* import com.sangdol.roomescape.user.business.UserService +import io.github.oshai.kotlinlogging.KLogger +import io.github.oshai.kotlinlogging.KotlinLogging +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional private val log: KLogger = KotlinLogging.logger {} diff --git a/service/src/main/kotlin/com/sangdol/roomescape/auth/business/LoginHistoryService.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/business/LoginHistoryService.kt index 2f6f7ba1..6cbed9bd 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/auth/business/LoginHistoryService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/business/LoginHistoryService.kt @@ -4,7 +4,7 @@ import com.sangdol.common.persistence.IDGenerator import com.sangdol.roomescape.auth.infrastructure.persistence.LoginHistoryEntity import com.sangdol.roomescape.auth.infrastructure.persistence.LoginHistoryRepository import com.sangdol.roomescape.auth.web.LoginContext -import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.auth.web.PrincipalType import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Service diff --git a/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt index 53115811..c191084f 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt @@ -1,11 +1,11 @@ package com.sangdol.roomescape.auth.docs import com.sangdol.common.types.web.CommonApiResponse +import com.sangdol.common.types.web.CurrentUserContext import com.sangdol.roomescape.auth.web.LoginRequest import com.sangdol.roomescape.auth.web.LoginSuccessResponse import com.sangdol.roomescape.auth.web.support.Public import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.roomescape.common.dto.CurrentUserContext import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse import io.swagger.v3.oas.annotations.responses.ApiResponses diff --git a/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt index 84a88708..8d8b2e67 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.auth.infrastructure.persistence import com.sangdol.common.persistence.PersistableBaseEntity -import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.auth.web.PrincipalType import jakarta.persistence.* import org.springframework.data.annotation.CreatedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener diff --git a/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt index 1d0595c7..50f676f0 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt @@ -4,7 +4,7 @@ import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.business.AuthService import com.sangdol.roomescape.auth.docs.AuthAPI import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.common.types.web.CurrentUserContext import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse import org.springframework.http.ResponseEntity diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt index da6f6770..866813bf 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt @@ -3,7 +3,7 @@ package com.sangdol.roomescape.payment.docs import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.web.support.User import com.sangdol.roomescape.auth.web.support.UserOnly -import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.common.types.web.CurrentUserContext import com.sangdol.roomescape.payment.web.PaymentCancelRequest import com.sangdol.roomescape.payment.web.PaymentConfirmRequest import com.sangdol.roomescape.payment.web.PaymentCreateResponse diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt index 1308fe1b..32851b96 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt @@ -2,7 +2,7 @@ package com.sangdol.roomescape.payment.web import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.common.types.web.CurrentUserContext import com.sangdol.roomescape.payment.business.PaymentService import com.sangdol.roomescape.payment.docs.PaymentAPI import jakarta.validation.Valid diff --git a/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt index 7f53de4d..2638c671 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.reservation.business import com.sangdol.common.persistence.IDGenerator -import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.common.types.web.CurrentUserContext import com.sangdol.roomescape.payment.business.PaymentService import com.sangdol.roomescape.payment.web.PaymentWithDetailResponse import com.sangdol.roomescape.reservation.exception.ReservationErrorCode diff --git a/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt index d3a03612..22e4e2db 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt @@ -1,9 +1,9 @@ package com.sangdol.roomescape.reservation.docs import com.sangdol.common.types.web.CommonApiResponse +import com.sangdol.common.types.web.CurrentUserContext import com.sangdol.roomescape.auth.web.support.User import com.sangdol.roomescape.auth.web.support.UserOnly -import com.sangdol.roomescape.common.dto.CurrentUserContext import com.sangdol.roomescape.reservation.web.* import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse diff --git a/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt index 4e5a3239..5f9bd7cb 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt @@ -1,8 +1,8 @@ package com.sangdol.roomescape.reservation.web import com.sangdol.common.types.web.CommonApiResponse +import com.sangdol.common.types.web.CurrentUserContext import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.roomescape.common.dto.CurrentUserContext import com.sangdol.roomescape.reservation.business.ReservationService import com.sangdol.roomescape.reservation.docs.ReservationAPI import jakarta.validation.Valid diff --git a/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt index 2139bc14..618cdb0d 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt @@ -1,9 +1,9 @@ package com.sangdol.roomescape.user.business import com.sangdol.common.persistence.IDGenerator -import com.sangdol.roomescape.common.dto.CurrentUserContext -import com.sangdol.roomescape.common.dto.UserLoginCredentials -import com.sangdol.roomescape.common.dto.toCredentials +import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.user.business.dto.UserLoginCredentials +import com.sangdol.roomescape.user.business.dto.toCredentials import com.sangdol.roomescape.user.exception.UserErrorCode import com.sangdol.roomescape.user.exception.UserException import com.sangdol.roomescape.user.infrastructure.persistence.* diff --git a/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt index adc6322a..e4e83252 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt @@ -3,7 +3,7 @@ package com.sangdol.roomescape.user.docs import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.web.support.Public import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.common.types.web.CurrentUserContext import com.sangdol.roomescape.user.web.UserContactResponse import com.sangdol.roomescape.user.web.UserCreateRequest import com.sangdol.roomescape.user.web.UserCreateResponse diff --git a/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt index 295ff9ce..a6469d9f 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt @@ -2,7 +2,7 @@ package com.sangdol.roomescape.user.web import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.common.types.web.CurrentUserContext import com.sangdol.roomescape.user.business.UserService import com.sangdol.roomescape.user.docs.UserAPI import jakarta.validation.Valid diff --git a/service/src/test/kotlin/com/sangdol/roomescape/auth/AuthApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/auth/AuthApiTest.kt index 3711e2c0..c69695f1 100644 --- a/service/src/test/kotlin/com/sangdol/roomescape/auth/AuthApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/auth/AuthApiTest.kt @@ -17,7 +17,7 @@ import com.sangdol.roomescape.auth.exception.AuthErrorCode import com.sangdol.roomescape.auth.infrastructure.jwt.JwtUtils import com.sangdol.roomescape.auth.infrastructure.persistence.LoginHistoryRepository import com.sangdol.roomescape.auth.web.LoginRequest -import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.auth.web.PrincipalType import com.sangdol.roomescape.supports.AdminFixture import com.sangdol.roomescape.supports.FunSpecSpringbootTest import com.sangdol.roomescape.supports.UserFixture diff --git a/service/src/test/kotlin/com/sangdol/roomescape/auth/FailOnSaveLoginHistoryTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/auth/FailOnSaveLoginHistoryTest.kt index 35bc31aa..16d616f3 100644 --- a/service/src/test/kotlin/com/sangdol/roomescape/auth/FailOnSaveLoginHistoryTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/auth/FailOnSaveLoginHistoryTest.kt @@ -6,7 +6,7 @@ import io.mockk.every import com.sangdol.common.types.web.HttpStatus import com.sangdol.roomescape.auth.infrastructure.persistence.LoginHistoryRepository import com.sangdol.roomescape.auth.web.LoginRequest -import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.auth.web.PrincipalType import com.sangdol.roomescape.supports.AdminFixture import com.sangdol.roomescape.supports.FunSpecSpringbootTest import com.sangdol.roomescape.supports.UserFixture diff --git a/service/src/test/kotlin/com/sangdol/roomescape/supports/TestAuthUtil.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/TestAuthUtil.kt index 500354e9..a3340a19 100644 --- a/service/src/test/kotlin/com/sangdol/roomescape/supports/TestAuthUtil.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/TestAuthUtil.kt @@ -11,7 +11,7 @@ import com.sangdol.roomescape.admin.infrastructure.persistence.AdminEntity import com.sangdol.roomescape.admin.infrastructure.persistence.AdminRepository import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType import com.sangdol.roomescape.auth.web.LoginRequest -import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.auth.web.PrincipalType import com.sangdol.roomescape.store.infrastructure.persistence.StoreRepository import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity import com.sangdol.roomescape.user.infrastructure.persistence.UserRepository