Resolving post-rebase merge conflict problems

kevwhitt-hee · kevwhitt-hee · commit 697b272cea53 · 2025-02-11T09:29:19.000Z
diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
@@ -123,7 +123,6 @@ bool zeroBased
         //INSERT DATA
         BrandedFramework CreateFramework(DetailFramework detailFramework, int adminId);
 
-        int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId);
         int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId);
 
         int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId);
@@ -285,7 +284,7 @@ public class FrameworkDataService : IFrameworkDataService
             fwr.ID AS FrameworkReviewID";
 
         private const string BrandedFrameworkFields =
-            @", FW.Description, (SELECT BrandName
+            @",(SELECT BrandName
                                  FROM    Brands
                                  WHERE (BrandID = FW.BrandID)) AS Brand,
                                  (SELECT CategoryName
@@ -476,7 +475,6 @@ public BrandedFramework CreateFramework(DetailFramework detailFramework, int adm
                 return new BrandedFramework();
             }
 
-            var existingFrameworks = connection.QuerySingle<int>(
             var existingFrameworks = connection.QuerySingle<int>(
                 @"SELECT COUNT(*) FROM Frameworks WHERE FrameworkName = @frameworkName",
                 new { frameworkName }
@@ -550,7 +548,6 @@ int adminId
             return GetBrandedFrameworkByFrameworkId(frameworkId, adminId);
         }
 
-        public int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId)
         public int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId)
         {
             if ((groupName.Length == 0) | (adminId < 1))
@@ -583,26 +580,7 @@ OUTPUT INSERTED.Id
                     VALUES (@groupName, @groupDescription, @adminId)",
                 new { groupName, groupDescription, adminId }
             );
-            if (numberOfAffectedRows < 1)
-            {
-                logger.LogWarning(
-                    "Not inserting competency group as db insert failed. " +
-                    $"Group name: {groupName}, admin id: {adminId}"
-                );
-                return -1;
-            }
 
-            existingId = connection.QuerySingle<int>(
-                @"SELECT COALESCE
-                 ((SELECT TOP (1) ID
-                  FROM    CompetencyGroups
-                  WHERE (Name = @groupName) AND EXISTS
-                                   (SELECT 1 AS Expr1
-                                   FROM    FrameworkCompetencyGroups
-                                   WHERE (CompetencyGroupID = CompetencyGroups.ID) AND (FrameworkID = @frameworkId) OR
-                                                (CompetencyGroupID = CompetencyGroups.ID) AND (@frameworkId IS NULL))), 0) AS CompetencyGroupID",
-                new { groupName, groupDescription }
-            );
             return existingId;
         }
 
@@ -616,7 +594,6 @@ public int InsertFrameworkCompetencyGroup(int groupId, int frameworkId, int admi
                 return -2;
             }
 
-            var existingId = connection.QuerySingle<int>(
             var existingId = connection.QuerySingle<int>(
                 @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencyGroups WHERE CompetencyGroupID = @groupID AND FrameworkID = @frameworkID), 0) AS FrameworkCompetencyGroupID",
                 new { groupId, frameworkId }
@@ -635,19 +612,7 @@ FROM            [FrameworkCompetencyGroups]
                                  WHERE        ([FrameworkID] = @frameworkId)), 0)+1, @frameworkId)",
                 new { groupId, adminId, frameworkId }
             );
-            if (numberOfAffectedRows < 1)
-            {
-                logger.LogWarning(
-                    "Not inserting framework competency group as db insert failed. " +
-                    $"Group id: {groupId}, admin id: {adminId}, frameworkId: {frameworkId}"
-                );
-                return -1;
-            }
 
-            existingId = connection.QuerySingle<int>(
-                @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencyGroups WHERE CompetencyGroupID = @groupID AND FrameworkID = @frameworkID), 0) AS FrameworkCompetencyGroupID",
-                new { groupId, frameworkId }
-            );
             return existingId;
         }
 
