TD-6134: My account personal details page issues

LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs

@@ -210,6 +210,37 @@ public async Task<IActionResult> UpdatePersonalDetails(MyAccountPersonalDetailsV
                 return this.View("ChangePersonalDetails", model);
             }
 
+            if (model.PrimaryEmailAddress.ToLower() == model.SecondaryEmailAddress?.ToLower())
+            {
+                this.ModelState.AddModelError(nameof(model.SecondaryEmailAddress), CommonValidationErrorMessages.SecondaryEmailShouldNotBeSame);
+                return this.View("ChangePersonalDetails", model);
+            }
+
+            bool userPrimaryEmailAddressChanged = false;
+            var user = await this.userService.GetUserByUserIdAsync(this.CurrentUserId);
+            if (user != null)
+            {
+                if (!string.IsNullOrEmpty(model.PrimaryEmailAddress) && user.EmailAddress.ToLower() != model.PrimaryEmailAddress.ToLower())
+                {
+                    userPrimaryEmailAddressChanged = true;
+                }
+            }
+
+            if (userPrimaryEmailAddressChanged)
+            {
+                if (await this.userService.DoesEmailAlreadyExist(model.PrimaryEmailAddress))
+                {
+                    this.ModelState.AddModelError(
+                               nameof(model.PrimaryEmailAddress),
+                               CommonValidationErrorMessages.DuplicateEmailAddress);
+                    return this.View("ChangePersonalDetails", model);
+                }
+                else
+                {
+                    await this.MyAccountUpdatePrimaryEmail(user.EmailAddress, model.PrimaryEmailAddress);
+                }
+            }
+
             bool isSamePrimaryEmailPendingforValidate = await this.userService.CheckSamePrimaryemailIsPendingToValidate(model.SecondaryEmailAddress);
             if (isSamePrimaryEmailPendingforValidate)
             {
@@ -218,7 +249,6 @@ public async Task<IActionResult> UpdatePersonalDetails(MyAccountPersonalDetailsV
             }
 
             await this.userService.UpdateMyAccountPersonalDetailsAsync(this.CurrentUserId, model);
-            await this.MyAccountUpdatePrimaryEmail(model.PrimaryEmailAddress);
             this.ViewBag.SuccessMessage = CommonValidationErrorMessages.PersonalDetailsSuccessMessage;
             this.ViewBag.MyAction = "Index";
             return this.View("SuccessMessageMyAccount");
@@ -1507,48 +1537,26 @@ public async Task<ActionResult> CancelEmailChangeValidationToken()
             return this.View("SuccessMessage");
         }
 
-        private async Task MyAccountUpdatePrimaryEmail(string primaryEmailAddress)
+        private async Task MyAccountUpdatePrimaryEmail(string currentEmailAddress, string primaryEmailAddress)
         {
-            bool userPrimaryEmailAddressChanged = false;
-            var user = await this.userService.GetUserByUserIdAsync(this.CurrentUserId);
-            if (user != null)
+            var isUserRoleUpgrade = await this.userService.ValidateUserRoleUpgradeAsync(currentEmailAddress, primaryEmailAddress);
+            UserRoleUpgrade userRoleUpgradeModel = new UserRoleUpgrade()
             {
-                if (!string.IsNullOrEmpty(primaryEmailAddress) && user.EmailAddress.ToLower() != primaryEmailAddress.ToLower())
-                {
-                    userPrimaryEmailAddressChanged = true;
-                }
+                UserId = this.CurrentUserId,
+                EmailAddress = primaryEmailAddress,
+            };
+            if (isUserRoleUpgrade)
+            {
+                userRoleUpgradeModel.UserHistoryTypeId = (int)UserHistoryType.UserRoleUpgarde;
             }
-
-            if (userPrimaryEmailAddressChanged)
+            else
             {
-                if (await this.userService.DoesEmailAlreadyExist(primaryEmailAddress))
-                {
-                    this.ModelState.AddModelError(
-                               nameof(primaryEmailAddress),
-                               CommonValidationErrorMessages.DuplicateEmailAddress);
-                }
-                else
-                {
-                    var isUserRoleUpgrade = await this.userService.ValidateUserRoleUpgradeAsync(user.EmailAddress, primaryEmailAddress);
-                    UserRoleUpgrade userRoleUpgradeModel = new UserRoleUpgrade()
-                    {
-                        UserId = this.CurrentUserId,
-                        EmailAddress = primaryEmailAddress,
-                    };
-                    if (isUserRoleUpgrade)
-                    {
-                        userRoleUpgradeModel.UserHistoryTypeId = (int)UserHistoryType.UserRoleUpgarde;
-                    }
-                    else
-                    {
-                        userRoleUpgradeModel.UserHistoryTypeId = (int)UserHistoryType.UserDetails;
-                    }
-
-                    await this.userService.GenerateEmailChangeValidationTokenAndSendEmailAsync(primaryEmailAddress, isUserRoleUpgrade);
-                    await this.userService.UpdateUserRoleUpgradeAsync();
-                    await this.userService.CreateUserRoleUpgradeAsync(userRoleUpgradeModel);
-                }
+                userRoleUpgradeModel.UserHistoryTypeId = (int)UserHistoryType.UserDetails;
             }
+
+            await this.userService.GenerateEmailChangeValidationTokenAndSendEmailAsync(primaryEmailAddress, isUserRoleUpgrade);
+            await this.userService.UpdateUserRoleUpgradeAsync();
+            await this.userService.CreateUserRoleUpgradeAsync(userRoleUpgradeModel);
         }
     }
 }

