send message and realtime in one request

kolosovpetro · kolosovpetro · commit e1863d67a4ac · 2023-03-15T19:32:53.000+01:00
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageCommand.cs b/MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageCommand.cs
@@ -6,6 +6,7 @@
 namespace MangoAPI.BusinessLogic.ApiCommands.Messages;
 
 public record SendMessageCommand(
+        Guid MessageId,
         Guid UserId,
         Guid ChatId,
         string Text,
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageCommandHandler.cs b/MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageCommandHandler.cs
@@ -4,12 +4,14 @@
 using System.Threading.Tasks;
 using MangoAPI.Application.Interfaces;
 using MangoAPI.Application.Services;
+using MangoAPI.BusinessLogic.HubConfig;
 using MangoAPI.BusinessLogic.Models;
 using MangoAPI.BusinessLogic.Responses;
 using MangoAPI.Domain.Constants;
 using MangoAPI.Domain.Entities;
 using MangoAPI.Infrastructure.Database;
 using MediatR;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
 
 namespace MangoAPI.BusinessLogic.ApiCommands.Messages;
@@ -21,17 +23,19 @@ public class SendMessageCommandHandler
     private readonly ResponseFactory<SendMessageResponse> responseFactory;
     private readonly IBlobServiceSettings blobServiceSettings;
     private readonly IBlobService blobService;
+    private readonly IHubContext<ChatHub, IHubClient> hubContext;
 
     public SendMessageCommandHandler(
         MangoDbContext dbContext,
         ResponseFactory<SendMessageResponse> responseFactory,
         IBlobServiceSettings blobServiceSettings,
-        IBlobService blobService)
+        IBlobService blobService, IHubContext<ChatHub, IHubClient> hubContext)
     {
         this.dbContext = dbContext;
         this.responseFactory = responseFactory;
         this.blobServiceSettings = blobServiceSettings;
         this.blobService = blobService;
+        this.hubContext = hubContext;
     }
 
     public async Task<Result<SendMessageResponse>> Handle(
@@ -69,6 +73,7 @@ public async Task<Result<SendMessageResponse>> Handle(
         var attachmentUniqueFileName = await UploadAttachmentIfExistsAsync(request);
 
         var messageEntity = MessageEntity.Create(
+            request.MessageId,
             request.UserId,
             request.ChatId,
             request.Text,
@@ -92,15 +97,18 @@ public async Task<Result<SendMessageResponse>> Handle(
         var attachmentUrl = attachmentUniqueFileName == null
             ? null
             : $"{blobServiceSettings.MangoBlobAccess}/{attachmentUniqueFileName}";
-        
+
         var messageResultDto = messageEntity.ToMessage(
             user.DisplayName,
             user.Id,
             user.DisplayNameColour,
             authorPictureUrl,
             attachmentUrl);
 
-        return responseFactory.SuccessResponse(SendMessageResponse.FromSuccess(messageResultDto));
+        await hubContext.Clients.Group(request.ChatId.ToString()).BroadcastMessageAsync(messageResultDto);
+
+        return responseFactory.SuccessResponse(SendMessageResponse.FromSuccess(messageEntity.Id, attachmentUrl,
+            messageEntity.CreatedAt));
     }
 
     private async Task<string> UploadAttachmentIfExistsAsync(SendMessageCommand request)
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageRequest.cs b/MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageRequest.cs
@@ -6,17 +6,14 @@ namespace MangoAPI.BusinessLogic.ApiCommands.Messages;
 
 public class SendMessageRequest
 {
-    [DefaultValue("hello world")]
-    public string Text { get; set; }
+    [DefaultValue("hello world")] public string Text { get; set; }
 
     [DefaultValue("a8747c37-c5ef-4a87-943c-3ee3ae0a2871")]
     public Guid ChatId { get; set; }
 
-    [DefaultValue("John Doe")]
-    public string InReplyToUser { get; set; }
+    [DefaultValue("John Doe")] public string InReplyToUser { get; set; }
 
-    [DefaultValue("Hello world!")]
-    public string InReplyToText { get; set; }
+    [DefaultValue("Hello world!")] public string InReplyToText { get; set; }
 
     [DefaultValue("2021-08-01T00:00:00.0000000")]
     public DateTime? CreatedAt { get; set; }
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageResponse.cs b/MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageResponse.cs
@@ -1,20 +1,26 @@
-﻿using MangoAPI.BusinessLogic.Models;
-using MangoAPI.BusinessLogic.Responses;
+﻿using MangoAPI.BusinessLogic.Responses;
 using MangoAPI.Domain.Constants;
+using System;
 
 namespace MangoAPI.BusinessLogic.ApiCommands.Messages;
 
 public record SendMessageResponse : ResponseBase
 {
-    public Message MessageModel { get; init; }
+    public string AttachmentUrl { get; set; }
 
-    public static SendMessageResponse FromSuccess(Message messageModel)
+    public Guid NewMessageId { get; set; }
+    
+    public DateTime CreatedAt { get; set; }
+
+    public static SendMessageResponse FromSuccess(Guid newMessageId, string attachmentUrl, DateTime createdAt)
     {
         return new SendMessageResponse
         {
             Success = true,
             Message = ResponseMessageCodes.Success,
-            MessageModel = messageModel,
+            NewMessageId = newMessageId,
+            AttachmentUrl = attachmentUrl,
+            CreatedAt = createdAt
         };
     }
 }
diff --git a/MangoAPI.Client/src/app/components/chats/chats.component.ts b/MangoAPI.Client/src/app/components/chats/chats.component.ts
@@ -23,7 +23,6 @@ import { SendMessageResponse } from '../../types/responses/SendMessageResponse';
 import { ReplyStateService } from 'src/app/services/states/replyState.service';
 import { Reply } from 'src/app/types/models/Reply';
 import { GetChatMessagesResponse } from '../../types/responses/GetChatMessagesResponse';
-import { RealtimeService } from '../../services/api/realtime.service';
 import { BaseResponse } from '../../types/responses/BaseResponse';
 import { GetUserChatsResponse } from '../../types/responses/GetUserChatsResponse';
 import { DeleteMessageResponse } from '../../types/responses/DeleteMessageResponse';
@@ -46,7 +45,7 @@ export class ChatsComponent implements OnInit {
     private _apiBaseService: ApiBaseService,
     public _modalWindowStateService: ModalWindowStateService,
     public _replyStateService: ReplyStateService,
-    private _realtimeService: RealtimeService,
+    // private _realtimeService: RealtimeService,
     private _defaultChatHelper: DefaultChatHelper
   ) {}
 
@@ -227,10 +226,12 @@ export class ChatsComponent implements OnInit {
       return;
     }
 
+    const messageId = crypto.randomUUID();
     const createdAt = new Date().toISOString();
     const sendMessageFormData = new FormData();
 
     sendMessageFormData.append('text', newMessageText);
+    sendMessageFormData.append('messageId', messageId);
     sendMessageFormData.append('chatId', this.activeChatId);
     sendMessageFormData.append('inReplyToUser', this._replyStateService.reply?.displayName ?? '');
     sendMessageFormData.append('inReplyToText', this._replyStateService.reply?.text ?? '');
@@ -240,6 +241,7 @@ export class ChatsComponent implements OnInit {
     }
 
     const newMessage = new Message(
+      messageId,
       tokens.userId,
       this.activeChatId,
       tokens.userDisplayName,
@@ -262,15 +264,17 @@ export class ChatsComponent implements OnInit {
 
     const response = await firstValueFrom<SendMessageResponse>(sendMessage$);
 
-    newMessage.messageId = response.messageModel.messageId;
-    newMessage.attachmentUrl = response.messageModel.attachmentUrl;
-    newMessage.createdAt = response.messageModel.createdAt;
+    console.log(JSON.stringify(response));
 
-    const sendNotification$ = this._realtimeService.sendRealtimeNewMessageNotification(
-      response.messageModel
-    );
+    // newMessage.messageId = response.messageModel.messageId;
+    newMessage.attachmentUrl = response.attachmentUrl;
+    newMessage.createdAt = response.createdAt;
 
-    await firstValueFrom<BaseResponse>(sendNotification$);
+    // const sendNotification$ = this._realtimeService.sendRealtimeNewMessageNotification(
+    //   response.messageModel
+    // );
+    //
+    // await firstValueFrom<BaseResponse>(sendNotification$);
 
     this.clearAttachmentInput();
     this.scrollToEnd();
@@ -401,6 +405,8 @@ export class ChatsComponent implements OnInit {
   }
 
   private onMessageSendHandler(message: Message) {
+    console.log(JSON.stringify(message));
+
     message.self = message.userId == this.userId;
     const chat = this.chats.filter((x) => x.chatId === message.chatId)[0];
     chat.lastMessageAuthor = message.userDisplayName;
@@ -415,8 +421,6 @@ export class ChatsComponent implements OnInit {
     if (message.chatId === this.activeChatId && !includesMessage) {
       this.messages.push(message);
     }
-
-    this.scrollToEnd();
   }
 
   private onMessageEditHandler(notification: EditMessageNotification) {
diff --git a/MangoAPI.Client/src/app/services/api/realtime.service.ts b/MangoAPI.Client/src/app/services/api/realtime.service.ts
diff --git a/MangoAPI.Domain/Entities/MessageEntity.cs b/MangoAPI.Domain/Entities/MessageEntity.cs
@@ -30,7 +30,7 @@ public sealed class MessageEntity
     private MessageEntity()
     {
     }
-    
+
     private MessageEntity(Guid userId, Guid chatId, string text)
     {
         Id = Guid.NewGuid();
@@ -58,7 +58,40 @@ private MessageEntity(
         new MessageEntityValidator().ValidateAndThrow(this);
     }
 
+    private MessageEntity(
+        Guid id,
+        Guid userId,
+        Guid chatId,
+        string text,
+        string inReplyToUser,
+        string inReplyToText,
+        string attachmentFileName) : this(userId, chatId, text, inReplyToUser, inReplyToText, attachmentFileName)
+    {
+        Id = id;
+        new MessageEntityValidator().ValidateAndThrow(this);
+    }
+
+    public static MessageEntity Create(
+        Guid userId,
+        Guid chatId,
+        string text,
+        string inReplyToUser,
+        string inReplyToText,
+        string attachmentFileName)
+    {
+        var message = new MessageEntity(
+            userId,
+            chatId,
+            text,
+            inReplyToUser,
+            inReplyToText,
+            attachmentFileName);
+
+        return message;
+    }
+
     public static MessageEntity Create(
+        Guid id,
         Guid userId,
         Guid chatId,
         string text,
@@ -67,6 +100,7 @@ public static MessageEntity Create(
         string attachmentFileName)
     {
         var message = new MessageEntity(
+            id,
             userId,
             chatId,
             text,
diff --git a/MangoAPI.IntegrationTests/ApiCommandsTests/DeleteMessageCommandHandlerTests/DeleteMessageShouldThrowChatNotFound.cs b/MangoAPI.IntegrationTests/ApiCommandsTests/DeleteMessageCommandHandlerTests/DeleteMessageShouldThrowChatNotFound.cs
@@ -31,7 +31,7 @@ await MangoModule.RequestAsync(
         var command = new DeleteMessageCommand(
             UserId: user.Response.Tokens.UserId,
             ChatId: Guid.NewGuid(),
-            MessageId: message.Response.MessageModel.MessageId);
+            MessageId: message.Response.NewMessageId);
 
         var result = await MangoModule.RequestAsync(command, CancellationToken.None);
 
diff --git a/MangoAPI.IntegrationTests/ApiCommandsTests/DeleteMessageCommandHandlerTests/DeleteMessageTestSuccess.cs b/MangoAPI.IntegrationTests/ApiCommandsTests/DeleteMessageCommandHandlerTests/DeleteMessageTestSuccess.cs
@@ -27,7 +27,7 @@ await MangoModule.RequestAsync(
         var command = new DeleteMessageCommand(
             UserId: user.Response.Tokens.UserId,
             ChatId: chat.Response.ChatId,
-            MessageId: message.Response.MessageModel.MessageId);
+            MessageId: message.Response.NewMessageId);
 
         var result = await MangoModule.RequestAsync(command, CancellationToken.None);
 
diff --git a/MangoAPI.IntegrationTests/ApiCommandsTests/EditMessageCommandHandlerTests/EditMessageShouldThrowChatNotFound.cs b/MangoAPI.IntegrationTests/ApiCommandsTests/EditMessageCommandHandlerTests/EditMessageShouldThrowChatNotFound.cs
@@ -30,7 +30,7 @@ public async Task EditMessageCommandHandlerTestShouldThrowChatNotFoundAsync()
         var command = new EditMessageCommand(
             ChatId: Guid.Empty,
             petroId,
-            message.Response.MessageModel.MessageId,
+            message.Response.NewMessageId,
             ModifiedText: "Message edited");
 
         var result = await MangoModule.RequestAsync(command, CancellationToken.None);
diff --git a/MangoAPI.IntegrationTests/ApiCommandsTests/EditMessageCommandHandlerTests/EditMessageSuccess.cs b/MangoAPI.IntegrationTests/ApiCommandsTests/EditMessageCommandHandlerTests/EditMessageSuccess.cs
@@ -27,12 +27,12 @@ public async Task EditMessageHandlerTestSuccessAsync()
         var editCommand = new EditMessageCommand(
             chatResult.Response.ChatId,
             petroResult.Response.Tokens.UserId,
-            messageResult.Response.MessageModel.MessageId,
+            messageResult.Response.NewMessageId,
             "Message edited");
 
         var result = await MangoModule.RequestAsync(editCommand, CancellationToken.None);
         var editedMessage =
-            await DbContextFixture.Messages.FirstAsync(x => x.Id == messageResult.Response.MessageModel.MessageId);
+            await DbContextFixture.Messages.FirstAsync(x => x.Id == messageResult.Response.NewMessageId);
 
         assert.Pass(result);
         editedMessage.Text.Should().Be(editCommand.ModifiedText);
diff --git a/MangoAPI.IntegrationTests/ApiCommandsTests/SendMessageCommandHandlerTests/SendMessageSuccessTest.cs b/MangoAPI.IntegrationTests/ApiCommandsTests/SendMessageCommandHandlerTests/SendMessageSuccessTest.cs
@@ -27,7 +27,7 @@ public async Task SendMessageNoAttachmentTestSuccessAsync()
         var messageEntity = await DbContextFixture.Messages
             .Include(x => x.User)
             .Include(x => x.Chat)
-            .FirstAsync(x => x.Id == result.Response.MessageModel.MessageId);
+            .FirstAsync(x => x.Id == result.Response.NewMessageId);
 
         assert.Pass(result);
         var chatEntity = messageEntity.Chat;
@@ -53,7 +53,7 @@ public async Task SendMessageWithAttachmentTestSuccessAsync()
         var messageEntity = await DbContextFixture.Messages
             .Include(x => x.User)
             .Include(x => x.Chat)
-            .FirstAsync(x => x.Id == result.Response.MessageModel.MessageId);
+            .FirstAsync(x => x.Id == result.Response.NewMessageId);
 
         assert.Pass(result);
         var chatEntity = messageEntity.Chat;
diff --git a/MangoAPI.IntegrationTests/Helpers/CommandHelper.cs b/MangoAPI.IntegrationTests/Helpers/CommandHelper.cs
@@ -52,6 +52,7 @@ public static AddContactCommand CreateContactCommand(Guid userId, Guid contactId
     public static SendMessageCommand SendMessageToChannelCommand(Guid userId, Guid chatId, IFormFile attachment = null)
     {
         var command = new SendMessageCommand(
+            Guid.NewGuid(),
             Text: "test message",
             UserId: userId,
             ChatId: chatId,
diff --git a/MangoAPI.Presentation/Controllers/MessagesController.cs b/MangoAPI.Presentation/Controllers/MessagesController.cs
@@ -104,7 +104,10 @@ public async Task<IActionResult> SendMessage(
     {
         var userId = CorrelationContext.GetUserId();
 
+        var messageId = request.MessageId ?? Guid.NewGuid();
+
         var command = new SendMessageCommand(
+            messageId,
             userId,
             request.ChatId,
             request.Text,
diff --git a/MangoAPI.Presentation/Controllers/RealtimeController.cs b/MangoAPI.Presentation/Controllers/RealtimeController.cs

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,26 @@`
`1`		`-using MangoAPI.BusinessLogic.Models;`
`2`		`-using MangoAPI.BusinessLogic.Responses;`
	`1`	`+using MangoAPI.BusinessLogic.Responses;`
`3`	`2`	`using MangoAPI.Domain.Constants;`
	`3`	`+using System;`
`4`	`4`
`5`	`5`	`namespace MangoAPI.BusinessLogic.ApiCommands.Messages;`
`6`	`6`
`7`	`7`	`public record SendMessageResponse : ResponseBase`
`8`	`8`	`{`
`9`		`- public Message MessageModel { get; init; }`
	`9`	`+ public string AttachmentUrl { get; set; }`
`10`	`10`
`11`		`- public static SendMessageResponse FromSuccess(Message messageModel)`
	`11`	`+ public Guid NewMessageId { get; set; }`
	`12`	`+`
	`13`	`+ public DateTime CreatedAt { get; set; }`
	`14`	`+`
	`15`	`+ public static SendMessageResponse FromSuccess(Guid newMessageId, string attachmentUrl, DateTime createdAt)`
`12`	`16`	`{`
`13`	`17`	`return new SendMessageResponse`
`14`	`18`	`{`
`15`	`19`	`Success = true,`
`16`	`20`	`Message = ResponseMessageCodes.Success,`
`17`		`- MessageModel = messageModel,`
	`21`	`+ NewMessageId = newMessageId,`
	`22`	`+ AttachmentUrl = attachmentUrl,`
	`23`	`+ CreatedAt = createdAt`
`18`	`24`	`};`
`19`	`25`	`}`
`20`	`26`	`}`