Merge pull request #2749 from TechnologyEnhancedLearning/Develop/Fix/TD-4370-Accounts-appearing-DelegateActivities-export

TD-4370-Email format validation added in SQL query.

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -144,17 +144,25 @@ public class CourseDataService : ICourseDataService
         private const string DelegateCountQuery =
             @"(SELECT COUNT(pr.CandidateID)
                 FROM dbo.Progress AS pr WITH (NOLOCK)
-                INNER JOIN dbo.Candidates AS can WITH (NOLOCK) ON can.CandidateID = pr.CandidateID
+                    INNER JOIN dbo.Candidates AS can WITH (NOLOCK) ON can.CandidateID = pr.CandidateID
+                    INNER JOIN dbo.DelegateAccounts AS da WITH (NOLOCK) ON da.ID = pr.CandidateID
+				    INNER JOIN dbo.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
                 WHERE pr.CustomisationID = cu.CustomisationID
-                AND can.CentreID = @centreId
-                AND RemovedDate IS NULL) AS DelegateCount";
+                    AND can.CentreID = @centreId
+                    AND RemovedDate IS NULL
+                    AND COALESCE(ucd.Email, u.PrimaryEmail) LIKE '%_@_%.__%') AS DelegateCount";
 
         private const string CompletedCountQuery =
             @"(SELECT COUNT(pr.CandidateID)
                 FROM dbo.Progress AS pr WITH (NOLOCK) 
-                INNER JOIN dbo.Candidates AS can WITH (NOLOCK) ON can.CandidateID = pr.CandidateID
+                    INNER JOIN dbo.Candidates AS can WITH (NOLOCK) ON can.CandidateID = pr.CandidateID
+                    INNER JOIN dbo.DelegateAccounts AS da WITH (NOLOCK) ON da.ID = pr.CandidateID
+				    INNER JOIN dbo.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
                 WHERE pr.CustomisationID = cu.CustomisationID AND pr.Completed IS NOT NULL
-                AND can.CentreID = @centreId) AS CompletedCount";
+                    AND can.CentreID = @centreId
+                    AND COALESCE(ucd.Email, u.PrimaryEmail) LIKE '%_@_%.__%') AS CompletedCount";
 
         private const string AllAttemptsQuery =
             @"(SELECT COUNT(aa.AssessAttemptID)
@@ -1620,7 +1628,8 @@ FROM DelegateAccounts AS da
                     INNER JOIN dbo.Applications AS ap ON ap.ApplicationID = cu.ApplicationID
                     WHERE da.CentreID = @centreId
                         AND p.CustomisationID = @customisationId
-                        AND ap.DefaultContentTypeID <> 4",
+                        AND ap.DefaultContentTypeID <> 4
+                        AND COALESCE(ucd.Email, u.PrimaryEmail) LIKE '%_@_%.__%'",
                 new { customisationId, centreId }
             );
         }