[codex] Fix notification async dispatch#331

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
jjoonleo merged 1 commit into from
Jun 30, 2026
Merged

[codex] Fix notification async dispatch #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion ontime-back/src/main/java/devkor/ontime_back/config/SchedulerConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,11 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;

import java.util.concurrent.Executor;

@Configuration
public class SchedulerConfig {

Expand All@@ -16,4 +19,15 @@ public TaskScheduler taskScheduler() {
scheduler.initialize();
return scheduler;
}
}

@Bean(name = "notificationAsyncExecutor")
public Executor notificationAsyncExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(4);
executor.setMaxPoolSize(8);
executor.setQueueCapacity(200);
executor.setThreadNamePrefix("notification-");
executor.initialize();
return executor;
}
}
8 changes: 8 additions & 0 deletions ontime-back/src/main/java/devkor/ontime_back/repository/NotificationScheduleRepository.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@
import devkor.ontime_back.entity.NotificationSchedule;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.UUID;

@Repository
Expand All@@ -17,5 +19,11 @@ public interface NotificationScheduleRepository extends JpaRepository<Notificati
"WHERE n.notificationTime > :now AND n.isSent = false")
List<NotificationSchedule> findAllWithScheduleAndUser(LocalDateTime now);

@Query("SELECT n FROM NotificationSchedule n " +
"JOIN FETCH n.schedule s " +
"JOIN FETCH s.user " +
"WHERE n.id = :notificationId")
Optional<NotificationSchedule> findByIdWithScheduleAndUser(@Param("notificationId") Long notificationId);

List<NotificationSchedule> findAllByScheduleScheduleIdOrderByIdAsc(UUID scheduleId);
}
86 changes: 86 additions & 0 deletions ontime-back/src/main/java/devkor/ontime_back/service/NotificationDeliveryService.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationDeliveryService {

private final UserSettingRepository userSettingRepository;
private final AlarmService alarmService;
private final NotificationScheduleRepository notificationScheduleRepository;

@Transactional
public void sendReminder(NotificationSchedule notificationSchedule, String message) {
Long userId = notificationSchedule.getSchedule().getUser().getId();

if (userId != null) {
UserSetting userSetting = userSettingRepository.findByUserId(userId)
.orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
if (alarmService.shouldSuppressLegacyReminder(
userId,
notificationSchedule.getSchedule().getScheduleId(),
notificationSchedule.getNotificationTime())) {
log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
notificationSchedule.getSchedule().getScheduleId());
return;
}
sendNotificationToUser(notificationSchedule.getSchedule(), message);
notificationSchedule.changeStatusToSent();
notificationScheduleRepository.save(notificationSchedule);
}
}
}

public void sendReminder(List<Schedule> schedules, String message) {
for (Schedule schedule : schedules) {
User user = schedule.getUser();
Long userId = user.getId();

if (userId != null) {
UserSetting userSetting = userSettingRepository.findByUserId(userId)
.orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));

if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
sendNotificationToUser(schedule, message);
}
}
}
}

public void sendNotificationToUser(Schedule schedule, String message) {
User user = schedule.getUser();
String firebaseToken = user.getFirebaseToken();

Message firebaseMessage = Message.builder()
.putData("title", "약속 알림")
.putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
.setToken(firebaseToken)
.build();

try {
FirebaseMessaging.getInstance().send(firebaseMessage);
log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
} catch (Exception e) {
e.printStackTrace();
}
}
}
31 changes: 31 additions & 0 deletions ontime-back/src/main/java/devkor/ontime_back/service/NotificationDispatchService.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
package devkor.ontime_back.service;

