TD-5163 Process imported competencies

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs

@@ -245,23 +245,9 @@ public IActionResult ImportSummarySubmit()
             var workbook = new XLWorkbook(filePath);
             var results = importCompetenciesFromFileService.ProcessCompetenciesFromFile(workbook, adminId, data.FrameworkId, data.FrameworkVocubulary, data.ReorderCompetenciesOption, data.AddAssessmentQuestionsOption, data.AddCustomAssessmentQuestion ? (int)data.CustomAssessmentQuestionID : 0, data.AddDefaultAssessmentQuestions ? data.DefaultQuestionIDs : []);
             data.ImportCompetenciesResult = results;
-            //TO DO apply ordering changes if required:
-            if (data.ReorderCompetenciesOption == 2 && data.CompetenciesToReorderCount > 0)
-            {
-
-            }
             setBulkUploadData(data);
             return RedirectToAction("UploadResults", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });
         }
-        [Route("/Framework/{frameworkId}/{tabname}/Import/Results")]
-        public IActionResult UploadResults()
-        {
-            var data = GetBulkUploadData();
-            FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName);
-            TempData.Clear();
-            var model = new ImportCompetenciesResultsViewModel(data.ImportCompetenciesResult, data.FrameworkId, data.FrameworkName, data.FrameworkVocubulary);
-            return View("Developer/Import/UploadResults", model);
-        }
         [Route("CancelImport")]
         public IActionResult CancelImport()
         {

DigitalLearningSolutions.Web/Services/FrameworkService.cs

@@ -119,12 +119,14 @@ bool zeroBased
 
         int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId = null);
 
+        int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false);
         int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false);
 
         IEnumerable<FrameworkCompetency> GetAllCompetenciesForAdminId(string name, int adminId);
 
         int InsertCompetency(string name, string? description, int adminId);
 
+        int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId);
         int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId);
 
         int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID);

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

@@ -20,6 +20,7 @@ public interface IImportCompetenciesFromFileService
         byte[] GetCompetencyFileForFramework(int frameworkId, bool isBlank, string vocabulary);
         public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook, string vocabulary, int frameworkId);
         public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List<int> defaultQuestionIds);
+        public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List<int> defaultQuestionIds);
     }
     public class ImportCompetenciesFromFileService : IImportCompetenciesFromFileService
     {
@@ -71,11 +72,12 @@ private void PreProcessCompetencyRow(CompetencyTableRow competencyRow, List<int>
             competencyRow.Validate();
         }
         public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List<int> defaultQuestionIds)
+        public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List<int> defaultQuestionIds)
         {
             int maxFrameworkCompetencyId = frameworkService.GetMaxFrameworkCompetencyID();
             int maxFrameworkCompetencyGroupId = frameworkService.GetMaxFrameworkCompetencyGroupID();
             var table = OpenCompetenciesTable(workbook, vocabulary);
-            return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds);
+            return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds);
         }
         internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary)
         {
@@ -92,7 +94,7 @@ internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary)
             }
             return table;
         }
-        internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int reorderCompetenciesOption, int customAssessmentQuestionID, List<int> defaultQuestionIds)
+        internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List<int> defaultQuestionIds)
         {
             var competenciesRows = table.Rows().Skip(1).Select(row => new CompetencyTableRow(table, row)).ToList();
             int rowCount = 0;
@@ -120,7 +122,7 @@ internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int a
             .Count();
             foreach (var competencyRow in competenciesRows)
             {
-                maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow);
+                maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow);
             }
             // Check for changes to competency group order and apply them if appropriate:
             if (reorderCompetenciesOption == 2)
