feature/26-wrong-merge-solve

casper-user/src/main/kotlin/hs/kr/entrydsm/user/domain/admin/exception/AdminNotFoundException.kt

@@ -1,11 +1,11 @@
 package hs.kr.entrydsm.user.domain.admin.exception
 
-import hs.kr.entrydsm.user.global.error.exception.EquusException
+import hs.kr.entrydsm.user.global.error.exception.CasperException
 import hs.kr.entrydsm.user.global.error.exception.ErrorCode
 
 /**
  * 관리자를 찾을 수 없을 때 발생하는 예외입니다.
  */
-object AdminNotFoundException : EquusException(
+object AdminNotFoundException : CasperException(
     ErrorCode.ADMIN_NOT_FOUND,
 )

casper-user/src/main/kotlin/hs/kr/entrydsm/user/domain/admin/exception/AdminUnauthorizedException.kt

@@ -1,11 +1,11 @@
 package hs.kr.entrydsm.user.domain.admin.exception
 
-import hs.kr.entrydsm.user.global.error.exception.EquusException
+import hs.kr.entrydsm.user.global.error.exception.CasperException
 import hs.kr.entrydsm.user.global.error.exception.ErrorCode
 
 /**
  * 관리자 권한이 없을 때 발생하는 예외입니다.
  */
-object AdminUnauthorizedException : EquusException(
+object AdminUnauthorizedException : CasperException(
     ErrorCode.ADMIN_UNAUTHORIZED,
 )

casper-user/src/main/kotlin/hs/kr/entrydsm/user/domain/auth/application/service/PassPopupService.kt

@@ -6,6 +6,7 @@ import hs.kr.entrydsm.user.global.exception.InternalServerErrorException
 import hs.kr.entrydsm.user.global.utils.pass.RedirectUrlChecker
 import kcb.module.v3.OkCert
 import org.json.JSONObject
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional

casper-user/src/main/kotlin/hs/kr/entrydsm/user/domain/auth/application/service/QueryPassInfoService.kt

@@ -6,6 +6,7 @@ import hs.kr.entrydsm.user.domain.auth.adapter.out.repository.PassInfoRepository
 import hs.kr.entrydsm.user.domain.auth.application.port.`in`.QueryPassInfoUseCase
 import hs.kr.entrydsm.user.domain.auth.exception.InvalidPassException
 import hs.kr.entrydsm.user.global.utils.encryption.EncryptionUtil
+import hs.kr.entrydsm.user.global.utils.encryption.HashUtil
 import hs.kr.entrydsm.user.global.utils.pass.PassUtil
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service

casper-user/src/main/kotlin/hs/kr/entrydsm/user/domain/auth/exception/InvalidOkCertConnectException.kt

@@ -1,11 +1,11 @@
 package hs.kr.entrydsm.user.domain.auth.exception
 
-import hs.kr.entrydsm.user.global.error.exception.EquusException
+import hs.kr.entrydsm.user.global.error.exception.CasperException
 import hs.kr.entrydsm.user.global.error.exception.ErrorCode
 
 /**
  * OkCert 연결이 유효하지 않을 때 발생하는 예외입니다.
  */
-object InvalidOkCertConnectException : EquusException(
+object InvalidOkCertConnectException : CasperException(
     ErrorCode.INVALID_OKCERT_CONNECTION,
 )

casper-user/src/main/kotlin/hs/kr/entrydsm/user/domain/auth/exception/InvalidPassException.kt

@@ -1,12 +1,12 @@
 package hs.kr.entrydsm.user.domain.auth.exception
 
-import hs.kr.entrydsm.user.global.error.exception.EquusException
+import hs.kr.entrydsm.user.global.error.exception.CasperException
 import hs.kr.entrydsm.user.global.error.exception.ErrorCode
 
 /**
  * Pass 인증이 유효하지 않을 때 발생하는 예외입니다.
  * Pass 인증 과정에서 검증에 실패한 경우 사용됩니다.
  */
-object InvalidPassException : EquusException(
+object InvalidPassException : CasperException(
     ErrorCode.INVALID_PASS,
 )

casper-user/src/main/kotlin/hs/kr/entrydsm/user/domain/auth/exception/InvalidUrlException.kt

@@ -1,11 +1,11 @@
 package hs.kr.entrydsm.user.domain.auth.exception
 
-import hs.kr.entrydsm.user.global.error.exception.EquusException
+import hs.kr.entrydsm.user.global.error.exception.CasperException
 import hs.kr.entrydsm.user.global.error.exception.ErrorCode
 
 /**
  * URL이 유효하지 않을 때 발생하는 예외입니다.
  */
-object InvalidUrlException : EquusException(
+object InvalidUrlException : CasperException(
     ErrorCode.INVALID_URL,
 )

casper-user/src/main/kotlin/hs/kr/entrydsm/user/domain/auth/exception/PassInfoNotFoundException.kt

@@ -1,12 +1,12 @@
 package hs.kr.entrydsm.user.domain.auth.exception
 
-import hs.kr.entrydsm.user.global.error.exception.EquusException
+import hs.kr.entrydsm.user.global.error.exception.CasperException
 import hs.kr.entrydsm.user.global.error.exception.ErrorCode
 
 /**
  * Pass 인증 정보를 찾을 수 없을 때 발생하는 예외입니다.
  * Pass 인증을 통해 저장된 사용자 정보가 만료되었거나 존재하지 않는 경우 사용됩니다.
  */
-object PassInfoNotFoundException : EquusException(
+object PassInfoNotFoundException : CasperException(
     ErrorCode.PASS_INFO_NOT_FOUND,
 )