TD-5118

route fix for GetResourceReferenceByOriginalId
Removal of duplicated dbcontext
Fix to populate the  findwise search endpoint

Author: OluwatobiAwe

OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs

@@ -16,7 +16,6 @@ namespace LearningHub.Nhs.OpenApi.Repositories.Repositories
     /// <inheritdoc />
     public class ResourceRepository : GenericRepository<Resource>, IResourceRepository
     {
-        private LearningHubDbContext dbContext;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceRepository"/> class.
@@ -31,7 +30,7 @@ public ResourceRepository(LearningHubDbContext dbContext, ITimezoneOffsetManager
         /// <inheritdoc />
         public async Task<IEnumerable<Resource>> GetResourcesFromIds(IEnumerable<int> resourceIds)
         {
-            var resources = await this.dbContext.Resource
+            var resources = await this.DbContext.Resource
                 .Where(r => resourceIds.Contains(r.Id))
                 .Where(r => !r.Deleted)
                 .Include(r => r.ResourceReference)
@@ -62,7 +61,7 @@ public async Task<IEnumerable<Resource>> GetResourcesFromIds(IEnumerable<int> re
         public async Task<IEnumerable<ResourceReference>> GetResourceReferencesByOriginalResourceReferenceIds(
             IEnumerable<int> originalResourceReferenceIds)
         {
-            return await this.dbContext.ResourceReference
+            return await this.DbContext.ResourceReference
                 .Where(rr => originalResourceReferenceIds.Contains(rr.OriginalResourceReferenceId))
                 .Where(rr => !rr.Deleted)
                 .Where(rr => (int)rr.NodePath.Node.NodeTypeEnum != 4)
@@ -83,7 +82,7 @@ public async Task<List<int>> GetAchievedCertificatedResourceIds(int currentUserI
             var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = currentUserId };
             var param4 = new SqlParameter("@TotalRecords", SqlDbType.Int) { Direction = ParameterDirection.Output };
 
-            var result = this.dbContext.DashboardResourceDto.FromSqlRaw("resources.GetAchievedCertificatedResourcesWithOptionalPagination @userId = @userId, @TotalRecords = @TotalRecords output", param0, param4).ToList();
+            var result = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetAchievedCertificatedResourcesWithOptionalPagination @userId = @userId, @TotalRecords = @TotalRecords output", param0, param4).ToList();
             List<int> achievedCertificatedResourceIds = result.Select(drd => drd.ResourceId).Distinct().ToList<int>();
 
             return achievedCertificatedResourceIds;
@@ -108,7 +107,7 @@ public async Task<IEnumerable<ResourceActivityDTO>> GetResourceActivityPerResour
             var resourceIdsParameter = new SqlParameter("@p0", resourceIdsParam ?? (object)DBNull.Value);
             var userIdsParameter = new SqlParameter("@p1", userIdsParam ?? (object)DBNull.Value);
 
-            List<ResourceActivityDTO> resourceActivityDTOs = await dbContext.ResourceActivityDTO
+            List<ResourceActivityDTO> resourceActivityDTOs = await this.DbContext.ResourceActivityDTO
                 .FromSqlRaw(
                     "[activity].[GetResourceActivityPerResourceMajorVersion] @p0, @p1",
                     resourceIdsParameter,
@@ -126,7 +125,7 @@ public async Task<IEnumerable<ResourceActivityDTO>> GetResourceActivityPerResour
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<Resource> GetByIdAsync(int id)
         {
-            return await this.dbContext.Resource.AsNoTracking().FirstOrDefaultAsync(r => r.Id == id && !r.Deleted);
+            return await this.DbContext.Resource.AsNoTracking().FirstOrDefaultAsync(r => r.Id == id && !r.Deleted);
         }
 
         /// <summary>
@@ -136,7 +135,7 @@ public async Task<Resource> GetByIdAsync(int id)
         /// <returns>If the user has any resources published.</returns>
         public async Task<bool> UserHasPublishedResourcesAsync(int userId)
         {
-            return await this.dbContext.Resource.AsNoTracking()
+            return await this.DbContext.Resource.AsNoTracking()
                 .Where(r => r.CreateUserId == userId && !r.Deleted)
                 .AnyAsync();
         }
@@ -161,7 +160,7 @@ public async Task<int> CreateResourceAsync(ResourceTypeEnum resourceType, string
                 var param4 = new SqlParameter("@p4", SqlDbType.Int) { Value = this.TimezoneOffsetManager.UserTimezoneOffset ?? (object)DBNull.Value };
                 var param5 = new SqlParameter("@p5", SqlDbType.Int) { Direction = ParameterDirection.Output };
 
-                await this.dbContext.Database.ExecuteSqlRawAsync("resources.ResourceCreate @p0, @p1, @p2, @p3, @p4, @p5 output", param0, param1, param2, param3, param4, param5);
+                await this.DbContext.Database.ExecuteSqlRawAsync("resources.ResourceCreate @p0, @p1, @p2, @p3, @p4, @p5 output", param0, param1, param2, param3, param4, param5);
 
                 int resourceVersionId = (int)param5.Value;
 

OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/RoleUserGroupRepository.cs

@@ -33,7 +33,7 @@ public RoleUserGroupRepository(LearningHubDbContext dbContext, ITimezoneOffsetMa
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<RoleUserGroup> GetByIdAsync(int id)
         {
-            return await DbContext.RoleUserGroup
+            return await this.DbContext.RoleUserGroup
                                         .Include(n => n.UserGroup).ThenInclude(u => u.UserGroupAttribute)
                                         .Include(n => n.Role)
                                         .Include(n => n.Scope).AsNoTracking().FirstOrDefaultAsync(n => n.Id == id);
@@ -48,7 +48,7 @@ public async Task<RoleUserGroup> GetByIdAsync(int id)
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<RoleUserGroup> GetByRoleIdUserGroupIdScopeIdAsync(int roleId, int userGroupId, int scopeId)
         {
-            return await DbContext.RoleUserGroup.AsNoTracking().FirstOrDefaultAsync(n => n.RoleId == roleId && n.UserGroupId == userGroupId && n.ScopeId == scopeId);
+            return await this.DbContext.RoleUserGroup.AsNoTracking().FirstOrDefaultAsync(n => n.RoleId == roleId && n.UserGroupId == userGroupId && n.ScopeId == scopeId);
         }
 
         /// <summary>
@@ -57,7 +57,7 @@ public async Task<RoleUserGroup> GetByRoleIdUserGroupIdScopeIdAsync(int roleId,
         /// <returns>The <see cref="Task"/>.</returns>
         public new IQueryable<RoleUserGroup> GetAll()
         {
-            return DbContext.Set<RoleUserGroup>()
+            return this.DbContext.Set<RoleUserGroup>()
                 .Include(n => n.UserGroup).ThenInclude(u => u.UserGroupAttribute)
                 .Include(n => n.Role)
                 .Include(n => n.Scope)
@@ -72,7 +72,7 @@ public async Task<RoleUserGroup> GetByRoleIdUserGroupIdScopeIdAsync(int roleId,
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<List<RoleUserGroup>> GetAllforSearch(int catalogueNodeId, int userId)
         {
-            return await DbContext.RoleUserGroup.Where(rug => rug.Scope.CatalogueNodeId == catalogueNodeId)
+            return await this.DbContext.RoleUserGroup.Where(rug => rug.Scope.CatalogueNodeId == catalogueNodeId)
                                         .Include(n => n.UserGroup).ThenInclude(u => u.UserUserGroup.Where(p => p.UserId == userId))
                                         .Include(n => n.Scope).AsNoTracking()
                                         .ToListAsync();
@@ -86,7 +86,7 @@ public async Task<List<RoleUserGroup>> GetAllforSearch(int catalogueNodeId, int
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<List<RoleUserGroup>> GetByRoleIdCatalogueId(int roleId, int catalogueNodeId)
         {
-            return await DbContext.RoleUserGroup.Where(rug => rug.RoleId == roleId && rug.Scope.CatalogueNodeId == catalogueNodeId)
+            return await this.DbContext.RoleUserGroup.Where(rug => rug.RoleId == roleId && rug.Scope.CatalogueNodeId == catalogueNodeId)
                                         .Include(n => n.UserGroup).ThenInclude(u => u.UserGroupAttribute)
                                         .Include(n => n.Role)
                                         .Include(n => n.Scope).AsNoTracking().OrderByDescending(rug => rug.RoleId).ToListAsync();
@@ -100,7 +100,7 @@ public async Task<List<RoleUserGroup>> GetByRoleIdCatalogueId(int roleId, int ca
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<List<RoleUserGroup>> GetByRoleIdCatalogueIdWithUsers(int roleId, int catalogueNodeId)
         {
-            return await DbContext.RoleUserGroup.Where(rug => rug.RoleId == roleId && rug.Scope.CatalogueNodeId == catalogueNodeId)
+            return await this.DbContext.RoleUserGroup.Where(rug => rug.RoleId == roleId && rug.Scope.CatalogueNodeId == catalogueNodeId)
                                         .Include(n => n.UserGroup).ThenInclude(u => u.UserUserGroup).Where(u => u.UserGroup != null && u.UserGroup.UserUserGroup.Count() > 0)
                                         .Include(n => n.Role)
                                         .Include(n => n.Scope).AsNoTracking().ToListAsync();
@@ -115,7 +115,7 @@ public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupViewModelsByUser
         {
             var param0 = new SqlParameter("@userGroupId", SqlDbType.Int) { Value = userGroupId };
 
-            var vm = await DbContext.RoleUserGroupViewModel.FromSqlRaw("hub.RoleUserGroupGetByUserGroupId @userGroupId", param0).AsNoTracking().ToListAsync();
+            var vm = await this.DbContext.RoleUserGroupViewModel.FromSqlRaw("hub.RoleUserGroupGetByUserGroupId @userGroupId", param0).AsNoTracking().ToListAsync();
             return vm;
         }
 
@@ -128,7 +128,7 @@ public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupViewModelsByUser
         {
             var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };
 
-            var vm = await DbContext.RoleUserGroupViewModel.FromSqlRaw("hub.RoleUserGroupGetByUserId @userId", param0).AsNoTracking().ToListAsync();
+            var vm = await this.DbContext.RoleUserGroupViewModel.FromSqlRaw("hub.RoleUserGroupGetByUserId @userId", param0).AsNoTracking().ToListAsync();
             return vm;
         }
     }

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs

@@ -133,7 +133,7 @@ public async Task<SearchAllCatalogueResultModel> GetAllCatalogueSearchResultsAsy
                 var offset = catalogSearchRequestModel.PageIndex * catalogSearchRequestModel.PageSize;
                 var client = await this.findwiseClient.GetClient(this.findwiseConfig.SearchBaseUrl);
                 var request = string.Format(
-                    this.findwiseConfig.SearchEndpointPath + "?offset={1}&hits={2}&q={3}&token={4}",
+                    this.findwiseConfig.SearchEndpointPath + "{0}?offset={1}&hits={2}&q={3}&token={4}",
                     this.findwiseConfig.CollectionIds.Catalogue,
                     offset,
                     catalogSearchRequestModel.PageSize,
@@ -180,7 +180,7 @@ public async Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term
             {
                 var client = await this.findwiseClient.GetClient(this.findwiseConfig.SearchBaseUrl);
                 var request = string.Format(
-                   this.findwiseConfig.SearchEndpointPath + "?q={1}&token={2}",
+                   this.findwiseConfig.SearchEndpointPath + "{0}?q={1}&token={2}",
                    this.findwiseConfig.CollectionIds.AutoSuggestion,
                    this.EncodeSearchText(term),
                    this.findwiseConfig.Token);

OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs

@@ -121,7 +121,7 @@ await this.searchService.Search(
         /// </summary>
         /// <param name="originalResourceReferenceId">id.</param>
         /// <returns>Resource data.</returns>
-        [HttpGet("{originalResourceReferenceId}")]
+        [HttpGet("GetResourceReferenceByOriginalId/{originalResourceReferenceId}")]
         public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId)
         {
             return await this.resourceService.GetResourceReferenceByOriginalId(originalResourceReferenceId, this.CurrentUserId.GetValueOrDefault());