work in progress

Author: kolosovpetro

MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageCommand.cs

@@ -1,16 +1,17 @@
 using System;
 using MangoAPI.BusinessLogic.Responses;
 using MediatR;
+using Microsoft.AspNetCore.Http;
 
 namespace MangoAPI.BusinessLogic.ApiCommands.Messages;
 
 public record SendMessageCommand(
         string MessageText,
         Guid UserId,
         Guid ChatId,
-        string AttachmentUrl,
         string InReplayToAuthor,
         string InReplayToText,
         DateTime? CreatedAt,
-        Guid? MessageId)
-    : IRequest<Result<SendMessageResponse>>;
+        Guid? MessageId,
+        IFormFile Attachment)
+    : IRequest<Result<SendMessageResponse>>;

MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageCommandHandler.cs

@@ -3,6 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.Application.Interfaces;
+using MangoAPI.Application.Services;
 using MangoAPI.BusinessLogic.HubConfig;
 using MangoAPI.BusinessLogic.Models;
 using MangoAPI.BusinessLogic.Responses;
@@ -22,17 +23,20 @@ public class SendMessageCommandHandler
     private readonly IHubContext<ChatHub, IHubClient> hubContext;
     private readonly ResponseFactory<SendMessageResponse> responseFactory;
     private readonly IBlobServiceSettings blobServiceSettings;
+    private readonly IBlobService blobService;
 
     public SendMessageCommandHandler(
         MangoDbContext dbContext,
         IHubContext<ChatHub, IHubClient> hubContext,
         ResponseFactory<SendMessageResponse> responseFactory,
-        IBlobServiceSettings blobServiceSettings)
+        IBlobServiceSettings blobServiceSettings,
+        IBlobService blobService)
     {
         this.dbContext = dbContext;
         this.hubContext = hubContext;
         this.responseFactory = responseFactory;
         this.blobServiceSettings = blobServiceSettings;
+        this.blobService = blobService;
     }
 
     public async Task<Result<SendMessageResponse>> Handle(
@@ -44,8 +48,7 @@ public async Task<Result<SendMessageResponse>> Handle(
             {
                 x.DisplayName, x.DisplayNameColour, x.Image, x.Id,
             }).FirstOrDefaultAsync(
-                x => x.Id == request.UserId,
-                cancellationToken);
+                x => x.Id == request.UserId, cancellationToken);
 
         if (user == null)
         {
@@ -68,14 +71,16 @@ public async Task<Result<SendMessageResponse>> Handle(
             return responseFactory.ConflictResponse(errorMessage, errorDescription);
         }
 
+        var attachmentUniqueFileName = await UploadAttachmentIfExistsAsync(request);
+
         var messageEntity = new MessageEntity
         {
             Id = request.MessageId ?? Guid.NewGuid(),
             ChatId = request.ChatId,
             UserId = request.UserId,
             Content = request.MessageText,
             CreatedAt = request.CreatedAt ?? DateTime.UtcNow,
-            Attachment = request.AttachmentUrl,
+            AttachmentFileName = attachmentUniqueFileName,
             InReplayToAuthor = request.InReplayToAuthor,
             InReplayToText = request.InReplayToText,
         };
@@ -102,4 +107,19 @@ public async Task<Result<SendMessageResponse>> Handle(
 
         return responseFactory.SuccessResponse(SendMessageResponse.FromSuccess(messageEntity.Id));
     }
+
+    private async Task<string> UploadAttachmentIfExistsAsync(SendMessageCommand request)
+    {
+        if (request.Attachment == null)
+        {
+            return null;
+        }
+
+        var file = request.Attachment;
+        var uniqueFileName = FileNameHelper.CreateUniqueFileName(file.FileName);
+
+        await blobService.UploadFileBlobAsync(file.OpenReadStream(), file.ContentType, uniqueFileName);
+
+        return uniqueFileName;
+    }
 }

MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageCommandValidator.cs

@@ -19,9 +19,6 @@ public SendMessageCommandValidator()
             .Cascade(CascadeMode.Stop)
             .Length(1, 300);
 
-        RuleFor(x => x.AttachmentUrl)
-            .Cascade(CascadeMode.Stop);
-
         RuleFor(x => x.ChatId).NotEmpty();
         RuleFor(x => x.UserId).NotEmpty();
     }

