redis를 이전하기 위해 설정했던 모든 커밋 Revert

This commit is contained in:
2024-11-24 01:23:41 +09:00
parent e38ed331b6
commit b7d7afb8a5
34 changed files with 214 additions and 637 deletions

View File

@@ -35,9 +35,7 @@ import kr.co.vividnext.sodalive.member.stipulation.StipulationIds
import kr.co.vividnext.sodalive.member.stipulation.StipulationRepository
import kr.co.vividnext.sodalive.member.tag.MemberCreatorTag
import kr.co.vividnext.sodalive.member.tag.MemberTagRepository
import kr.co.vividnext.sodalive.member.token.MemberToken
import kr.co.vividnext.sodalive.redis.v1.MemberTokenRepository
import kr.co.vividnext.sodalive.redis.v2.MemberTokenRepositoryV2
import kr.co.vividnext.sodalive.member.token.MemberTokenRepository
import kr.co.vividnext.sodalive.utils.generateFileName
import kr.co.vividnext.sodalive.utils.generatePassword
import org.springframework.beans.factory.annotation.Value
@@ -64,7 +62,6 @@ import kotlin.concurrent.write
class MemberService(
private val repository: MemberRepository,
private val tokenRepository: MemberTokenRepository,
private val tokenRepositoryV2: MemberTokenRepositoryV2,
private val stipulationRepository: StipulationRepository,
private val stipulationAgreeRepository: StipulationAgreeRepository,
private val creatorFollowingRepository: CreatorFollowingRepository,
@@ -438,12 +435,11 @@ class MemberService(
val lock = getOrCreateLock(memberId = memberId)
lock.write {
val memberToken = saveAndGetTokenById(memberId)
val memberToken = tokenRepository.findByIdOrNull(memberId)
?: throw SodaException("로그인 정보를 확인해주세요.")
if (memberToken != null) {
memberToken.tokenSet.remove(token)
tokenRepositoryV2.save(memberToken)
}
memberToken.tokenSet.remove(token)
tokenRepository.save(memberToken)
}
}
@@ -455,25 +451,7 @@ class MemberService(
member.pushToken = null
val lock = getOrCreateLock(memberId = memberId)
lock.write {
tokenRepository.deleteById(memberId)
tokenRepositoryV2.deleteById(memberId)
}
}
private fun saveAndGetTokenById(id: Long): MemberToken? {
var memberToken = tokenRepositoryV2.findByIdOrNull(id = id)
if (memberToken == null) {
memberToken = tokenRepository.findByIdOrNull(id = id)
if (memberToken != null) {
tokenRepositoryV2.save(memberToken)
tokenRepository.delete(memberToken)
}
}
return memberToken
lock.write { tokenRepository.deleteById(memberId) }
}
@Transactional