Skip to content
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

Jump to bottom

[Fix] 타이머 스케줄 부하 해결 #217

Merged
merged 1 commit into from
Jan 20, 2024
Merged

[Fix] 타이머 스케줄 부하 해결 #217

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
128 changes: 120 additions & 8 deletions linkmind/src/main/java/com/app/toaster/external/client/fcm/FCMScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
package com.app.toaster.external.client.fcm;

import com.app.toaster.domain.Category;
import com.app.toaster.domain.Reminder;
import com.app.toaster.exception.Error;
import com.app.toaster.exception.model.NotFoundException;
import com.app.toaster.external.client.sqs.SqsProducer;
import com.app.toaster.infrastructure.TimerRepository;
import com.app.toaster.infrastructure.ToastRepository;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import jakarta.persistence.PessimisticLockException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.dao.PessimisticLockingFailureException;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.DefaultTransactionDefinition;

import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.TextStyle;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Random;
import java.util.concurrent.ScheduledFuture;

@Slf4j
@Component
Expand All @@ -22,24 +43,115 @@ public class FCMScheduler {

private final ObjectMapper objectMapper; // FCM의 body 형태에 따라 생성한 값을 문자열로 저장하기 위한 Mapper 클래스

@Scheduled(cron = "0 0 0 * * ?", zone = "Asia/Seoul")
private final ToastRepository toastRepository;

private final PlatformTransactionManager transactionManager;
private final SqsProducer sqsProducer;

@PersistenceContext
private EntityManager em;


private final int PUSH_MESSAGE_NUMBER = 5;
@Scheduled(cron = "1 * * * * *", zone = "Asia/Seoul")
public String pushTodayTimer() {

log.info("리마인드 알람");

// 오늘 요일
int today = LocalDateTime.now().getDayOfWeek().getValue();
TransactionDefinition transactionDefinition = new DefaultTransactionDefinition();
TransactionStatus transactionStatus = transactionManager.getTransaction(transactionDefinition);

try {

// 오늘 요일
int today = LocalDateTime.now().getDayOfWeek().getValue();


timerRepository.findAll().stream().filter(reminder -> reminder.getRemindDates().contains(today)).forEach(timer -> {

LocalTime now = LocalTime.now();

//한국 시간대로 변환
ZoneId koreaTimeZone = ZoneId.of("Asia/Seoul");
ZonedDateTime koreaTime = now.atDate(ZonedDateTime.now().toLocalDate()).atZone(koreaTimeZone);

//ZonedDateTime에서 LocalTime 추출
LocalTime koreaLocalTime = koreaTime.toLocalTime();

// 현재 알람이 커져있고 설정값이 동일하면 알람 전송
if(timer.getIsAlarm() && timer.getUser().getFcmIsAllowed() && timer.getRemindTime().getHour()== koreaLocalTime.getHour()
&&timer.getRemindTime().getMinute()== koreaLocalTime.getMinute()) {
System.out.println("=========================================");
System.out.println("timer.getRemindTime().equals(koreaTime)");
System.out.println("================= 전송시간 =================");
//sqs 푸시
FCMPushRequestDto request = getPushMessage(timer,toastRepository.getUnReadToastNumber(timer.getUser().getUserId()) );

timerRepository.findAll().stream().filter(reminder -> reminder.getRemindDates().contains(today)).forEach(timer -> {
System.out.println("timerId : " + timer.getId());
String cronExpression = String.format("0 %s %s * * ?", timer.getRemindTime().getMinute(),timer.getRemindTime().getHour());
sqsProducer.sendMessage(request, timer.getId().toString());

fcmService.schedulePushAlarm(cronExpression, timer.getId());
System.out.println("========="+request.getTitle() + request.getBody()+"=========");

});
}

});


} catch (PessimisticLockingFailureException | PessimisticLockException e) {
transactionManager.rollback(transactionStatus);
} finally {
em.close();
}

return "오늘의 토스터를 구워 전달했어요!!!";
}


private FCMPushRequestDto getPushMessage(Reminder reminder, int unReadToastNumber){
Random random = new Random();
int randomNumber = random.nextInt(PUSH_MESSAGE_NUMBER);
String categoryTitle = "전체";

Category category = timerRepository.findCategoryByReminderId(reminder.getId());
if(category != null){
categoryTitle = category.getTitle();
}


String title="";
String body="";

switch (randomNumber) {
case 0 -> {
title = reminder.getUser().getNickname()+PushMessage.ALARM_MESSAGE_0.getTitle();
body = categoryTitle+PushMessage.ALARM_MESSAGE_0.getBody();
}
case 1 -> {
title = "띵동! " + categoryTitle+PushMessage.ALARM_MESSAGE_1.getTitle();
body = PushMessage.ALARM_MESSAGE_1.getBody();
}
case 2 -> {
title = reminder.getUser().getNickname()+"님, "+categoryTitle+PushMessage.ALARM_MESSAGE_2.getTitle();
body = PushMessage.ALARM_MESSAGE_2.getBody();
}
case 3 -> {
LocalDateTime now = LocalDateTime.now();

title = now.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.KOREA)+"요일 "+now.getHour()+"시에는 "
+categoryTitle+PushMessage.ALARM_MESSAGE_3.getTitle();
body = PushMessage.ALARM_MESSAGE_3.getBody();
}
case 4 -> {
title = reminder.getUser().getNickname()+"님, " +categoryTitle+PushMessage.ALARM_MESSAGE_4.getTitle();
body = PushMessage.ALARM_MESSAGE_4.getBody()+unReadToastNumber+"개 남아있어요";
}
};

return FCMPushRequestDto.builder()
.targetToken(reminder.getUser().getFcmToken())
.title(title)
.body(body)
.build();
}


}
15 changes: 13 additions & 2 deletions linkmind/src/main/java/com/app/toaster/external/client/fcm/FCMService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