import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
@RequiredArgsConstructor
public class NotificationDispatchService {

private final NotificationScheduleRepository notificationScheduleRepository;
private final NotificationDeliveryService notificationDeliveryService;

@Async("notificationAsyncExecutor")
@Transactional
public void dispatchReminder(Long notificationId, String message) {
NotificationSchedule notificationSchedule = notificationScheduleRepository.findByIdWithScheduleAndUser(notificationId)
.orElse(null);
if (notificationSchedule == null) {
log.warn("예약된 알림을 찾을 수 없어 푸시 알림을 건너뜁니다. notificationId={}", notificationId);
return;
}

notificationDeliveryService.sendReminder(notificationSchedule, message);
}
}
81 changes: 14 additions & 67 deletions ontime-back/src/main/java/devkor/ontime_back/service/NotificationService.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
Expand All@@ -26,13 +17,11 @@
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationService {

private final UserSettingRepository userSettingRepository;
private final AlarmService alarmService;
private final TaskScheduler taskScheduler;
private final NotificationScheduleRepository notificationScheduleRepository;
private final NotificationDispatchService notificationDispatchService;
private final NotificationDeliveryService notificationDeliveryService;
private final ConcurrentHashMap<Long, ScheduledFuture<?>> scheduledTasks = new ConcurrentHashMap<>();

public void scheduleReminder(NotificationSchedule notificationSchedule) {
Expand All@@ -43,12 +32,19 @@ public void scheduleReminder(NotificationSchedule notificationSchedule) {
return;
}

Long notificationId = notificationSchedule.getId();
if (notificationId == null) {
throw new IllegalArgumentException("NotificationSchedule must be persisted before scheduling");
}

ScheduledFuture<?> future = taskScheduler.schedule(
() -> sendReminder(notificationSchedule, "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
() -> notificationDispatchService.dispatchReminder(
notificationId,
"준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
Date.from(reminderTime.atZone(ZoneId.systemDefault()).toInstant())
);

scheduledTasks.put(notificationSchedule.getId(), future);
scheduledTasks.put(notificationId, future);

log.info("스케줄 등록 완료 {} ({})", notificationSchedule.getSchedule().getScheduleName(), reminderTime);
}
Expand All@@ -62,64 +58,15 @@ public void cancelScheduledNotification(Long notificationId) {
}
}

@Async
@Transactional
public void sendReminder(NotificationSchedule notificationSchedule, String message) {
Long userId = notificationSchedule.getSchedule().getUser().getId();

if (userId != null) {
UserSetting userSetting = userSettingRepository.findByUserId(userId)
.orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
if (alarmService.shouldSuppressLegacyReminder(
userId,
notificationSchedule.getSchedule().getScheduleId(),
notificationSchedule.getNotificationTime())) {
log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
notificationSchedule.getSchedule().getScheduleId());
return;
}
sendNotificationToUser(notificationSchedule.getSchedule(), message);
notificationSchedule.changeStatusToSent();
notificationScheduleRepository.save(notificationSchedule);
}
}
notificationDeliveryService.sendReminder(notificationSchedule, message);
}

public void sendReminder(List<Schedule> schedules, String message) {
for (Schedule schedule : schedules) {
User user = schedule.getUser();
Long userId = user.getId();

if (userId != null) {
UserSetting userSetting = userSettingRepository.findByUserId(userId)
.orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));// Repository 메서드 가정

if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
sendNotificationToUser(schedule, message);
}
}
}
notificationDeliveryService.sendReminder(schedules, message);
}

@Transactional
public void sendNotificationToUser(Schedule schedule, String message) {
User user = schedule.getUser();
String firebaseToken = user.getFirebaseToken();

Message firebaseMessage = Message.builder()
.putData("title", "약속 알림")
.putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
.setToken(firebaseToken)
.build();

try {
FirebaseMessaging.getInstance().send(firebaseMessage);
log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
} catch (Exception e) {
e.printStackTrace();
}
notificationDeliveryService.sendNotificationToUser(schedule, message);
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[codex] Fix notification async dispatch#331

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

jjoonleo
merged 1 commit into

from

Jun 30, 2026
 Merged


[codex] Fix notification async dispatch
#331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


16 changes: 15 additions & 1 deletion
ontime-back/src/main/java/devkor/ontime_back/config/SchedulerConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,11 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;

import java.util.concurrent.Executor;

@Configuration
public class SchedulerConfig {

Expand All@@ -16,4 +19,15 @@ public TaskScheduler taskScheduler() {
 scheduler.initialize();
 return scheduler;
 }
}

 @Bean(name = "notificationAsyncExecutor")
 public Executor notificationAsyncExecutor() {
 ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 executor.setCorePoolSize(4);
 executor.setMaxPoolSize(8);
 executor.setQueueCapacity(200);
 executor.setThreadNamePrefix("notification-");
 executor.initialize();
 return executor;
 }
}

8 changes: 8 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/repository/NotificationScheduleRepository.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@
import devkor.ontime_back.entity.NotificationSchedule;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.UUID;

@Repository
Expand All@@ -17,5 +19,11 @@ public interface NotificationScheduleRepository extends JpaRepository<Notificati
 "WHERE n.notificationTime > :now AND n.isSent = false")
 List<NotificationSchedule> findAllWithScheduleAndUser(LocalDateTime now);

 @Query("SELECT n FROM NotificationSchedule n " +
 "JOIN FETCH n.schedule s " +
 "JOIN FETCH s.user " +
 "WHERE n.id = :notificationId")
 Optional<NotificationSchedule> findByIdWithScheduleAndUser(@Param("notificationId") Long notificationId);

 List<NotificationSchedule> findAllByScheduleScheduleIdOrderByIdAsc(UUID scheduleId);
}

86 changes: 86 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDeliveryService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationDeliveryService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final NotificationScheduleRepository notificationScheduleRepository;

 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 }

 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 }
}

31 changes: 31 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDispatchService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
package devkor.ontime_back.service;

import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
@RequiredArgsConstructor
public class NotificationDispatchService {

 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDeliveryService notificationDeliveryService;

 @Async("notificationAsyncExecutor")
 @Transactional
 public void dispatchReminder(Long notificationId, String message) {
 NotificationSchedule notificationSchedule = notificationScheduleRepository.findByIdWithScheduleAndUser(notificationId)
 .orElse(null);
 if (notificationSchedule == null) {
 log.warn("예약된 알림을 찾을 수 없어 푸시 알림을 건너뜁니다. notificationId={}", notificationId);
 return;
 }

 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }
}

