TD-4703: Fixed issue showing 'unknown error' on 'search' and 'all catalogue search' results screens when navigated to the paginated next pages

WebAPI/LearningHub.Nhs.API/Controllers/SearchController.cs

@@ -257,14 +257,13 @@ private async Task<SearchViewModel> GetSearchResults(SearchRequestModel searchRe
                     continue;
                 }
 
-                var roleUserGroups = this.catalogueService.GetRoleUserGroupsForCatalogue(catalogue.NodeId, true);
-
                 document.CatalogueUrl = catalogue.Url;
                 document.CatalogueBadgeUrl = catalogue.BadgeUrl;
                 document.CatalogueName = catalogue.Name;
 
                 if (catalogue.RestrictedAccess)
                 {
+                    var roleUserGroups = await this.catalogueService.GetRoleUserGroupsForCatalogueSearch(catalogue.NodeId, this.CurrentUserId);
                     document.CatalogueRestrictedAccess = catalogue.RestrictedAccess;
                     document.CatalogueHasAccess = roleUserGroups.Any(x => x.UserGroup.UserUserGroup.Any(y => y.UserId == this.CurrentUserId)
                         && (x.RoleId == (int)RoleEnum.Editor || x.RoleId == (int)RoleEnum.LocalAdmin || x.RoleId == (int)RoleEnum.Reader));
@@ -347,8 +346,6 @@ private async Task<SearchCatalogueViewModel> GetCatalogueSearchResults(Catalogue
                     continue;
                 }
 
-                var roleUserGroups = this.catalogueService.GetRoleUserGroupsForCatalogue(catalogue.NodeId, true);
-
                 // catalogue.No
                 document.Url = catalogue.Url;
                 document.BannerUrl = catalogue.BannerUrl;
@@ -357,6 +354,7 @@ private async Task<SearchCatalogueViewModel> GetCatalogueSearchResults(Catalogue
                 document.NodePathId = catalogue.NodePathId;
                 if (catalogue.RestrictedAccess)
                 {
+                    var roleUserGroups = await this.catalogueService.GetRoleUserGroupsForCatalogueSearch(catalogue.NodeId, this.CurrentUserId);
                     document.RestrictedAccess = catalogue.RestrictedAccess;
                     document.HasAccess = roleUserGroups.Any(x => x.UserGroup.UserUserGroup.Any(y => y.UserId == this.CurrentUserId)
                         && (x.RoleId == (int)RoleEnum.Editor || x.RoleId == (int)RoleEnum.LocalAdmin || x.RoleId == (int)RoleEnum.Reader));
@@ -419,8 +417,6 @@ private async Task<SearchAllCatalogueViewModel> GetAllCatalogueResults(AllCatalo
                     continue;
                 }
 
-                var roleUserGroups = this.catalogueService.GetRoleUserGroupsForCatalogue(catalogue.NodeId, true);
-
                 // catalogue.No
                 document.Url = catalogue.Url;
                 document.BannerUrl = catalogue.BannerUrl;
@@ -430,6 +426,7 @@ private async Task<SearchAllCatalogueViewModel> GetAllCatalogueResults(AllCatalo
 
                 if (catalogue.RestrictedAccess)
                 {
+                    var roleUserGroups = await this.catalogueService.GetRoleUserGroupsForCatalogueSearch(catalogue.NodeId, this.CurrentUserId);
                     document.RestrictedAccess = catalogue.RestrictedAccess;
                     document.HasAccess = roleUserGroups.Any(x => x.UserGroup.UserUserGroup.Any(y => y.UserId == this.CurrentUserId)
                        && (x.RoleId == (int)RoleEnum.Editor || x.RoleId == (int)RoleEnum.LocalAdmin || x.RoleId == (int)RoleEnum.Reader));

WebAPI/LearningHub.Nhs.Repository.Interface/IRoleUserGroupRepository.cs

@@ -55,5 +55,13 @@ public interface IRoleUserGroupRepository : IGenericRepository<RoleUserGroup>
         /// <param name="userId">The userGroupId.</param>
         /// <returns>A list of RoleUserGroupViewModel.</returns>
         Task<List<RoleUserGroupViewModel>> GetRoleUserGroupViewModelsByUserId(int userId);
+
+        /// <summary>
+        /// The get all for search.
+        /// </summary>
+        /// <param name="catalogueNodeId">The catalogueNodeId.</param>
+        /// <param name="userId">The userId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<List<RoleUserGroup>> GetAllforSearch(int catalogueNodeId, int userId);
     }
 }

WebAPI/LearningHub.Nhs.Repository/RoleUserGroupRepository.cs

@@ -63,6 +63,20 @@ public async Task<RoleUserGroup> GetByRoleIdUserGroupIdScopeIdAsync(int roleId,
                 .Where(n => n.Deleted == false);
         }
 
+        /// <summary>
+        /// The get all for Search.
+        /// </summary>
+        /// <param name="catalogueNodeId">The catalogueNodeId.</param>
+        /// <param name="userId">The userId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<List<RoleUserGroup>> GetAllforSearch(int catalogueNodeId, int userId)
+        {
+            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();
+        }
+
         /// <summary>
         /// The get by role id and catalogue id.
         /// </summary>

WebAPI/LearningHub.Nhs.Services.Interface/ICatalogueService.cs

@@ -192,6 +192,14 @@ public interface ICatalogueService
         /// <returns>The roleUserGroups.</returns>
         List<RoleUserGroup> GetRoleUserGroupsForCatalogue(int catalogueNodeId, bool includeUser = false);
 
+        /// <summary>
+        /// The GetRolesForCatalogueSearch.
+        /// </summary>
+        /// <param name="catalogueNodeId">The catalogueNodeId.</param>
+        /// <param name="userId">The current user.</param>
+        /// <returns>The roleUserGroups.</returns>
+        Task<List<RoleUserGroup>> GetRoleUserGroupsForCatalogueSearch(int catalogueNodeId, int userId);
+
         /// <summary>
         /// The GetLatestCatalogueAccessRequestAsync.
         /// </summary>

WebAPI/LearningHub.Nhs.Services/CatalogueService.cs

@@ -404,6 +404,17 @@ public List<RoleUserGroup> GetRoleUserGroupsForCatalogue(int catalogueNodeId, bo
             return query.Where(x => x.Scope.CatalogueNodeId == catalogueNodeId).ToList();
         }
 
+        /// <summary>
+        /// The GetRolesForCatalogueSearch.
+        /// </summary>
+        /// <param name="catalogueNodeId">The catalogueNodeId.</param>
+        /// <param name="userId">The current user.</param>
+        /// <returns>The roleUserGroups.</returns>
+        public async Task<List<RoleUserGroup>> GetRoleUserGroupsForCatalogueSearch(int catalogueNodeId, int userId)
+        {
+            return await this.roleUserGroupRepository.GetAllforSearch(catalogueNodeId, userId);
+        }
+
         /// <summary>
         /// The RequestAccessAsync.
         /// </summary>