Merge pull request #189 from Link-MIND/feature/#185

[#185] fix: transactionManager 추가
Link-MIND · Jan 18, 2024 · 696c463 · 696c463
2 parents e6525c6 + de1022d
commit 696c463
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/linkmind/src/main/java/com/app/toaster/external/client/fcm/FCMService.java b/linkmind/src/main/java/com/app/toaster/external/client/fcm/FCMService.java
@@ -145,23 +145,33 @@ public void schedulePushAlarm(String cronExpression,Long timerId) {
                 throw new RuntimeException(e);
             }
 
+            TransactionDefinition transactionDefinition = new DefaultTransactionDefinition();
+            TransactionStatus transactionStatus = transactionManager.getTransaction(transactionDefinition);
 
-            Reminder timer = timerRepository.findById(timerId).orElseThrow(
-                    ()-> new NotFoundException(Error.NOT_FOUND_TIMER, Error.NOT_FOUND_TIMER.getMessage())
-            );
+            try {
+
+                Reminder timer = timerRepository.findById(timerId).orElseThrow(
+                        ()-> new NotFoundException(Error.NOT_FOUND_TIMER, Error.NOT_FOUND_TIMER.getMessage())
+                );
+
+                String cron = String.format("0 %s %s * * ?", timer.getRemindTime().getMinute(),timer.getRemindTime().getHour());
 
-            String cron = String.format("0 %s %s * * ?", timer.getRemindTime().getMinute(),timer.getRemindTime().getHour());
+                // 현재 알람이 커져있고 설정값이 동일하면 알람 전송
+                if(timer.getIsAlarm() && timer.getUser().getFcmIsAllowed() && cronExpression.equals(cron)) {
+                    System.out.println("================= 전송시간 =================");
+                    //sqs 푸시
+                    FCMPushRequestDto request = getPushMessage(timer,toastRepository.getUnReadToastNumber(timer.getUser().getUserId()) );
 
-            // 현재 알람이 커져있고 설정값이 동일하면 알람 전송
-            if(timer.getIsAlarm() && timer.getUser().getFcmIsAllowed() && cronExpression.equals(cron)) {
-                System.out.println("================= 전송시간 =================");
-                //sqs 푸시
-                FCMPushRequestDto request = getPushMessage(timer,toastRepository.getUnReadToastNumber(timer.getUser().getUserId()) );
+                    sqsProducer.sendMessage(request);
 
-                sqsProducer.sendMessage(request);
+                    System.out.println("========="+request.getTitle() + request.getBody()+"=========");
 
-                System.out.println("========="+request.getTitle() + request.getBody()+"=========");
+                }
 
+            } catch (PessimisticLockingFailureException | PessimisticLockException e) {
+                transactionManager.rollback(transactionStatus);
+            } finally {
+                em.close();
             }