From 865ca2d35fc3df605fc92dd2cefc0fedd599583f Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 1 Oct 2024 11:57:16 +0100 Subject: [PATCH] Corrects coalescing of valid emails and fixes mapping return field name to model --- .../DataServices/ActivityDataService.cs | 5 +++-- .../Models/TrackingSystem/ActivityLogDetail.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs b/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs index 12252082b4..56c0301129 100644 --- a/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs @@ -143,7 +143,7 @@ int currentRun c.CustomisationName, u.FirstName, u.LastName, - CASE WHEN COALESCE(ucd.Email, u.PrimaryEmail) LIKE '%@%' THEN COALESCE(ucd.Email, u.PrimaryEmail) ELSE '' END AS EmailAddress, + COALESCE(ucd.Email, u.PrimaryEmail) AS EmailAddress, da.CandidateNumber AS DelegateId, da.Answer1, da.Answer2, @@ -166,7 +166,8 @@ Users AS u INNER JOIN al.CustomisationID = @customisationId) AND (@courseCategoryId IS NULL OR al.CourseCategoryID = @courseCategoryId) AND (al.Registered = 1 OR al.Completed = 1 OR - al.Evaluated = 1) AND EXISTS + al.Evaluated = 1) AND + (u.PrimaryEmail like '%_@_%' OR ucd.Email IS NOT NULL) AND EXISTS (SELECT ApplicationID FROM Applications AS ap WHERE (ApplicationID = al.ApplicationID) AND (DefaultContentTypeID <> 4)) diff --git a/DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs b/DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs index b704b41ca8..8cc5771dbc 100644 --- a/DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs +++ b/DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs @@ -9,7 +9,7 @@ public class ActivityLogDetail public string? CustomisationName { get; set; } public string? FirstName { get; set; } public string? LastName { get; set; } - public string? PrimaryEmail { get; set; } + public string? EmailAddress { get; set; } public string? DelegateId { get; set; } public string? Answer1 { get; set; } public string? Answer2 { get; set; }