Merge pull request #2144 from TechnologyEnhancedLearning/Develop/Fixes/TD-2865-Improve-error-messages-when-bulk-upload-Excel-file-doesn't-contain-correct-worksheet

TD-2865 improve error messages when bulk upload excel file doesn't contain correct worksheet

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs

@@ -14,6 +14,8 @@
     using Microsoft.FeatureManagement.Mvc;
     using Microsoft.Extensions.Configuration;
     using ConfigurationExtensions = DigitalLearningSolutions.Data.Extensions.ConfigurationExtensions;
+    using ClosedXML.Excel;
+
     [FeatureGate(FeatureFlags.RefactoredTrackingSystem)]
     [Authorize(Policy = CustomPolicies.UserCentreAdmin)]
     [SetDlsSubApplication(nameof(DlsSubApplication.TrackingSystem))]
@@ -78,10 +80,19 @@ public IActionResult StartUpload()
         public IActionResult StartUpload(UploadDelegatesViewModel model)
         {
             int MaxBulkUploadRows = GetMaxBulkUploadRowsLimit();
-            int ExcelRowsCount = delegateUploadFileService.GetBulkUploadExcelRowCount(model.DelegatesFile);
-            if (ExcelRowsCount > MaxBulkUploadRows)
+            if (model.DelegatesFile != null)
             {
-                ModelState.AddModelError("MaxBulkUploadRows", string.Format(CommonValidationErrorMessages.MaxBulkUploadRowsLimit, MaxBulkUploadRows));
+                var workbook = new XLWorkbook(model.DelegatesFile.OpenReadStream());
+                if (!workbook.Worksheets.Contains(DelegateDownloadFileService.DelegatesSheetName))
+                {
+                    ModelState.AddModelError("MaxBulkUploadRows", CommonValidationErrorMessages.InvalidBulkUploadExcelFile);
+                    return View("StartUpload", model);
+                }
+                int ExcelRowsCount = delegateUploadFileService.GetBulkUploadExcelRowCount(model.DelegatesFile);
+                if (ExcelRowsCount > MaxBulkUploadRows)
+                {
+                    ModelState.AddModelError("MaxBulkUploadRows", string.Format(CommonValidationErrorMessages.MaxBulkUploadRowsLimit, MaxBulkUploadRows));
+                }
             }
             if (!ModelState.IsValid)
             {

DigitalLearningSolutions.Web/Helpers/CommonValidationErrorMessages.cs

@@ -35,5 +35,6 @@ public static class CommonValidationErrorMessages
             "A user with this email address is already registered";
         public const string CentreNameAlreadyExist = "The centre name you have entered already exists, please enter a different centre name";
         public const string MaxBulkUploadRowsLimit = "File must contain no more than {0} rows";
+        public const string InvalidBulkUploadExcelFile = "The uploaded file must contain a \"DelegatesBulkUpload\" worksheet. Use the \"Download delegates\" button to generate a template.";
     }
 }