81 changes: 14 additions & 67 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
Expand All@@ -26,13 +17,11 @@
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final TaskScheduler taskScheduler;
 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDispatchService notificationDispatchService;
 private final NotificationDeliveryService notificationDeliveryService;
 private final ConcurrentHashMap<Long, ScheduledFuture<?>> scheduledTasks = new ConcurrentHashMap<>();

 public void scheduleReminder(NotificationSchedule notificationSchedule) {
Expand All@@ -43,12 +32,19 @@ public void scheduleReminder(NotificationSchedule notificationSchedule) {
 return;
 }

 Long notificationId = notificationSchedule.getId();
 if (notificationId == null) {
 throw new IllegalArgumentException("NotificationSchedule must be persisted before scheduling");
 }

 ScheduledFuture<?> future = taskScheduler.schedule(
 () -> sendReminder(notificationSchedule, "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 () -> notificationDispatchService.dispatchReminder(
 notificationId,
 "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 Date.from(reminderTime.atZone(ZoneId.systemDefault()).toInstant())
 );

 scheduledTasks.put(notificationSchedule.getId(), future);
 scheduledTasks.put(notificationId, future);

 log.info("스케줄 등록 완료 {} ({})", notificationSchedule.getSchedule().getScheduleName(), reminderTime);
 }
Expand All@@ -62,64 +58,15 @@ public void cancelScheduledNotification(Long notificationId) {
 }
 }

 @Async
 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));// Repository 메서드 가정

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 notificationDeliveryService.sendReminder(schedules, message);
 }

 @Transactional
 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 notificationDeliveryService.sendNotificationToUser(schedule, message);
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[codex] Fix notification async dispatch#331

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

jjoonleo
merged 1 commit into

from

Jun 30, 2026
 Merged


[codex] Fix notification async dispatch
#331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


16 changes: 15 additions & 1 deletion
ontime-back/src/main/java/devkor/ontime_back/config/SchedulerConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,11 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;

import java.util.concurrent.Executor;

@Configuration
public class SchedulerConfig {

Expand All@@ -16,4 +19,15 @@ public TaskScheduler taskScheduler() {
 scheduler.initialize();
 return scheduler;
 }
}

 @Bean(name = "notificationAsyncExecutor")
 public Executor notificationAsyncExecutor() {
 ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 executor.setCorePoolSize(4);
 executor.setMaxPoolSize(8);
 executor.setQueueCapacity(200);
 executor.setThreadNamePrefix("notification-");
 executor.initialize();
 return executor;
 }
}

8 changes: 8 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/repository/NotificationScheduleRepository.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@
import devkor.ontime_back.entity.NotificationSchedule;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.UUID;

@Repository
Expand All@@ -17,5 +19,11 @@ public interface NotificationScheduleRepository extends JpaRepository<Notificati
 "WHERE n.notificationTime > :now AND n.isSent = false")
 List<NotificationSchedule> findAllWithScheduleAndUser(LocalDateTime now);

 @Query("SELECT n FROM NotificationSchedule n " +
 "JOIN FETCH n.schedule s " +
 "JOIN FETCH s.user " +
 "WHERE n.id = :notificationId")
 Optional<NotificationSchedule> findByIdWithScheduleAndUser(@Param("notificationId") Long notificationId);

 List<NotificationSchedule> findAllByScheduleScheduleIdOrderByIdAsc(UUID scheduleId);
}

86 changes: 86 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDeliveryService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationDeliveryService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final NotificationScheduleRepository notificationScheduleRepository;

 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 }

 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 }
}

31 changes: 31 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDispatchService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
package devkor.ontime_back.service;

import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
@RequiredArgsConstructor
public class NotificationDispatchService {

 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDeliveryService notificationDeliveryService;

 @Async("notificationAsyncExecutor")
 @Transactional
 public void dispatchReminder(Long notificationId, String message) {
 NotificationSchedule notificationSchedule = notificationScheduleRepository.findByIdWithScheduleAndUser(notificationId)
 .orElse(null);
 if (notificationSchedule == null) {
 log.warn("예약된 알림을 찾을 수 없어 푸시 알림을 건너뜁니다. notificationId={}", notificationId);
 return;
 }

 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }
}

