From 6bc5143471f763f3fd0c0548f1a2978ca4b125b3 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 9 Nov 2023 17:17:58 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=B8=EC=9D=B8=EC=9D=B8=EC=A6=9D=20:=20bloc?= =?UTF-8?q?k=20=EB=90=9C=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EB=A1=9C=20=EB=B3=B8=EC=9D=B8=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=EC=9D=84=20=EC=8B=9C=EB=8F=84=ED=95=98=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20-=20=EB=B3=B8=EC=9D=B8=EC=9D=B8=EC=A6=9D=20?= =?UTF-8?q?=EC=8B=9C=EB=8F=84=20=EA=B3=84=EC=A0=95=20=ED=83=88=ED=87=B4=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/member/auth/AuthService.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/auth/AuthService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/auth/AuthService.kt index cbc3e30..c912c4b 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/auth/AuthService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/auth/AuthService.kt @@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.member.auth import com.fasterxml.jackson.databind.ObjectMapper import kr.co.bootpay.Bootpay 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.MemberService 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.data.repository.findByIdOrNull import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Propagation import org.springframework.transaction.annotation.Transactional import java.time.LocalDate @@ -57,8 +57,7 @@ class AuthService( val certificateYear = certificate.birth.substring(0, 4).toInt() if (isBlockAuth(certificate)) { - signOut(member) - member.isActive = false + signOut(memberId = memberId) throw SodaException(blockMessage) } @@ -97,12 +96,15 @@ class AuthService( return blockAuthId != null && blockAuthId > 0 } - @Transactional() - fun signOut(member: Member) { - memberService.logoutAll(memberId = member.id!!) + @Transactional(propagation = Propagation.REQUIRES_NEW) + fun signOut(memberId: Long) { + val member = memberRepository.findByIdOrNull(memberId) ?: throw SodaException("로그인 정보를 확인해주세요.") + member.isActive = false val signOut = SignOut(reason = blockMessage) signOut.member = member signOutRepository.save(signOut) + + memberService.logoutAll(memberId = member.id!!) } }