Merge pull request #259 from TechnologyEnhancedLearning/RC

AnjuJose011 · web-flow · commit 49390dda614f · 2025-10-28T07:52:15.000Z
Merge RC Changes to master
diff --git a/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj b/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj
@@ -9,7 +9,7 @@
 
   
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.12.0" />
diff --git a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj
@@ -101,7 +101,7 @@
 		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.4.0" />
 		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.3.0" />
 		<PackageReference Include="Azure.Identity" Version="1.13.2" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentValidation" Version="11.11.0" />
 		<PackageReference Include="IdentityServer4" Version="4.1.2" />
 		<PackageReference Include="IdentityServer4.Contrib.RedisStore" Version="4.0.0" />
diff --git a/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj b/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
diff --git a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
diff --git a/LearningHub.Nhs.UserApi.Repository/UserRoleUpgradeRepository.cs b/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();
         }
   }
diff --git a/LearningHub.Nhs.UserApi.Services.Interface/ICountryService.cs b/LearningHub.Nhs.UserApi.Services.Interface/ICountryService.cs
@@ -39,5 +39,21 @@ public interface ICountryService
         /// The <see cref="Task"/>.
         /// </returns>
         Task<List<GenericListViewModel>> GetFilteredAsync(string filter);
+
+        /// <summary>
+        /// The get all.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        Task<List<GenericListViewModel>> GetAllUKCountries();
+
+        /// <summary>
+        /// The get all.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        Task<List<GenericListViewModel>> GetAllNonUKCountries();
     }
 }
diff --git a/LearningHub.Nhs.UserApi.Services.Interface/IElfhUserService.cs b/LearningHub.Nhs.UserApi.Services.Interface/IElfhUserService.cs
@@ -520,5 +520,13 @@ public interface IElfhUserService
         /// <param name="currentUserId">currentUserId.</param>
         /// <returns>The <see cref="Task"/>.</returns>
         Task<bool> CheckSamePrimaryemailIsPendingToValidate(string secondaryEmail, int currentUserId);
+
+        /// <summary>
+        /// Update MyAccount Personal Details.
+        /// </summary>
+        /// <param name="personalDetailsViewModel">personalDetailsViewModel.</param>
+        /// <param name="currentUserId">currentUserId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task UpdateMyAccountPersonalDetails(PersonalDetailsViewModel personalDetailsViewModel, int currentUserId);
   }
 }
diff --git a/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj b/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
diff --git a/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj b/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="5.0.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
diff --git a/LearningHub.Nhs.UserApi.Services/CountryService.cs b/LearningHub.Nhs.UserApi.Services/CountryService.cs
@@ -79,5 +79,35 @@ public async Task<List<GenericListViewModel>> GetFilteredAsync(string filter)
 
             return countryList;
         }
+
+        /// <summary>
+        /// Get All UK Countries.
+        /// </summary>
+        /// <returns>List of countries.</returns>
+        public async Task<List<GenericListViewModel>> GetAllUKCountries()
+        {
+            var items = this.countryRepository.GetAll()
+                .Where(c => c.Deleted == false && c.Numeric == "826")
+                .OrderBy(r => r.DisplayOrder);
+
+            var countryList = await this.mapper.ProjectTo<GenericListViewModel>(items).ToListWithNoLockAsync();
+
+            return countryList;
+        }
+
+        /// <summary>
+        /// Get All Non UK Countries.
+        /// </summary>
+        /// <returns>List of countries.</returns>
+        public async Task<List<GenericListViewModel>> GetAllNonUKCountries()
+        {
+            var items = this.countryRepository.GetAll()
+                .Where(c => c.Deleted == false && c.Numeric != "826")
+                .OrderBy(r => r.DisplayOrder);
+
+            var countryList = await this.mapper.ProjectTo<GenericListViewModel>(items).ToListWithNoLockAsync();
+
+            return countryList;
+        }
     }
 }
diff --git a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs
@@ -968,6 +968,21 @@ public async Task<bool> CheckSamePrimaryemailIsPendingToValidate(string secondar
           return false;
         }
 
