parent
1eeea16792
commit
6bc5143471
|
@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.member.auth
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
import kr.co.bootpay.Bootpay
|
import kr.co.bootpay.Bootpay
|
||||||
import kr.co.vividnext.sodalive.common.SodaException
|
import kr.co.vividnext.sodalive.common.SodaException
|
||||||
import kr.co.vividnext.sodalive.member.Member
|
|
||||||
import kr.co.vividnext.sodalive.member.MemberRepository
|
import kr.co.vividnext.sodalive.member.MemberRepository
|
||||||
import kr.co.vividnext.sodalive.member.MemberService
|
import kr.co.vividnext.sodalive.member.MemberService
|
||||||
import kr.co.vividnext.sodalive.member.SignOut
|
import kr.co.vividnext.sodalive.member.SignOut
|
||||||
|
@ -11,6 +10,7 @@ import kr.co.vividnext.sodalive.member.SignOutRepository
|
||||||
import org.springframework.beans.factory.annotation.Value
|
import org.springframework.beans.factory.annotation.Value
|
||||||
import org.springframework.data.repository.findByIdOrNull
|
import org.springframework.data.repository.findByIdOrNull
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
|
import org.springframework.transaction.annotation.Propagation
|
||||||
import org.springframework.transaction.annotation.Transactional
|
import org.springframework.transaction.annotation.Transactional
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
|
|
||||||
|
@ -57,8 +57,7 @@ class AuthService(
|
||||||
val certificateYear = certificate.birth.substring(0, 4).toInt()
|
val certificateYear = certificate.birth.substring(0, 4).toInt()
|
||||||
|
|
||||||
if (isBlockAuth(certificate)) {
|
if (isBlockAuth(certificate)) {
|
||||||
signOut(member)
|
signOut(memberId = memberId)
|
||||||
member.isActive = false
|
|
||||||
throw SodaException(blockMessage)
|
throw SodaException(blockMessage)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,12 +96,15 @@ class AuthService(
|
||||||
return blockAuthId != null && blockAuthId > 0
|
return blockAuthId != null && blockAuthId > 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional()
|
@Transactional(propagation = Propagation.REQUIRES_NEW)
|
||||||
fun signOut(member: Member) {
|
fun signOut(memberId: Long) {
|
||||||
memberService.logoutAll(memberId = member.id!!)
|
val member = memberRepository.findByIdOrNull(memberId) ?: throw SodaException("로그인 정보를 확인해주세요.")
|
||||||
|
member.isActive = false
|
||||||
|
|
||||||
val signOut = SignOut(reason = blockMessage)
|
val signOut = SignOut(reason = blockMessage)
|
||||||
signOut.member = member
|
signOut.member = member
|
||||||
signOutRepository.save(signOut)
|
signOutRepository.save(signOut)
|
||||||
|
|
||||||
|
memberService.logoutAll(memberId = member.id!!)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue