TD-5761: Latest changes.

Author: ArunimaGeorge

LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Drawing;
     using System.Linq;
     using System.Net.Http;
     using System.Threading.Tasks;
@@ -20,11 +21,14 @@
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Routing;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
+    using Newtonsoft.Json.Linq;
     using NHSUKViewComponents.Web.ViewModels;
+    using static IdentityModel.ClaimComparer;
     using ChangePasswordViewModel = LearningHub.Nhs.WebUI.Models.UserProfile.ChangePasswordViewModel;
     using IConfiguration = Microsoft.Extensions.Configuration.IConfiguration;
 
@@ -197,25 +201,66 @@ public async Task<IActionResult> UpdatePersonalDetails(MyAccountPersonalDetailsV
         /// <summary>
         /// ChangeLocation.
         /// </summary>
-        /// <param name="selectedCountryId">country id.</param>
         /// <returns>ActionResult.</returns>
         [HttpGet]
         [Route("myaccount/ChangeLocation")]
-        public async Task<IActionResult> ChangeLocation(int? selectedCountryId)
+        public async Task<IActionResult> ChangeLocation()
         {
             this.TempData.Clear();
-            var userLocationViewModel = await this.userService.GetUserLocationDetailsAsync();
-            var userProfileSummary = await this.userService.GetUserProfileSummaryAsync();
-            if (selectedCountryId.HasValue)
+            var userLocationViewModel = await this.userService.GetMyAccountLocationDetailsAsync();
+            var allUKcountries = await this.countryService.GetAllUKCountries();
+            var allUKnoncountries = await this.countryService.GetAllNonUKCountries();
+            var regions = await this.regionService.GetAllAsync();
+
+            List<RadiosItemViewModel> radio = new List<RadiosItemViewModel>();
+            foreach (var country in allUKcountries)
             {
-                userLocationViewModel.SelectedCountryId = selectedCountryId;
+                var newradio = new RadiosItemViewModel(country.Id.ToString(), country.Name, false, country.Name);
+                radio.Add(newradio);
             }
 
-            await this.multiPageFormService.SetMultiPageFormData(
-                userLocationViewModel,
-                MultiPageFormDataFeature.AddRegistrationPrompt,
-                this.TempData);
-            return this.View("ChangeLocation", new Tuple<UserProfileSummaryViewModel, UserLocationViewModel>(userProfileSummary, userLocationViewModel));
+            if (allUKnoncountries.Any(v => v.Id == userLocationViewModel.SelectedCountryId))
+            {
+                ////userLocationViewModel.SelectedOtherCountry = true;
+                userLocationViewModel.SelectedOtherCountryId = userLocationViewModel.SelectedCountryId;
+                userLocationViewModel.SelectedCountryId = 0;
+            }
+
+            userLocationViewModel.Country = radio;
+            userLocationViewModel.OtherCountryOptions = SelectListHelper.MapOptionsToSelectListItems(allUKnoncountries, userLocationViewModel.SelectedOtherCountryId);
+
+            userLocationViewModel.RegionOptions = SelectListHelper.MapOptionsToSelectListItems(regions, userLocationViewModel.SelectedRegionId);
+            return this.View("MyAccountChangeLocation", userLocationViewModel);
+        }
+
+        /// <summary>
+        /// To update location details.
+        /// </summary>
+        /// <param name="model">model.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        public async Task<IActionResult> UpdateMyAccountLocationDetails(MyAccountLocationViewModel model)
+        {
+            if (this.ModelState.IsValid)
+            {
+                if (model?.SelectedCountryId == 0)
+                {
+                    model.SelectedCountryId = model.SelectedOtherCountryId;
+                }
+
+                if (model.SelectedCountryId != 1)
+                {
+                    model.SelectedRegionId = null;
+                }
+
+                await this.userService.UpdateMyAccountLocationDetailsAsync(this.CurrentUserId, model);
+                this.ViewBag.SuccessMessage = CommonValidationErrorMessages.CountrySuccessMessage;
+                return this.View("SuccessMessage");
+            }
+            else
+            {
+                return this.View("MyAccountChangeLocation", model);
+            }
         }
 
         /// <summary>

LearningHub.Nhs.WebUI/Helpers/SelectListHelper.cs

@@ -0,0 +1,24 @@
+namespace LearningHub.Nhs.WebUI.Helpers
+{
+    using System.Collections.Generic;
+    using System.Linq;
+    using elfhHub.Nhs.Models.Common;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+
+    /// <summary>
+    /// SelectListHelper.
+    /// </summary>
+    public static class SelectListHelper
+    {
+        /// <summary>
+        /// MapOptionsToSelectListItems.
+        /// </summary>
+        /// <param name="options">options.</param>
+        /// <param name="selectedId">selectedId.</param>
+        /// <returns>SelectListItem.</returns>
+        public static IEnumerable<SelectListItem> MapOptionsToSelectListItems(IEnumerable<GenericListViewModel> options, int? selectedId = null)
+        {
+            return options.Select(o => new SelectListItem(o.Name, o.Id.ToString(), o.Id == selectedId)).ToList();
+        }
+    }
+}

LearningHub.Nhs.WebUI/Interfaces/ICountryService.cs

@@ -29,5 +29,17 @@ public interface ICountryService
         /// </summary>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
         Task<List<Country>> GetAllAsync();
+
+        /// <summary>
+        /// The GetAllUKCountries.
+        /// </summary>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<List<GenericListViewModel>> GetAllUKCountries();
+
+        /// <summary>
+        /// The GetAllNonUKCountries.
+        /// </summary>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<List<GenericListViewModel>> GetAllNonUKCountries();
     }
 }

