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

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)
+    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,36 @@ 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));
+
+        if (occurrence.getDeactivateType() != DeactivateType.NONE) {
+            throw ApplicationException.from(ALREADY_DEACTIVATED);
+        }
+
+        LocalDateTime scheduledDateTime = LocalDateTime.of(occurrence.getDate(), occurrence.getTime());
+        if (LocalDateTime.now().isBefore(scheduledDateTime)) {
+            throw ApplicationException.from(NOT_ALARM_TIME);
+        }
+
+        int ringIndex = occurrence.ring();
+        AlarmRingingLogEntity log = AlarmMapper.mapToAlarmRingingLogEntity(
+            occurrence,
+            ringIndex,
+            LocalDateTime.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();
 }

src/main/java/akuma/whiplash/domains/alarm/domain/service/AlarmQueryServiceImpl.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 akuma.whiplash.domains.alarm.domain.constant.DeactivateType;
@@ -177,6 +178,11 @@ private AlarmInfoPreviewResponse buildPreviewResponse(AlarmEntity alarm, LocalDa
             .secondUpcomingDayOfWeek(DateUtil.getKoreanDayOfWeek(resolvedSecondUpcomingDate))
             .build();
     }
+
+    @Override
+    public List<RingingPushInfo> getRingingNotificationTargets() {
+        return alarmOccurrenceRepository.findRingingNotificationTargets(DeactivateType.NONE);
+    }
 }
 
 

src/main/java/akuma/whiplash/domains/alarm/exception/AlarmErrorCode.java

@@ -19,6 +19,7 @@ public enum AlarmErrorCode implements BaseErrorCode {
     INVALID_WEEKDAY(HttpStatus.BAD_REQUEST, "ALARM_008", "유효하지 않은 요일 정보입니다."),
     CHECKIN_OUT_OF_RANGE(HttpStatus.BAD_REQUEST, "ALARM_009", "지정된 위치 반경 내에 있지 않아 출석할 수 없습니다."),
     NEXT_WEEK_ALARM_DEACTIVATION_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "ALARM_010", "다음 주에 울릴 알람은 끌 수 없습니다."),
+    NOT_ALARM_TIME(HttpStatus.BAD_REQUEST, "ALARM_011", "알람이 울릴 시간이 아닙니다."),
 
     ALARM_NOT_FOUND(HttpStatus.NOT_FOUND, "ALARM_401", "존재하지 않는 알람입니다."),
     ALARM_OCCURRENCE_NOT_FOUND(HttpStatus.NOT_FOUND, "ALARM_402", "알람 발생 내역이 존재하지 않습니다.")

src/main/java/akuma/whiplash/domains/alarm/persistence/entity/AlarmOccurrenceEntity.java

@@ -83,6 +83,11 @@ public void checkin(LocalDateTime now) {
         this.checkinTime = now;
     }
 
+    public int ring() {
+        this.alarmRinging = true;
+        return ++this.ringingCount;
+    }
+
     public void updateReminderSent(boolean reminderSent) {
         this.reminderSent = reminderSent;
     }

src/main/java/akuma/whiplash/domains/alarm/persistence/entity/AlarmRingingLogEntity.java

@@ -14,10 +14,12 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.DynamicInsert;
 
 @Entity
 @Getter
+@SuperBuilder
 @DynamicInsert
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "alarm_ringing_log")

src/main/java/akuma/whiplash/domains/alarm/persistence/repository/AlarmOccurrenceRepository.java

@@ -1,6 +1,7 @@
 package akuma.whiplash.domains.alarm.persistence.repository;
 
 import akuma.whiplash.domains.alarm.application.dto.etc.OccurrencePushInfo;
+import akuma.whiplash.domains.alarm.application.dto.etc.RingingPushInfo;
 import akuma.whiplash.domains.alarm.domain.constant.DeactivateType;
 import akuma.whiplash.domains.alarm.persistence.entity.AlarmOccurrenceEntity;
 import java.time.LocalDate;