81 changes: 14 additions & 67 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
Expand All@@ -26,13 +17,11 @@
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final TaskScheduler taskScheduler;
 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDispatchService notificationDispatchService;
 private final NotificationDeliveryService notificationDeliveryService;
 private final ConcurrentHashMap<Long, ScheduledFuture<?>> scheduledTasks = new ConcurrentHashMap<>();

 public void scheduleReminder(NotificationSchedule notificationSchedule) {
Expand All@@ -43,12 +32,19 @@ public void scheduleReminder(NotificationSchedule notificationSchedule) {
 return;
 }

 Long notificationId = notificationSchedule.getId();
 if (notificationId == null) {
 throw new IllegalArgumentException("NotificationSchedule must be persisted before scheduling");
 }

 ScheduledFuture<?> future = taskScheduler.schedule(
 () -> sendReminder(notificationSchedule, "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 () -> notificationDispatchService.dispatchReminder(
 notificationId,
 "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 Date.from(reminderTime.atZone(ZoneId.systemDefault()).toInstant())
 );

 scheduledTasks.put(notificationSchedule.getId(), future);
 scheduledTasks.put(notificationId, future);

 log.info("스케줄 등록 완료 {} ({})", notificationSchedule.getSchedule().getScheduleName(), reminderTime);
 }
Expand All@@ -62,64 +58,15 @@ public void cancelScheduledNotification(Long notificationId) {
 }
 }

 @Async
 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));// Repository 메서드 가정

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 notificationDeliveryService.sendReminder(schedules, message);
 }

 @Transactional
 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 notificationDeliveryService.sendNotificationToUser(schedule, message);
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[codex] Fix notification async dispatch#331

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

jjoonleo
merged 1 commit into

from

Jun 30, 2026
 Merged


[codex] Fix notification async dispatch
#331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


16 changes: 15 additions & 1 deletion
ontime-back/src/main/java/devkor/ontime_back/config/SchedulerConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,11 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;

import java.util.concurrent.Executor;

@Configuration
public class SchedulerConfig {

Expand All@@ -16,4 +19,15 @@ public TaskScheduler taskScheduler() {
 scheduler.initialize();
 return scheduler;
 }
}

 @Bean(name = "notificationAsyncExecutor")
 public Executor notificationAsyncExecutor() {
 ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 executor.setCorePoolSize(4);
 executor.setMaxPoolSize(8);
 executor.setQueueCapacity(200);
 executor.setThreadNamePrefix("notification-");
 executor.initialize();
 return executor;
 }
}

8 changes: 8 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/repository/NotificationScheduleRepository.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@
import devkor.ontime_back.entity.NotificationSchedule;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.UUID;

@Repository
Expand All@@ -17,5 +19,11 @@ public interface NotificationScheduleRepository extends JpaRepository<Notificati
 "WHERE n.notificationTime > :now AND n.isSent = false")
 List<NotificationSchedule> findAllWithScheduleAndUser(LocalDateTime now);

 @Query("SELECT n FROM NotificationSchedule n " +
 "JOIN FETCH n.schedule s " +
 "JOIN FETCH s.user " +
 "WHERE n.id = :notificationId")
 Optional<NotificationSchedule> findByIdWithScheduleAndUser(@Param("notificationId") Long notificationId);

 List<NotificationSchedule> findAllByScheduleScheduleIdOrderByIdAsc(UUID scheduleId);
}

86 changes: 86 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDeliveryService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationDeliveryService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final NotificationScheduleRepository notificationScheduleRepository;

 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 }

 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 }
}

31 changes: 31 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDispatchService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
package devkor.ontime_back.service;

import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
@RequiredArgsConstructor
public class NotificationDispatchService {

 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDeliveryService notificationDeliveryService;

 @Async("notificationAsyncExecutor")
 @Transactional
 public void dispatchReminder(Long notificationId, String message) {
 NotificationSchedule notificationSchedule = notificationScheduleRepository.findByIdWithScheduleAndUser(notificationId)
 .orElse(null);
 if (notificationSchedule == null) {
 log.warn("예약된 알림을 찾을 수 없어 푸시 알림을 건너뜁니다. notificationId={}", notificationId);
 return;
 }

 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }
}

81 changes: 14 additions & 67 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
Expand All@@ -26,13 +17,11 @@
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final TaskScheduler taskScheduler;
 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDispatchService notificationDispatchService;
 private final NotificationDeliveryService notificationDeliveryService;
 private final ConcurrentHashMap<Long, ScheduledFuture<?>> scheduledTasks = new ConcurrentHashMap<>();

 public void scheduleReminder(NotificationSchedule notificationSchedule) {
Expand All@@ -43,12 +32,19 @@ public void scheduleReminder(NotificationSchedule notificationSchedule) {
 return;
 }

 Long notificationId = notificationSchedule.getId();
 if (notificationId == null) {
 throw new IllegalArgumentException("NotificationSchedule must be persisted before scheduling");
 }

 ScheduledFuture<?> future = taskScheduler.schedule(
 () -> sendReminder(notificationSchedule, "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 () -> notificationDispatchService.dispatchReminder(
 notificationId,
 "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 Date.from(reminderTime.atZone(ZoneId.systemDefault()).toInstant())
 );

 scheduledTasks.put(notificationSchedule.getId(), future);
 scheduledTasks.put(notificationId, future);

 log.info("스케줄 등록 완료 {} ({})", notificationSchedule.getSchedule().getScheduleName(), reminderTime);
 }
Expand All@@ -62,64 +58,15 @@ public void cancelScheduledNotification(Long notificationId) {
 }
 }

 @Async
 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));// Repository 메서드 가정

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 notificationDeliveryService.sendReminder(schedules, message);
 }

 @Transactional
 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 notificationDeliveryService.sendNotificationToUser(schedule, message);
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[codex] Fix notification async dispatch#331

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

