diff --git a/routee-activity/src/main/java/org/sopt/routee/activity/api/event/ActivityDeletedEvent.java b/routee-activity/src/main/java/org/sopt/routee/activity/api/event/ActivityDeletedEvent.java new file mode 100644 index 0000000..1e2803b --- /dev/null +++ b/routee-activity/src/main/java/org/sopt/routee/activity/api/event/ActivityDeletedEvent.java @@ -0,0 +1,6 @@ +package org.sopt.routee.activity.api.event; + +public record ActivityDeletedEvent( + Long memberId +) { +} diff --git a/routee-activity/src/main/java/org/sopt/routee/activity/internal/repository/ActivityRepository.java b/routee-activity/src/main/java/org/sopt/routee/activity/internal/repository/ActivityRepository.java index a33badb..decb576 100644 --- a/routee-activity/src/main/java/org/sopt/routee/activity/internal/repository/ActivityRepository.java +++ b/routee-activity/src/main/java/org/sopt/routee/activity/internal/repository/ActivityRepository.java @@ -9,10 +9,13 @@ import org.sopt.routee.activity.internal.entity.activity.Activity; import org.sopt.routee.activity.internal.entity.activity.ActivityStatus; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Lock; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import jakarta.persistence.LockModeType; + public interface ActivityRepository extends JpaRepository { boolean existsByMemberIdAndActivityStatusIn(Long memberId, Collection activityStatuses); @@ -26,6 +29,9 @@ List findIdsByMemberIdAndActivityStatusIn( Optional findByIdAndMemberId(Long id, Long memberId); + @Lock(LockModeType.PESSIMISTIC_WRITE) + Optional findForUpdateByIdAndMemberId(Long id, Long memberId); + List findByMemberIdAndActivityStatusAndStartedAtBetweenOrderByStartedAtDesc( Long memberId, ActivityStatus activityStatus, diff --git a/routee-activity/src/main/java/org/sopt/routee/activity/internal/service/ActivityService.java b/routee-activity/src/main/java/org/sopt/routee/activity/internal/service/ActivityService.java index f9aff13..b02c879 100644 --- a/routee-activity/src/main/java/org/sopt/routee/activity/internal/service/ActivityService.java +++ b/routee-activity/src/main/java/org/sopt/routee/activity/internal/service/ActivityService.java @@ -12,6 +12,7 @@ import java.util.stream.Collectors; import org.sopt.routee.activity.api.event.ActivityCompletedEvent; +import org.sopt.routee.activity.api.event.ActivityDeletedEvent; import org.sopt.routee.activity.internal.entity.activity.Activity; import org.sopt.routee.activity.internal.entity.activity.ActivityStatus; import org.sopt.routee.activity.internal.entity.timeline.Timeline; @@ -197,7 +198,7 @@ public UpdateActivityTitleResult updateTitle(UpdateActivityTitleCommand command) @Transactional public void complete(CompleteActivityCommand command) { - Activity activity = activityRepository.findByIdAndMemberId(command.activityId(), command.memberId()) + Activity activity = activityRepository.findForUpdateByIdAndMemberId(command.activityId(), command.memberId()) .orElseThrow(ActivityNotFoundException::new); if (activity.getActivityStatus().isCompleted()) { @@ -375,7 +376,7 @@ public void deleteActivitiesByMemberId(long memberId) { public void delete(Long activityId, Long memberId) { Activity deletedActivity = transactionTemplate.execute(status -> { - Activity activity = activityRepository.findByIdAndMemberId(activityId, memberId) + Activity activity = activityRepository.findForUpdateByIdAndMemberId(activityId, memberId) .orElseThrow(ActivityNotFoundException::new); routeRepository.deleteByActivityIdIn(List.of(activityId)); @@ -384,6 +385,7 @@ public void delete(Long activityId, Long memberId) { if (activity.getActivityStatus().isCompleted()) { refreshDailySummaryAfterDelete(activity); + applicationEventPublisher.publishEvent(new ActivityDeletedEvent(memberId)); } return activity; diff --git a/routee-member/src/main/java/org/sopt/routee/member/internal/listener/MemberActivityEventListener.java b/routee-member/src/main/java/org/sopt/routee/member/internal/listener/MemberActivityEventListener.java index a630256..e006da9 100644 --- a/routee-member/src/main/java/org/sopt/routee/member/internal/listener/MemberActivityEventListener.java +++ b/routee-member/src/main/java/org/sopt/routee/member/internal/listener/MemberActivityEventListener.java @@ -1,6 +1,7 @@ package org.sopt.routee.member.internal.listener; import org.sopt.routee.activity.api.event.ActivityCompletedEvent; +import org.sopt.routee.activity.api.event.ActivityDeletedEvent; import org.sopt.routee.member.internal.service.MemberService; import org.springframework.modulith.events.ApplicationModuleListener; import org.springframework.stereotype.Component; @@ -17,4 +18,9 @@ class MemberActivityEventListener { void handleActivityCompleted(ActivityCompletedEvent event) { memberService.incrementTotalActivityCount(event.memberId()); } + + @ApplicationModuleListener + void handleActivityDeleted(ActivityDeletedEvent event) { + memberService.decrementTotalActivityCount(event.memberId()); + } } \ No newline at end of file diff --git a/routee-member/src/main/java/org/sopt/routee/member/internal/repository/MemberRepository.java b/routee-member/src/main/java/org/sopt/routee/member/internal/repository/MemberRepository.java index c2e6b20..a1b6060 100644 --- a/routee-member/src/main/java/org/sopt/routee/member/internal/repository/MemberRepository.java +++ b/routee-member/src/main/java/org/sopt/routee/member/internal/repository/MemberRepository.java @@ -19,4 +19,8 @@ public interface MemberRepository extends JpaRepository { @Query("UPDATE Member m SET m.totalActivityCount = m.totalActivityCount + 1 WHERE m.id = :memberId") void incrementTotalActivityCount(@Param("memberId") Long memberId); + @Modifying + @Query("UPDATE Member m SET m.totalActivityCount = m.totalActivityCount - 1 WHERE m.id = :memberId AND m.totalActivityCount > 0") + void decrementTotalActivityCount(@Param("memberId") Long memberId); + } diff --git a/routee-member/src/main/java/org/sopt/routee/member/internal/service/MemberService.java b/routee-member/src/main/java/org/sopt/routee/member/internal/service/MemberService.java index 75f9113..263352d 100644 --- a/routee-member/src/main/java/org/sopt/routee/member/internal/service/MemberService.java +++ b/routee-member/src/main/java/org/sopt/routee/member/internal/service/MemberService.java @@ -295,6 +295,11 @@ public void incrementTotalActivityCount(long memberId) { memberRepository.incrementTotalActivityCount(memberId); } + @Transactional + public void decrementTotalActivityCount(long memberId) { + memberRepository.decrementTotalActivityCount(memberId); + } + @Transactional(readOnly = true) public ActivitySummaryResult getActivitySummary(long memberId, int year, int month) { if (!memberRepository.existsById(memberId)) {