LearningHub.Nhs.WebUI/Models/UserProfile/MyAccountPersonalDetailsViewModel.cs

@@ -66,7 +66,6 @@ public class MyAccountPersonalDetailsViewModel
         /// Gets or sets the SecondaryEmailAddress.
         /// </summary>
         [DataType(DataType.EmailAddress)]
-        [NotEqual("PrimaryEmailAddress", ErrorMessage = CommonValidationErrorMessages.SecondaryEmailShouldNotBeSame)]
         [MaxLength(100, ErrorMessage = CommonValidationErrorMessages.TooLongEmail)]
         [EmailAddress(ErrorMessage = CommonValidationErrorMessages.InvalidEmail)]
         [NoWhitespace(ErrorMessage = CommonValidationErrorMessages.WhitespaceInEmail)]

LearningHub.Nhs.WebUI/Services/UserService.cs

@@ -1942,9 +1942,9 @@ public async Task UpdateMyAccountPersonalDetailsAsync(int userId, MyAccountPerso
             PersonalDetailsViewModel personalDetailsViewModel = new PersonalDetailsViewModel
             {
                 UserId = userId,
-                FirstName = model.FirstName,
-                LastName = model.LastName,
-                PreferredName = model.PreferredName,
+                FirstName = model.FirstName.Trim(),
+                LastName = model.LastName.Trim(),
+                PreferredName = model.PreferredName?.Trim(),
                 SecondaryEmailAddress = model.SecondaryEmailAddress,
             };
 

LearningHub.Nhs.WebUI/Views/MyAccount/ChangePersonalDetails.cshtml

@@ -56,7 +56,7 @@
 
           <div>
                             <vc:text-input asp-for="PrimaryEmailAddress"
-                                           label="Primary email address"
+                                           label="Work email"
                                            populate-with-current-value="true"
                                            type="text"
                                            spell-check="false"
@@ -68,7 +68,7 @@
 
                     <div>
                         <vc:text-input asp-for="SecondaryEmailAddress"
-                                       label="Secondary email address"
+                                       label="Secondary email"
                                        populate-with-current-value="true"
                                        type="text"
                                        spell-check="false"

LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml

@@ -1,7 +1,7 @@
 @model LearningHub.Nhs.WebUI.Models.UserProfile.MyAccountPersonalDetailsViewModel
 
 @{
-    ViewData["Title"] = "Personal Details";
+    ViewData["Title"] = "Personal details";
     var isgeneralUser = User.IsInRole("BasicUser");
 }
 @section NavBreadcrumbs {
@@ -23,7 +23,7 @@
         </div>
     </section>
 }
-<div class="bg-white nhsuk-u-padding-bottom-9 nhsuk-u-padding-top-9">
+<div class="bg-white nhsuk-u-padding-bottom-7 nhsuk-u-padding-top-7">
     <div class="nhsuk-width-container app-width-container">
         <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-one-quarter">
@@ -83,7 +83,7 @@
                     </div>
                     <div class="nhsuk-summary-list__row">
                         <dt class="nhsuk-summary-list__key">
-                            Primary email address
+                            Work email
                         </dt>
                         @if (Model.NewPrimaryEmailAddress != "" && Model.NewPrimaryEmailAddress != null)
                         {
@@ -102,7 +102,7 @@
 
                     <div class="nhsuk-summary-list__row">
                         <dt class="nhsuk-summary-list__key">
-                            Secondary email address
+                            Secondary email
                         </dt>
                         <dd class="nhsuk-summary-list__value">
                             @Model.SecondaryEmailAddress

LearningHub.Nhs.WebUI/Views/MyAccount/MyAccountSecurity.cshtml

@@ -22,7 +22,7 @@
         </div>
     </section>
 }
-<div class="bg-white nhsuk-u-padding-bottom-9 nhsuk-u-padding-top-9">
+<div class="bg-white nhsuk-u-padding-bottom-7 nhsuk-u-padding-top-7">
     <div class="nhsuk-width-container app-width-container">
         <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-one-quarter">

LearningHub.Nhs.WebUI/Views/MyAccount/MyEmployment.cshtml

@@ -23,7 +23,7 @@
         </div>
     </section>
 }
-<div class="bg-white nhsuk-u-padding-bottom-9 nhsuk-u-padding-top-9">
+<div class="bg-white nhsuk-u-padding-bottom-7 nhsuk-u-padding-top-7">
     <div class="nhsuk-width-container app-width-container">
         <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-one-quarter">

LearningHub.Nhs.WebUI/Views/Notification/Index.cshtml

@@ -20,7 +20,7 @@
         </div>
     </section>
 }
-<div class="bg-white nhsuk-u-padding-bottom-9 nhsuk-u-padding-top-9">
+<div class="bg-white nhsuk-u-padding-bottom-7 nhsuk-u-padding-top-7">
 <div class="nhsuk-width-container app-width-container">
     <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-one-quarter">

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/Messaging/EmailTemplateService.cs

@@ -154,7 +154,7 @@ public EmailDetails GetEmailChangeConfirmation(SendEmailModel<EmailChangeConfirm
                 ["Content"] = emailTemplate.Body,
             });
             var model = emailModel.Model;
-            var expiraryDate = DateTime.Now.AddMinutes(model.TimeLimit);
+            var expiraryDate = DateTimeOffset.Now.AddMinutes(model.TimeLimit);
             var replacementDict = new Dictionary<string, string>
             {
                 ["UserFirstName"] = model.UserFirstName,