diff --git a/src/main/java/com/mr/domain/analysis/service/AnalysisStateService.java b/src/main/java/com/mr/domain/analysis/service/AnalysisStateService.java index af7d13c1..882b9527 100644 --- a/src/main/java/com/mr/domain/analysis/service/AnalysisStateService.java +++ b/src/main/java/com/mr/domain/analysis/service/AnalysisStateService.java @@ -23,6 +23,8 @@ import java.time.Clock; import java.time.LocalDateTime; import java.util.Optional; + +import com.mr.global.event.NotificationEvent; import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; @@ -117,6 +119,16 @@ public boolean complete( eventPublisher.publishEvent( AnalysisCompletedEvent.of(analysis.getUser().getUserId()) ); + + String practiceName = "자유 연주"; + + if (analysis.getPlaying() != null && analysis.getPlaying().getBackingTrack() != null) { + practiceName = analysis.getPlaying().getBackingTrack().getTitle(); + } + + eventPublisher.publishEvent( + NotificationEvent.forAnalysis(analysis.getUser().getUserId(), practiceName) + ); return true; } diff --git a/src/main/java/com/mr/domain/playing/repository/PlayingRepository.java b/src/main/java/com/mr/domain/playing/repository/PlayingRepository.java index 1a9c804e..ebee2ee2 100644 --- a/src/main/java/com/mr/domain/playing/repository/PlayingRepository.java +++ b/src/main/java/com/mr/domain/playing/repository/PlayingRepository.java @@ -96,4 +96,19 @@ interface PracticeTotals { } Optional findByIdAndDeletedAtIsNull(Long playingId); + + @Query(""" + select coalesce(sum(p.durationSec), 0) from Playing p + where p.user.userId = :userId + and p.status = :status + and p.deletedAt is null + and p.endedAt >= :since + and p.id != :excludePlayingId + """) + Long sumDurationSecExcludeCurrent( + @Param("userId") Long userId, + @Param("status") PlayingStatus status, + @Param("since") LocalDateTime since, + @Param("excludePlayingId") Long excludePlayingId + ); } diff --git a/src/main/java/com/mr/domain/playing/service/PlayingService.java b/src/main/java/com/mr/domain/playing/service/PlayingService.java index a95b6d72..1426d66b 100644 --- a/src/main/java/com/mr/domain/playing/service/PlayingService.java +++ b/src/main/java/com/mr/domain/playing/service/PlayingService.java @@ -15,10 +15,16 @@ import com.mr.domain.user.entity.User; import com.mr.domain.user.repository.UserRepository; import com.mr.global.apipayload.exception.GeneralException; +import com.mr.global.event.NotificationEvent; import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.Clock; +import java.time.DayOfWeek; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; import static com.mr.domain.backingtrack.entity.enums.AccessLevel.PUBLIC; @@ -32,6 +38,10 @@ public class PlayingService { private final UserRepository userRepository; private final BackingTrackRepository backingTrackRepository; + private final ApplicationEventPublisher eventPublisher; + + private final Clock clock; + @Transactional public PlayingStartResponse startPlaying( Long userId, PlayingStartRequest request @@ -80,6 +90,29 @@ public MidiEventSaveResponse saveMidiEvents( playing.completeWithMidiData(midiEvents); + int intervalHours = 10; // 10시간 단위로 알림 + int intervalSeconds = intervalHours * 3600; + + LocalDateTime weekStart = LocalDate.now(clock).with(DayOfWeek.MONDAY).atStartOfDay(); + + // 방금 끝낸 연주를 제외한 이전 누적 시간 + Long previousWeeklySeconds = playingRepository.sumDurationSecExcludeCurrent( + userId, playing.getStatus(), weekStart, playing.getId() + ); + + Long currentDuration = playing.getDurationSec() != null ? playing.getDurationSec() : 0L; + Long totalWeeklySeconds = previousWeeklySeconds + currentDuration; + + Long previousMilestones = previousWeeklySeconds / intervalSeconds; + Long currentMilestones = totalWeeklySeconds / intervalSeconds; + + if (currentMilestones > previousMilestones) { + int achievedHours = (int)(currentMilestones * intervalHours); // 달성한 시간: 10 시간 단위 + eventPublisher.publishEvent( + NotificationEvent.forPractice(userId, playing.getUser().getNickname(), achievedHours) + ); + } + return MidiEventSaveResponse.of( playing.getId(), playing.getMidiData().size()