Merge pull request #2439 from TechnologyEnhancedLearning/Develop/fix/TD-3313-Issue-with-Delegates-count

TD-3313- Issue with 'Delegates' count showing as '0' on 'Delegates Groups' screen for the listed groups

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/GroupsDataService.cs

@@ -165,17 +165,14 @@ AND NOT EXISTS (SELECT * FROM GroupCustomisations AS GCInner
                         GroupID,
                         GroupLabel,
                         GroupDescription,
-                        (SELECT  COUNT(*) FROM ( SELECT
-							da.CentreID,
-							COALESCE(ucd.Email, u.PrimaryEmail) AS EmailAddress,
-							u.JobGroupId
-								FROM DelegateAccounts AS da WITH (NOLOCK)
-						INNER JOIN Centres AS c WITH (NOLOCK) ON c.CentreID = da.CentreID
-						INNER JOIN Users AS u WITH (NOLOCK) ON u.ID = da.UserID
-						LEFT JOIN UserCentreDetails AS ucd WITH (NOLOCK) ON ucd.UserID = da.UserID AND ucd.CentreID = da.CentreID
-						INNER JOIN JobGroups AS jg WITH (NOLOCK) ON jg.JobGroupID = u.JobGroupID  where c.CentreID = @centreId
-						AND u.JobGroupID = (select JobGroupID from JobGroups where JobGroupName = GroupLabel))  D  Where 
-						EmailAddress LIKE '%_@_%.__%') AS DelegateCount,
+                        (SELECT COUNT(*) 
+                            FROM GroupDelegates AS gd WITH (NOLOCK)
+                            JOIN DelegateAccounts AS da WITH (NOLOCK) ON da.ID = gd.DelegateID
+                            JOIN Users AS u WITH (NOLOCK) ON u.ID = da.UserID
+                            LEFT JOIN UserCentreDetails AS ucd WITH (NOLOCK) ON ucd.UserID = u.ID AND ucd.CentreID = da.CentreID
+                            WHERE gd.GroupID = g.GroupID
+                                AND (u.PrimaryEmail like '%_@_%.__%' OR ucd.Email is NOT NULL)
+                                AND da.Approved = 1 AND da.Active = 1) AS DelegateCount,
                         ({CourseCountSql}) AS CoursesCount,
                         g.CreatedByAdminUserID AS AddedByAdminId,
                         au.Forename AS AddedByFirstName,
@@ -320,7 +317,9 @@ FROM GroupDelegates AS gd
                     JOIN DelegateAccounts AS da ON da.ID = gd.DelegateID
                     JOIN Users AS u ON u.ID = da.UserID
                     LEFT JOIN UserCentreDetails AS ucd ON ucd.UserID = u.ID AND ucd.CentreID = da.CentreID
-                    WHERE gd.GroupID = @groupId",
+                    WHERE gd.GroupID = @groupId
+                        AND (u.PrimaryEmail like '%_@_%.__%' OR ucd.Email is NOT NULL)
+                        AND da.Approved = 1 AND da.Active = 1",
                 new { groupId }
             );
         }

DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs

@@ -347,6 +347,7 @@ public List<DelegateUserCard> GetDelegatesNotRegisteredForGroupByGroupId(int gro
                         WHERE da.CentreId = @centreId
                         AND da.Approved = 1
                         AND da.Active = 1
+                        AND (u.PrimaryEmail like '%_@_%.__%' OR ucd.Email IS NOT NULL)
                         AND NOT EXISTS (SELECT DelegateID FROM GroupDelegates WHERE DelegateID = da.ID
                                         AND GroupID = @groupId)",
                 new

DigitalLearningSolutions.Web/Services/GroupsService.cs

@@ -524,7 +524,7 @@ public IEnumerable<GroupDelegateAdmin> GetAdminsForCentreGroups(int? centreId =
 
         public IEnumerable<GroupDelegate> GetGroupDelegates(int groupId)
         {
-            return groupsDataService.GetGroupDelegates(groupId).Where(gd => gd.CentreEmail != null || !Guid.TryParse(gd.PrimaryEmail, out _));
+            return groupsDataService.GetGroupDelegates(groupId);
         }
 
         public IEnumerable<GroupCourse> GetUsableGroupCoursesForCentre(int groupId, int centreId)