Update

backend/ResQueue/ResQueue/Dtos/ArchiveMessagesDto.cs

@@ -1,3 +1,3 @@
 namespace ResQueue.Dtos;
 
-public record ArchiveMessagesDto(string[] Ids);
+public record ArchiveMessagesDto(string QueueId, string[] Ids);

backend/ResQueue/ResQueue/Features/Messages/ArchiveMessages/ArchiveMessagesFeature.cs

@@ -14,7 +14,9 @@ public record ArchiveMessagesFeatureResponse();
 
 public class ArchiveMessagesFeature(
     UserManager<User> userManager,
-    IMongoCollection<Message> messagesCollection
+    IMongoCollection<Message> messagesCollection,
+    IMongoCollection<Queue> queuesCollection,
+    IMongoClient mongoClient
 ) : IArchiveMessagesFeature
 {
     public async Task<OperationResult<ArchiveMessagesFeatureResponse>> ExecuteAsync(
@@ -35,12 +37,21 @@ public async Task<OperationResult<ArchiveMessagesFeatureResponse>> ExecuteAsync(
 
         var filter = Builders<Message>.Filter.And(
             Builders<Message>.Filter.In(m => m.Id, request.Dto.Ids.Select(ObjectId.Parse)),
+            Builders<Message>.Filter.Eq(m => m.QueueId, ObjectId.Parse(request.Dto.QueueId)),
             Builders<Message>.Filter.Eq(m => m.UserId, user.Id)
         );
 
         var update = Builders<Message>.Update.Set(m => m.DeletedAt, dt);
 
-        await messagesCollection.UpdateManyAsync(filter, update);
+        using var session = await mongoClient.StartSessionAsync();
+        session.StartTransaction();
+
+        var result = await messagesCollection.UpdateManyAsync(filter, update);
+
+        await queuesCollection.UpdateOneAsync(session, x => x.Id == ObjectId.Parse(request.Dto.QueueId),
+            Builders<Queue>.Update.Inc(x => x.TotalMessages, -result.ModifiedCount));
+
+        await session.CommitTransactionAsync();
 
         return OperationResult<ArchiveMessagesFeatureResponse>.Success(new ArchiveMessagesFeatureResponse());
     }

frontend/src/api/messages/archiveMessagesMutation.ts

@@ -6,16 +6,16 @@ export function useArchiveMessagesMutation() {
   const queryClient = useQueryClient()
 
   return useMutation({
-    mutationFn: (ids: string[]) =>
+    mutationFn: (data: { ids: string[]; queueId: string }) =>
       axios.delete(`${API_URL}/messages`, {
-        data: {
-          ids
-        },
+        data,
         withCredentials: true
       }),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['messages'] })
       queryClient.invalidateQueries({ queryKey: ['message'] })
+      queryClient.invalidateQueries({ queryKey: ['queues'] })
+      queryClient.invalidateQueries({ queryKey: ['queue'] })
     }
   })
 }

frontend/src/features/message/MessageActions.vue

@@ -149,7 +149,10 @@ const archiveMessages = () => {
       severity: 'danger'
     },
     accept: () => {
-      archiveMessagesAsync(props.selectedMessageIds).then(() => {
+      archiveMessagesAsync({
+        ids: props.selectedMessageIds,
+        queueId: props.rabbitMqQueue.id
+      }).then(() => {
         emit('archive:message')
 
         toast.add({