MangoAPI.BusinessLogic/ApiCommands/Messages/SendMessageRequest.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.AspNetCore.Http;
+using System;
 using System.ComponentModel;
 using System.Text.Json.Serialization;
 
@@ -10,19 +11,19 @@ public record SendMessageRequest
     public SendMessageRequest(
         string messageText,
         Guid chatId,
-        string attachmentUrl,
         string inReplayToAuthor,
         string inReplayToText,
         DateTime? createdAt,
-        Guid? messageId)
+        Guid? messageId,
+        IFormFile attachment)
     {
         MessageText = messageText;
         ChatId = chatId;
-        AttachmentUrl = attachmentUrl;
         InReplayToAuthor = inReplayToAuthor;
         InReplayToText = inReplayToText;
         CreatedAt = createdAt;
         MessageId = messageId;
+        Attachment = attachment;
     }
 
     [DefaultValue("hello world")]
@@ -31,16 +32,17 @@ public SendMessageRequest(
     [DefaultValue("a8747c37-c5ef-4a87-943c-3ee3ae0a2871")]
     public Guid ChatId { get; }
 
-    [DefaultValue("https://localhost:5001/Uploads/khachatur_picture.jpg")]
-    public string AttachmentUrl { get; }
-
     [DefaultValue("John Doe")]
     public string InReplayToAuthor { get; }
 
     [DefaultValue("Hello world!")]
     public string InReplayToText { get; }
 
+    [DefaultValue("2021-08-01T00:00:00.0000000")]
     public DateTime? CreatedAt { get; }
 
+    [DefaultValue("f56ac722-a57b-411c-8306-c2e05fb1a8df")]
     public Guid? MessageId { get; }
+    
+    public IFormFile Attachment { get; }
 }

MangoAPI.BusinessLogic/ApiQueries/Messages/GetMessagesQueryHandler.cs

@@ -51,8 +51,8 @@ public async Task<Result<GetMessagesResponse>> Handle(GetMessagesQuery request,
                     ? $"{blobServiceSettings.MangoBlobAccess}/{messageEntity.User.Image}"
                     : null,
 
-                MessageAttachmentUrl = messageEntity.Attachment != null
-                    ? $"{blobServiceSettings.MangoBlobAccess}/{messageEntity.Attachment}"
+                MessageAttachmentUrl = messageEntity.AttachmentFileName != null
+                    ? $"{blobServiceSettings.MangoBlobAccess}/{messageEntity.AttachmentFileName}"
                     : null,
             }).Take(200).ToListAsync(cancellationToken);
 

MangoAPI.BusinessLogic/ApiQueries/Messages/SearchChatMessageQueryHandler.cs

@@ -67,8 +67,8 @@ public async Task<Result<SearchChatMessagesResponse>> Handle(
                     ? $"{blobServiceSettings.MangoBlobAccess}/{x.User.Image}"
                     : null,
 
-                MessageAttachmentUrl = x.Attachment != null
-                    ? $"{blobServiceSettings.MangoBlobAccess}/{x.Attachment}"
+                MessageAttachmentUrl = x.AttachmentFileName != null
+                    ? $"{blobServiceSettings.MangoBlobAccess}/{x.AttachmentFileName}"
                     : null,
             }).Take(200);
 

MangoAPI.BusinessLogic/Models/Message.cs

@@ -78,8 +78,8 @@ public static Message ToMessage(
                 ? $"{mangoBlobAccess}/{image}"
                 : null,
 
-            MessageAttachmentUrl = message.Attachment != null
-                ? $"{mangoBlobAccess}/{message.Attachment}"
+            MessageAttachmentUrl = message.AttachmentFileName != null
+                ? $"{mangoBlobAccess}/{message.AttachmentFileName}"
                 : null,
         };
 

MangoAPI.Domain/Entities/MessageEntity.cs

@@ -16,7 +16,7 @@ public sealed class MessageEntity
 
     public string InReplayToText { get; set; }
 
-    public string Attachment { get; set; }
+    public string AttachmentFileName { get; set; }
 
     public DateTime CreatedAt { get; set; }