From c4c89b95c726cd7f8bba7fd8f7a3990051d3d807 Mon Sep 17 00:00:00 2001 From: Arunima George Date: Wed, 20 Aug 2025 16:13:09 +0100 Subject: [PATCH 1/6] TD-5761: Revised My Account screen implementation --- .../LearningHub.Nhs.Auth.Tests.csproj | 2 +- .../LearningHub.Nhs.Auth.csproj | 2 +- ...ub.Nhs.UserApi.Repository.Interface.csproj | 2 +- .../LearningHub.Nhs.UserApi.Repository.csproj | 2 +- .../ICountryService.cs | 16 ++++++++++ .../IElfhUserService.cs | 8 +++++ ...gHub.Nhs.UserAPI.Services.Interface.csproj | 2 +- ...gHub.Nhs.UserApi.Services.UnitTests.csproj | 2 +- .../CountryService.cs | 30 +++++++++++++++++++ .../ElfhUserService.cs | 20 +++++++++++++ .../LearningHub.Nhs.UserApi.Services.csproj | 2 +- .../LearningHub.Nhs.UserApi.Shared.csproj | 2 +- .../LearningHub.Nhs.UserApi.UnitTests.csproj | 2 +- .../Controllers/CountryController.cs | 28 +++++++++++++++++ .../Controllers/ElfhUserController.cs | 13 ++++++++ .../LearningHub.Nhs.UserApi.csproj | 2 +- 16 files changed, 125 insertions(+), 10 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj b/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj index ec6d6ad..d5df667 100644 --- 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 @@ - + diff --git a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj index 2933aee..d2cf97a 100644 --- a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj +++ b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj @@ -101,7 +101,7 @@ - + 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 index 29a3a90..90e9ad6 100644 --- 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 @@ - + all diff --git a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj index 5921669..4abd4a0 100644 --- a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj +++ b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj @@ -8,7 +8,7 @@ - + diff --git a/LearningHub.Nhs.UserApi.Services.Interface/ICountryService.cs b/LearningHub.Nhs.UserApi.Services.Interface/ICountryService.cs index 8b950f7..9da2394 100644 --- a/LearningHub.Nhs.UserApi.Services.Interface/ICountryService.cs +++ b/LearningHub.Nhs.UserApi.Services.Interface/ICountryService.cs @@ -39,5 +39,21 @@ public interface ICountryService /// The . /// Task> GetFilteredAsync(string filter); + + /// + /// The get all. + /// + /// + /// The . + /// + Task> GetAllUKCountries(); + + /// + /// The get all. + /// + /// + /// The . + /// + Task> GetAllNonUKCountries(); } } \ No newline at end of file diff --git a/LearningHub.Nhs.UserApi.Services.Interface/IElfhUserService.cs b/LearningHub.Nhs.UserApi.Services.Interface/IElfhUserService.cs index 9f77a64..ae510eb 100644 --- a/LearningHub.Nhs.UserApi.Services.Interface/IElfhUserService.cs +++ b/LearningHub.Nhs.UserApi.Services.Interface/IElfhUserService.cs @@ -520,5 +520,13 @@ public interface IElfhUserService /// currentUserId. /// The . Task CheckSamePrimaryemailIsPendingToValidate(string secondaryEmail, int currentUserId); + + /// + /// Update MyAccount Personal Details. + /// + /// personalDetailsViewModel. + /// currentUserId. + /// The . + Task UpdateMyAccountPersonalDetails(PersonalDetailsViewModel personalDetailsViewModel, int currentUserId); } } \ No newline at end of file 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 index 29a3a90..90e9ad6 100644 --- 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 @@ - + all 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 index a61a661..a090e17 100644 --- 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 @@ - + diff --git a/LearningHub.Nhs.UserApi.Services/CountryService.cs b/LearningHub.Nhs.UserApi.Services/CountryService.cs index 5e2eb60..27d290b 100644 --- a/LearningHub.Nhs.UserApi.Services/CountryService.cs +++ b/LearningHub.Nhs.UserApi.Services/CountryService.cs @@ -79,5 +79,35 @@ public async Task> GetFilteredAsync(string filter) return countryList; } + + /// + /// Get All UK Countries. + /// + /// List of countries. + public async Task> GetAllUKCountries() + { + var items = this.countryRepository.GetAll() + .Where(c => c.Deleted == false && c.Numeric == "826") + .OrderBy(r => r.DisplayOrder); + + var countryList = await this.mapper.ProjectTo(items).ToListWithNoLockAsync(); + + return countryList; + } + + /// + /// Get All Non UK Countries. + /// + /// List of countries. + public async Task> GetAllNonUKCountries() + { + var items = this.countryRepository.GetAll() + .Where(c => c.Deleted == false && c.Numeric != "826") + .OrderBy(r => r.DisplayOrder); + + var countryList = await this.mapper.ProjectTo(items).ToListWithNoLockAsync(); + + return countryList; + } } } diff --git a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs index 1e42f93..624c545 100644 --- a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs +++ b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs @@ -968,6 +968,26 @@ public async Task CheckSamePrimaryemailIsPendingToValidate(string secondar return false; } + /// + /// Update MyAccount PersonalDetails. + /// + /// personalDetailsViewModel. + /// currentUserId. + /// The . + public async Task UpdateMyAccountPersonalDetails(PersonalDetailsViewModel personalDetailsViewModel, int currentUserId) + { + User user = await this.elfhUserRepository.GetByIdAsync(personalDetailsViewModel.UserId); + user.FirstName = personalDetailsViewModel.FirstName; + user.LastName = personalDetailsViewModel.LastName; + user.PreferredName = personalDetailsViewModel.PreferredName; + if (!string.IsNullOrEmpty(personalDetailsViewModel.SecondaryEmailAddress)) + { + user.AltEmailAddress = personalDetailsViewModel.SecondaryEmailAddress; + } + + await this.elfhUserRepository.UpdateAsync(currentUserId, user); + } + private async Task 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 index 670491b..ef123db 100644 --- a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj +++ b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj @@ -8,7 +8,7 @@ - + diff --git a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj index ecfe311..f5f2819 100644 --- a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj +++ b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj @@ -8,7 +8,7 @@ - + all diff --git a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj index 5c215c5..9993831 100644 --- a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj +++ b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/LearningHub.Nhs.UserApi/Controllers/CountryController.cs b/LearningHub.Nhs.UserApi/Controllers/CountryController.cs index e2430d5..8af9d92 100644 --- a/LearningHub.Nhs.UserApi/Controllers/CountryController.cs +++ b/LearningHub.Nhs.UserApi/Controllers/CountryController.cs @@ -83,5 +83,33 @@ public async Task GetFiltered(string filter) var list = await this.countryService.GetFilteredAsync(filter); return this.Ok(list); } + + /// + /// Get a list of Uk Country records. + /// + /// + /// The . + /// + [HttpGet] + [Route("GetAllUKCountries")] + public async Task GetAllUKCountries() + { + var list = await this.countryService.GetAllUKCountries(); + return this.Ok(list); + } + + /// + /// Get a list of non Uk Country records. + /// + /// + /// The . + /// + [HttpGet] + [Route("GetAllNonUKCountries")] + public async Task GetAllNonUKCountries() + { + var list = await this.countryService.GetAllNonUKCountries(); + return this.Ok(list); + } } } \ No newline at end of file diff --git a/LearningHub.Nhs.UserApi/Controllers/ElfhUserController.cs b/LearningHub.Nhs.UserApi/Controllers/ElfhUserController.cs index e2441d1..7532c80 100644 --- a/LearningHub.Nhs.UserApi/Controllers/ElfhUserController.cs +++ b/LearningHub.Nhs.UserApi/Controllers/ElfhUserController.cs @@ -923,5 +923,18 @@ public async Task UpgradeAsFullAccessUser(int userId, string emai var result = await this.securityService.UpgradeAsFullAccessUser(userId, email); return this.Ok(result); } + + /// + /// Update MyAccount Personal Details. + /// + /// personalDetailsViewModel. + /// The . + [HttpPut] + [Route("UpdateMyAccountPersonalDetails")] + public async Task UpdateMyAccountPersonalDetails([FromBody] PersonalDetailsViewModel personalDetailsViewModel) + { + await this.elfhUserService.UpdateMyAccountPersonalDetails(personalDetailsViewModel, this.CurrentUserId); + return this.Ok(); + } } } \ No newline at end of file diff --git a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj index c707f5a..89a319d 100644 --- a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj +++ b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj @@ -23,7 +23,7 @@ - + From 1e88d5c448dd862445fa4e279362964a9cc01ffe Mon Sep 17 00:00:00 2001 From: Arunima George Date: Fri, 5 Sep 2025 11:50:08 +0100 Subject: [PATCH 2/6] TD-6134: My account personal details page issues --- .../UserRoleUpgradeRepository.cs | 2 +- LearningHub.Nhs.UserApi.Services/ElfhUserService.cs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/LearningHub.Nhs.UserApi.Repository/UserRoleUpgradeRepository.cs b/LearningHub.Nhs.UserApi.Repository/UserRoleUpgradeRepository.cs index 920c996..fe5453e 100644 --- a/LearningHub.Nhs.UserApi.Repository/UserRoleUpgradeRepository.cs +++ b/LearningHub.Nhs.UserApi.Repository/UserRoleUpgradeRepository.cs @@ -37,7 +37,7 @@ public IQueryable GetByUserIdAsync(int userId) public IQueryable GetByEmailAddressAsync(string emailAddress, int userId) { return this.DbContext.Set() - .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/ElfhUserService.cs b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs index 624c545..36a3688 100644 --- a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs +++ b/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); } From a80cee648365fca4fc66289159dad7b6b3104ca5 Mon Sep 17 00:00:00 2001 From: Arunima George Date: Thu, 2 Oct 2025 10:39:56 +0100 Subject: [PATCH 3/6] TD-6133: Fixed issues on 'My Account - My employment details' screen --- .../LearningHub.Nhs.Auth.Tests.csproj | 2 +- Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj | 2 +- .../LearningHub.Nhs.UserApi.Repository.Interface.csproj | 2 +- .../LearningHub.Nhs.UserApi.Repository.csproj | 2 +- .../LearningHub.Nhs.UserAPI.Services.Interface.csproj | 2 +- .../LearningHub.Nhs.UserApi.Services.UnitTests.csproj | 2 +- .../LearningHub.Nhs.UserApi.Services.csproj | 2 +- .../LearningHub.Nhs.UserApi.Shared.csproj | 2 +- .../LearningHub.Nhs.UserApi.UnitTests.csproj | 2 +- LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj b/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj index d5df667..537152f 100644 --- 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 @@ - + diff --git a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj index d2cf97a..b8d40b6 100644 --- a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj +++ b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj @@ -101,7 +101,7 @@ - + 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 index 90e9ad6..c27c9a8 100644 --- 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 @@ - + all diff --git a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj index 4abd4a0..141c1ef 100644 --- a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj +++ b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj @@ -8,7 +8,7 @@ - + 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 index 90e9ad6..c27c9a8 100644 --- 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 @@ - + all 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 index a090e17..fffc2eb 100644 --- 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 @@ - + diff --git a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj index ef123db..4fae482 100644 --- a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj +++ b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj @@ -8,7 +8,7 @@ - + diff --git a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj index f5f2819..6de208c 100644 --- a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj +++ b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj @@ -8,7 +8,7 @@ - + all diff --git a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj index 9993831..e23f0cd 100644 --- a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj +++ b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj index 89a319d..d264eed 100644 --- a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj +++ b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj @@ -23,7 +23,7 @@ - + From edf20930b8d3b1841bca9a044f3eeba6f115d579 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Mon, 6 Oct 2025 12:38:29 +0100 Subject: [PATCH 4/6] fixes --- .../LearningHub.Nhs.Auth.Tests.csproj | 2 +- Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj | 2 +- .../LearningHub.Nhs.UserApi.Repository.Interface.csproj | 2 +- .../LearningHub.Nhs.UserApi.Repository.csproj | 2 +- .../LearningHub.Nhs.UserAPI.Services.Interface.csproj | 2 +- .../LearningHub.Nhs.UserApi.Services.UnitTests.csproj | 2 +- .../LearningHub.Nhs.UserApi.Services.csproj | 2 +- .../LearningHub.Nhs.UserApi.Shared.csproj | 2 +- .../LearningHub.Nhs.UserApi.UnitTests.csproj | 2 +- LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj b/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj index 537152f..ee12d1f 100644 --- 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 @@ - + diff --git a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj index b8d40b6..cd3df81 100644 --- a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj +++ b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj @@ -101,7 +101,7 @@ - + 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 index c27c9a8..41c2944 100644 --- 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 @@ - + all diff --git a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj index 141c1ef..27ea6ec 100644 --- a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj +++ b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj @@ -8,7 +8,7 @@ - + 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 index c27c9a8..41c2944 100644 --- 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 @@ - + all 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 index fffc2eb..0aab24b 100644 --- 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 @@ - + diff --git a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj index 4fae482..c2d2db3 100644 --- a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj +++ b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj @@ -8,7 +8,7 @@ - + diff --git a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj index 6de208c..d4654b4 100644 --- a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj +++ b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj @@ -8,7 +8,7 @@ - + all diff --git a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj index e23f0cd..38cdec7 100644 --- a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj +++ b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj index d264eed..bba58e4 100644 --- a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj +++ b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj @@ -23,7 +23,7 @@ - + From c167cf19d69343b63dbfc4af909c947313a2ffba Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:10:54 +0100 Subject: [PATCH 5/6] TD-6335 --- LearningHub.Nhs.UserApi.Services/ElfhUserService.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs index 36a3688..361aa0d 100644 --- a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs +++ b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs @@ -237,7 +237,7 @@ public async Task RecordSuccessfulSigninAsync(int id, CancellationToken token = await this.elfhUserRepository.UpdateAsync(id, user); - await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token); + // await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token); } /// @@ -250,7 +250,7 @@ public async Task RecordUnsuccessfulSigninAsync(int id, CancellationToken token await this.elfhUserRepository.UpdateAsync(id, user); - await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token); + // await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token); } /// @@ -977,8 +977,6 @@ public async Task CheckSamePrimaryemailIsPendingToValidate(string secondar public async Task UpdateMyAccountPersonalDetails(PersonalDetailsViewModel personalDetailsViewModel, int currentUserId) { User user = await this.elfhUserRepository.GetByIdAsync(personalDetailsViewModel.UserId); - user.FirstName = personalDetailsViewModel.FirstName; - user.LastName = personalDetailsViewModel.LastName; user.PreferredName = personalDetailsViewModel.PreferredName; user.AltEmailAddress = personalDetailsViewModel.SecondaryEmailAddress; From dddfb6eed1e56f6d5106171925c69eb13fb6104b Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:15:37 +0100 Subject: [PATCH 6/6] TD-6335 --- LearningHub.Nhs.UserApi.Services/ElfhUserService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs index 361aa0d..37c40b7 100644 --- a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs +++ b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs @@ -237,7 +237,7 @@ public async Task RecordSuccessfulSigninAsync(int id, CancellationToken token = await this.elfhUserRepository.UpdateAsync(id, user); - // await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token); + await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token); } /// @@ -250,7 +250,7 @@ public async Task RecordUnsuccessfulSigninAsync(int id, CancellationToken token await this.elfhUserRepository.UpdateAsync(id, user); - // await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token); + await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token); } ///