fixes 424

Author: kolosovpetro

MangoAPI.BusinessLogic/ApiCommands/Communities/LeaveGroupCommandHandler.cs

@@ -1,11 +1,13 @@
-using System.Linq;
+using MangoAPI.BusinessLogic.HubConfig;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.Responses;
 using MangoAPI.Domain.Constants;
 using MangoAPI.Domain.Enums;
 using MangoAPI.Infrastructure.Database;
 using MediatR;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
 
 namespace MangoAPI.BusinessLogic.ApiCommands.Communities;
@@ -15,38 +17,39 @@ public class LeaveGroupCommandHandler
 {
     private readonly MangoDbContext dbContext;
     private readonly ResponseFactory<LeaveGroupResponse> responseFactory;
+    private readonly IHubContext<ChatHub, IHubClient> hubContext;
 
     public LeaveGroupCommandHandler(
         MangoDbContext dbContext,
-        ResponseFactory<LeaveGroupResponse> responseFactory)
+        ResponseFactory<LeaveGroupResponse> responseFactory,
+        IHubContext<ChatHub, IHubClient> hubContext)
     {
         this.dbContext = dbContext;
         this.responseFactory = responseFactory;
+        this.hubContext = hubContext;
     }
 
     public async Task<Result<LeaveGroupResponse>> Handle(
         LeaveGroupCommand request,
         CancellationToken cancellationToken)
     {
-        var userChat = await dbContext.UserChats
-            .Include(x => x.Chat)
-            .Where(chatEntity => chatEntity.UserId == request.UserId)
-            .Where(chatEntity => chatEntity.ChatId == request.ChatId)
-            .FirstOrDefaultAsync(cancellationToken);
+        var chat = await dbContext.Chats
+            .Include(x => x.ChatUsers)
+            .FirstOrDefaultAsync(x => x.Id == request.ChatId, cancellationToken);
 
-        if (userChat == null)
+        if (chat == null)
         {
             const string errorMessage = ResponseMessageCodes.ChatNotFound;
             var details = ResponseMessageCodes.ErrorDictionary[errorMessage];
 
             return responseFactory.ConflictResponse(errorMessage, details);
         }
 
-        var chat = userChat.Chat;
+        var userBelongsToChat = chat.ChatUsers.Any(x => x.UserId == request.UserId);
 
-        if (chat == null)
+        if (!userBelongsToChat)
         {
-            const string errorMessage = ResponseMessageCodes.ChatNotFound;
+            const string errorMessage = ResponseMessageCodes.Unauthorized;
             var details = ResponseMessageCodes.ErrorDictionary[errorMessage];
 
             return responseFactory.ConflictResponse(errorMessage, details);
@@ -58,16 +61,20 @@ public async Task<Result<LeaveGroupResponse>> Handle(
                 .Where(messageEntity => messageEntity.ChatId == request.ChatId)
                 .ToListAsync(cancellationToken);
 
+            var partnerId = chat.ChatUsers.First(x => x.UserId != request.UserId).UserId;
+
             dbContext.Messages.RemoveRange(messages);
             dbContext.UserChats.RemoveRange(chat.ChatUsers);
             dbContext.Chats.Remove(chat);
 
             await dbContext.SaveChangesAsync(cancellationToken);
 
+            await hubContext.Clients.Group(partnerId.ToString()).PrivateChatDeletedAsync(request.ChatId);
+
             return responseFactory.SuccessResponse(LeaveGroupResponse.FromSuccess(chat.Id));
         }
 
-        dbContext.UserChats.Remove(userChat);
+        dbContext.Chats.Remove(chat);
         chat.IncrementMembersCount(-1);
 
         dbContext.Update(chat);

MangoAPI.BusinessLogic/HubConfig/IHubClient.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.Models;
+using System;
 
 namespace MangoAPI.BusinessLogic.HubConfig;
 
@@ -11,9 +12,14 @@ public interface IHubClient
     Task BroadcastMessageAsync(Message message);
 
     /// <summary>
-    /// Updates client list of chats via SignalR.
+    /// Pushes new created private chat to the receiver's chats list via SignalR.
     /// </summary>
     Task PrivateChatCreatedAsync(Chat chat);
+    
+    /// <summary>
+    /// Removes deleted private chat from the receiver's chats list via SignalR.
+    /// </summary>
+    Task PrivateChatDeletedAsync(Guid chatId);
 
     /// <summary>
     /// Notifies chat subscribers on the message delete via SignalR.

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

@@ -164,6 +164,11 @@ export class ChatsComponent implements OnInit {
       });
     });
 
+    this.connection.on('PrivateChatDeletedAsync', (chatId: string) => {
+      console.log(`Private chat deleted: ${chatId}`);
+      this.chats = this.chats.filter((x) => x.chatId !== chatId);
+    });
+
     this.connection.on('NotifyOnMessageDeleteAsync', (notification: DeleteMessageNotification) => {
       this.onMessageDeleteHandler(notification);
     });