Merge pull request #262 from TechnologyEnhancedLearning/Develop/Feature/TD-6159-latest

AnjuJose011 · web-flow · commit cbafad303a46 · 2025-11-03T14:32:21.000Z
TD-6159-User Profile Migartion
diff --git a/LearningHub.Nhs.UserApi.Repository.Interface/LH/IUserRepository.cs b/LearningHub.Nhs.UserApi.Repository.Interface/LH/IUserRepository.cs
@@ -1,6 +1,8 @@
 ﻿namespace LearningHub.Nhs.UserApi.Repository.Interface.LH
 {
     using System.Threading.Tasks;
+    using elfhHub.Nhs.Models.Common;
+    using elfhHub.Nhs.Models.Dto;
     using LearningHub.Nhs.Models.Entities;
 
     /// <summary>
@@ -18,5 +20,38 @@ public interface IUserRepository : IGenericLHRepository<User>
         /// The <see cref="Task"/>.
         /// </returns>
         Task<User> GetByIdAsync(int id);
+
+        /// <summary>
+        /// The get user id by username async.
+        /// </summary>
+        /// <param name="username">
+        /// The username.
+        /// </param>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        Task<int> GetUserIdByUsernameAsync(string username);
+
+        /// <summary>
+        /// The get by open athens id.
+        /// </summary>
+        /// <param name="openAthensId">
+        /// The open athens id.
+        /// </param>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        Task<UserBasic> GetByOpenAthensIdAsync(string openAthensId);
+
+        /// <summary>
+        /// The get user detail for the authentication.
+        /// </summary>
+        /// <param name = "username">
+        /// username.
+        /// </param>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        Task<UserAuthenticateDto> GetUserDetailForAuthentication(string username);
     }
 }
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
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.UserApi.Repository/LH/LearningHubDbContext.cs b/LearningHub.Nhs.UserApi.Repository/LH/LearningHubDbContext.cs
@@ -1,5 +1,6 @@
 ﻿namespace LearningHub.Nhs.UserApi.Repository.LH
 {
+    using elfhHub.Nhs.Models.Dto;
     using LearningHub.Nhs.Models.Entities;
     using LearningHub.Nhs.Models.Entities.External;
     using LearningHub.Nhs.Models.Entities.Messaging;
@@ -50,6 +51,11 @@ public LearningHubDbContext(LearningHubDbContextOptions options)
         /// </summary>
         public virtual DbSet<EmailTemplate> EmailTemplate { get; set; }
 
+        /// <summary>
+        /// Gets or sets the UserAuthentiate Dto.
+        /// </summary>
+        public virtual DbSet<UserAuthenticateDto> UserAuthenticateDto { get; set; }
+
         /// <summary>
         /// The on model creating.
         /// </summary>
diff --git a/LearningHub.Nhs.UserApi.Repository/LH/UserRepository.cs b/LearningHub.Nhs.UserApi.Repository/LH/UserRepository.cs
@@ -1,9 +1,14 @@
 ﻿namespace LearningHub.Nhs.UserApi.Repository.LH
 {
+    using System.Data;
+    using System.Linq;
     using System.Threading.Tasks;
+    using elfhHub.Nhs.Models.Common;
+    using elfhHub.Nhs.Models.Dto;
     using LearningHub.Nhs.Models.Entities;
     using LearningHub.Nhs.UserApi.Repository;
     using LearningHub.Nhs.UserApi.Repository.Interface.LH;
+    using Microsoft.Data.SqlClient;
     using Microsoft.EntityFrameworkCore;
 
     /// <summary>
@@ -26,5 +31,40 @@ public async Task<User> GetByIdAsync(int id)
         {
             return await this.DbContext.User.FirstOrDefaultWithNoLockAsync(n => n.Id == id);
         }
+
+        /// <inheritdoc/>
+        public async Task<int> GetUserIdByUsernameAsync(string username)
+        {
+            return await this.DbContext.User.AsNoTracking().Where(n => n.UserName == username).Select(n => n.Id).FirstOrDefaultWithNoLockAsync();
+        }
+
+        /// <inheritdoc/>
+        public async Task<UserBasic> GetByOpenAthensIdAsync(string openAthensId)
+        {
+            var param = new SqlParameter("@OpenAthensId", openAthensId);
+
+            return await this.DbContext.Set<UserBasic>()
+                .FromSqlRaw("EXEC elfh.proc_GetUserByOpenAthensId @OpenAthensId", param)
+                .AsNoTracking()
+                .FirstOrDefaultAsync();
+        }
+
+        /// <summary>
+        /// The get user detail for the authentication.
+        /// </summary>
+        /// <param name = "username">
+        /// username.
+        /// </param>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        public async Task<UserAuthenticateDto> GetUserDetailForAuthentication(string username)
+        {
+                var param0 = new SqlParameter("@userName", SqlDbType.VarChar) { Value = username };
+
+                var userAuthenticateDto = await this.DbContext.UserAuthenticateDto.FromSqlRaw("elfh.proc_UserDetailForAuthenticationByUserName @userName", param0).AsNoTracking().ToListAsync();
+
+                return userAuthenticateDto.FirstOrDefault();
+        }
     }
 }
