Merge pull request #1173 from TechnologyEnhancedLearning/Develop/Fixes/TD-5664-Implement-a-business-rule-tieing-'Contribute-a-resource'-and-a-Catalogue-permission/group

Develop/fixes/td 5664 implement a business rule tieing 'contribute a resource' and a catalogue permission/group

Author: swapnamol-abraham

.gitignore

@@ -53,3 +53,6 @@ obj
 /AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
 /WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
 /ReportAPI/LearningHub.Nhs.ReportApi/web.config
+/AdminUI/LearningHub.Nhs.AdminUI/web.config
+/LearningHub.Nhs.WebUI/web.config
+/WebAPI/LearningHub.Nhs.API/web.config

AdminUI/LearningHub.Nhs.AdminUI/web.config

@@ -81,11 +81,6 @@ public async Task<List<CatalogueNodeVersion>> GetPublishedCatalogues()
         /// <returns>The <see cref="Task"/>.</returns>
         public IQueryable<CatalogueNodeVersion> GetPublishedCataloguesForUserAsync(int userId)
         {
-            var communityCatalogue = this.DbContext.CatalogueNodeVersion.AsNoTracking()
-                    .Include(cnv => cnv.NodeVersion.Node)
-                    .Where(cnv => cnv.NodeVersion.VersionStatusEnum == VersionStatusEnum.Published
-                            && cnv.NodeVersion.NodeId == 1 /* Community Catalogue */);
-
             var cataloguesForUser = from cnv in this.DbContext.CatalogueNodeVersion.Include(cnv => cnv.NodeVersion.Node).AsNoTracking()
                                     join nv in this.DbContext.NodeVersion.Where(cnv => cnv.VersionStatusEnum == VersionStatusEnum.Published && !cnv.Deleted) // .Include(nv => nv.Node)
                                         on cnv.NodeVersionId equals nv.Id
@@ -99,7 +94,7 @@ join n in this.DbContext.Node.Where(x => !x.Deleted)
                                         on nv.Id equals n.CurrentNodeVersionId
                                     select cnv;
 
-            var returnedCatalogues = communityCatalogue.Union(cataloguesForUser).Distinct()
+            var returnedCatalogues = cataloguesForUser.Distinct()
                                                         .OrderBy(cnv => cnv.NodeVersion.NodeId != 1)
                                                         .ThenBy(cnv => cnv.Name);