Merge pull request #62 from Central-MakeUs/feature/#58-alarm-ringing-log

알람 울림 API, 푸시 알림 추가

Author: strongmhk

build.gradle

@@ -32,6 +32,10 @@ repositories {
 	mavenCentral()
 }
 
+tasks.withType(Test).configureEach {
+	useJUnitPlatform()
+}
+
 dependencies {
 	// --- Spring starters ---
 	implementation 'org.springframework.boot:spring-boot-starter-web'

src/main/java/akuma/whiplash/domains/alarm/application/dto/etc/RingingPushInfo.java

@@ -0,0 +1,10 @@
+package akuma.whiplash.domains.alarm.application.dto.etc;
+
+import lombok.Builder;
+
+@Builder
+public record RingingPushInfo(
+    Long alarmId,
+    Long memberId
+) {
+}

src/main/java/akuma/whiplash/domains/alarm/application/dto/etc/RingingPushTargetDto.java

@@ -0,0 +1,11 @@
+package akuma.whiplash.domains.alarm.application.dto.etc;
+
+import lombok.Builder;
+
+@Builder
+public record RingingPushTargetDto(
+    String token,
+    Long alarmId,
+    Long memberId
+) {
+}

src/main/java/akuma/whiplash/domains/alarm/application/mapper/AlarmMapper.java

@@ -10,10 +10,12 @@
 import akuma.whiplash.domains.alarm.persistence.entity.AlarmEntity;
 import akuma.whiplash.domains.alarm.persistence.entity.AlarmOccurrenceEntity;
 import akuma.whiplash.domains.alarm.persistence.entity.AlarmOffLogEntity;
+import akuma.whiplash.domains.alarm.persistence.entity.AlarmRingingLogEntity;
 import akuma.whiplash.domains.member.persistence.entity.MemberEntity;
 import akuma.whiplash.global.exception.ApplicationException;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
@@ -78,6 +80,18 @@ public static AlarmOccurrenceEntity mapToAlarmOccurrenceForDate(AlarmEntity alar
             .build();
     }
 
+    public static AlarmRingingLogEntity mapToAlarmRingingLogEntity(
+        AlarmOccurrenceEntity occurrence,
+        int ringIndex,
+        LocalDateTime ringedAt
+    ) {
+        return AlarmRingingLogEntity.builder()
+            .alarmOccurrence(occurrence)
+            .ringIndex(ringIndex)
+            .ringedAt(ringedAt)
+            .build();
+    }
+
     public static CreateAlarmOccurrenceResponse mapToCreateAlarmOccurrenceResponse(Long occurrenceId) {
         return CreateAlarmOccurrenceResponse.builder()
             .occurrenceId(occurrenceId)

src/main/java/akuma/whiplash/domains/alarm/application/scheduler/AlarmReminderScheduler.java

@@ -15,6 +15,7 @@
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Slf4j
@@ -27,7 +28,8 @@ public class AlarmReminderScheduler {
     private final FcmService fcmService;
     private final AlarmCommandService alarmCommandService;
 
-    // @Scheduled(cron = "0 * * * * *") // 매 분
+    // 매 분 마다 실행
+    @Scheduled(cron = "0 * * * * *")
     public void sendPreAlarmNotifications() {
         log.info("[AlarmReminderScheduler.sendPreAlarmNotifications] 알람 울리기 1시간 전 푸시 알림 전송 스케줄러 시작");
         try {

src/main/java/akuma/whiplash/domains/alarm/application/scheduler/AlarmRingingNotificationScheduler.java

@@ -0,0 +1,51 @@
+package akuma.whiplash.domains.alarm.application.scheduler;
+
+import akuma.whiplash.domains.alarm.application.dto.etc.RingingPushInfo;
+import akuma.whiplash.domains.alarm.application.dto.etc.RingingPushTargetDto;
+import akuma.whiplash.domains.alarm.domain.service.AlarmQueryService;
+import akuma.whiplash.infrastructure.firebase.FcmService;
+import akuma.whiplash.infrastructure.redis.RedisService;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AlarmRingingNotificationScheduler {
+
+    private final AlarmQueryService alarmQueryService;
+    private final RedisService redisService;
+    private final FcmService fcmService;
+
+    // 10초 간격으로 실행
+    @Scheduled(fixedRate = 10000, zone = "Asia/Seoul")
+    public void sendRingingAlarmNotifications() {
+        log.info("[AlarmRingingNotificationScheduler.sendRingingAlarmNotifications] 알람 울림 푸시 알림 전송 스케줄러 시작");
+        try {
+            List<RingingPushInfo> infos = alarmQueryService.getRingingNotificationTargets();
+            if (infos.isEmpty()) {
+                return;
+            }
+
+            List<RingingPushTargetDto> targets = infos.stream()
+                .flatMap(info -> redisService.getFcmTokens(info.memberId()).stream()
+                    .map(token -> RingingPushTargetDto.builder()
+                        .token(token)
+                        .alarmId(info.alarmId())
+                        .memberId(info.memberId())
+                        .build()))
+                .toList();
+
+            if (targets.isEmpty()) {
+                return;
+            }
+
+            fcmService.sendRingingNotifications(targets);
+        } finally {
+            log.info("[AlarmRingingNotificationScheduler.sendRingingAlarmNotifications] 알람 울림 푸시 알림 전송 스케줄러 종료");
+        }
+    }
+}

src/main/java/akuma/whiplash/domains/alarm/application/usecase/AlarmUseCase.java

@@ -41,6 +41,10 @@ public void checkinAlarm(Long memberId, Long alarmId, AlarmCheckinRequest reques
         alarmCommandService.checkinAlarm(memberId, alarmId, request);
     }
 
+    public void ringAlarm(Long memberId, Long alarmId) {
+        alarmCommandService.ringAlarm(memberId, alarmId);
+    }
+
     public List<AlarmInfoPreviewResponse> getAlarms(Long memberId) {
         return alarmQueryService.getAlarms(memberId);
     }

src/main/java/akuma/whiplash/domains/alarm/domain/service/AlarmCommandService.java

@@ -15,5 +15,6 @@ public interface AlarmCommandService {
     AlarmOffResultResponse alarmOff(Long memberId, Long alarmId, LocalDateTime clientNow);
     void removeAlarm(Long memberId, Long alarmId, String reason);
     void checkinAlarm(Long memberId, Long alarmId, AlarmCheckinRequest request);
+    void ringAlarm(Long memberId, Long alarmId);
     void markReminderSent(Set<Long> occurrenceIds);
 }

src/main/java/akuma/whiplash/domains/alarm/domain/service/AlarmCommandServiceImpl.java

@@ -13,6 +13,7 @@
 import akuma.whiplash.domains.alarm.persistence.entity.AlarmEntity;
 import akuma.whiplash.domains.alarm.persistence.entity.AlarmOccurrenceEntity;
 import akuma.whiplash.domains.alarm.persistence.entity.AlarmOffLogEntity;
+import akuma.whiplash.domains.alarm.persistence.entity.AlarmRingingLogEntity;
 import akuma.whiplash.domains.alarm.persistence.repository.AlarmOccurrenceRepository;
 import akuma.whiplash.domains.alarm.persistence.repository.AlarmOffLogRepository;
 import akuma.whiplash.domains.alarm.persistence.repository.AlarmRepository;
@@ -245,6 +246,33 @@ public void checkinAlarm(Long memberId, Long alarmId, AlarmCheckinRequest reques
         occurrence.checkin(LocalDateTime.now());
     }
 
+    @Override
+    public void ringAlarm(Long memberId, Long alarmId) {
+        AlarmEntity alarm = findAlarmById(alarmId);
+        validAlarmOwner(memberId, alarm.getMember().getId());
+
+        AlarmOccurrenceEntity occurrence = alarmOccurrenceRepository
+            .findTopByAlarmIdAndDeactivateTypeInOrderByDateDescTimeDesc(
+                alarmId,
+                List.of(DeactivateType.NONE)
+            )
+            .orElseThrow(() -> ApplicationException.from(ALARM_OCCURRENCE_NOT_FOUND));
+
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime scheduledDateTime = LocalDateTime.of(occurrence.getDate(), occurrence.getTime());
+        if (now.isBefore(scheduledDateTime)) {
+            throw ApplicationException.from(NOT_ALARM_TIME);
+        }
+
+        int ringIndex = occurrence.ring();
+        AlarmRingingLogEntity log = AlarmMapper.mapToAlarmRingingLogEntity(
+            occurrence,
+            ringIndex,
+            now
+        );
+        alarmRingingLogRepository.save(log);
+    }
+
     @Override
     public void markReminderSent(Set<Long> occurrenceIds) {
         if (occurrenceIds == null || occurrenceIds.isEmpty()) return;

src/main/java/akuma/whiplash/domains/alarm/domain/service/AlarmQueryService.java

@@ -1,6 +1,7 @@
 package akuma.whiplash.domains.alarm.domain.service;
 
 import akuma.whiplash.domains.alarm.application.dto.etc.OccurrencePushInfo;
+import akuma.whiplash.domains.alarm.application.dto.etc.RingingPushInfo;
 import akuma.whiplash.domains.alarm.application.dto.response.AlarmInfoPreviewResponse;
 import akuma.whiplash.domains.alarm.application.dto.response.AlarmRemainingOffCountResponse;
 import java.time.LocalDateTime;
@@ -10,4 +11,5 @@ public interface AlarmQueryService {
     List<AlarmInfoPreviewResponse> getAlarms(Long memberId);
     List<OccurrencePushInfo> getPreNotificationTargets(LocalDateTime startInclusive, LocalDateTime endInclusive);
     AlarmRemainingOffCountResponse getWeeklyRemainingOffCount(Long memberId);
+    List<RingingPushInfo> getRingingNotificationTargets();
 }