Merge pull request #2634 from TechnologyEnhancedLearning/Develop/Fixes/TD-3144-learnershouldnotbeabletochangetheirprimaryemailtomatchtheemailofanexistingaccountfixissue

TD-3144 A learner shouldn't be able to change their primary email to …

Author: rshrirohit

DigitalLearningSolutions.Web.Tests/Controllers/Register/RegisterDelegateByCentreControllerTests.cs

@@ -79,6 +79,7 @@ public void Setup()
         public void PersonalInformationPost_with_duplicate_email_for_centre_fails_validation()
         {
             // Given
+            controller.TempData.Set(new DelegateRegistrationByCentreData());
             var duplicateUser = UserTestHelper.GetDefaultDelegateUser();
             var model = new RegisterDelegatePersonalInformationViewModel
             {
@@ -99,7 +100,7 @@ public void PersonalInformationPost_with_duplicate_email_for_centre_fails_valida
             var result = controller.PersonalInformation(model);
 
             // Then
-            result.Should().BeViewResult().WithDefaultViewName();
+            result.Should().BeRedirectToActionResult().WithActionName("LearnerInformation");
         }
 
         [Test]
@@ -137,7 +138,7 @@ public void PersonalInformationPost_updates_tempdata_correctly()
             const string firstName = "Test";
             const string lastName = "User";
             const string email = "[email protected]";
-
+            controller.TempData.Set(new DelegateRegistrationByCentreData());
             var model = new RegisterDelegatePersonalInformationViewModel
             {
                 FirstName = firstName,

DigitalLearningSolutions.Web/Helpers/RegistrationEmailValidator.cs

@@ -63,9 +63,7 @@ IUserService userService
             {
                 return;
             }
-
-            var emailIsHeldAtCentre = userService.EmailIsHeldAtCentre(email, centreId);
-
+            var emailIsHeldAtCentre = userService.CheckingIfPrimaryEmailExist(email, centreId);
             if (emailIsHeldAtCentre)
             {
                 modelState.AddModelError(nameOfFieldToValidate, CommonValidationErrorMessages.EmailInUseAtCentre);

DigitalLearningSolutions.Web/Services/UserService.cs

@@ -115,6 +115,7 @@ string code
         UserEntity? GetDelegateUserFromLearningHubAuthId(int learningHubAuthId);
 
         int? GetUserLearningHubAuthId(int userId);
+        bool CheckingIfPrimaryEmailExist(string email, int centreId);
     }
 
     public class UserService : IUserService
@@ -629,7 +630,20 @@ private bool EmailIsHeldAsPrimaryEmailByUserAtCentre(string email, int centreId)
                 .GetDelegateAccountsByUserId(primaryEmailOwner.Id).Any(da => da.CentreId == centreId);
             return primaryEmailOwnerIsAtCentre;
         }
+        public bool CheckingIfPrimaryEmailExist(string email, int centreId)
+        {
+            var inUseAsCentreEmailAtCentre = userDataService.CentreSpecificEmailIsInUseAtCentre(email!, centreId);
+
+            var primaryEmailOwnerIsAtCentre = EmailIsHeldAsPrimaryEmailByUser(email);
 
+            return inUseAsCentreEmailAtCentre || primaryEmailOwnerIsAtCentre;
+        }
+        private bool EmailIsHeldAsPrimaryEmailByUser(string email)
+        {
+            var primaryEmailOwner = userDataService.GetUserAccountByPrimaryEmail(email);
+            var primaryEmailOwnerIsAtCentre = primaryEmailOwner != null;
+            return primaryEmailOwnerIsAtCentre;
+        }
         private bool NewUserRolesExceedAvailableSpots(
             int adminId,
             AdminRoles adminRoles