+        /// <summary>
+        /// Update MyAccount PersonalDetails.
+        /// </summary>
+        /// <param name="personalDetailsViewModel">personalDetailsViewModel.</param>
+        /// <param name="currentUserId">currentUserId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task UpdateMyAccountPersonalDetails(PersonalDetailsViewModel personalDetailsViewModel, int currentUserId)
+        {
+            User user = await this.elfhUserRepository.GetByIdAsync(personalDetailsViewModel.UserId);
+            user.PreferredName = personalDetailsViewModel.PreferredName;
+            user.AltEmailAddress = personalDetailsViewModel.SecondaryEmailAddress;
+
+            await this.elfhUserRepository.UpdateAsync(currentUserId, user);
+        }
+
         private async Task<LearningHubValidationResult> ValidateAsync(CreateOpenAthensLinkToLhUser newUserDetails)
         {
             var registrationValidator = new CreateLinkedOpenAthensUserValidator();
diff --git a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.3.0" />
diff --git a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
diff --git a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
diff --git a/LearningHub.Nhs.UserApi/Controllers/CountryController.cs b/LearningHub.Nhs.UserApi/Controllers/CountryController.cs
@@ -83,5 +83,33 @@ public async Task<IActionResult> GetFiltered(string filter)
             var list = await this.countryService.GetFilteredAsync(filter);
             return this.Ok(list);
         }
+
+        /// <summary>
+        /// Get a list of Uk Country records.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        [HttpGet]
+        [Route("GetAllUKCountries")]
+        public async Task<IActionResult> GetAllUKCountries()
+        {
+            var list = await this.countryService.GetAllUKCountries();
+            return this.Ok(list);
+        }
+
+        /// <summary>
+        /// Get a list of non Uk Country records.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        [HttpGet]
+        [Route("GetAllNonUKCountries")]
+        public async Task<IActionResult> GetAllNonUKCountries()
+        {
+            var list = await this.countryService.GetAllNonUKCountries();
+            return this.Ok(list);
+        }
     }
 }
diff --git a/LearningHub.Nhs.UserApi/Controllers/ElfhUserController.cs b/LearningHub.Nhs.UserApi/Controllers/ElfhUserController.cs
@@ -923,5 +923,18 @@ public async Task<IActionResult> UpgradeAsFullAccessUser(int userId, string emai
             var result = await this.securityService.UpgradeAsFullAccessUser(userId, email);
             return this.Ok(result);
         }
+
+        /// <summary>
+        /// Update MyAccount Personal Details.
+        /// </summary>
+        /// <param name="personalDetailsViewModel">personalDetailsViewModel.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        [HttpPut]
+        [Route("UpdateMyAccountPersonalDetails")]
+        public async Task<IActionResult> UpdateMyAccountPersonalDetails([FromBody] PersonalDetailsViewModel personalDetailsViewModel)
+        {
+            await this.elfhUserService.UpdateMyAccountPersonalDetails(personalDetailsViewModel, this.CurrentUserId);
+            return this.Ok();
+        }
     }
 }
diff --git a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public IQueryable<UserRoleUpgrade> GetByUserIdAsync(int userId)`
`37`	`37`	`public IQueryable<UserRoleUpgrade> GetByEmailAddressAsync(string emailAddress, int userId)`
`38`	`38`	`{`
`39`	`39`	`return this.DbContext.Set<UserRoleUpgrade>()`
`40`		`- .Where(n => n.UserId == userId && n.EmailAddress == emailAddress && n.Deleted == false && n.UpgradeDate == null)`
	`40`	`+ .Where(n => n.UserId == userId && n.EmailAddress.ToLower() == emailAddress.ToLower() && n.Deleted == false && n.UpgradeDate == null)`
`41`	`41`	`.AsNoTracking();`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -520,5 +520,13 @@ public interface IElfhUserService`
`520`	`520`	`/// <param name="currentUserId">currentUserId.</param>`
`521`	`521`	`/// <returns>The <see cref="Task"/>.</returns>`
`522`	`522`	`Task<bool> CheckSamePrimaryemailIsPendingToValidate(string secondaryEmail, int currentUserId);`
	`523`	`+`
	`524`	`+ /// <summary>`
	`525`	`+ /// Update MyAccount Personal Details.`
	`526`	`+ /// </summary>`
	`527`	`+ /// <param name="personalDetailsViewModel">personalDetailsViewModel.</param>`
	`528`	`+ /// <param name="currentUserId">currentUserId.</param>`
	`529`	`+ /// <returns>The <see cref="Task"/>.</returns>`
	`530`	`+ Task UpdateMyAccountPersonalDetails(PersonalDetailsViewModel personalDetailsViewModel, int currentUserId);`
`523`	`531`	`}`
`524`	`532`	`}`