generated from pricelees/issue-pr-template
refactor: 이전 CommonAuth 타입 분리를 기존 클래스에 반영
This commit is contained in:
parent
df5abf5cd4
commit
14d68bb4fb
@ -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
|
||||
|
||||
@ -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 {}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.*
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user