Implements models for handling upload

Author: kevwhitt-hee

DigitalLearningSolutions.Data/Models/Frameworks/Import/CompetencyTableRow.cs

@@ -1,16 +1,16 @@
 namespace DigitalLearningSolutions.Data.Models.Frameworks.Import
 {
     using ClosedXML.Excel;
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
     public enum RowStatus
     {
         NotYetProcessed,
         Skipped,
-        CompetencyGroupInserted,
         CompetencyGroupAndCompetencyInserted,
-        CompetencyInserted
+        CompetencyInserted,
+        CompetencyUpdated,
+        CompetencyGroupInserted,
+        CompetencyGroupUpdated,
+        CompetencyGroupAndCompetencyUpdated
     }
     public class CompetencyTableRow : BulkCompetency
     {
@@ -23,9 +23,12 @@ public CompetencyTableRow(IXLTable table, IXLRangeRow row)
             }
 
             RowNumber = row.RowNumber();
-            CompetencyGroup = FindFieldValue("competency group");
-            Competency = FindFieldValue("competency name");
-            CompetencyDescription = FindFieldValue("competency description");
+            id = int.Parse(FindFieldValue("ID"));
+            CompetencyGroup = FindFieldValue("CompetencyGroup");
+            Competency = FindFieldValue("Competency");
+            CompetencyDescription = FindFieldValue("CompetencyDescription");
+            GroupDescription = FindFieldValue("CompetencyGroupDescription");
+            FlagsCsv = FindFieldValue("FlagsCSV");
             RowStatus = RowStatus.NotYetProcessed;
         }
         public int RowNumber { get; set; }

DigitalLearningSolutions.Web.Tests/Controllers/Frameworks/FrameworkControllerTests.cs

@@ -12,6 +12,8 @@
     using Microsoft.Extensions.Logging;
     using NUnit.Framework;
     using GDS.MultiPageFormData;