LearningHub.Nhs.WebUI/Interfaces/IUserService.cs

@@ -504,5 +504,19 @@ public interface IUserService
         /// </summary>
         /// <returns>The <see cref="Task{MyAccountSecurityViewModel}"/>.</returns>
         Task<MyAccountSecurityViewModel> GetMyAccountSecurityDetailsAsync();
+
+        /// <summary>
+        /// Get MyAccount Location Details Async.
+        /// </summary>
+        /// <returns>The <see cref="Task{MyAccountLocationViewModel}"/>.</returns>
+        Task<MyAccountLocationViewModel> GetMyAccountLocationDetailsAsync();
+
+        /// <summary>
+        /// Update MyAccount Location Details Async.
+        /// </summary>
+        /// <param name="userId">userId.</param>
+        /// <param name="model">MyAccountLocationViewModel.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task UpdateMyAccountLocationDetailsAsync(int userId, MyAccountLocationViewModel model);
     }
 }

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

@@ -0,0 +1,66 @@
+namespace LearningHub.Nhs.WebUI.Models.UserProfile
+{
+    using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.ComponentModel.DataAnnotations;
+    using elfhHub.Nhs.Models.Common;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using NHSUKViewComponents.Web.ViewModels;
+
+    /// <summary>
+    /// Defines the <see cref="MyAccountLocationViewModel" />.
+    /// </summary>
+    public class MyAccountLocationViewModel
+    {
+        /// <summary>
+        /// Gets or sets the country id.
+        /// </summary>
+        [Required(ErrorMessage = "Select a country.")]
+        [DisplayName("Country")]
+        public int? SelectedCountryId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the region id.
+        /// </summary>
+        [Required(ErrorMessage = "Select a region.")]
+        [DisplayName("Region")]
+        public int? SelectedRegionId { get; set; }
+
+        /// <summary>
+        /// Gets or sets selected country name.
+        /// </summary>
+        public string SelectedCountryName { get; set; }
+
+        /// <summary>
+        /// Gets or sets selected region name.
+        /// </summary>
+        public string SelectedRegionName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the country id.
+        /// </summary>
+        ////[Required(ErrorMessage = "Select a country.")]
+        ////[DisplayName("Country")]
+        public int? SelectedOtherCountryId { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether SelectedOtherCountry.
+        /// </summary>
+        public bool SelectedOtherCountry { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Country.
+        /// </summary>
+        public List<RadiosItemViewModel> Country { get; set; }
+
+        /// <summary>
+        /// Gets or sets the OtherCountryOptions.
+        /// </summary>
+        public IEnumerable<SelectListItem> OtherCountryOptions { get; set; }
+
+        /// <summary>
+        /// Gets or sets the RegionOptions.
+        /// </summary>
+        public IEnumerable<SelectListItem> RegionOptions { get; set; }
+    }
+}

LearningHub.Nhs.WebUI/Services/CountryService.cs

@@ -118,5 +118,61 @@ public async Task<List<Country>> GetAllAsync()
 
             return viewmodel;
         }
+
+        /// <summary>
+        /// Get a list of Uk Country records..
+        /// </summary>
+        /// <returns>The <see cref="T:Task{List{GenericListViewModel}}"/>.</returns>
+        public async Task<List<GenericListViewModel>> GetAllUKCountries()
+        {
+            List<GenericListViewModel> viewmodel = null;
+
+            var client = await this.userApiHttpClient.GetClientAsync();
+
+            var request = $"Country/GetAllUKCountries";
+            var response = await client.GetAsync(request).ConfigureAwait(false);
+
+            if (response.IsSuccessStatusCode)
+            {
+                var result = response.Content.ReadAsStringAsync().Result;
+                viewmodel = JsonConvert.DeserializeObject<List<GenericListViewModel>>(result);
+            }
+            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
+                        ||
+                     response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            return viewmodel;
+        }
+
+        /// <summary>
+        /// Get a list of non Uk Country records.
+        /// </summary>
+        /// <returns>The <see cref="T:Task{List{GenericListViewModel}}"/>.</returns>
+        public async Task<List<GenericListViewModel>> GetAllNonUKCountries()
+        {
+            List<GenericListViewModel> viewmodel = null;
+
+            var client = await this.userApiHttpClient.GetClientAsync();
+
+            var request = $"Country/GetAllNonUKCountries";
+            var response = await client.GetAsync(request).ConfigureAwait(false);
+
+            if (response.IsSuccessStatusCode)
+            {
+                var result = response.Content.ReadAsStringAsync().Result;
+                viewmodel = JsonConvert.DeserializeObject<List<GenericListViewModel>>(result);
+            }
+            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
+                        ||
+                     response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            return viewmodel;
+        }
     }
 }