jjoonleo
merged 1 commit into

from

Jun 30, 2026
 Merged


[codex] Fix notification async dispatch
#331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


16 changes: 15 additions & 1 deletion
ontime-back/src/main/java/devkor/ontime_back/config/SchedulerConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,11 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;

import java.util.concurrent.Executor;

@Configuration
public class SchedulerConfig {

Expand All@@ -16,4 +19,15 @@ public TaskScheduler taskScheduler() {
 scheduler.initialize();
 return scheduler;
 }
}

 @Bean(name = "notificationAsyncExecutor")
 public Executor notificationAsyncExecutor() {
 ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 executor.setCorePoolSize(4);
 executor.setMaxPoolSize(8);
 executor.setQueueCapacity(200);
 executor.setThreadNamePrefix("notification-");
 executor.initialize();
 return executor;
 }
}

8 changes: 8 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/repository/NotificationScheduleRepository.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@
import devkor.ontime_back.entity.NotificationSchedule;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.UUID;

@Repository
Expand All@@ -17,5 +19,11 @@ public interface NotificationScheduleRepository extends JpaRepository<Notificati
 "WHERE n.notificationTime > :now AND n.isSent = false")
 List<NotificationSchedule> findAllWithScheduleAndUser(LocalDateTime now);

 @Query("SELECT n FROM NotificationSchedule n " +
 "JOIN FETCH n.schedule s " +
 "JOIN FETCH s.user " +
 "WHERE n.id = :notificationId")
 Optional<NotificationSchedule> findByIdWithScheduleAndUser(@Param("notificationId") Long notificationId);

 List<NotificationSchedule> findAllByScheduleScheduleIdOrderByIdAsc(UUID scheduleId);
}

86 changes: 86 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDeliveryService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationDeliveryService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final NotificationScheduleRepository notificationScheduleRepository;

 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 }

 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 }
}

31 changes: 31 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDispatchService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
package devkor.ontime_back.service;

import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
@RequiredArgsConstructor
public class NotificationDispatchService {

 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDeliveryService notificationDeliveryService;

 @Async("notificationAsyncExecutor")
 @Transactional
 public void dispatchReminder(Long notificationId, String message) {
 NotificationSchedule notificationSchedule = notificationScheduleRepository.findByIdWithScheduleAndUser(notificationId)
 .orElse(null);
 if (notificationSchedule == null) {
 log.warn("예약된 알림을 찾을 수 없어 푸시 알림을 건너뜁니다. notificationId={}", notificationId);
 return;
 }

 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }
}

81 changes: 14 additions & 67 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
Expand All@@ -26,13 +17,11 @@
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final TaskScheduler taskScheduler;
 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDispatchService notificationDispatchService;
 private final NotificationDeliveryService notificationDeliveryService;
 private final ConcurrentHashMap<Long, ScheduledFuture<?>> scheduledTasks = new ConcurrentHashMap<>();

 public void scheduleReminder(NotificationSchedule notificationSchedule) {
Expand All@@ -43,12 +32,19 @@ public void scheduleReminder(NotificationSchedule notificationSchedule) {
 return;
 }

 Long notificationId = notificationSchedule.getId();
 if (notificationId == null) {
 throw new IllegalArgumentException("NotificationSchedule must be persisted before scheduling");
 }

 ScheduledFuture<?> future = taskScheduler.schedule(
 () -> sendReminder(notificationSchedule, "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 () -> notificationDispatchService.dispatchReminder(
 notificationId,
 "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 Date.from(reminderTime.atZone(ZoneId.systemDefault()).toInstant())
 );

 scheduledTasks.put(notificationSchedule.getId(), future);
 scheduledTasks.put(notificationId, future);

 log.info("스케줄 등록 완료 {} ({})", notificationSchedule.getSchedule().getScheduleName(), reminderTime);
 }
Expand All@@ -62,64 +58,15 @@ public void cancelScheduledNotification(Long notificationId) {
 }
 }

 @Async
 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));// Repository 메서드 가정

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 notificationDeliveryService.sendReminder(schedules, message);
 }

 @Transactional
 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 notificationDeliveryService.sendNotificationToUser(schedule, message);
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[codex] Fix notification async dispatch#331

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

jjoonleo
merged 1 commit into

from

Jun 30, 2026
 Merged


[codex] Fix notification async dispatch
#331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


16 changes: 15 additions & 1 deletion
ontime-back/src/main/java/devkor/ontime_back/config/SchedulerConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,11 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;

import java.util.concurrent.Executor;

@Configuration
public class SchedulerConfig {

Expand All@@ -16,4 +19,15 @@ public TaskScheduler taskScheduler() {
 scheduler.initialize();
 return scheduler;
 }
}

 @Bean(name = "notificationAsyncExecutor")
 public Executor notificationAsyncExecutor() {
 ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 executor.setCorePoolSize(4);
 executor.setMaxPoolSize(8);
 executor.setQueueCapacity(200);
 executor.setThreadNamePrefix("notification-");
 executor.initialize();
 return executor;
 }
}