@@ -691,15 +656,13 @@ public int InsertFrameworkCompetency(
             var existingId = 0;
             if (frameworkCompetencyGroupID == null)
             {
-                existingId = connection.QuerySingle<int>(
                 existingId = connection.QuerySingle<int>(
                     @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID IS NULL), 0) AS FrameworkCompetencyID",
                     new { competencyId, frameworkCompetencyGroupID }
                 );
             }
             else
             {
-                existingId = connection.QuerySingle<int>(
                 existingId = connection.QuerySingle<int>(
                     @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID = @frameworkCompetencyGroupID), 0) AS FrameworkCompetencyID",
                     new { competencyId, frameworkCompetencyGroupID }
@@ -729,15 +692,13 @@ FROM            [FrameworkCompetencies]
 
             if (frameworkCompetencyGroupID == null)
             {
-                existingId = connection.QuerySingle<int>(
                 existingId = connection.QuerySingle<int>(
                     @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID IS NULL), 0) AS FrameworkCompetencyID",
                     new { competencyId, frameworkCompetencyGroupID }
                 );
             }
             else
             {
-                existingId = connection.QuerySingle<int>(
                 existingId = connection.QuerySingle<int>(
                     @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID = @frameworkCompetencyGroupID), 0) AS FrameworkCompetencyID",
                     new { competencyId, frameworkCompetencyGroupID }
@@ -789,7 +750,6 @@ public int AddCollaboratorToFramework(int frameworkId, string? userEmail, bool c
                 return -3;
             }
 
-            var existingId = connection.QuerySingle<int>(
             var existingId = connection.QuerySingle<int>(
                 @"SELECT COALESCE
                  ((SELECT ID
@@ -840,7 +800,6 @@ FROM    FrameworkCollaborators
                 );
             }
 
-            existingId = connection.QuerySingle<int>(
             existingId = connection.QuerySingle<int>(
                 @"SELECT COALESCE
                  ((SELECT ID
@@ -1029,7 +988,6 @@ int adminId
                 return;
             }
 
-            var usedElsewhere = connection.QuerySingle<int>(
             var usedElsewhere = connection.QuerySingle<int>(
                 @"SELECT COUNT(*) FROM FrameworkCompetencyGroups
                     WHERE CompetencyGroupId = @competencyGroupId
@@ -1088,7 +1046,7 @@ public void UpdateFrameworkCompetency(int frameworkCompetencyId, string name, st
                 @"UPDATE Competencies SET Name = @name, Description = @description, UpdatedByAdminID = @adminId, AlwaysShowDescription = CASE WHEN @alwaysShowDescription IS NULL THEN AlwaysShowDescription ELSE @alwaysShowDescription END
                     FROM   Competencies INNER JOIN FrameworkCompetencies AS fc ON Competencies.ID = fc.CompetencyID
                     WHERE (fc.Id = @frameworkCompetencyId)",
-                new { name, description, adminId, frameworkCompetencyId, alwaysShowDescription}
+                new { name, description, adminId, frameworkCompetencyId, alwaysShowDescription }
             );
             if (numberOfAffectedRows < 1)
             {
@@ -1200,15 +1158,13 @@ public void DeleteFrameworkCompetencyGroup(int frameworkCompetencyGroupId, int c
             }
 
             //Check if used elsewhere and delete competency group if not:
-            var usedElsewhere = connection.QuerySingle<int>(
             var usedElsewhere = connection.QuerySingle<int>(
                 @"SELECT COUNT(*) FROM FrameworkCompetencyGroups
                     WHERE CompetencyGroupId = @competencyGroupId",
                 new { competencyGroupId }
             );
             if (usedElsewhere == 0)
             {
-                usedElsewhere = connection.QuerySingle<int>(
                 usedElsewhere = connection.QuerySingle<int>(
                     @"SELECT COUNT(*) FROM SelfAssessmentStructure
                     WHERE CompetencyGroupId = @competencyGroupId",
@@ -1240,7 +1196,6 @@ public void DeleteFrameworkCompetencyGroup(int frameworkCompetencyGroupId, int c
 
         public void DeleteFrameworkCompetency(int frameworkCompetencyId, int adminId)
         {
-            var competencyId = connection.QuerySingle<int>(
             var competencyId = connection.QuerySingle<int>(
                 @"SELECT CompetencyID FROM FrameworkCompetencies WHERE ID = @frameworkCompetencyId",
                 new { frameworkCompetencyId }
@@ -1272,15 +1227,13 @@ public void DeleteFrameworkCompetency(int frameworkCompetencyId, int adminId)
             }
 
             //Check if used elsewhere and delete competency group if not:
-            var usedElsewhere = connection.QuerySingle<int>(
             var usedElsewhere = connection.QuerySingle<int>(
                 @"SELECT COUNT(*) FROM FrameworkCompetencies
                     WHERE CompetencyID = @competencyId",
                 new { competencyId }
             );
             if (usedElsewhere == 0)
             {
-                usedElsewhere = connection.QuerySingle<int>(
                 usedElsewhere = connection.QuerySingle<int>(
                     @"SELECT COUNT(*) FROM SelfAssessmentStructure
                     WHERE CompetencyID = @competencyId",
@@ -2221,15 +2174,15 @@ public void ArchiveReviewRequest(int reviewId)
                  FROM    FrameworkCollaborators
                  WHERE (FrameworkID = FW.ID) AND (IsDeleted=0)))) AS MyFrameworksCount,
 
-                 (SELECT COUNT(*) FROM SelfAssessments) AS CompetencyAssessmentCount,
+                 (SELECT COUNT(*) FROM SelfAssessments) AS RoleProfileCount,
 
                  (SELECT COUNT(*) FROM SelfAssessments AS RP LEFT OUTER JOIN
              SelfAssessmentCollaborators AS RPC ON RPC.SelfAssessmentID = RP.ID AND RPC.AdminID = @adminId
 WHERE (RP.CreatedByAdminID = @adminId) OR
              (@adminId IN
                  (SELECT AdminID
                  FROM    SelfAssessmentCollaborators
-                 WHERE (SelfAssessmentID = RP.ID)))) AS MyCompetencyAssessmentCount",
+                 WHERE (SelfAssessmentID = RP.ID)))) AS MyRoleProfileCount",
                 new { adminId }
             ).FirstOrDefault();
         }
@@ -2239,7 +2192,7 @@ public IEnumerable<DashboardToDoItem> GetDashboardToDoItems(int adminId)
             return connection.Query<DashboardToDoItem>(
                 @"SELECT
                         FW.ID AS FrameworkID,
-                        0 AS CompetencyAssessmentID,
+                        0 AS RoleProfileID,
                         FW.FrameworkName AS ItemName,
                         AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName,
                         FWR.SignOffRequired,
diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs
@@ -200,7 +200,7 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
         public IActionResult AddQuestionsToWhichCompetencies()
         {
             var data = GetBulkUploadData();
-            if (data.DefaultQuestionIDs.Count ==0 && data.CustomAssessmentQuestionID == null)
+            if (data.DefaultQuestionIDs.Count == 0 && data.CustomAssessmentQuestionID == null)
             {
                 return RedirectToAction("ImportSummary", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });
             }
@@ -245,9 +245,23 @@ 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()
         {
diff --git a/DigitalLearningSolutions.Web/Services/FrameworkService.cs b/DigitalLearningSolutions.Web/Services/FrameworkService.cs
@@ -119,14 +119,12 @@ 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);
@@ -675,7 +673,7 @@ public int UpdateCompetencyFlags(int frameworkId, int competencyId, int[] select
         }
 
         public void UpdateFrameworkCompetency(int frameworkCompetencyId, string name, string? description, int adminId, bool? alwaysShowDescription)
-        { 
+        {
             frameworkDataService.UpdateFrameworkCompetency(frameworkCompetencyId, name, description, adminId, alwaysShowDescription);
         }
 
diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs
