Merge pull request #408 from MangoInstantMessenger/file-upload-optimization

File upload optimization

Author: kolosovpetro

MangoAPI.Application/Services/MailgunSettings.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.Linq;
-using FluentValidation;
+using FluentValidation;
 using Microsoft.AspNetCore.Http;
+using System.Collections.Generic;
+using System.Linq;
 
-namespace MangoAPI.BusinessLogic.Pipelines;
+namespace MangoAPI.BusinessLogic.ApiCommands;
 
 public class CommonFileValidator : AbstractValidator<IFormFile>
 {

…ssLogic/Pipelines/CommonFileValidator.cs …Logic/ApiCommands/CommonFileValidator.csMangoAPI.BusinessLogic/Pipelines/CommonFileValidator.cs renamed to MangoAPI.BusinessLogic/ApiCommands/CommonFileValidator.cs MangoAPI.BusinessLogic/Pipelines/CommonFileValidator.cs renamed to MangoAPI.BusinessLogic/ApiCommands/CommonFileValidator.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.Linq;
-using FluentValidation;
+using FluentValidation;
 using Microsoft.AspNetCore.Http;
+using System.Collections.Generic;
+using System.Linq;
 
-namespace MangoAPI.BusinessLogic.Pipelines;
+namespace MangoAPI.BusinessLogic.ApiCommands;
 
 public class CommonImageValidator : AbstractValidator<IFormFile>
 {

…sLogic/Pipelines/CommonImageValidator.cs …ogic/ApiCommands/CommonImageValidator.csMangoAPI.BusinessLogic/Pipelines/CommonImageValidator.cs renamed to MangoAPI.BusinessLogic/ApiCommands/CommonImageValidator.cs MangoAPI.BusinessLogic/Pipelines/CommonImageValidator.cs renamed to MangoAPI.BusinessLogic/ApiCommands/CommonImageValidator.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/Documents/UploadDocumentCommand.cs

@@ -1,8 +1,10 @@
-using System;
+using FluentValidation;
+using System;
 using System.Linq;
 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 +24,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 +49,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 +72,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,
         };
@@ -91,15 +97,38 @@ public async Task<Result<SendMessageResponse>> Handle(
 
         await dbContext.SaveChangesAsync(cancellationToken);
 
+        var authorPictureUrl = $"{blobServiceSettings.MangoBlobAccess}/{user.Image}";
+
+        var attachmentUrl = attachmentUniqueFileName == null
+            ? null
+            : $"{blobServiceSettings.MangoBlobAccess}/{attachmentUniqueFileName}";
+
         var messageDto = messageEntity.ToMessage(
             user.DisplayName,
             user.Id,
-            user.Image,
-            blobServiceSettings.MangoBlobAccess,
-            user.DisplayNameColour);
+            user.DisplayNameColour,
+            authorPictureUrl,
+            attachmentUrl);
 
         await hubContext.Clients.Group(request.ChatId.ToString()).BroadcastMessageAsync(messageDto);
 
-        return responseFactory.SuccessResponse(SendMessageResponse.FromSuccess(messageEntity.Id));
+        return responseFactory.SuccessResponse(SendMessageResponse.FromSuccess(messageEntity.Id, attachmentUrl));
+    }
+
+    private async Task<string> UploadAttachmentIfExistsAsync(SendMessageCommand request)
+    {
+        if (request.Attachment == null)
+        {
+            return null;
+        }
+
+        await new CommonFileValidator().ValidateAndThrowAsync(request.Attachment);
+
+        var file = request.Attachment;
+        var uniqueFileName = FileNameHelper.CreateUniqueFileName(file.FileName);
+
+        await blobService.UploadFileBlobAsync(file.OpenReadStream(), file.ContentType, uniqueFileName);
+
+        return uniqueFileName;
     }
 }

MangoAPI.BusinessLogic/ApiCommands/Documents/UploadDocumentCommandHandler.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();
     }