8 changes: 8 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/repository/NotificationScheduleRepository.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@
import devkor.ontime_back.entity.NotificationSchedule;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.UUID;

@Repository
Expand All@@ -17,5 +19,11 @@ public interface NotificationScheduleRepository extends JpaRepository<Notificati
 "WHERE n.notificationTime > :now AND n.isSent = false")
 List<NotificationSchedule> findAllWithScheduleAndUser(LocalDateTime now);

 @Query("SELECT n FROM NotificationSchedule n " +
 "JOIN FETCH n.schedule s " +
 "JOIN FETCH s.user " +
 "WHERE n.id = :notificationId")
 Optional<NotificationSchedule> findByIdWithScheduleAndUser(@Param("notificationId") Long notificationId);

 List<NotificationSchedule> findAllByScheduleScheduleIdOrderByIdAsc(UUID scheduleId);
}

86 changes: 86 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDeliveryService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationDeliveryService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final NotificationScheduleRepository notificationScheduleRepository;

 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 }

 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 }
}

31 changes: 31 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDispatchService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
package devkor.ontime_back.service;

import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
@RequiredArgsConstructor
public class NotificationDispatchService {

 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDeliveryService notificationDeliveryService;

 @Async("notificationAsyncExecutor")
 @Transactional
 public void dispatchReminder(Long notificationId, String message) {
 NotificationSchedule notificationSchedule = notificationScheduleRepository.findByIdWithScheduleAndUser(notificationId)
 .orElse(null);
 if (notificationSchedule == null) {
 log.warn("예약된 알림을 찾을 수 없어 푸시 알림을 건너뜁니다. notificationId={}", notificationId);
 return;
 }

 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }
}

81 changes: 14 additions & 67 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
Expand All@@ -26,13 +17,11 @@
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final TaskScheduler taskScheduler;
 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDispatchService notificationDispatchService;
 private final NotificationDeliveryService notificationDeliveryService;
 private final ConcurrentHashMap<Long, ScheduledFuture<?>> scheduledTasks = new ConcurrentHashMap<>();

 public void scheduleReminder(NotificationSchedule notificationSchedule) {
Expand All@@ -43,12 +32,19 @@ public void scheduleReminder(NotificationSchedule notificationSchedule) {
 return;
 }

 Long notificationId = notificationSchedule.getId();
 if (notificationId == null) {
 throw new IllegalArgumentException("NotificationSchedule must be persisted before scheduling");
 }

 ScheduledFuture<?> future = taskScheduler.schedule(
 () -> sendReminder(notificationSchedule, "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 () -> notificationDispatchService.dispatchReminder(
 notificationId,
 "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 Date.from(reminderTime.atZone(ZoneId.systemDefault()).toInstant())
 );

 scheduledTasks.put(notificationSchedule.getId(), future);
 scheduledTasks.put(notificationId, future);

 log.info("스케줄 등록 완료 {} ({})", notificationSchedule.getSchedule().getScheduleName(), reminderTime);
 }
Expand All@@ -62,64 +58,15 @@ public void cancelScheduledNotification(Long notificationId) {
 }
 }

 @Async
 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));// Repository 메서드 가정

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 notificationDeliveryService.sendReminder(schedules, message);
 }

 @Transactional
 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 notificationDeliveryService.sendNotificationToUser(schedule, message);
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[codex] Fix notification async dispatch#331

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

jjoonleo
merged 1 commit into

from

Jun 30, 2026
 Merged


[codex] Fix notification async dispatch
#331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


16 changes: 15 additions & 1 deletion
ontime-back/src/main/java/devkor/ontime_back/config/SchedulerConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,11 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;

import java.util.concurrent.Executor;

@Configuration
public class SchedulerConfig {

Expand All@@ -16,4 +19,15 @@ public TaskScheduler taskScheduler() {
 scheduler.initialize();
 return scheduler;
 }
}

 @Bean(name = "notificationAsyncExecutor")
 public Executor notificationAsyncExecutor() {
 ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 executor.setCorePoolSize(4);
 executor.setMaxPoolSize(8);
 executor.setQueueCapacity(200);
 executor.setThreadNamePrefix("notification-");
 executor.initialize();
 return executor;
 }
}

8 changes: 8 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/repository/NotificationScheduleRepository.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@
import devkor.ontime_back.entity.NotificationSchedule;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.UUID;

@Repository
Expand All@@ -17,5 +19,11 @@ public interface NotificationScheduleRepository extends JpaRepository<Notificati
 "WHERE n.notificationTime > :now AND n.isSent = false")
 List<NotificationSchedule> findAllWithScheduleAndUser(LocalDateTime now);

 @Query("SELECT n FROM NotificationSchedule n " +
 "JOIN FETCH n.schedule s " +
 "JOIN FETCH s.user " +
 "WHERE n.id = :notificationId")
 Optional<NotificationSchedule> findByIdWithScheduleAndUser(@Param("notificationId") Long notificationId);

 List<NotificationSchedule> findAllByScheduleScheduleIdOrderByIdAsc(UUID scheduleId);
}

