Skip to content

Commit aabbb35

Browse files
TD-2865: Invalid file format validation not working issue fixed.
1 parent cb60268 commit aabbb35

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,25 +81,22 @@ public IActionResult StartUpload(UploadDelegatesViewModel model)
8181
{
8282
int MaxBulkUploadRows = GetMaxBulkUploadRowsLimit();
8383
model.MaxBulkUploadRows = MaxBulkUploadRows;
84-
if (model.DelegatesFile != null)
84+
if (!ModelState.IsValid)
8585
{
86-
var workbook = new XLWorkbook(model.DelegatesFile.OpenReadStream());
87-
if (!workbook.Worksheets.Contains(DelegateDownloadFileService.DelegatesSheetName))
88-
{
89-
ModelState.AddModelError("MaxBulkUploadRows", CommonValidationErrorMessages.InvalidBulkUploadExcelFile);
90-
return View("StartUpload", model);
91-
}
92-
int ExcelRowsCount = delegateUploadFileService.GetBulkUploadExcelRowCount(model.DelegatesFile);
93-
if (ExcelRowsCount > MaxBulkUploadRows)
94-
{
95-
ModelState.AddModelError("MaxBulkUploadRows", string.Format(CommonValidationErrorMessages.MaxBulkUploadRowsLimit, MaxBulkUploadRows));
96-
}
86+
return View("StartUpload", model);
9787
}
98-
if (!ModelState.IsValid)
88+
var workbook = new XLWorkbook(model.DelegatesFile.OpenReadStream());
89+
if (!workbook.Worksheets.Contains(DelegateDownloadFileService.DelegatesSheetName))
9990
{
91+
ModelState.AddModelError("MaxBulkUploadRows", CommonValidationErrorMessages.InvalidBulkUploadExcelFile);
92+
return View("StartUpload", model);
93+
}
94+
int ExcelRowsCount = delegateUploadFileService.GetBulkUploadExcelRowCount(model.DelegatesFile);
95+
if (ExcelRowsCount > MaxBulkUploadRows)
96+
{
97+
ModelState.AddModelError("MaxBulkUploadRows", string.Format(CommonValidationErrorMessages.MaxBulkUploadRowsLimit, MaxBulkUploadRows));
10098
return View("StartUpload", model);
10199
}
102-
103100
try
104101
{
105102
var results = delegateUploadFileService.ProcessDelegatesFile(

0 commit comments

Comments
 (0)