fixes 423

Author: kolosovpetro

MangoAPI.BusinessLogic/ApiCommands/Communities/CreateChannelCommandHandler.cs

@@ -1,15 +1,11 @@
-using MangoAPI.Application.Interfaces;
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
-using MangoAPI.BusinessLogic.HubConfig;
-using MangoAPI.BusinessLogic.Models;
 using MangoAPI.BusinessLogic.Responses;
 using MangoAPI.Domain.Entities;
 using MangoAPI.Domain.Enums;
 using MangoAPI.Infrastructure.Database;
 using MediatR;
-using Microsoft.AspNetCore.SignalR;
 
 namespace MangoAPI.BusinessLogic.ApiCommands.Communities;
 
@@ -18,20 +14,21 @@ public class CreateChannelCommandHandler
 {
     private const string DefaultChannelImage = "default_group_logo.png";
     private readonly MangoDbContext dbContext;
-    private readonly IHubContext<ChatHub, IHubClient> hubContext;
+    // private readonly IHubContext<ChatHub, IHubClient> hubContext;
     private readonly ResponseFactory<CreateCommunityResponse> responseFactory;
-    private readonly IBlobServiceSettings blobServiceSettings;
+    // private readonly IBlobServiceSettings blobServiceSettings;
 
     public CreateChannelCommandHandler(
         MangoDbContext dbContext,
-        IHubContext<ChatHub, IHubClient> hubContext,
-        ResponseFactory<CreateCommunityResponse> responseFactory,
-        IBlobServiceSettings blobServiceSettings)
+        // IHubContext<ChatHub, IHubClient> hubContext,
+        ResponseFactory<CreateCommunityResponse> responseFactory
+        // IBlobServiceSettings blobServiceSettings
+        )
     {
         this.dbContext = dbContext;
-        this.hubContext = hubContext;
+        // this.hubContext = hubContext;
         this.responseFactory = responseFactory;
-        this.blobServiceSettings = blobServiceSettings;
+        // this.blobServiceSettings = blobServiceSettings;
     }
 
     public async Task<Result<CreateCommunityResponse>> Handle(
@@ -54,10 +51,10 @@ public async Task<Result<CreateCommunityResponse>> Handle(
 
         await dbContext.SaveChangesAsync(cancellationToken);
 
-        var chatLogoImageUrl = $"{blobServiceSettings.MangoBlobAccess}/{DefaultChannelImage}";
+        // var chatLogoImageUrl = $"{blobServiceSettings.MangoBlobAccess}/{DefaultChannelImage}";
 
-        var chatDto = chat.ToChatDto(chatLogoImageUrl);
-        await hubContext.Clients.Group(request.UserId.ToString()).UpdateUserChatsAsync(chatDto);
+        // var chatDto = chat.ToChatDto(chatLogoImageUrl);
+        // await hubContext.Clients.Group(request.UserId.ToString()).PrivateChatCreatedAsync(chatDto);
 
         return responseFactory.SuccessResponse(CreateCommunityResponse.FromSuccess(chat));
     }

MangoAPI.BusinessLogic/ApiCommands/Communities/CreateChatCommandHandler.cs

@@ -1,3 +1,4 @@
+using MangoAPI.Application.Interfaces;
 using System;
 using System.Linq;
 using System.Threading;
@@ -21,15 +22,18 @@ public class CreateChatCommandHandler
     private readonly MangoDbContext dbContext;
     private readonly IHubContext<ChatHub, IHubClient> hubContext;
     private readonly ResponseFactory<CreateCommunityResponse> responseFactory;
+    private readonly IBlobServiceSettings blobServiceSettings;
 
     public CreateChatCommandHandler(
         MangoDbContext dbContext,
         IHubContext<ChatHub, IHubClient> hubContext,
-        ResponseFactory<CreateCommunityResponse> responseFactory)
+        ResponseFactory<CreateCommunityResponse> responseFactory,
+        IBlobServiceSettings blobServiceSettings)
     {
         this.dbContext = dbContext;
         this.hubContext = hubContext;
         this.responseFactory = responseFactory;
+        this.blobServiceSettings = blobServiceSettings;
     }
 
     public async Task<Result<CreateCommunityResponse>> Handle(
@@ -55,8 +59,8 @@ public async Task<Result<CreateCommunityResponse>> Handle(
             return responseFactory.ConflictResponse(errorMessage, errorDescription);
         }
 
-        var currentUserDisplayName = await dbContext.Users.Where(x => x.Id == request.UserId)
-            .Select(x => x.DisplayName)
+        var senderData = await dbContext.Users.Where(x => x.Id == request.UserId)
+            .Select(x => new { x.DisplayName, x.ImageFileName })
             .FirstOrDefaultAsync(cancellationToken);
 
         var userPrivateChats = await dbContext.Chats
@@ -74,8 +78,8 @@ public async Task<Result<CreateCommunityResponse>> Handle(
             return responseFactory.SuccessResponse(CreateCommunityResponse.FromSuccess(existingChat));
         }
 
-        var title = $"{currentUserDisplayName} / {partner.DisplayName}";
-        var description = $"Direct chat between {currentUserDisplayName} and {partner.DisplayName}";
+        var title = $"{senderData.DisplayName} / {partner.DisplayName}";
+        var description = $"Direct chat between {senderData.DisplayName} and {partner.DisplayName}";
 
         var chat = ChatEntity.Create(
             title,
@@ -93,8 +97,11 @@ public async Task<Result<CreateCommunityResponse>> Handle(
 
         await dbContext.SaveChangesAsync(cancellationToken);
 
-        var chatDto = chat.ToChatDto();
-        await hubContext.Clients.Group(request.UserId.ToString()).UpdateUserChatsAsync(chatDto);
+        var partnerImageUrl = $"{blobServiceSettings.MangoBlobAccess}/{senderData.ImageFileName}";
+
+        var chatDto = chat.ToChatDto(partnerImageUrl, partner.DisplayName);
+
+        await hubContext.Clients.Group(request.PartnerId.ToString()).PrivateChatCreatedAsync(chatDto);
 
         return responseFactory.SuccessResponse(CreateCommunityResponse.FromSuccess(chat));
     }

MangoAPI.BusinessLogic/HubConfig/IHubClient.cs

@@ -13,7 +13,7 @@ public interface IHubClient
     /// <summary>
     /// Updates client list of chats via SignalR.
     /// </summary>
-    Task UpdateUserChatsAsync(Chat chat);
+    Task PrivateChatCreatedAsync(Chat chat);
 
     /// <summary>
     /// Notifies chat subscribers on the message delete via SignalR.

MangoAPI.BusinessLogic/Models/Chat.cs

@@ -47,12 +47,12 @@ public override string ToString()
 
 public static class ChatEntityMapper
 {
-    public static Chat ToChatDto(this ChatEntity entity, string chatLogoImageUrl = "")
+    public static Chat ToChatDto(this ChatEntity entity, string chatLogoImageUrl, string partnerDisplayName)
     {
         return new Chat
         {
             ChatId = entity.Id,
-            Title = entity.Title,
+            Title = partnerDisplayName,
             CommunityType = entity.CommunityType,
             Description = entity.Description,
             MembersCount = entity.MembersCount,

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

@@ -151,8 +151,17 @@ export class ChatsComponent implements OnInit {
       this.onMessageSendHandler(message);
     });
 
-    this.connection.on('UpdateUserChatsAsync', (chat: Chat) => {
+    this.connection.on('PrivateChatCreatedAsync', (chat: Chat) => {
       this.chats.push(chat);
+
+      if (this.realTimeConnections.includes(chat.chatId)) {
+        return;
+      }
+
+      this.connection.invoke('JoinGroup', chat.chatId).then(() => {
+        this.realTimeConnections.push(chat.chatId);
+        console.log(`SignalR JoinGroup: ${chat.chatId}`);
+      });
     });
 
     this.connection.on('NotifyOnMessageDeleteAsync', (notification: DeleteMessageNotification) => {

MangoAPI.Domain/README.md

@@ -32,8 +32,8 @@
 ## Chat Entity
 
 1. **Id**: Primary key of chat entity (GUID). Required.
-2. **Title**: Title of the chat as string. Can be up to 50 characters. Required.
-3. **ImageFileName**: Name of the image file. Must be a string up to 50 various characters. Required.
+2. **Title**: Title of the chat as string. Can be up to 100 characters. Required.
+3. **ImageFileName**: Name of the image file. Must be a string up to 100 various characters. Required.
 4. **Description**: Short description of the chat as string. Can be up to 150 various characters. Required.
 5. **MembersCount**: Number of members in the chat as integer. Must be greater or equal to zero. Required.
 6. **CommunityType**: Type of the chat as enum. Can be one of the following: "DirectChat = 1", "PublicChannel = 2".

MangoAPI.Infrastructure/Database/Configurations/ChatEntityConfiguration.cs

@@ -12,8 +12,8 @@ public void Configure(EntityTypeBuilder<ChatEntity> builder)
 
         builder.HasKey(x => x.Id);
 
-        builder.Property(x => x.Title).HasMaxLength(50).IsRequired();
-        builder.Property(x => x.ImageFileName).HasMaxLength(50).IsRequired();
+        builder.Property(x => x.Title).HasMaxLength(100).IsRequired();
+        builder.Property(x => x.ImageFileName).HasMaxLength(100).IsRequired();
         builder.Property(x => x.Description).IsRequired().HasMaxLength(150);
         builder.Property(x => x.CommunityType).IsRequired();
         builder.Property(x => x.LastMessageAuthor).HasMaxLength(50);

MangoAPI.Infrastructure/Database/DesignTimeDbContextFactory.cs

@@ -4,6 +4,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.Extensions.Configuration;
+using System;
 
 namespace MangoAPI.Infrastructure.Database;
 
@@ -17,8 +18,9 @@ public DesignTimeDbContextFactory()
 
         var configuration = new ConfigurationBuilder().AddJsonFile(appSettingsPath).Build();
 
-        mangoDatabaseUrl = configuration[EnvironmentConstants.DatabaseUrl]
-                            ?? throw new AppSettingException(EnvironmentConstants.DatabaseUrl);
+        mangoDatabaseUrl = Environment.GetEnvironmentVariable(EnvironmentConstants.DatabaseUrl)
+                           ?? configuration[EnvironmentConstants.DatabaseUrl]
+                           ?? throw new AppSettingException(EnvironmentConstants.DatabaseUrl);
     }
 
     public MangoDbContext CreateDbContext(string[] args)
@@ -29,4 +31,4 @@ public MangoDbContext CreateDbContext(string[] args)
 
         return new MangoDbContext(options.Options);
     }
-}
+}

…tions/20230313185156_Initial.Designer.cs …tions/20230314232517_Initial.Designer.csMangoAPI.Infrastructure/Migrations/20230313185156_Initial.Designer.cs renamed to MangoAPI.Infrastructure/Migrations/20230314232517_Initial.Designer.cs MangoAPI.Infrastructure/Migrations/20230313185156_Initial.Designer.cs renamed to MangoAPI.Infrastructure/Migrations/20230314232517_Initial.Designer.cs

@@ -18,10 +18,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Title = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    Title = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
                     CommunityType = table.Column<int>(type: "int", nullable: false),
                     Description = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: false),
-                    ImageFileName = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    ImageFileName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
                     CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
                     MembersCount = table.Column<int>(type: "int", nullable: false),
                     LastMessageAuthor = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
@@ -96,8 +96,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 schema: "mango",
                 columns: table => new
                 {
-                    ContactId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
                     UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ContactId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
                     CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false)
                 },
                 constraints: table =>