Bugfix: fetch notifications query

samply · Feb 20, 2024 · afcf789 · afcf789
1 parent d40265d
commit afcf789
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/de/samply/db/repository/NotificationRepository.java b/src/main/java/de/samply/db/repository/NotificationRepository.java
@@ -3,13 +3,17 @@
 import de.samply.db.model.Notification;
 import de.samply.db.model.Project;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
 public interface NotificationRepository extends JpaRepository<Notification, Long> {
 
-    List<Notification> findAllByProjectOrderByTimestampDesc(Project project);
-    List<Notification> findAllByProjectAndBridgeheadOrBridgeheadIsNullOrderByTimestampDesc(Project project, String bridgehead);
+    List<Notification> findByProjectOrderByTimestampDesc(Project project);
+
+    @Query("SELECT n FROM Notification n WHERE n.project = :project AND (n.bridgehead = :bridgehead OR n.bridgehead IS NULL) " +
+            "ORDER BY n.timestamp DESC")
+    List<Notification> findByProjectAndBridgeheadOrBridgeheadIsNullOrderByTimestampDesc(Project project, String bridgehead);
 }
diff --git a/src/main/java/de/samply/notification/NotificationService.java b/src/main/java/de/samply/notification/NotificationService.java
@@ -72,10 +72,10 @@ public List<de.samply.frontend.dto.Notification> fetchUserVisibleNotifications(
         List<String> bridgeheads = fetchUserVisibleBridgeheads(bridgheadOptional);
         projects.forEach(project -> {
             if (bridgeheads.isEmpty() && sessionUser.getUserOrganisationRoles().containsRole(OrganisationRole.PROJECT_MANAGER_ADMIN)) {
-                notificationRepository.findAllByProjectOrderByTimestampDesc(project);
+                result.addAll(notificationRepository.findByProjectOrderByTimestampDesc(project));
             } else {
                 bridgeheads.forEach(bridgehead -> result.addAll(
-                        notificationRepository.findAllByProjectAndBridgeheadOrBridgeheadIsNullOrderByTimestampDesc(project, bridgehead)));
+                        notificationRepository.findByProjectAndBridgeheadOrBridgeheadIsNullOrderByTimestampDesc(project, bridgehead)));
             }
         });
         return result.stream().map(notification ->