86 changes: 86 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDeliveryService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationDeliveryService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final NotificationScheduleRepository notificationScheduleRepository;

 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 }

 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 }
}

31 changes: 31 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDispatchService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
package devkor.ontime_back.service;

import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
@RequiredArgsConstructor
public class NotificationDispatchService {

 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDeliveryService notificationDeliveryService;

 @Async("notificationAsyncExecutor")
 @Transactional
 public void dispatchReminder(Long notificationId, String message) {
 NotificationSchedule notificationSchedule = notificationScheduleRepository.findByIdWithScheduleAndUser(notificationId)
 .orElse(null);
 if (notificationSchedule == null) {
 log.warn("예약된 알림을 찾을 수 없어 푸시 알림을 건너뜁니다. notificationId={}", notificationId);
 return;
 }

 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }
}

81 changes: 14 additions & 67 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
Expand All@@ -26,13 +17,11 @@
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final TaskScheduler taskScheduler;
 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDispatchService notificationDispatchService;
 private final NotificationDeliveryService notificationDeliveryService;
 private final ConcurrentHashMap<Long, ScheduledFuture<?>> scheduledTasks = new ConcurrentHashMap<>();

 public void scheduleReminder(NotificationSchedule notificationSchedule) {
Expand All@@ -43,12 +32,19 @@ public void scheduleReminder(NotificationSchedule notificationSchedule) {
 return;
 }

 Long notificationId = notificationSchedule.getId();
 if (notificationId == null) {
 throw new IllegalArgumentException("NotificationSchedule must be persisted before scheduling");
 }

 ScheduledFuture<?> future = taskScheduler.schedule(
 () -> sendReminder(notificationSchedule, "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 () -> notificationDispatchService.dispatchReminder(
 notificationId,
 "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 Date.from(reminderTime.atZone(ZoneId.systemDefault()).toInstant())
 );

 scheduledTasks.put(notificationSchedule.getId(), future);
 scheduledTasks.put(notificationId, future);

 log.info("스케줄 등록 완료 {} ({})", notificationSchedule.getSchedule().getScheduleName(), reminderTime);
 }
Expand All@@ -62,64 +58,15 @@ public void cancelScheduledNotification(Long notificationId) {
 }
 }

 @Async
 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));// Repository 메서드 가정

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 notificationDeliveryService.sendReminder(schedules, message);
 }

 @Transactional
 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 notificationDeliveryService.sendNotificationToUser(schedule, message);
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[codex] Fix notification async dispatch#331

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

jjoonleo
merged 1 commit into

from

Jun 30, 2026
 Merged


[codex] Fix notification async dispatch
#331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


16 changes: 15 additions & 1 deletion
ontime-back/src/main/java/devkor/ontime_back/config/SchedulerConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,11 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;

import java.util.concurrent.Executor;

@Configuration
public class SchedulerConfig {

Expand All@@ -16,4 +19,15 @@ public TaskScheduler taskScheduler() {
 scheduler.initialize();
 return scheduler;
 }
}

 @Bean(name = "notificationAsyncExecutor")
 public Executor notificationAsyncExecutor() {
 ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 executor.setCorePoolSize(4);
 executor.setMaxPoolSize(8);
 executor.setQueueCapacity(200);
 executor.setThreadNamePrefix("notification-");
 executor.initialize();
 return executor;
 }
}

8 changes: 8 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/repository/NotificationScheduleRepository.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@
import devkor.ontime_back.entity.NotificationSchedule;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.UUID;

@Repository
Expand All@@ -17,5 +19,11 @@ public interface NotificationScheduleRepository extends JpaRepository<Notificati
 "WHERE n.notificationTime > :now AND n.isSent = false")
 List<NotificationSchedule> findAllWithScheduleAndUser(LocalDateTime now);

 @Query("SELECT n FROM NotificationSchedule n " +
 "JOIN FETCH n.schedule s " +
 "JOIN FETCH s.user " +
 "WHERE n.id = :notificationId")
 Optional<NotificationSchedule> findByIdWithScheduleAndUser(@Param("notificationId") Long notificationId);

 List<NotificationSchedule> findAllByScheduleScheduleIdOrderByIdAsc(UUID scheduleId);
}

86 changes: 86 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDeliveryService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationDeliveryService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final NotificationScheduleRepository notificationScheduleRepository;

 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 }

 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 }
}

31 changes: 31 additions & 0 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationDispatchService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
package devkor.ontime_back.service;

import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
@RequiredArgsConstructor
public class NotificationDispatchService {

 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDeliveryService notificationDeliveryService;

