pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[#34] 회원 / 인증 도메인 재정의 #43

Merged
pricelees merged 73 commits from refactor/#34 into main 2025-09-13 10:13:45 +00:00
Conversation 0 Commits 73 Files Changed 150 +45 -45
17 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 85b1eb2f6f - Show all commits

2
src/main/kotlin/roomescape/auth/business/AuthService.kt
View File

@ -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 {}

4
src/main/kotlin/roomescape/reservation/business/ReservationService.kt
View File

@ -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

2
src/main/kotlin/roomescape/reservation/web/ReservationDto.kt
View File

@ -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

16
src/main/kotlin/roomescape/member/business/UserService.kt → src/main/kotlin/roomescape/user/business/UserService.kt
View File

@ -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 {}

8
src/main/kotlin/roomescape/member/business/UserValidator.kt → src/main/kotlin/roomescape/user/business/UserValidator.kt
View File

@ -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 {}

8
src/main/kotlin/roomescape/member/docs/UserAPI.kt → src/main/kotlin/roomescape/user/docs/UserAPI.kt
View File

@ -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 {

2
src/main/kotlin/roomescape/member/exception/UserException.kt → src/main/kotlin/roomescape/user/exception/UserException.kt
View File

@ -1,4 +1,4 @@
package roomescape.member.exception
package roomescape.user.exception
import org.springframework.http.HttpStatus
import roomescape.common.exception.ErrorCode

2
src/main/kotlin/roomescape/member/infrastructure/persistence/UserEntities.kt → src/main/kotlin/roomescape/user/infrastructure/persistence/UserEntities.kt
View File

@ -1,4 +1,4 @@
package roomescape.member.infrastructure.persistence
package roomescape.user.infrastructure.persistence
import jakarta.persistence.*
import roomescape.common.entity.AuditingBaseEntity

2
src/main/kotlin/roomescape/member/infrastructure/persistence/UserRepositories.kt → src/main/kotlin/roomescape/user/infrastructure/persistence/UserRepositories.kt
View File

@ -1,4 +1,4 @@
package roomescape.member.infrastructure.persistence
package roomescape.user.infrastructure.persistence
import org.springframework.data.jpa.repository.JpaRepository

6
src/main/kotlin/roomescape/member/web/UserController.kt → src/main/kotlin/roomescape/user/web/UserController.kt
View File

@ -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(

6
src/main/kotlin/roomescape/member/web/UserDTO.kt → src/main/kotlin/roomescape/user/web/UserDTO.kt
View File

@ -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

4
src/test/kotlin/roomescape/auth/AuthApiTest.kt
View File

@ -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

2
src/test/kotlin/roomescape/reservation/ReservationApiTest.kt
View File

@ -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

8
src/test/kotlin/roomescape/supports/Fixtures.kt
View File

@ -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

2
src/test/kotlin/roomescape/supports/KotestConfig.kt
View File

@ -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

6
src/test/kotlin/roomescape/supports/RestAssuredUtils.kt
View File

@ -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,

10
src/test/kotlin/roomescape/user/UserApiTest.kt
View File

@ -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