Skip to content

캐시 트랜잭션 오류 수정 #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
worhs02 merged 3 commits into from
Oct 27, 2025
Merged

캐시 트랜잭션 오류 수정 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
520607f
fix/#194: 캐시 트랜잭션 오류 수정
worhs02 Oct 26, 2025
e9db239
fix/#194: saveMember에서 detached entity version null 오류 해결
worhs02 Oct 26, 2025
c754317
Merge pull request #195 from DivaryOfficial/fix/#194-cache-transactio…
worhs02 Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/com/divary/domain/logbase/logbook/service/LogBookService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ public class LogBookService {
.build();
}

@Transactional
@Transactional(readOnly = true)
public List<LogBaseListResultDTO> getLogBooksByYearAndStatus(int year, SaveStatus status, Long userId) {

List<LogBaseInfo> logBaseInfoList;


Member member = memberService.findById(userId);

if (status == null) {
Expand All @@ -84,7 +85,7 @@ public List<LogBaseListResultDTO> getLogBooksByYearAndStatus(int year, SaveStatu

}//연도에 따라, 저장 상태(임시저장,완전저장)에 따라 로그북베이스정보 조회

@Transactional
@Transactional(readOnly = true)
public List<LogBaseListResultDTO> getLogBooks(Long userId) {

List<LogBaseInfo> logBaseInfoList = logBaseInfoRepository.findByMemberId(userId);
Expand Down
28 changes: 24 additions & 4 deletions src/main/java/com/divary/domain/member/service/MemberServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public class MemberServiceImpl implements MemberService {
private int gracePeriodDays;

@Override
@Transactional(readOnly = true)
public Member findMemberByEmail(String email) {
return memberRepository.findByEmail(email).orElseThrow(()-> new BusinessException(ErrorCode.EMAIL_NOT_FOUND));
}
Expand All @@ -52,18 +53,35 @@ public Member findById(Long id) {
@Override
@CacheEvict(cacheNames = com.divary.global.config.CacheConfig.CACHE_MEMBER_BY_ID, key = "#member.id", condition = "#member.id != null")
public Member saveMember(Member member) {
// If member has an ID, it might be a detached entity from cache
// Re-fetch from DB to get managed entity with proper version
if (member.getId() != null) {
Member managedMember = memberRepository.findById(member.getId())
.orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND));

// Copy all fields from detached member to managed member
managedMember.setEmail(member.getEmail());
managedMember.setLevel(member.getLevel());
managedMember.setRole(member.getRole());
managedMember.setStatus(member.getStatus());
managedMember.setDeactivatedAt(member.getDeactivatedAt());

return managedMember; // JPA dirty checking will save this
}

// New entity - just save directly
return memberRepository.save(member);
}



@CacheEvict(cacheNames = com.divary.global.config.CacheConfig.CACHE_MEMBER_BY_ID, key = "#userId")
@CacheEvict(cacheNames = com.divary.global.config.CacheConfig.CACHE_MEMBER_BY_ID, key = "#userId", beforeInvocation = false)
public void updateLevel(Long userId, MyPageLevelRequestDTO requestDTO) {
Levels level = EnumValidator.validateEnum(Levels.class, requestDTO.getLevel().name());


Member member = memberRepository.findById(userId).orElseThrow(()-> new BusinessException(ErrorCode.MEMBER_NOT_FOUND));
member.setLevel(level);
// Cache evicted after successful update
}

@Override
Expand All @@ -83,7 +101,7 @@ public MyPageImageResponseDTO uploadLicense(MultipartFile image, Long userId) {

@Override
@Transactional
@CacheEvict(cacheNames = com.divary.global.config.CacheConfig.CACHE_MEMBER_BY_ID, key = "#memberId")
@CacheEvict(cacheNames = com.divary.global.config.CacheConfig.CACHE_MEMBER_BY_ID, key = "#memberId", beforeInvocation = false)
public DeactivateResponse requestToDeleteMember(Long memberId) {
Member member = memberRepository.findById(memberId).orElseThrow(()-> new BusinessException(ErrorCode.MEMBER_NOT_FOUND));

Expand All @@ -96,18 +114,20 @@ public DeactivateResponse requestToDeleteMember(Long memberId) {
.plusDays(gracePeriodDays);

return new DeactivateResponse(scheduledDeletionAt);
// Cache evicted after successful update
}

@Override
@Transactional
@CacheEvict(cacheNames = com.divary.global.config.CacheConfig.CACHE_MEMBER_BY_ID, key = "#memberId")
@CacheEvict(cacheNames = com.divary.global.config.CacheConfig.CACHE_MEMBER_BY_ID, key = "#memberId", beforeInvocation = false)
public void cancelDeleteMember(Long memberId) {
Member member = memberRepository.findById(memberId).orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND));

// DEACTIVATED 상태일 때만 취소 가능
if (member.getStatus() == Status.DEACTIVATED) {
member.cancelDeletion();
}
// Cache evicted after successful update
}
@Override
@Transactional
Expand Down