Merge pull request #241 from TechnologyEnhancedLearning/Develop/Fixes/TD-6134-Issues-on-'My-account---Personal-details'-screen

TD-6134: My account personal details page issues

Author: AnjuJose011

LearningHub.Nhs.UserApi.Repository/UserRoleUpgradeRepository.cs

@@ -37,7 +37,7 @@ public IQueryable<UserRoleUpgrade> GetByUserIdAsync(int userId)
         public IQueryable<UserRoleUpgrade> GetByEmailAddressAsync(string emailAddress, int userId)
         {
             return this.DbContext.Set<UserRoleUpgrade>()
-                .Where(n => n.UserId == userId && n.EmailAddress == emailAddress && n.Deleted == false && n.UpgradeDate == null)
+                .Where(n => n.UserId == userId && n.EmailAddress.ToLower() == emailAddress.ToLower() && n.Deleted == false && n.UpgradeDate == null)
               .AsNoTracking();
         }
   }

LearningHub.Nhs.UserApi.Services/ElfhUserService.cs

@@ -980,10 +980,7 @@ public async Task UpdateMyAccountPersonalDetails(PersonalDetailsViewModel person
             user.FirstName = personalDetailsViewModel.FirstName;
             user.LastName = personalDetailsViewModel.LastName;
             user.PreferredName = personalDetailsViewModel.PreferredName;
-            if (!string.IsNullOrEmpty(personalDetailsViewModel.SecondaryEmailAddress))
-            {
-                user.AltEmailAddress = personalDetailsViewModel.SecondaryEmailAddress;
-            }
+            user.AltEmailAddress = personalDetailsViewModel.SecondaryEmailAddress;
 
             await this.elfhUserRepository.UpdateAsync(currentUserId, user);
         }