LearningHub.Nhs.WebUI/Services/UserService.cs

@@ -2029,6 +2029,41 @@ public async Task<MyAccountEmploymentDetailsViewModel> GetMyEmploymentDetailsAsy
             return viewModel;
         }
 
+        /// <summary>
+        /// GetMyAccountLocationDetailsAsync.
+        /// </summary>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<MyAccountLocationViewModel> GetMyAccountLocationDetailsAsync()
+        {
+            MyAccountLocationViewModel viewModel = null;
+
+            var personalDetailsModel = await this.GetCurrentUserPersonalDetailsAsync();
+            var employmentViewModel = await this.GetPrimaryUserEmploymentForUser(personalDetailsModel.UserId);
+
+            if (personalDetailsModel != null)
+            {
+                viewModel = new MyAccountLocationViewModel
+                {
+                    SelectedCountryId = personalDetailsModel.CountryId,
+                    SelectedRegionId = personalDetailsModel.RegionId,
+                };
+
+                if (personalDetailsModel.CountryId.HasValue)
+                {
+                    var country = await this.countryService.GetByIdAsync(personalDetailsModel.CountryId.Value);
+                    viewModel.SelectedCountryName = country.Name;
+                }
+
+                if (personalDetailsModel.RegionId.HasValue)
+                {
+                    var region = await this.regionService.GetByIdAsync(personalDetailsModel.RegionId.Value);
+                    viewModel.SelectedRegionName = region.Name;
+                }
+            }
+
+            return viewModel;
+        }
+
         /// <summary>
         /// Get MyAccount Security Details Async.
         /// </summary>
@@ -2056,5 +2091,38 @@ public async Task<MyAccountSecurityViewModel> GetMyAccountSecurityDetailsAsync()
 
             return viewModel;
         }
+
+        /// <summary>
+        /// Update MyAccount Location Details Async.
+        /// </summary>
+        /// <param name="userId">userId.</param>
+        /// <param name="model">MyAccountLocationViewModel.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task UpdateMyAccountLocationDetailsAsync(int userId, MyAccountLocationViewModel model)
+        {
+            PersonalDetailsViewModel personalDetailsViewModel = new PersonalDetailsViewModel
+            {
+                UserId = userId,
+                CountryId = model.SelectedCountryId,
+                RegionId = model.SelectedRegionId,
+            };
+
+            var json = JsonConvert.SerializeObject(personalDetailsViewModel);
+            var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
+
+            var client = await this.userApiHttpClient.GetClientAsync();
+            var request = $"ElfhUser/UpdateLocationDetails";
+            var response = await client.PutAsync(request, stringContent).ConfigureAwait(false);
+
+            if (response.StatusCode == HttpStatusCode.Unauthorized || response.StatusCode == HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            if (!response.IsSuccessStatusCode)
+            {
+                throw new Exception("Update user location details failed!");
+            }
+        }
     }
 }