 @Async("notificationAsyncExecutor")
 @Transactional
 public void dispatchReminder(Long notificationId, String message) {
 NotificationSchedule notificationSchedule = notificationScheduleRepository.findByIdWithScheduleAndUser(notificationId)
 .orElse(null);
 if (notificationSchedule == null) {
 log.warn("예약된 알림을 찾을 수 없어 푸시 알림을 건너뜁니다. notificationId={}", notificationId);
 return;
 }

 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }
}

81 changes: 14 additions & 67 deletions
ontime-back/src/main/java/devkor/ontime_back/service/NotificationService.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
package devkor.ontime_back.service;

import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.Message;
import devkor.ontime_back.entity.NotificationSchedule;
import devkor.ontime_back.entity.Schedule;
import devkor.ontime_back.entity.User;
import devkor.ontime_back.entity.UserSetting;
import devkor.ontime_back.repository.NotificationScheduleRepository;
import devkor.ontime_back.repository.UserSettingRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
Expand All@@ -26,13 +17,11 @@
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class NotificationService {

 private final UserSettingRepository userSettingRepository;
 private final AlarmService alarmService;
 private final TaskScheduler taskScheduler;
 private final NotificationScheduleRepository notificationScheduleRepository;
 private final NotificationDispatchService notificationDispatchService;
 private final NotificationDeliveryService notificationDeliveryService;
 private final ConcurrentHashMap<Long, ScheduledFuture<?>> scheduledTasks = new ConcurrentHashMap<>();

 public void scheduleReminder(NotificationSchedule notificationSchedule) {
Expand All@@ -43,12 +32,19 @@ public void scheduleReminder(NotificationSchedule notificationSchedule) {
 return;
 }

 Long notificationId = notificationSchedule.getId();
 if (notificationId == null) {
 throw new IllegalArgumentException("NotificationSchedule must be persisted before scheduling");
 }

 ScheduledFuture<?> future = taskScheduler.schedule(
 () -> sendReminder(notificationSchedule, "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 () -> notificationDispatchService.dispatchReminder(
 notificationId,
 "준비 시작해야 합니다.(현재 시각: 약속시각 - (여유시간 + 이동시간 + 총준비시간) )"),
 Date.from(reminderTime.atZone(ZoneId.systemDefault()).toInstant())
 );

 scheduledTasks.put(notificationSchedule.getId(), future);
 scheduledTasks.put(notificationId, future);

 log.info("스케줄 등록 완료 {} ({})", notificationSchedule.getSchedule().getScheduleName(), reminderTime);
 }
Expand All@@ -62,64 +58,15 @@ public void cancelScheduledNotification(Long notificationId) {
 }
 }

 @Async
 @Transactional
 public void sendReminder(NotificationSchedule notificationSchedule, String message) {
 Long userId = notificationSchedule.getSchedule().getUser().getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));
 log.debug("사용자 알림 전송 설정 여부: " + userSetting.getIsNotificationsEnabled());

 if (Boolean.TRUE.equals(userSetting.getIsNotificationsEnabled())) {
 if (alarmService.shouldSuppressLegacyReminder(
 userId,
 notificationSchedule.getSchedule().getScheduleId(),
 notificationSchedule.getNotificationTime())) {
 log.info("현재 기기 로컬 알람 커버리지로 인해 레거시 푸시 알림을 생략합니다. scheduleId={}",
 notificationSchedule.getSchedule().getScheduleId());
 return;
 }
 sendNotificationToUser(notificationSchedule.getSchedule(), message);
 notificationSchedule.changeStatusToSent();
 notificationScheduleRepository.save(notificationSchedule);
 }
 }
 notificationDeliveryService.sendReminder(notificationSchedule, message);
 }

 public void sendReminder(List<Schedule> schedules, String message) {
 for (Schedule schedule : schedules) {
 User user = schedule.getUser();
 Long userId = user.getId();

 if (userId != null) {
 UserSetting userSetting = userSettingRepository.findByUserId(userId)
 .orElseThrow(() -> new IllegalArgumentException("No UserSetting found in schedule's user"));// Repository 메서드 가정

 if (userSetting != null && userSetting.getIsNotificationsEnabled()) {
 sendNotificationToUser(schedule, message);
 }
 }
 }
 notificationDeliveryService.sendReminder(schedules, message);
 }

 @Transactional
 public void sendNotificationToUser(Schedule schedule, String message) {
 User user = schedule.getUser();
 String firebaseToken = user.getFirebaseToken();

 Message firebaseMessage = Message.builder()
 .putData("title", "약속 알림")
 .putData("content", user.getName() + "님 " + message + "\n약속명: " + schedule.getScheduleName())
 .setToken(firebaseToken)
 .build();

 try {
 FirebaseMessaging.getInstance().send(firebaseMessage);
 log.info("Firebase에 성공적으로 push notification 요청을 보냈으며, Firebase로부터 적절한 응답을 받았습니다 \n알림 푸시한 약속:" + schedule.getScheduleName());
 } catch (Exception e) {
 e.printStackTrace();
 }
 notificationDeliveryService.sendNotificationToUser(schedule, message);
 }
}
Loading
Loading