@@ -159,7 +161,6 @@ private int ProcessCompetencyRow(
             int maxFrameworkCompetencyId,
             int maxFrameworkCompetencyGroupId,
             int addAssessmentQuestionsOption,
-            int reorderCompetenciesOption,
             int customAssessmentQuestionID,
             List<int> defaultQuestionIds,
             CompetencyTableRow competencyRow
@@ -169,13 +170,13 @@ CompetencyTableRow competencyRow
             {
                 return maxFrameworkCompetencyGroupId;
             }
+            int newCompetencyGroupId = 0;
             int newCompetencyId = 0;
-            int newFrameworkCompetencyId = 0;
             //If competency group is set, check if competency group exists within framework and add if not and get the Framework Competency Group ID
-            int? frameworkCompetencyGroupId = null;
+            int ? frameworkCompetencyGroupId = null;
             if (competencyRow.CompetencyGroup != null)
             {
-                int newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId, frameworkId);
+                newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId);
                 if (newCompetencyGroupId > 0)
                 {
                     frameworkCompetencyGroupId = frameworkService.InsertFrameworkCompetencyGroup(newCompetencyGroupId, frameworkId, adminUserId);
@@ -193,10 +194,10 @@ CompetencyTableRow competencyRow
                 if (frameworkCompetency != null)
                 {
                     newCompetencyId = frameworkCompetency.CompetencyID;
-                    if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription)
+                    if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription )
                     {
                         frameworkService.UpdateFrameworkCompetency((int)competencyRow.ID, competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId, competencyRow.AlwaysShowDescription ?? false);
-                        competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated : RowStatus.CompetencyUpdated);
+                        competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated: RowStatus.CompetencyUpdated);
                     }
                     else
                     {
@@ -210,7 +211,7 @@ CompetencyTableRow competencyRow
                 newCompetencyId = frameworkService.InsertCompetency(competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId);
                 if (newCompetencyId > 0)
                 {
-                    newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag
+                    var newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag
                     if (newFrameworkCompetencyId > maxFrameworkCompetencyId)
                     {
                         competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyInserted : RowStatus.CompetencyInserted);
@@ -224,12 +225,11 @@ CompetencyTableRow competencyRow
 
 
             // If flags are supplied, add them:
-            if (!string.IsNullOrWhiteSpace(competencyRow.FlagsCsv.Trim()))
+            if (competencyRow.FlagsCsv != null)
             {
                 var flags = competencyRow.FlagsCsv.Split(',');
-                var flagIds = new List<int>();
-                foreach (var flag in flags)
-                {
+                int[] flagIds = [];
+                foreach (var flag in flags) {
                     int flagId = 0;
                     var frameworkFlags = frameworkService.GetCompetencyFlagsByFrameworkId(frameworkId, null, null);
                     if (frameworkFlags.Any())
@@ -239,64 +239,37 @@ CompetencyTableRow competencyRow
                             if (frameworkFlag.FlagName == flag)
                             {
                                 flagId = frameworkFlag.FlagId;
-                                break;
                             }
                         }
                     }
                     if (flagId == 0)
                     {
                         flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag, "Flag", "nhsuk-tag--white");
                     }
-                    flagIds.Add(flagId);
+                    flagIds.Append(flagId);
                 }
-                if (flagIds.Count > 0)
-                {
-                    var updated = frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, [.. flagIds]);
-                    if (updated > 0 && competencyRow.RowStatus == RowStatus.Skipped)
-                    {
-                        competencyRow.RowStatus = RowStatus.CompetencyUpdated;
-                    }
+                if (flagIds.Any()) {
+                    frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, flagIds);
                 }
             }
 
-            // Reorder competencies if required:
-            if (reorderCompetenciesOption == 2)
-            {
-                var frameworkCompetencyId = (int)competencyRow.ID;
-                var frameworkCompetency = frameworkService.GetFrameworkCompetencyById(frameworkCompetencyId);
-                var placesToMove = Math.Abs(frameworkCompetency.Ordering - competencyRow.CompetencyOrderNumber);
-
-                if (placesToMove > 0)
-                {
-                    var direction = frameworkCompetency.Ordering > competencyRow.CompetencyOrderNumber ? "UP" : "DOWN";
-
-                    for (int i = 0; i < placesToMove; i++)
-                    {
-                        frameworkService.MoveFrameworkCompetency(frameworkCompetencyId, true, direction);
-                    }
-
-                    competencyRow.Reordered = true;
-                }
-            }
 
             // Add assessment questions if necessary:
             if (defaultQuestionIds.Count > 0 | customAssessmentQuestionID > 0)
             {
                 if (competencyRow.RowStatus == RowStatus.CompetencyInserted | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted || addAssessmentQuestionsOption == 2 && competencyRow.RowStatus == RowStatus.CompetencyUpdated | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyUpdated || addAssessmentQuestionsOption == 3)
                 {
-                    foreach (var id in defaultQuestionIds)
+                    foreach(var id in defaultQuestionIds)
                     {
-                        frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, id, adminUserId);
+                        frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, id, adminUserId);
                     }
-                    if (customAssessmentQuestionID > 0)
+                    if(customAssessmentQuestionID > 0)
                     {
-                        frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, customAssessmentQuestionID, adminUserId);
+                        frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, customAssessmentQuestionID, adminUserId);
                     }
                 }
             }
 
-            
-
             return maxFrameworkCompetencyGroupId;
         }