import java.io.IOException;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.TextStyle;
import java.util.List;
import java.util.Locale;
Expand Down Expand Up @@ -154,10 +157,18 @@ public void schedulePushAlarm(String cronExpression,Long timerId) {
()-> new NotFoundException(Error.NOT_FOUND_TIMER, Error.NOT_FOUND_TIMER.getMessage())
);

String cron = String.format("0 %s %s * * ?", timer.getRemindTime().getMinute(),timer.getRemindTime().getHour());
LocalTime now = LocalTime.now();

// 한국 시간대로 변환
//ZoneId koreaTimeZone = ZoneId.of("Asia/Seoul");
//ZonedDateTime koreaTime = localTime.atDate(ZonedDateTime.now().toLocalDate()).atZone(koreaTimeZone);

// ZonedDateTime에서 LocalTime 추출
//LocalTime koreaLocalTime = koreaTime.toLocalTime();


// 현재 알람이 커져있고 설정값이 동일하면 알람 전송
if(timer.getIsAlarm() && timer.getUser().getFcmIsAllowed() && cronExpression.equals(cron)) {
if(timer.getIsAlarm() && timer.getUser().getFcmIsAllowed() && timer.getRemindTime().equals(now)) {
System.out.println("================= 전송시간 =================");
//sqs 푸시
FCMPushRequestDto request = getPushMessage(timer,toastRepository.getUnReadToastNumber(timer.getUser().getUserId()) );
Expand Down
24 changes: 12 additions & 12 deletions linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ public void createTimer(Long userId, CreateTimerRequestDto createTimerRequestDto
timerRepository.save(reminder);

// 바뀐 타이머가 오늘 이후 설정되어있으면 새로운 schedule 추가
if (createTimerRequestDto.remindDates().contains(LocalDateTime.now().getDayOfWeek().getValue()))
if(LocalTime.parse(createTimerRequestDto.remindTime()).isAfter(LocalTime.now())){
String cronExpression = String.format("0 %s %s * * ?", LocalTime.parse(createTimerRequestDto.remindTime()).getMinute(),LocalTime.parse(createTimerRequestDto.remindTime()).getHour());

fcmService.schedulePushAlarm(cronExpression, reminder.getId());
}
// if (createTimerRequestDto.remindDates().contains(LocalDateTime.now().getDayOfWeek().getValue()))
// if(LocalTime.parse(createTimerRequestDto.remindTime()).isAfter(LocalTime.now())){
// String cronExpression = String.format("0 %s %s * * ?", LocalTime.parse(createTimerRequestDto.remindTime()).getMinute(),LocalTime.parse(createTimerRequestDto.remindTime()).getHour());
//
// fcmService.schedulePushAlarm(cronExpression, reminder.getId());
// }
}
@Transactional(readOnly = true)
public GetTimerResponseDto getTimer(Long userId, Long timerId){
Expand Down Expand Up @@ -115,12 +115,12 @@ public void updateTimerDatetime(Long userId, Long timerId, UpdateTimerDateTimeDt
LocalDateTime now = LocalDateTime.now();

// 바뀐 타이머가 오늘 이후 설정되어있으면 새로운 schedule 추가
if (updateTimerDateTimeDto.remindDates().contains(now.getDayOfWeek().getValue()))
if(LocalTime.parse(updateTimerDateTimeDto.remindTime()).isAfter(LocalTime.now())){
String cronExpression = String.format("0 %s %s * * ?", LocalTime.parse(updateTimerDateTimeDto.remindTime()).getMinute(),LocalTime.parse(updateTimerDateTimeDto.remindTime()).getHour());

fcmService.schedulePushAlarm(cronExpression, reminder.getId());
}
// if (updateTimerDateTimeDto.remindDates().contains(now.getDayOfWeek().getValue()))
// if(LocalTime.parse(updateTimerDateTimeDto.remindTime()).isAfter(LocalTime.now())){
// String cronExpression = String.format("0 %s %s * * ?", LocalTime.parse(updateTimerDateTimeDto.remindTime()).getMinute(),LocalTime.parse(updateTimerDateTimeDto.remindTime()).getHour());
//
// fcmService.schedulePushAlarm(cronExpression, reminder.getId());
// }


}
Expand Down