Skip to content

When deleting messages, match by message id and seq no. #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

When deleting messages, match by message id and seq no. #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions PurpleExplorer/Models/MessageCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
}

Expand Down
8 changes: 4 additions & 4 deletions PurpleExplorer/ViewModels/MessageDetailsWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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}");
Expand Down