TD-4502 Issue not listing the delegates on 'Send welcome message' screen for whose Password is set and unclaimed

sherif-olaboye · sherif-olaboye · commit ddb931ea24d8 · 2024-08-13T10:03:37.000+01:00
diff --git a/DigitalLearningSolutions.Web/Services/UserService.cs b/DigitalLearningSolutions.Web/Services/UserService.cs
@@ -275,7 +275,7 @@ public void UpdateFailedLoginCount(UserAccount userAccount)
         public IEnumerable<DelegateUserCard> GetDelegateUserCardsForWelcomeEmail(int centreId)
         {
             return userDataService.GetDelegateUserCardsByCentreId(centreId).Where(
-                user => user.Approved && !user.SelfReg && string.IsNullOrEmpty(user.Password) &&
+                user => user.Approved && !user.SelfReg && (string.IsNullOrEmpty(user.Password) || !string.IsNullOrEmpty(user.Password)) &&
                         !string.IsNullOrEmpty(user.EmailAddress)
                         && !Guid.TryParse(user.EmailAddress, out _)
                         && user.RegistrationConfirmationHash != null

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ public void UpdateFailedLoginCount(UserAccount userAccount)`
`275`	`275`	`public IEnumerable<DelegateUserCard> GetDelegateUserCardsForWelcomeEmail(int centreId)`
`276`	`276`	`{`
`277`	`277`	`return userDataService.GetDelegateUserCardsByCentreId(centreId).Where(`
`278`		`- user => user.Approved && !user.SelfReg && string.IsNullOrEmpty(user.Password) &&`
	`278`	`+ user => user.Approved && !user.SelfReg && (string.IsNullOrEmpty(user.Password) \|\| !string.IsNullOrEmpty(user.Password)) &&`
`279`	`279`	`!string.IsNullOrEmpty(user.EmailAddress)`
`280`	`280`	`&& !Guid.TryParse(user.EmailAddress, out _)`
`281`	`281`	`&& user.RegistrationConfirmationHash != null`