Merge branch 'delete-dup-msg-id' into main

telstrapurple#99 * delete-dup-msg-id: When deleting messages, match by message id and seq no.
timabell · Jan 20, 2025 · e034929 · e034929
2 parents 58b1e7a + ba86dde
commit e034929
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/PurpleExplorer/Models/MessageCollection.cs b/PurpleExplorer/Models/MessageCollection.cs
@@ -48,12 +48,13 @@ public void AddMessages(IEnumerable<Message> messages)
         MessageCount = Messages.Count;
     }
 
-    public void RemoveMessage(string messageId)
+    public void RemoveMessage(string messageId, long seqNo)
     {
-        Messages.Remove(Messages.Single(msg => msg.MessageId.Equals(messageId)));
+        var match = (Message msg) => msg.MessageId.Equals(messageId) && msg.SequenceNumber.Equals(seqNo);
+        Messages.Remove(Messages.Single(match));
         MessageCount = Messages.Count;
     }
-        
+
     public void ClearMessages()
     {
         Messages.Clear();
@@ -66,9 +67,10 @@ public void AddDlqMessages(IEnumerable<Message> dlqMessages)
         DlqCount = DlqMessages.Count;
     }
 
-    public void RemoveDlqMessage(string messageId)
+    public void RemoveDlqMessage(string messageId, long seqNo)
     {
-        DlqMessages.Remove(DlqMessages.Single(msg => msg.MessageId.Equals(messageId)));
+        var match = (Message msg) => msg.MessageId.Equals(messageId) && msg.SequenceNumber.Equals(seqNo);
+        DlqMessages.Remove(DlqMessages.Single(match));
         DlqCount = DlqMessages.Count;
     }
 

diff --git a/PurpleExplorer/ViewModels/MessageDetailsWindowViewModel.cs b/PurpleExplorer/ViewModels/MessageDetailsWindowViewModel.cs
@@ -69,9 +69,9 @@ await _topicHelper.DeleteMessage(connectionString, Subscription.Topic.Name, Subs
                 Message, Message.IsDlq);
 
             if(!Message.IsDlq) 
-                Subscription.RemoveMessage(Message.MessageId);
+                Subscription.RemoveMessage(Message.MessageId, Message.SequenceNumber);
             else
-                Subscription.RemoveDlqMessage(Message.MessageId);
+                Subscription.RemoveDlqMessage(Message.MessageId, Message.SequenceNumber);
         }
 
         if (Queue != null)
@@ -80,9 +80,9 @@ await _topicHelper.DeleteMessage(connectionString, Subscription.Topic.Name, Subs
             await _queueHelper.DeleteMessage(connectionString, Queue.Name, Message, Message.IsDlq);
 
             if(!Message.IsDlq) 
-                Queue.RemoveMessage(Message.MessageId);
+                Queue.RemoveMessage(Message.MessageId, Message.SequenceNumber);
             else
-                Queue.RemoveDlqMessage(Message.MessageId);
+                Queue.RemoveDlqMessage(Message.MessageId, Message.SequenceNumber);
         }
 
         _loggingService.Log($"Message deleted, MessageId: {Message.MessageId}");