From 451b5db98389d3a429a1ca1e60ad8294f51ab3b4 Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Fri, 14 Oct 2022 15:34:34 +0100
Subject: [PATCH] Skipped adding framework competency to the competency group
 when it is null.

---
 DigitalLearningSolutions.Data/Services/FrameworkService.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/DigitalLearningSolutions.Data/Services/FrameworkService.cs b/DigitalLearningSolutions.Data/Services/FrameworkService.cs
index 20ccda8688..c4c05a1f60 100644
--- a/DigitalLearningSolutions.Data/Services/FrameworkService.cs
+++ b/DigitalLearningSolutions.Data/Services/FrameworkService.cs
@@ -876,7 +876,8 @@ FROM   FrameworkCompetencyGroups AS fcg INNER JOIN
                     ORDER BY fcg.Ordering, fc.Ordering",
                 (frameworkCompetencyGroup, frameworkCompetency) =>
                 {
-                    frameworkCompetencyGroup.FrameworkCompetencies.Add(frameworkCompetency);
+                    if (frameworkCompetency != null)
+                        frameworkCompetencyGroup.FrameworkCompetencies.Add(frameworkCompetency);
                     return frameworkCompetencyGroup;
                 },
                 new { frameworkId }
@@ -885,7 +886,8 @@ FROM   FrameworkCompetencyGroups AS fcg INNER JOIN
                 group =>
                 {
                     var groupedFrameworkCompetencyGroup = group.First();
-                    groupedFrameworkCompetencyGroup.FrameworkCompetencies = group.Select(
+                    groupedFrameworkCompetencyGroup.FrameworkCompetencies = group.Where(frameworkCompetencyGroup => frameworkCompetencyGroup.FrameworkCompetencies.Count > 0)
+                    .Select(
                         frameworkCompetencyGroup => frameworkCompetencyGroup.FrameworkCompetencies.Single()
                     ).ToList();
                     return groupedFrameworkCompetencyGroup;