Merge branch 'DLS-Release-v1.2.0' into UAT

rshrirohit · rshrirohit · commit da29b9aaa7b2 · 2025-04-17T10:51:50.000+01:00
diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs
@@ -41,7 +41,7 @@ public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook
                 .Select(row => row.Name)
                 .Distinct()
                 .ToList();
-            var newGroups = competencyRows.Select(row => row.CompetencyGroup ?? "").ToList();
+            var newGroups = competencyRows.Select(row => row.CompetencyGroup ?? "").Distinct().ToList();
             foreach (var competencyRow in competencyRows)
             {
                 PreProcessCompetencyRow(competencyRow, newCompetencyIds, existingIds, existingGroups, newGroups);

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook`
`41`	`41`	`.Select(row => row.Name)`
`42`	`42`	`.Distinct()`
`43`	`43`	`.ToList();`
`44`		`- var newGroups = competencyRows.Select(row => row.CompetencyGroup ?? "").ToList();`
	`44`	`+ var newGroups = competencyRows.Select(row => row.CompetencyGroup ?? "").Distinct().ToList();`
`45`	`45`	`foreach (var competencyRow in competencyRows)`
`46`	`46`	`{`
`47`	`47`	`PreProcessCompetencyRow(competencyRow, newCompetencyIds, existingIds, existingGroups, newGroups);`