TD-5761: Draft commit

Author: ArunimaGeorge

AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj

@@ -83,7 +83,7 @@
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
 		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
 		<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
 		<PackageReference Include="FluentValidation" Version="11.11.0" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />

LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj

@@ -11,6 +11,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />

LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs

@@ -131,8 +131,91 @@ public async Task<IActionResult> Index(string returnUrl = null, bool? checkDetai
                 }
             }
 
+            var userPersonalDetails = await this.userService.GetMyAccountPersonalDetailsAsync();
+            ////var userProfileSummary = await this.userService.GetUserProfileSummaryAsync();
+            ////var userProfileSummary1 = await this.userService.GetCurrentUserBasicDetailsAsync();
+            return this.View("Index", userPersonalDetails);
+        }
+
+        /// <summary>
+        /// MyEmploymentDetails.
+        /// </summary>
+        /// <returns>IActionResult.</returns>
+        [HttpGet]
+        [Route("myaccount-employement")]
+        public async Task<IActionResult> MyEmploymentDetails()
+        {
+            var employmentDetails = await this.userService.GetMyEmploymentDetailsAsync();
+            return this.View("MyEmployment", employmentDetails);
+        }
+
+        /// <summary>
+        /// User profile actions.
+        /// </summary>
+        /// <param name="returnUrl">The redirect back url.</param>
+        /// <param name="checkDetails">Whether to check account details.</param>
+        /// <returns>IActionResult.</returns>
+        [HttpGet]
+        [Route("myaccount-security")]
+        public async Task<IActionResult> MyAccountSecurity(string returnUrl = null, bool? checkDetails = false)
+        {
+            var securityDetails = await this.userService.GetMyAccountSecurityDetailsAsync();
+            return this.View("MyAccountSecurity", securityDetails);
+        }
+
+        /// <summary>
+        /// ChangePersonalDetails.
+        /// </summary>
+        /// <returns>ActionResult.</returns>
+        [HttpGet]
+        [Route("myaccount/ChangePersonalDetails")]
+        public async Task<IActionResult> ChangePersonalDetails()
+        {
+            var userPersonalDetails = await this.userService.GetMyAccountPersonalDetailsAsync();
+            return this.View("ChangePersonalDetails", userPersonalDetails);
+        }
+
+        /// <summary>
+        /// To Update first name.
+        /// </summary>
+        /// <param name="model">model.</param>
+        /// <returns>ActionResult.</returns>
+        [HttpPost]
+        public async Task<IActionResult> UpdatePersonalDetails(MyAccountPersonalDetailsViewModel model)
+        {
+            if (!this.ModelState.IsValid)
+            {
+                return this.View("ChangePersonalDetails", model);
+            }
+
+            await this.userService.UpdateMyAccountPersonalDetailsAsync(this.CurrentUserId, model);
+            await this.MyAccountUpdatePrimaryEmail(model.PrimaryEmailAddress);
+            this.ViewBag.SuccessMessage = "Success";
+            return this.View("SuccessMessage");
+        }
+
+        /// <summary>
+        /// ChangeLocation.
+        /// </summary>
+        /// <param name="selectedCountryId">country id.</param>
+        /// <returns>ActionResult.</returns>
+        [HttpGet]
+        [Route("myaccount/ChangeLocation")]
+        public async Task<IActionResult> ChangeLocation(int? selectedCountryId)
+        {
+            this.TempData.Clear();
+            var userLocationViewModel = await this.userService.GetUserLocationDetailsAsync();
             var userProfileSummary = await this.userService.GetUserProfileSummaryAsync();
-            return this.View("Index", userProfileSummary);
+            if (selectedCountryId.HasValue)
+            {
+                userLocationViewModel.SelectedCountryId = selectedCountryId;
+            }
+
+            await this.multiPageFormService.SetMultiPageFormData(
+                userLocationViewModel,
+                MultiPageFormDataFeature.AddRegistrationPrompt,
+                this.TempData);
+            return this.View("ChangeLocation", new Tuple<UserProfileSummaryViewModel, UserLocationViewModel>(userProfileSummary, userLocationViewModel));
         }
 
         /// <summary>
@@ -827,8 +910,10 @@ await this.userService.UpdateUserEmployment(
                             LocationId = profile.LocationId,
                         });
 
