moved elfh db query to LH

call LH database SP in place of elfh efcore query

Author: OluwatobiAwe

LearningHub.Nhs.UserApi.Repository.Interface/LH/IUserRepository.cs

@@ -1,6 +1,7 @@
 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;
 
@@ -20,6 +21,28 @@ public interface IUserRepository : IGenericLHRepository<User>
         /// </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>

LearningHub.Nhs.UserApi.Repository/LH/UserRepository.cs

@@ -3,6 +3,7 @@
     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;
@@ -31,6 +32,23 @@ 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>

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,7 +180,7 @@ 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/>