From 234e02dca4b9a1d82c70cf270eb1d51fe702cff7 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 2 Aug 2023 17:04:51 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4=20API=20-?= =?UTF-8?q?=20=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4=EC=8B=9C=20=ED=86=A0?= =?UTF-8?q?=ED=81=B0=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/member/MemberService.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt index 4ed6090..f972dbd 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt @@ -389,12 +389,8 @@ class MemberService( lock.write { tokenRepository.deleteById(memberId) } } - private fun getOrCreateLock(memberId: Long): ReentrantReadWriteLock { - return tokenLocks.computeIfAbsent(memberId) { ReentrantReadWriteLock() } - } - @Transactional - fun signOut(signOutRequest: SignOutRequest, user: User) { + fun signOut(signOutRequest: SignOutRequest, token: String, user: User) { val member = repository.findByEmail(user.username) ?: throw SodaException("로그인 정보를 확인해주세요.") if (!passwordEncoder.matches(signOutRequest.password, member.password)) { throw SodaException("비밀번호가 일치하지 않습니다.") @@ -404,10 +400,15 @@ class MemberService( throw SodaException("탈퇴하려는 이유를 입력해 주세요.") } + logoutAll(memberId = member.id!!) member.isActive = false val signOut = SignOut(reason = signOutRequest.reason) signOut.member = member signOutRepository.save(signOut) } + + private fun getOrCreateLock(memberId: Long): ReentrantReadWriteLock { + return tokenLocks.computeIfAbsent(memberId) { ReentrantReadWriteLock() } + } }