-                    this.ViewBag.SuccessMessage = "Your job details have been changed";
-                    return this.View("SuccessMessage");
+                    ////this.ViewBag.SuccessMessage = "Your job details have been changed";
+                    ////return this.View("SuccessMessage");
+
+                    return this.RedirectToAction(nameof(this.ChangePrimarySpecialty), new UserPrimarySpecialtyUpdateViewModel { });
                 }
                 else
                 {
@@ -887,8 +972,10 @@ await this.userService.UpdateUserEmployment(
                             LocationId = profile.LocationId,
                         });
 
-                    this.ViewBag.SuccessMessage = "Your primary specialty has been changed";
-                    return this.View("SuccessMessage");
+                    ////this.ViewBag.SuccessMessage = "Your primary specialty has been changed";
+                    ////return this.View("SuccessMessage");
+
+                    return this.RedirectToAction(nameof(this.ChangeStartDate), new UserStartDateUpdateViewModel { });
                 }
                 else
                 {
@@ -940,8 +1027,10 @@ await this.userService.UpdateUserEmployment(
                             LocationId = profile.LocationId,
                         });
 
-                    this.ViewBag.SuccessMessage = "Your job start date has been changed";
-                    return this.View("SuccessMessage");
+                    ////this.ViewBag.SuccessMessage = "Your job start date has been changed";
+                    ////return this.View("SuccessMessage");
+
+                    return this.RedirectToAction(nameof(this.ChangeWorkPlace), new UserWorkPlaceUpdateViewModel { });
                 }
             }
             else
@@ -1012,7 +1101,7 @@ await this.userService.UpdateUserEmployment(
                     await this.cacheService.SetAsync(this.LoginWizardCacheKey, Newtonsoft.Json.JsonConvert.SerializeObject(loginWizardViewModel));
                 }
 
-                this.ViewBag.SuccessMessage = "Your place of work has been changed";
+                this.ViewBag.SuccessMessage = "Your employment details have been updated";
                 return this.View("SuccessMessage");
             }
 
@@ -1197,5 +1286,53 @@ public async Task<ActionResult> CancelEmailChangeValidationToken()
             this.ViewBag.SuccessMessage = CommonValidationErrorMessages.EmailCancelMessage;
             return this.View("SuccessMessage");
         }
+
+        private async Task MyAccountUpdatePrimaryEmail(string primaryEmailAddress)
+        {
+            bool userPrimaryEmailAddressChanged = false;
+            var user = await this.userService.GetUserByUserIdAsync(this.CurrentUserId);
+            if (user != null)
+            {
+                if (!string.IsNullOrEmpty(primaryEmailAddress) && user.EmailAddress.ToLower() != primaryEmailAddress.ToLower())
+                {
+                    userPrimaryEmailAddressChanged = true;
+                }
+            }
+
+            if (userPrimaryEmailAddressChanged)
+            {
+                if (await this.userService.DoesEmailAlreadyExist(primaryEmailAddress))
+                {
+                    this.ModelState.AddModelError(
+                               nameof(primaryEmailAddress),
+                               CommonValidationErrorMessages.DuplicateEmailAddress);
+                    ////return this.View("ChangePrimaryEmail", primaryEmailAddress);
+                }
+                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);
+                    ////this.ViewBag.SuccessMessage = CommonValidationErrorMessages.EmailChangeRequestedSucessMessage;
+                    ////this.ViewBag.Status = "Valid";
+                    ////return this.View("ConfirmEmailSuccessMessage");
+                }
+            }
+        }
     }
 }

LearningHub.Nhs.WebUI/Interfaces/IUserService.cs

@@ -478,5 +478,31 @@ public interface IUserService
         /// <param name="szString">the string.</param>
         /// <returns>base64 string.</returns>
         string Base64MD5HashDigest(string szString);
+
+        /// <summary>
+        /// The get current user profile for My account.
+        /// </summary>
+        /// <returns>The <see cref="Task{MyAccountPersonalDetailsViewModel}"/>.</returns>
+        Task<MyAccountPersonalDetailsViewModel> GetMyAccountPersonalDetailsAsync();
+
+        /// <summary>
+        /// Update MyAccount Personal Details Async.
+        /// </summary>
+        /// <param name="userId">userId.</param>
+        /// <param name="model">MyAccountPersonalDetailsViewModel.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task UpdateMyAccountPersonalDetailsAsync(int userId, MyAccountPersonalDetailsViewModel model);
+
+        /// <summary>
+        /// Get MyEmployment Details Async.
+        /// </summary>
+        /// <returns>The <see cref="Task{MyAccountEmploymentDetailsViewModel}"/>.</returns>
+        Task<MyAccountEmploymentDetailsViewModel> GetMyEmploymentDetailsAsync();
+
+        /// <summary>
+        /// Get MyAccount Security Details Async.
+        /// </summary>
+        /// <returns>The <see cref="Task{MyAccountSecurityViewModel}"/>.</returns>
+        Task<MyAccountSecurityViewModel> GetMyAccountSecurityDetailsAsync();
     }
 }

LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj

@@ -107,7 +107,7 @@
 		<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 		<PackageReference Include="GDS.MultiPageFormData" Version="1.0.6" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />

LearningHub.Nhs.WebUI/Models/SideMenu/SideNavigationConfiguration.cs

@@ -26,30 +26,30 @@ public static IEnumerable<SideNavigationGroup> GetGroupedMenus()
                     new SideNavigationItem
                     {
                         Text = "Personal details",
-                        Controller = "Account",
-                        Action = "PersonalDetails",
-                        IsActive = route => MatchRoute(route, "Account", "PersonalDetails"),
+                        Controller = "MyAccount",
+                        Action = "Index",
+                        IsActive = route => MatchRoute(route, "MyAccount", "PersonalDetails"),
                     },
                     new SideNavigationItem
                     {
                         Text = "My employment",
-                        Controller = "Account",
-                        Action = "MyEmployment",
-                        IsActive = route => MatchRoute(route, "Account", "MyEmployment"),
+                        Controller = "MyAccount",
+                        Action = "MyEmploymentDetails",
+                        IsActive = route => MatchRoute(route, "MyAccount", "MyEmploymentDetails"),
                     },
                     new SideNavigationItem
                     {
                         Text = "Security",
-                        Controller = "Account",
-                        Action = "Security",
-                        IsActive = route => MatchRoute(route, "Account", "Security"),
+                        Controller = "MyAccount",
+                        Action = "MyAccountSecurity",
+                        IsActive = route => MatchRoute(route, "MyAccount", "MyAccountSecurity"),
                     },
                     new SideNavigationItem
                     {
                         Text = "Notification",
-                        Controller = "Account",
-                        Action = "Notification",
-                        IsActive = route => MatchRoute(route, "Account", "Notification"),
+                        Controller = "Notification",
+                        Action = "Index",
+                        IsActive = route => MatchRoute(route, "Notification", "Index"),
                     },
                 },
             },

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

@@ -0,0 +1,95 @@
+namespace LearningHub.Nhs.WebUI.Models.UserProfile
+{
+    using System;
+
+    /// <summary>
+    /// Defines the <see cref="MyAccountEmploymentDetailsViewModel" />.
+    /// </summary>
+    public class MyAccountEmploymentDetailsViewModel
+    {
+        /// <summary>
+        /// Gets or sets the Id.
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Country.
+        /// </summary>
+        public string Country { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Region.
+        /// </summary>
+        public string Region { get; set; }
+
+        /// <summary>
+        /// Gets or sets the CountryName.
+        /// </summary>
+        public string CountryName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the RegionName.
+        /// </summary>
+        public string RegionName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user employment id.
+        /// </summary>
+        public int EmploymentId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the job role id.
+        /// </summary>
+        public int? JobRoleId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the CurrentRole.
+        /// </summary>
+        public string JobRole { get; set; }
+
+        /// <summary>
+        /// Gets or sets the medical council id.
+        /// </summary>
+        public int? MedicalCouncilId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ProfessionalRegistrationNumber.
+        /// </summary>
+        public string MedicalCouncilNo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the grade id.
+        /// </summary>
+        public int? GradeId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Grade.
+        /// </summary>
+        public string Grade { get; set; }
+
+        /// <summary>
+        /// Gets or sets the specialty id.
+        /// </summary>
+        public int? SpecialtyId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the PrimarySpecialty.
+        /// </summary>
+        public string PrimarySpecialty { get; set; }
+
+        /// <summary>
+        /// Gets or sets the StartDate.
+        /// </summary>
+        public DateTimeOffset? JobStartDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the location id.
+        /// </summary>
+        public int LocationId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the PlaceOfWork.
+        /// </summary>
+        public string PlaceOfWork { get; set; }
+    }
+}