From 175bd310f5f09069cef100fcfd68a72397a8b816 Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Thu, 18 Jan 2024 13:05:50 +0100
Subject: [PATCH] (control) Message queue UX improvements

---
 .../control/sys/svc/MessageQueueService.java  | 53 +++++++++++++------
 .../control/partials/message-queue-table.hdb  |  1 +
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/MessageQueueService.java b/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/MessageQueueService.java
index 2f175f95..7e74ed94 100644
--- a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/MessageQueueService.java
+++ b/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/MessageQueueService.java
@@ -322,35 +322,54 @@ public class MessageQueueService {
         }
     }
 
+    /** Get all messages related to a given message, including the given message itself */
     public List<MessageQueueEntry> getRelatedMessages(long relatedId) {
+        NavigableSet<Long> newRelatedIds = new TreeSet<>();
+        Set<Long> addedIds = new HashSet<>();
+        Set<Long> queriedIds = new HashSet<>();
+        newRelatedIds.add(relatedId);
+
+        List<MessageQueueEntry> entries = new ArrayList<>();
+
+        // This is not a very performant way of doing this, but it's not a very common operation either
+        // and only available within the operator user interface.
         try (var conn = dataSource.getConnection();
-             var query = conn.prepareStatement("""
-                     (SELECT ID, RELATED_ID, SENDER_INBOX, RECIPIENT_INBOX, FUNCTION, PAYLOAD, OWNER_INSTANCE, OWNER_TICK, STATE, CREATED_TIME, UPDATED_TIME, TTL
+             var ps = conn.prepareStatement("""
+                     SELECT ID, RELATED_ID, SENDER_INBOX, RECIPIENT_INBOX, FUNCTION, PAYLOAD, OWNER_INSTANCE, OWNER_TICK, STATE, CREATED_TIME, UPDATED_TIME, TTL
                      FROM MESSAGE_QUEUE
-                     WHERE RELATED_ID = ?
+                     WHERE ID = ? OR RELATED_ID = ?
                      ORDER BY ID DESC
-                     LIMIT 100)
-                     UNION
-                     (SELECT ID, RELATED_ID, SENDER_INBOX, RECIPIENT_INBOX, FUNCTION, PAYLOAD, OWNER_INSTANCE, OWNER_TICK, STATE, CREATED_TIME, UPDATED_TIME, TTL
-                     FROM MESSAGE_QUEUE
-                     WHERE ID = (SELECT RELATED_ID FROM MESSAGE_QUEUE WHERE ID=?)
-                     ORDER BY ID DESC
-                     LIMIT 100)
                      """)) {
 
-            query.setLong(1, relatedId);
-            query.setLong(2, relatedId);
+            while (!newRelatedIds.isEmpty()) {
+                var nextId = newRelatedIds.pollFirst();
 
-            List<MessageQueueEntry> entries = new ArrayList<>(100);
-            var rs = query.executeQuery();
-            while (rs.next()) {
-                entries.add(newEntry(rs));
+                if (nextId == null || !queriedIds.add(nextId))
+                    continue;
+
+                ps.setLong(1, nextId);
+                ps.setLong(2, nextId);
+
+                var rs = ps.executeQuery();
+                while (rs.next()) {
+                    var entry = newEntry(rs);
+
+                    if (addedIds.add(entry.id()))
+                        entries.add(entry);
+
+                    if (!queriedIds.contains(entry.id()))
+                        newRelatedIds.add(entry.id());
+                    if (entry.hasRelatedMessage() && !queriedIds.contains(entry.relatedId()))
+                        newRelatedIds.add(entry.relatedId());
+                }
             }
-            return entries;
         }
         catch (SQLException ex) {
             throw new RuntimeException(ex);
         }
+
+        entries.sort(Comparator.comparingLong(MessageQueueEntry::id).reversed());
+        return entries;
     }
 
     private MessageQueueEntry newEntry(ResultSet rs) throws SQLException {
diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb b/code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb
index 9f60cd7c..a31bc1ce 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb
@@ -19,6 +19,7 @@
                         Filter
                     </button>
                     <ul class="dropdown-menu">
+                        <li><a class="dropdown-item" href="/message-queue">Show All</a></li>
                     {{#each inboxes}}
                         <li><a class="dropdown-item" href="/message-queue?inbox={{this}}">{{this}}</a></li>
                     {{/each}}