diff --git a/src/main/kotlin/roomescape/auth/business/AuthService.kt b/src/main/kotlin/roomescape/auth/business/AuthService.kt index a1fdac4c..3d3096a6 100644 --- a/src/main/kotlin/roomescape/auth/business/AuthService.kt +++ b/src/main/kotlin/roomescape/auth/business/AuthService.kt @@ -14,7 +14,7 @@ import roomescape.auth.web.LoginSuccessResponse import roomescape.common.dto.CurrentUserContext import roomescape.common.dto.LoginCredentials import roomescape.common.dto.PrincipalType -import roomescape.member.business.UserService +import roomescape.user.business.UserService private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt index d487d2cf..e5cffca2 100644 --- a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt +++ b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt @@ -10,8 +10,8 @@ import roomescape.common.config.next import roomescape.common.dto.CurrentUserContext import roomescape.common.dto.PrincipalType import roomescape.common.util.DateUtils -import roomescape.member.business.UserService -import roomescape.member.web.UserContactRetrieveResponse +import roomescape.user.business.UserService +import roomescape.user.web.UserContactRetrieveResponse import roomescape.payment.business.PaymentService import roomescape.payment.web.PaymentRetrieveResponse import roomescape.reservation.exception.ReservationErrorCode diff --git a/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt b/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt index 9593483e..92c0ec19 100644 --- a/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt +++ b/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt @@ -1,7 +1,7 @@ package roomescape.reservation.web import jakarta.validation.constraints.NotEmpty -import roomescape.member.web.UserContactRetrieveResponse +import roomescape.user.web.UserContactRetrieveResponse import roomescape.payment.web.PaymentRetrieveResponse import roomescape.reservation.infrastructure.persistence.ReservationEntity import roomescape.reservation.infrastructure.persistence.ReservationStatus diff --git a/src/main/kotlin/roomescape/member/business/UserService.kt b/src/main/kotlin/roomescape/user/business/UserService.kt similarity index 90% rename from src/main/kotlin/roomescape/member/business/UserService.kt rename to src/main/kotlin/roomescape/user/business/UserService.kt index c2da722a..a841b790 100644 --- a/src/main/kotlin/roomescape/member/business/UserService.kt +++ b/src/main/kotlin/roomescape/user/business/UserService.kt @@ -1,4 +1,4 @@ -package roomescape.member.business +package roomescape.user.business import com.github.f4b6a3.tsid.TsidFactory import io.github.oshai.kotlinlogging.KLogger @@ -10,13 +10,13 @@ import roomescape.common.config.next import roomescape.common.dto.CurrentUserContext import roomescape.common.dto.PrincipalType import roomescape.common.dto.UserLoginCredentials -import roomescape.member.exception.UserErrorCode -import roomescape.member.exception.UserException -import roomescape.member.infrastructure.persistence.* -import roomescape.member.web.UserContactRetrieveResponse -import roomescape.member.web.UserCreateRequest -import roomescape.member.web.UserCreateResponse -import roomescape.member.web.toEntity +import roomescape.user.exception.UserErrorCode +import roomescape.user.exception.UserException +import roomescape.user.infrastructure.persistence.* +import roomescape.user.web.UserContactRetrieveResponse +import roomescape.user.web.UserCreateRequest +import roomescape.user.web.UserCreateResponse +import roomescape.user.web.toEntity private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/member/business/UserValidator.kt b/src/main/kotlin/roomescape/user/business/UserValidator.kt similarity index 83% rename from src/main/kotlin/roomescape/member/business/UserValidator.kt rename to src/main/kotlin/roomescape/user/business/UserValidator.kt index ede9f9a7..8e8d8cce 100644 --- a/src/main/kotlin/roomescape/member/business/UserValidator.kt +++ b/src/main/kotlin/roomescape/user/business/UserValidator.kt @@ -1,11 +1,11 @@ -package roomescape.member.business +package roomescape.user.business import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Component -import roomescape.member.exception.UserErrorCode -import roomescape.member.exception.UserException -import roomescape.member.infrastructure.persistence.UserRepository +import roomescape.user.exception.UserErrorCode +import roomescape.user.exception.UserException +import roomescape.user.infrastructure.persistence.UserRepository private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/member/docs/UserAPI.kt b/src/main/kotlin/roomescape/user/docs/UserAPI.kt similarity index 88% rename from src/main/kotlin/roomescape/member/docs/UserAPI.kt rename to src/main/kotlin/roomescape/user/docs/UserAPI.kt index 4a1d8571..7e7bb960 100644 --- a/src/main/kotlin/roomescape/member/docs/UserAPI.kt +++ b/src/main/kotlin/roomescape/user/docs/UserAPI.kt @@ -1,4 +1,4 @@ -package roomescape.member.docs +package roomescape.user.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse @@ -12,9 +12,9 @@ import roomescape.auth.web.support.Public import roomescape.auth.web.support.UserOnly import roomescape.common.dto.CurrentUserContext import roomescape.common.dto.response.CommonApiResponse -import roomescape.member.web.UserContactRetrieveResponse -import roomescape.member.web.UserCreateRequest -import roomescape.member.web.UserCreateResponse +import roomescape.user.web.UserContactRetrieveResponse +import roomescape.user.web.UserCreateRequest +import roomescape.user.web.UserCreateResponse @Tag(name = "2. 회원 API", description = "회원 정보를 관리할 때 사용합니다.") interface UserAPI { diff --git a/src/main/kotlin/roomescape/member/exception/UserException.kt b/src/main/kotlin/roomescape/user/exception/UserException.kt similarity index 95% rename from src/main/kotlin/roomescape/member/exception/UserException.kt rename to src/main/kotlin/roomescape/user/exception/UserException.kt index e0421f79..5f44f515 100644 --- a/src/main/kotlin/roomescape/member/exception/UserException.kt +++ b/src/main/kotlin/roomescape/user/exception/UserException.kt @@ -1,4 +1,4 @@ -package roomescape.member.exception +package roomescape.user.exception import org.springframework.http.HttpStatus import roomescape.common.exception.ErrorCode diff --git a/src/main/kotlin/roomescape/member/infrastructure/persistence/UserEntities.kt b/src/main/kotlin/roomescape/user/infrastructure/persistence/UserEntities.kt similarity index 93% rename from src/main/kotlin/roomescape/member/infrastructure/persistence/UserEntities.kt rename to src/main/kotlin/roomescape/user/infrastructure/persistence/UserEntities.kt index bb4abd98..420764a0 100644 --- a/src/main/kotlin/roomescape/member/infrastructure/persistence/UserEntities.kt +++ b/src/main/kotlin/roomescape/user/infrastructure/persistence/UserEntities.kt @@ -1,4 +1,4 @@ -package roomescape.member.infrastructure.persistence +package roomescape.user.infrastructure.persistence import jakarta.persistence.* import roomescape.common.entity.AuditingBaseEntity diff --git a/src/main/kotlin/roomescape/member/infrastructure/persistence/UserRepositories.kt b/src/main/kotlin/roomescape/user/infrastructure/persistence/UserRepositories.kt similarity index 86% rename from src/main/kotlin/roomescape/member/infrastructure/persistence/UserRepositories.kt rename to src/main/kotlin/roomescape/user/infrastructure/persistence/UserRepositories.kt index 37b6f4e0..8095a090 100644 --- a/src/main/kotlin/roomescape/member/infrastructure/persistence/UserRepositories.kt +++ b/src/main/kotlin/roomescape/user/infrastructure/persistence/UserRepositories.kt @@ -1,4 +1,4 @@ -package roomescape.member.infrastructure.persistence +package roomescape.user.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/roomescape/member/web/UserController.kt b/src/main/kotlin/roomescape/user/web/UserController.kt similarity index 91% rename from src/main/kotlin/roomescape/member/web/UserController.kt rename to src/main/kotlin/roomescape/user/web/UserController.kt index c20e6849..1df37266 100644 --- a/src/main/kotlin/roomescape/member/web/UserController.kt +++ b/src/main/kotlin/roomescape/user/web/UserController.kt @@ -1,4 +1,4 @@ -package roomescape.member.web +package roomescape.user.web import jakarta.validation.Valid import org.springframework.http.ResponseEntity @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RestController import roomescape.auth.web.support.CurrentUser import roomescape.common.dto.CurrentUserContext import roomescape.common.dto.response.CommonApiResponse -import roomescape.member.business.UserService -import roomescape.member.docs.UserAPI +import roomescape.user.business.UserService +import roomescape.user.docs.UserAPI @RestController class UserController( diff --git a/src/main/kotlin/roomescape/member/web/UserDTO.kt b/src/main/kotlin/roomescape/user/web/UserDTO.kt similarity index 85% rename from src/main/kotlin/roomescape/member/web/UserDTO.kt rename to src/main/kotlin/roomescape/user/web/UserDTO.kt index dbe421ad..a387e8b1 100644 --- a/src/main/kotlin/roomescape/member/web/UserDTO.kt +++ b/src/main/kotlin/roomescape/user/web/UserDTO.kt @@ -1,11 +1,11 @@ -package roomescape.member.web +package roomescape.user.web import jakarta.validation.constraints.Email import jakarta.validation.constraints.NotEmpty import jakarta.validation.constraints.Pattern import jakarta.validation.constraints.Size -import roomescape.member.infrastructure.persistence.UserEntity -import roomescape.member.infrastructure.persistence.UserStatus +import roomescape.user.infrastructure.persistence.UserEntity +import roomescape.user.infrastructure.persistence.UserStatus const val MIN_PASSWORD_LENGTH = 8 diff --git a/src/test/kotlin/roomescape/auth/AuthApiTest.kt b/src/test/kotlin/roomescape/auth/AuthApiTest.kt index 7a04b219..81c50b3a 100644 --- a/src/test/kotlin/roomescape/auth/AuthApiTest.kt +++ b/src/test/kotlin/roomescape/auth/AuthApiTest.kt @@ -16,8 +16,8 @@ import roomescape.auth.infrastructure.jwt.JwtUtils import roomescape.auth.infrastructure.persistence.LoginHistoryRepository import roomescape.auth.web.LoginRequest import roomescape.common.dto.PrincipalType -import roomescape.member.exception.UserErrorCode -import roomescape.member.infrastructure.persistence.UserEntity +import roomescape.user.exception.UserErrorCode +import roomescape.user.infrastructure.persistence.UserEntity import roomescape.supports.AdminFixture import roomescape.supports.FunSpecSpringbootTest import roomescape.supports.UserFixture diff --git a/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt b/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt index 0eb3825b..caedb284 100644 --- a/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt +++ b/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt @@ -9,7 +9,7 @@ import roomescape.auth.exception.AuthErrorCode import roomescape.common.config.next import roomescape.common.exception.CommonErrorCode import roomescape.common.util.DateUtils -import roomescape.member.infrastructure.persistence.UserEntity +import roomescape.user.infrastructure.persistence.UserEntity import roomescape.payment.infrastructure.common.BankCode import roomescape.payment.infrastructure.common.CardIssuerCode import roomescape.payment.infrastructure.common.EasyPayCompanyCode diff --git a/src/test/kotlin/roomescape/supports/Fixtures.kt b/src/test/kotlin/roomescape/supports/Fixtures.kt index 53214c2c..0793c31a 100644 --- a/src/test/kotlin/roomescape/supports/Fixtures.kt +++ b/src/test/kotlin/roomescape/supports/Fixtures.kt @@ -4,10 +4,10 @@ import com.github.f4b6a3.tsid.TsidFactory import roomescape.admin.infrastructure.persistence.AdminEntity import roomescape.admin.infrastructure.persistence.AdminPermissionLevel import roomescape.common.config.next -import roomescape.member.infrastructure.persistence.UserEntity -import roomescape.member.infrastructure.persistence.UserStatus -import roomescape.member.web.MIN_PASSWORD_LENGTH -import roomescape.member.web.UserCreateRequest +import roomescape.user.infrastructure.persistence.UserEntity +import roomescape.user.infrastructure.persistence.UserStatus +import roomescape.user.web.MIN_PASSWORD_LENGTH +import roomescape.user.web.UserCreateRequest import roomescape.payment.infrastructure.client.* import roomescape.payment.infrastructure.common.* import roomescape.payment.web.PaymentCancelRequest diff --git a/src/test/kotlin/roomescape/supports/KotestConfig.kt b/src/test/kotlin/roomescape/supports/KotestConfig.kt index 6b578421..d5b76834 100644 --- a/src/test/kotlin/roomescape/supports/KotestConfig.kt +++ b/src/test/kotlin/roomescape/supports/KotestConfig.kt @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Import import org.springframework.test.context.ActiveProfiles import roomescape.admin.infrastructure.persistence.AdminRepository -import roomescape.member.infrastructure.persistence.UserRepository +import roomescape.user.infrastructure.persistence.UserRepository import roomescape.payment.business.PaymentWriter import roomescape.payment.infrastructure.persistence.PaymentRepository import roomescape.reservation.infrastructure.persistence.ReservationRepository diff --git a/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt b/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt index c3c3c766..fd1d8391 100644 --- a/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt +++ b/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt @@ -17,9 +17,9 @@ import roomescape.admin.infrastructure.persistence.AdminRepository import roomescape.auth.web.LoginRequest import roomescape.common.dto.PrincipalType import roomescape.common.exception.ErrorCode -import roomescape.member.infrastructure.persistence.UserEntity -import roomescape.member.infrastructure.persistence.UserRepository -import roomescape.member.web.UserCreateRequest +import roomescape.user.infrastructure.persistence.UserEntity +import roomescape.user.infrastructure.persistence.UserRepository +import roomescape.user.web.UserCreateRequest class AuthUtil( private val userRepository: UserRepository, diff --git a/src/test/kotlin/roomescape/user/UserApiTest.kt b/src/test/kotlin/roomescape/user/UserApiTest.kt index 07843050..8db87e46 100644 --- a/src/test/kotlin/roomescape/user/UserApiTest.kt +++ b/src/test/kotlin/roomescape/user/UserApiTest.kt @@ -13,11 +13,11 @@ import org.springframework.http.HttpStatus import org.springframework.http.MediaType import roomescape.auth.exception.AuthErrorCode import roomescape.common.exception.CommonErrorCode -import roomescape.member.business.SIGNUP -import roomescape.member.exception.UserErrorCode -import roomescape.member.infrastructure.persistence.* -import roomescape.member.web.MIN_PASSWORD_LENGTH -import roomescape.member.web.UserCreateRequest +import roomescape.user.business.SIGNUP +import roomescape.user.exception.UserErrorCode +import roomescape.user.infrastructure.persistence.* +import roomescape.user.web.MIN_PASSWORD_LENGTH +import roomescape.user.web.UserCreateRequest import roomescape.supports.FunSpecSpringbootTest import roomescape.supports.UserFixture import roomescape.supports.runExceptionTest