Merge pull request #2449 from TechnologyEnhancedLearning/Develop/Fixes/TD-2286-FixTestingFails

TD-2286 Addresses issues with attaching more than 20 MB in separate uploads

Author: rshrirohit

DigitalLearningSolutions.Data/Models/Support/RequestAttachment.cs

@@ -10,6 +10,7 @@ public class RequestAttachment
     {
         public string? Id { get; set; }
         public string? FileName { get; set; }
+        public double? SizeMb { get; set; }
         public string? OriginalFileName { get; set; }
         public string? FullFileName { get; set; }
         public byte[] Content { get; set; }

DigitalLearningSolutions.Web/Controllers/Support/RequestSupportTicketController.cs

@@ -170,10 +170,10 @@ public IActionResult SetAttachment(DlsSubApplication dlsSubApplication, RequestA
                 MultiPageFormDataFeature.AddCustomWebForm("RequestSupportTicketCWF"),
                 TempData
             ).GetAwaiter().GetResult(); ;
-
+            requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
             if (requestAttachmentmodel.ImageFiles == null)
             {
-                requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
+                //requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
                 ModelState.AddModelError("ImageFiles", "Please select at least one image");
                 return View("RequestAttachment", requestAttachmentmodel);
             }
@@ -184,13 +184,13 @@ public IActionResult SetAttachment(DlsSubApplication dlsSubApplication, RequestA
             (bool? fileExtension, bool? fileSize) = validateUploadedImages(requestAttachmentmodel);
             if (fileExtension == true)
             {
-                requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
+                //requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
                 ModelState.AddModelError("FileExtensionError", "File must be in valid image formats jpg, jpeg, png, bmp or mp4 video format");
                 return View("RequestAttachment", requestAttachmentmodel);
             }
             if (fileSize == true)
             {
-                requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
+                //requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
                 ModelState.AddModelError("FileSizeError", "Maximum allowed file size is 20MB");
                 return View("RequestAttachment", requestAttachmentmodel);
             }
@@ -202,7 +202,8 @@ public IActionResult SetAttachment(DlsSubApplication dlsSubApplication, RequestA
                 {
                     OriginalFileName = item.FileName,
                     FileName = fileName,
-                    FullFileName = uploadDir + fileName
+                    FullFileName = uploadDir + fileName,
+                    SizeMb = Convert.ToDouble(item.Length.ToSize(FileSizeCalc.SizeUnits.MB))
                 };
                 RequestAttachmentList.Add(RequestAttachment);
             }
@@ -370,6 +371,13 @@ private string UploadFile(IFormFile file)
         private (bool, bool) validateUploadedImages(RequestAttachmentViewModel requestAttachmentmodel)
         {
             var totalFileSize = 0.00;
+            if (requestAttachmentmodel.RequestAttachment != null)
+            {
+                foreach (var item in requestAttachmentmodel.RequestAttachment)
+                {
+                    totalFileSize = totalFileSize + item.SizeMb??0;
+                }
+            }
             foreach (var item in requestAttachmentmodel.ImageFiles)
             {
                 var extension = Path.GetExtension(item.FileName);
@@ -380,10 +388,11 @@ private string UploadFile(IFormFile file)
                 }
                 var fileSize = Convert.ToDouble(item.Length.ToSize(FileSizeCalc.SizeUnits.MB));
                 totalFileSize = totalFileSize + fileSize;
-                if (fileSize > requestAttachmentmodel.SizeLimit || totalFileSize > requestAttachmentmodel.SizeLimit)
-                {
-                    requestAttachmentmodel.FileSizeFlag = true;
-                }
+
+            }
+            if (totalFileSize > requestAttachmentmodel.SizeLimit)
+            {
+                requestAttachmentmodel.FileSizeFlag = true;
             }
             return (requestAttachmentmodel.FileExtensionFlag ?? false, requestAttachmentmodel.FileSizeFlag ?? false);
         }

DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestAttachment.cshtml

@@ -34,7 +34,7 @@
                         </legend>
                         <div class="nhsuk-form-group">
                             <label class="nhsuk-label" for="ImageFiles">
-                                If you have any screenshots that help illustrate your request, attach them here. The maximum total file size for uploaded files is 20MB.
+                                If you have any screenshots that help illustrate your request, attach them here. The maximum total file size for uploaded files is 20 MB.
                             </label>
                             @if (!ViewData.ModelState.IsValid)
                             {
@@ -60,7 +60,7 @@
                             <div class="nhsuk-summary-list__row">
 
                                 <dd class="nhsuk-summary-list__value">
-                                    @a.OriginalFileName
+                                    @a.OriginalFileName (@a.SizeMb.ToString() MB)
                                 </dd>
                                 <dd class="nhsuk-summary-list__actions">
                                     <a asp-action="DeleteImage" asp-all-route-data="@cancelLinkData" asp-route-imageName="@a.FileName" asp-route-imageId="@a.Id">