Merge pull request #460 from RADAR-base/fix/transient-task

Fix issue when saving notifications
RADAR-base · Apr 16, 2024 · 3c0fa89 · 3c0fa89
2 parents caa129b + 68bad69
commit 3c0fa89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/main/java/org/radarbase/appserver/entity/Message.java b/src/main/java/org/radarbase/appserver/entity/Message.java
@@ -42,6 +42,7 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 import org.springframework.lang.Nullable;
+import jakarta.persistence.CascadeType;
 
 @MappedSuperclass
 @Getter
@@ -64,7 +65,7 @@ public class Message extends AuditModel implements Serializable, Scheduled {
     @JsonIgnore
     private User user;
 
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
+    @ManyToOne(fetch = FetchType.LAZY, optional = true, cascade = CascadeType.ALL)
     @JoinColumn(name = "task_id", nullable = true)
     @OnDelete(action = OnDeleteAction.CASCADE)
     @JsonIgnore

diff --git a/src/main/java/org/radarbase/appserver/service/FcmNotificationService.java b/src/main/java/org/radarbase/appserver/service/FcmNotificationService.java
@@ -416,12 +416,11 @@ public List<Notification> addNotifications(List<Notification> notifications,User
                                             notification.getTitle(),
                                             notification.getBody(),
                                             notification.getType(),
-                                            notification.getTtlSeconds()).isPresent()
+                                            notification.getTtlSeconds()).isEmpty()
                         )
                         .collect(Collectors.toList());
 
-        List<Notification> savedNotifications = this.notificationRepository.saveAll(newNotifications);
-        this.notificationRepository.flush();
+        List<Notification> savedNotifications = this.notificationRepository.saveAllAndFlush(newNotifications);
         savedNotifications.forEach(
                 n -> addNotificationStateEvent(n, MessageState.ADDED, n.getCreatedAt().toInstant()));
         this.schedulerService.scheduleMultiple(savedNotifications);

diff --git a/src/main/java/org/radarbase/appserver/service/TaskService.java b/src/main/java/org/radarbase/appserver/service/TaskService.java
@@ -141,9 +141,7 @@ public List<Task> addTasks(List<Task> tasks, User user) {
                 .filter(task -> !this.taskRepository.existsByUserIdAndNameAndTimestamp(user.getId(), task.getName(), task.getTimestamp()))
                 .collect(Collectors.toList());
 
-        List<Task> saved = this.taskRepository.saveAll(newTasks);
-        this.taskRepository.flush();
-
+        List<Task> saved = this.taskRepository.saveAllAndFlush(newTasks);
         saved.forEach(t -> addTaskStateEvent(t, TaskState.ADDED, t.getCreatedAt().toInstant()));
 
         return saved;