@@ -122,4 +123,14 @@ List<OccurrencePushInfo> findPreNotificationTargetsUntilTime(
         WHERE o.id IN :ids AND o.reminderSent = false
     """)
     void markReminderSentIn(@Param("ids") Set<Long> ids);
+
+    @Query("""
+    SELECT new akuma.whiplash.domains.alarm.application.dto.etc.RingingPushInfo(a.id, m.id)
+    FROM AlarmOccurrenceEntity o
+    JOIN o.alarm a
+    JOIN a.member m
+    WHERE o.alarmRinging = true
+      AND o.deactivateType = :status
+    """)
+    List<RingingPushInfo> findRingingNotificationTargets(@Param("status") DeactivateType status);
 }

src/main/java/akuma/whiplash/domains/alarm/presentation/AlarmController.java

@@ -63,7 +63,7 @@ public ApplicationResponse<CreateAlarmResponse> createAlarm(@AuthenticationPrinc
         alarmErrorCodes = {ALARM_NOT_FOUND, ALARM_OFF_LIMIT_EXCEEDED, ALREADY_DEACTIVATED, INVALID_CLIENT_DATE},
         authErrorCodes = {PERMISSION_DENIED}
     )
-    @Operation(summary = "알람 끄기", description = "알람을 끕니다.")
+    @Operation(summary = "알람 끄기", description = "알람 목록에 있는 토글을 이용하여 알람을 끌 때, 알람 울림 화면에서 [봐주세요] 버튼을 눌러서 알람을 끌 때 호출하는 API입니다.")
     @PostMapping("/{alarmId}/off")
     public ApplicationResponse<AlarmOffResultResponse> alarmOff(@AuthenticationPrincipal MemberContext memberContext, @PathVariable Long alarmId, @RequestBody @Valid AlarmOffRequest request) {
         AlarmOffResultResponse response = alarmUseCase.alarmOff(memberContext.memberId(), alarmId, request.clientNow());
@@ -117,4 +117,18 @@ public ApplicationResponse<AlarmRemainingOffCountResponse> getWeeklyRemainingOff
         AlarmRemainingOffCountResponse response = alarmUseCase.getWeeklyRemainingOffCount(memberContext.memberId());
         return ApplicationResponse.onSuccess(response);
     }
+
+    @CustomErrorCodes(
+        alarmErrorCodes = {ALARM_NOT_FOUND, ALARM_OCCURRENCE_NOT_FOUND, ALREADY_DEACTIVATED, NOT_ALARM_TIME},
+        authErrorCodes = {PERMISSION_DENIED}
+    )
+    @Operation(summary = "알람 울림", description = "알람이 울릴 때 호출합니다.")
+    @PostMapping("/{alarmId}/ring")
+    public ApplicationResponse<Void> ringAlarm(
+        @AuthenticationPrincipal MemberContext memberContext,
+        @PathVariable Long alarmId
+    ) {
+        alarmUseCase.ringAlarm(memberContext.memberId(), alarmId);
+        return ApplicationResponse.onSuccess();
+    }
 }

src/main/java/akuma/whiplash/global/config/security/SecurityConfig.java

@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -27,6 +28,7 @@ public class SecurityConfig {
 
     private final JwtUtils jwtUtils;
     private final RequestMatcherHolder requestMatcherHolder;
+    private final Environment env;
 
     @Value("${swagger.server.url}")
     private String serverUrl;
@@ -49,7 +51,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                 .hasAnyAuthority(ADMIN.name())
                 .anyRequest().authenticated()
             )
-            .addFilterBefore(new JwtAuthenticationFilter(jwtUtils, requestMatcherHolder),
+            .addFilterBefore(new JwtAuthenticationFilter(jwtUtils, requestMatcherHolder, env),
                 UsernamePasswordAuthenticationFilter.class);
 
         return http.build();