+    using DigitalLearningSolutions.Data.Utilities;
+    using Microsoft.AspNetCore.Hosting;
 
     public partial class FrameworkControllerTests
     {
@@ -28,6 +30,8 @@ public partial class FrameworkControllerTests
         private ILearningHubApiClient learningHubApiClient = null!;
         private ISearchSortFilterPaginateService searchSortFilterPaginateService = null!;
         private IMultiPageFormService multiPageFormService = null!;
+        private IClockUtility clockUtility = null!;
+        private IWebHostEnvironment webHostEnvironment = null!;
 
         [SetUp]
         public void SetUp()
@@ -42,7 +46,8 @@ public void SetUp()
             learningHubApiClient = A.Fake<ILearningHubApiClient>();
             searchSortFilterPaginateService = A.Fake<ISearchSortFilterPaginateService>();
             multiPageFormService = A.Fake<IMultiPageFormService>();
-
+            clockUtility = A.Fake<ClockUtility>();
+            webHostEnvironment = A.Fake<IWebHostEnvironment>();
             A.CallTo(() => config["CurrentSystemBaseUrl"]).Returns(BaseUrl);
 
             var user = new ClaimsPrincipal(
@@ -65,7 +70,9 @@ public void SetUp()
                 competencyLearningResourcesService,
                 learningHubApiClient,
                 searchSortFilterPaginateService,
-                multiPageFormService
+                multiPageFormService,
+                clockUtility,
+                webHostEnvironment
             )
             {
                 ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext { User = user } },

DigitalLearningSolutions.Web.Tests/ServiceFilter/RedirectToErrorEmptySessionDataTests.cs

@@ -22,6 +22,8 @@
     using NUnit.Framework;
     using GDS.MultiPageFormData;
     using GDS.MultiPageFormData.Enums;
+    using DigitalLearningSolutions.Data.Utilities;
+    using Microsoft.AspNetCore.Hosting;
 
     public class RedirectToErrorEmptySessionDataTests
     {
@@ -41,7 +43,9 @@ public void Setup()
                         A.Fake<ICompetencyLearningResourcesService>(),
                         A.Fake<ILearningHubApiClient>(),
                         A.Fake<ISearchSortFilterPaginateService>(),
-                        A.Fake<IMultiPageFormService>()
+                        A.Fake<IMultiPageFormService>(),
+                        A.Fake<IClockUtility>(),
+                        A.Fake<IWebHostEnvironment>()
                     )
                     .WithDefaultContext().WithMockTempData();
 

DigitalLearningSolutions.Web/Models/BulkCompetenciesResult.cs

@@ -1,6 +1,40 @@
-namespace DigitalLearningSolutions.Web.Models
+using DigitalLearningSolutions.Data.Models.Frameworks.Import;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace DigitalLearningSolutions.Web.Models
 {
     public class BulkCompetenciesResult
     {
+        public enum ErrorReason
+        {
+            InvalidId,
+            MissingCompetencyName,
+            TooLongCompetencyName,
+            TooLongCompetencyGroupName,
+            InvalidAlwaysShowDescription
+        }
+
+        public BulkCompetenciesResult() { }
+
+        public BulkCompetenciesResult(
+            IReadOnlyCollection<CompetencyTableRow> competencyRows
+        )
+        {
+            ProcessedCount = competencyRows.Count;
+            CompetencyAddedCount = competencyRows.Count(cr => cr.RowStatus == RowStatus.CompetencyInserted || cr.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted);
+            GroupAddedCount = competencyRows.Count(cr => cr.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted);
+            GroupUpdatedCount = competencyRows.Count(cr => cr.RowStatus == RowStatus.CompetencyGroupUpdated || cr.RowStatus == RowStatus.CompetencyGroupAndCompetencyUpdated);
+            SkippedCount = competencyRows.Count(cr => cr.RowStatus == RowStatus.Skipped);
+            Errors = (IEnumerable<(int RowNumber, ErrorReason Reason)>)competencyRows.Where(cr => cr.Error.HasValue).Select(cr => (cr.RowNumber, cr.Error!.Value));
+        }
+
+        public IEnumerable<(int RowNumber, ErrorReason Reason)>? Errors { get; set; }
+        public int ProcessedCount { get; set; }
+        public int CompetencyAddedCount { get; set; }
+        public int CompetencyUpdatedCount { get; set; }
+        public int GroupAddedCount { get; set; }
+        public int GroupUpdatedCount { get; set; }
+        public int SkippedCount { get; set; }
     }
 }

DigitalLearningSolutions.Web/ViewModels/Frameworks/ImportCompetenciesPreProcessViewModel.cs

@@ -1,6 +1,47 @@
-namespace DigitalLearningSolutions.Web.ViewModels.Frameworks
+using System.Collections.Generic;
+using System;
+using DigitalLearningSolutions.Web.Models;
+using System.Linq;
+
+namespace DigitalLearningSolutions.Web.ViewModels.Frameworks
 {
     public class ImportCompetenciesPreProcessViewModel
     {
+        public ImportCompetenciesPreProcessViewModel(BulkCompetenciesResult bulkCompetenciesResult)
+        {
+            ToProcessCount = bulkCompetenciesResult.ProcessedCount;
+            CompetenciesToAddCount = bulkCompetenciesResult.CompetencyAddedCount;
+            CompetenciesToUpdateCount = bulkCompetenciesResult.CompetencyUpdatedCount;
+            CompetencyGroupsToAddCount = bulkCompetenciesResult.GroupAddedCount;
+            CompetencyGroupsToUpdateCount = bulkCompetenciesResult.GroupUpdatedCount;
+            Errors = bulkCompetenciesResult.Errors.Select(x => (x.RowNumber, MapReasonToErrorMessage(x.Reason)));
+        }
+
+        public IEnumerable<(int RowNumber, string ErrorMessage)> Errors { get; set; }
+        public int ErrorCount => Errors.Count();
+        public int ToProcessCount { get; set; }
+        public int CompetenciesToAddCount { get; set; }
+        public int CompetenciesToUpdateCount { get; set; }
+        public int CompetencyGroupsToAddCount { get; set; }
+        public int CompetencyGroupsToUpdateCount { get; set; }
+        public int ToUpdateOrSkipCount { get; set; }
+       
+        private static string MapReasonToErrorMessage(BulkCompetenciesResult.ErrorReason reason)
+        {
+            return reason switch
+            {
+                BulkCompetenciesResult.ErrorReason.TooLongCompetencyGroupName =>
+                    "Group name must be 255 characters or less.",
+                BulkCompetenciesResult.ErrorReason.MissingCompetencyName =>
+                    "Competency is blank. Competency is a required field and cannot be left blank",
+                BulkCompetenciesResult.ErrorReason.InvalidId =>
+                    "The ID provided does not match a Competency ID in this Framework",
+                BulkCompetenciesResult.ErrorReason.TooLongCompetencyName =>
+                    "Competency must be 255 characters or less.",
+                BulkCompetenciesResult.ErrorReason.InvalidAlwaysShowDescription =>
+                    "Always show description is invalid. The Always show description  field must contain 'TRUE' or 'FALSE'",
+                _ => "Unspecified error.",
+            };
+        }
     }
 }