realtime flow updated | minor cleanups and edits

Author: kolosovpetro

MangoAPI.BusinessLogic/ApiCommands/Messages/DeleteMessageCommandHandler.cs

@@ -37,11 +37,7 @@ public async Task<Result<DeleteMessageResponse>> Handle(
     {
         var checkMessage = await dbContext.Messages
             .Include(x => x.User)
-            .Select(x=> new
-            {
-                MessageId = x.Id,
-                UserId = x.User.Id
-            })
+            .Select(x => new { MessageId = x.Id, UserId = x.User.Id })
             .FirstOrDefaultAsync(t => t.MessageId == request.MessageId, cancellationToken);
 
         if (checkMessage == null)
@@ -85,7 +81,7 @@ public async Task<Result<DeleteMessageResponse>> Handle(
 
         var deleteNotification = isMessageLast
             ? UpdateChatLastMessageAndReturnNotification(chat, deletedMessage)
-            : CreateNotLastMessageNotification(chat.Id, deletedMessage.Id);
+            : CreateNotLastMessageNotification(chat.Id, deletedMessage.Id, deletedMessage.UserId);
 
         dbContext.Messages.Remove(deletedMessage);
         dbContext.Chats.Update(chat);
@@ -97,7 +93,7 @@ public async Task<Result<DeleteMessageResponse>> Handle(
         return responseFactory.SuccessResponse(DeleteMessageResponse.FromSuccess(deletedMessage));
     }
 
-    private static MessageDeleteNotification UpdateChatLastMessageAndReturnNotification(
+    private static DeleteMessageNotification UpdateChatLastMessageAndReturnNotification(
         ChatEntity chat,
         MessageEntity deletedMessage)
     {
@@ -110,7 +106,8 @@ private static MessageDeleteNotification UpdateChatLastMessageAndReturnNotificat
             newLastMessage?.CreatedAt,
             newLastMessage?.Id);
 
-        var deleteNotification = new MessageDeleteNotification(
+        var deleteNotification = new DeleteMessageNotification(
+            deletedMessage.UserId,
             chat.Id,
             deletedMessage.Id,
             newLastMessage?.Text,
@@ -122,9 +119,13 @@ private static MessageDeleteNotification UpdateChatLastMessageAndReturnNotificat
         return deleteNotification;
     }
 
-    private static MessageDeleteNotification CreateNotLastMessageNotification(Guid chatId, Guid deletedMessageId)
+    private static DeleteMessageNotification CreateNotLastMessageNotification(
+        Guid chatId,
+        Guid deletedMessageId,
+        Guid userId)
     {
-        var deleteNotification = new MessageDeleteNotification(
+        var deleteNotification = new DeleteMessageNotification(
+            userId,
             chatId,
             deletedMessageId,
             NewLastMessageText: string.Empty,

MangoAPI.BusinessLogic/HubConfig/IHubClient.cs

@@ -23,5 +23,5 @@ public interface IHubClient
     /// <summary>
     /// Notifies chat subscribers on the message delete via SignalR.
     /// </summary>
-    Task MessageDeletedAsync(MessageDeleteNotification notification);
+    Task MessageDeletedAsync(DeleteMessageNotification notification);
 }

…tifications/MessageDeleteNotification.cs …tifications/DeleteMessageNotification.csMangoAPI.BusinessLogic/Notifications/MessageDeleteNotification.cs renamed to MangoAPI.BusinessLogic/Notifications/DeleteMessageNotification.cs MangoAPI.BusinessLogic/Notifications/MessageDeleteNotification.cs renamed to MangoAPI.BusinessLogic/Notifications/DeleteMessageNotification.cs

@@ -2,7 +2,8 @@
 
 namespace MangoAPI.BusinessLogic.Notifications;
 
-public record MessageDeleteNotification(
+public record DeleteMessageNotification(
+    Guid UserId,
     Guid ChatId,
     Guid DeletedMessageId,
     string NewLastMessageText,

MangoAPI.Client/src/app/components/chats/chats.component.ts

@@ -13,7 +13,7 @@ import { UserChatsService } from '../../services/api/user-chats.service';
 import { ValidationService } from '../../services/messenger/validation.service';
 import * as signalR from '@microsoft/signalr';
 import { DeleteMessageNotification } from '../../types/notifications/DeleteMessageNotification';
-import { BehaviorSubject, firstValueFrom, distinctUntilKeyChanged, last } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, distinctUntilKeyChanged } from 'rxjs';
 import { DisplayNameColours } from 'src/app/types/enums/DisplayNameColours';
 import { DeleteMessageCommand } from 'src/app/types/requests/DeleteMessageCommand';
 import ApiBaseService from 'src/app/services/api/api-base.service';
@@ -356,30 +356,36 @@ export class ChatsComponent implements OnInit {
     if (messageIndex === -1) return;
 
     const lastMessage = this.messages[this.messages.length - 1];
+
     const deletedMessage = this.messages.splice(messageIndex, 1)[0];
-    const lastMessageAfterDeleting = this.messages[this.messages.length - 1];
-    const isDeleteMessageLast = lastMessage.messageId === deletedMessage.messageId;
-    const chatIndex = this.chats.findIndex((x) => x.chatId === message.chatId)
+
+    const newLastMessage = this.messages[this.messages.length - 1];
+
+    const lastMessageDeleted = lastMessage.messageId === deletedMessage.messageId;
+
+    const chatIndex = this.chats.findIndex((x) => x.chatId === message.chatId);
+
     const chat = this.chats[chatIndex];
 
-    if (isDeleteMessageLast && lastMessageAfterDeleting) {
-      chat.lastMessageId = lastMessageAfterDeleting.messageId;
-      chat.lastMessageText = lastMessageAfterDeleting.text;
-      chat.lastMessageAuthor = lastMessageAfterDeleting.displayName;
-      chat.lastMessageTime = lastMessageAfterDeleting.createdAt;
+    if (lastMessageDeleted && newLastMessage) {
+      chat.lastMessageId = newLastMessage.messageId;
+      chat.lastMessageText = newLastMessage.text;
+      chat.lastMessageAuthor = newLastMessage.displayName;
+      chat.lastMessageTime = newLastMessage.createdAt;
 
       const deleteMessageSub$ = this._messagesService.deleteMessage(deleteMessageCommand);
       await firstValueFrom<DeleteMessageResponse>(deleteMessageSub$);
-      return
+      return;
     }
-    else if (isDeleteMessageLast && !lastMessageAfterDeleting) {
-      chat.lastMessageId = "";
-      chat.lastMessageText = "";
-      chat.lastMessageAuthor = "";
-      chat.lastMessageTime = "";
+
+    if (lastMessageDeleted && !newLastMessage) {
+      chat.lastMessageId = '';
+      chat.lastMessageText = '';
+      chat.lastMessageAuthor = '';
+      chat.lastMessageTime = '';
 
       const deleteMessageSub$ = this._messagesService.deleteMessage(deleteMessageCommand);
-      await firstValueFrom<DeleteMessageResponse>(deleteMessageSub$)
+      await firstValueFrom<DeleteMessageResponse>(deleteMessageSub$);
       return;
     }
 
@@ -516,37 +522,25 @@ export class ChatsComponent implements OnInit {
   }
 
   private onMessageDeleteHandler(notification: DeleteMessageNotification) {
-    const message = this.messages.find(x => x.messageId === notification.deletedMessageId);
-
-    if (message === undefined) return;
+    const selfMessage = notification.userId === this.userId;
 
-    const isDeletedMessageSelf = message.userId === this.userId;
+    if (selfMessage) return;
 
-    if (isDeletedMessageSelf) return;
+    if (this.activeChatId === notification.chatId) {
+      const messageIndex = this.messages.findIndex(
+        (x) => x.messageId === notification.deletedMessageId
+      );
+      this.messages.splice(messageIndex, 1);
+    }
 
     const chatIndex = this.chats.findIndex((x) => x.chatId === notification.chatId);
-
-    const lastMessage = this.messages[this.messages.length - 1];
-    const messageIndex = this.messages.findIndex(x => x.messageId === notification.deletedMessageId);
-    const deletedMessage = this.messages.splice(messageIndex, 1)[0];
-    const lastMessageAfterDeleting = this.messages[this.messages.length - 1];
-    const isDeleteMessageLast = lastMessage.messageId === deletedMessage.messageId;
     const chat = this.chats[chatIndex];
 
-    if (isDeleteMessageLast && lastMessageAfterDeleting) {
-      chat.lastMessageId = lastMessageAfterDeleting.messageId;
-      chat.lastMessageText = lastMessageAfterDeleting.text;
-      chat.lastMessageAuthor = lastMessageAfterDeleting.displayName;
-      chat.lastMessageTime = lastMessageAfterDeleting.createdAt;
-
-      return
-    }
-    else if (isDeleteMessageLast && !lastMessageAfterDeleting) {
-      chat.lastMessageId = "";
-      chat.lastMessageText = "";
-      chat.lastMessageAuthor = "";
-      chat.lastMessageTime = "";
-
+    if (notification.isLastMessage) {
+      chat.lastMessageId = notification.newLastMessageId;
+      chat.lastMessageText = notification.newLastMessageText;
+      chat.lastMessageAuthor = notification.newLastMessageDisplayName;
+      chat.lastMessageTime = notification.newLastMessageTime;
       return;
     }
   }

MangoAPI.Client/src/app/types/notifications/DeleteMessageNotification.ts

@@ -1,4 +1,5 @@
 export interface DeleteMessageNotification {
+  userId: string;
   chatId: string;
   deletedMessageId: string;
   newLastMessageText: string;