diff --git a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
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
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
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
@@ -13,7 +13,7 @@
     <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" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 	  <PackageReference Include="MockQueryable.Core" Version="7.0.3" />
 	  <PackageReference Include="MockQueryable.Moq" Version="5.0.0" />
diff --git a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs
@@ -158,14 +158,13 @@ public async Task<UserBasic> GetByOpenAthensIdAsync(string openAthensId)
                 return null;
             }
 
-            var user = await this.elfhUserRepository.GetByOpenAthensIdAsync(openAthensId);
+            var user = await this.lhUserRepository.GetByOpenAthensIdAsync(openAthensId);
 
-            if (user != null)
-            {
-                await this.SyncLHUserAsync(user.Id, user.UserName);
-            }
-
-            return user?.ToBasicUser();
+            // if (user != null)
+            // {
+            //    await this.SyncLHUserAsync(user.Id, user.UserName);
+            // }
+            return user;
         }
 
         /// <inheritdoc/>
@@ -181,13 +180,13 @@ public async Task<User> GetByUsernameAsync(string userName, UserIncludeCollectio
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<int> GetUserIdByUsernameAsync(string userName)
         {
-            return await this.elfhUserRepository.GetUserIdByUsernameAsync(userName);
+            return await this.lhUserRepository.GetUserIdByUsernameAsync(userName);
         }
 
         /// <inheritdoc/>
         public async Task<UserAuthenticateDto> GetUserDetailForAuthenticateAsync(string userName)
         {
-            return await this.elfhUserRepository.GetUserDetailForAuthentication(userName);
+            return await this.lhUserRepository.GetUserDetailForAuthentication(userName);
         }
 
         /// <inheritdoc/>
@@ -229,14 +228,14 @@ public async Task<string> GetUserRoleAsync(int id)
         /// <inheritdoc/>
         public async Task RecordSuccessfulSigninAsync(int id, CancellationToken token = default)
         {
-            var user = await this.elfhUserRepository.GetByIdAsync(id);
+            var user = await this.lhUserRepository.GetByIdAsync(id);
 
             if (user.PasswordLifeCounter != 0 || user.SecurityLifeCounter != 0)
             {
                 user.PasswordLifeCounter = 0;
                 user.SecurityLifeCounter = 0;
 
-                await this.elfhUserRepository.UpdateAsync(id, user);
+                await this.lhUserRepository.UpdateAsync(id, user);
 
                 await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token);
             }
@@ -245,11 +244,11 @@ public async Task RecordSuccessfulSigninAsync(int id, CancellationToken token =
         /// <inheritdoc/>
         public async Task RecordUnsuccessfulSigninAsync(int id, CancellationToken token = default)
         {
-            var user = await this.elfhUserRepository.GetByIdAsync(id);
+            var user = await this.lhUserRepository.GetByIdAsync(id);
 
             user.PasswordLifeCounter++;
 
-            await this.elfhUserRepository.UpdateAsync(id, user);
+            await this.lhUserRepository.UpdateAsync(id, user);
 
             await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token);
         }
diff --git a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.3.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
diff --git a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
diff --git a/LearningHub.Nhs.UserApi/Controllers/AuthenticationController.cs b/LearningHub.Nhs.UserApi/Controllers/AuthenticationController.cs
@@ -53,11 +53,10 @@ public async Task<IActionResult> AuthenticateElfhHubAsync([FromBody] Login login
         {
             var loginResult = await this.authenticationService.AuthenticateAsync(login);
 
-            if (loginResult.IsAuthenticated && !string.IsNullOrWhiteSpace(loginResult.UserName))
-            {
-                await this.elfhUserService.SyncLHUserAsync(loginResult.UserId, loginResult.UserName);
-            }
-
+            // if (loginResult.IsAuthenticated && !string.IsNullOrWhiteSpace(loginResult.UserName))
+            // {
+            //    await this.elfhUserService.SyncLHUserAsync(loginResult.UserId, loginResult.UserName);
+            // }
             return this.Ok(loginResult);
         }
 
@@ -81,11 +80,10 @@ public async Task<IActionResult> AuthenticateSsoAsync([FromBody] LoginSso reques
 
             var loginResult = await this.authenticationService.CheckUserCredentialsSsoAsync(request.UserId);
 
-            if (loginResult.IsAuthenticated && !string.IsNullOrWhiteSpace(loginResult.UserName))
-            {
-                await this.elfhUserService.SyncLHUserAsync(loginResult.UserId, loginResult.UserName);
-            }
-
+            // if (loginResult.IsAuthenticated && !string.IsNullOrWhiteSpace(loginResult.UserName))
+            // {
+            //    await this.elfhUserService.SyncLHUserAsync(loginResult.UserId, loginResult.UserName);
+            // }
             return this.Ok(loginResult);
         }
 
diff --git a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj
@@ -26,7 +26,7 @@
     <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" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />

Original file line number	Diff line number	Diff line change
`@@ -158,14 +158,13 @@ public async Task<UserBasic> GetByOpenAthensIdAsync(string openAthensId)`
`158`	`158`	`return null;`
`159`	`159`	`}`
`160`	`160`
`161`		`- var user = await this.elfhUserRepository.GetByOpenAthensIdAsync(openAthensId);`
	`161`	`+ var user = await this.lhUserRepository.GetByOpenAthensIdAsync(openAthensId);`
`162`	`162`
`163`		`- if (user != null)`
`164`		`- {`
`165`		`- await this.SyncLHUserAsync(user.Id, user.UserName);`
`166`		`- }`
`167`		`-`
`168`		`- return user?.ToBasicUser();`
	`163`	`+ // if (user != null)`
	`164`	`+ // {`
	`165`	`+ // await this.SyncLHUserAsync(user.Id, user.UserName);`
	`166`	`+ // }`
	`167`	`+ return user;`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`/// <inheritdoc/>`
`@@ -181,13 +180,13 @@ public async Task<User> GetByUsernameAsync(string userName, UserIncludeCollectio`
`181`	`180`	`/// <returns>The <see cref="Task"/>.</returns>`
`182`	`181`	`public async Task<int> GetUserIdByUsernameAsync(string userName)`
`183`	`182`	`{`
`184`		`- return await this.elfhUserRepository.GetUserIdByUsernameAsync(userName);`
	`183`	`+ return await this.lhUserRepository.GetUserIdByUsernameAsync(userName);`
`185`	`184`	`}`
`186`	`185`
`187`	`186`	`/// <inheritdoc/>`
`188`	`187`	`public async Task<UserAuthenticateDto> GetUserDetailForAuthenticateAsync(string userName)`
`189`	`188`	`{`
`190`		`- return await this.elfhUserRepository.GetUserDetailForAuthentication(userName);`
	`189`	`+ return await this.lhUserRepository.GetUserDetailForAuthentication(userName);`
`191`	`190`	`}`
`192`	`191`
`193`	`192`	`/// <inheritdoc/>`
`@@ -229,14 +228,14 @@ public async Task<string> GetUserRoleAsync(int id)`
`229`	`228`	`/// <inheritdoc/>`
`230`	`229`	`public async Task RecordSuccessfulSigninAsync(int id, CancellationToken token = default)`
`231`	`230`	`{`
`232`		`- var user = await this.elfhUserRepository.GetByIdAsync(id);`
	`231`	`+ var user = await this.lhUserRepository.GetByIdAsync(id);`
`233`	`232`
`234`	`233`	`if (user.PasswordLifeCounter != 0 \|\| user.SecurityLifeCounter != 0)`
`235`	`234`	`{`
`236`	`235`	`user.PasswordLifeCounter = 0;`
`237`	`236`	`user.SecurityLifeCounter = 0;`
`238`	`237`
`239`		`- await this.elfhUserRepository.UpdateAsync(id, user);`
	`238`	`+ await this.lhUserRepository.UpdateAsync(id, user);`
`240`	`239`
`241`	`240`	`await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token);`
`242`	`241`	`}`
`@@ -245,11 +244,11 @@ public async Task RecordSuccessfulSigninAsync(int id, CancellationToken token =`
`245`	`244`	`/// <inheritdoc/>`
`246`	`245`	`public async Task RecordUnsuccessfulSigninAsync(int id, CancellationToken token = default)`
`247`	`246`	`{`
`248`		`- var user = await this.elfhUserRepository.GetByIdAsync(id);`
	`247`	`+ var user = await this.lhUserRepository.GetByIdAsync(id);`
`249`	`248`
`250`	`249`	`user.PasswordLifeCounter++;`
`251`	`250`
`252`		`- await this.elfhUserRepository.UpdateAsync(id, user);`
	`251`	`+ await this.lhUserRepository.UpdateAsync(id, user);`
`253`	`252`
`254`	`253`	`await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token);`
`255`	`254`	`}`