Merge pull request #5165 from dfe-analytical-services/EES-4670-revert

EES-4670 Revert Data Catalogue code removal

Author: mmyoungman

src/GovUk.Education.ExploreEducationStatistics.Content.Api.Tests/Controllers/PublicationControllerTests.cs

@@ -73,7 +73,7 @@ public async Task GetPublicationTree()
             var controller = BuildPublicationController(publicationCacheService: publicationCacheService.Object);
 
             publicationCacheService
-                .Setup(s => s.GetPublicationTree(PublicationTreeFilter.FastTrack))
+                .Setup(s => s.GetPublicationTree(PublicationTreeFilter.DataCatalogue))
                 .ReturnsAsync(new List<PublicationTreeThemeViewModel>
                 {
                     new()
@@ -91,7 +91,7 @@ public async Task GetPublicationTree()
                     }
                 });
 
-            var result = await controller.GetPublicationTree(PublicationTreeFilter.FastTrack);
+            var result = await controller.GetPublicationTree(PublicationTreeFilter.DataCatalogue);
 
             VerifyAllMocks(publicationCacheService);
 

src/GovUk.Education.ExploreEducationStatistics.Content.Services.Tests/Cache/PublicationCacheServiceTests.cs

@@ -178,7 +178,7 @@ public async Task GetPublicationTree_NoCachedTreeExists()
 
         var service = BuildService(publicationService.Object);
 
-        var result = await service.GetPublicationTree(PublicationTreeFilter.FastTrack);
+        var result = await service.GetPublicationTree(PublicationTreeFilter.DataCatalogue);
 
         VerifyAllMocks(PublicBlobCacheService);
 
@@ -213,14 +213,60 @@ public async Task GetPublicationTree_CachedTreeExists()
 
         var service = BuildService();
 
-        var result = await service.GetPublicationTree(PublicationTreeFilter.FastTrack);
+        var result = await service.GetPublicationTree(PublicationTreeFilter.DataCatalogue);
 
         VerifyAllMocks(PublicBlobCacheService);
 
         var filteredTree = result.AssertRight();
         filteredTree.AssertDeepEqualTo(ListOf(publicationTree));
     }
 
+    [Fact]
+    public async Task GetPublicationTree_DataCatalogue_SomeLiveReleaseHasData_Included()
+    {
+        var publicationTree = new PublicationTreeThemeViewModel
+        {
+            Title = "Theme A",
+            Topics = new List<PublicationTreeTopicViewModel>
+            {
+                new()
+                {
+                    Title = "Topic A",
+                    Publications = ListOf(new PublicationTreePublicationViewModel
+                    {
+                        Title = "Publication A",
+                        AnyLiveReleaseHasData = true
+                    })
+                }
+            }
+        };
+
+        await AssertPublicationTreeUnfiltered(publicationTree, PublicationTreeFilter.DataCatalogue);
+    }
+
+    [Fact]
+    public async Task GetPublicationTree_DataCatalogue_NoLiveReleaseHasData_Excluded()
+    {
+        var publicationTree = new PublicationTreeThemeViewModel
+        {
+            Title = "Theme A",
+            Topics = new List<PublicationTreeTopicViewModel>
+            {
+                new()
+                {
+                    Title = "Topic A",
+                    Publications = ListOf(new PublicationTreePublicationViewModel
+                    {
+                        Title = "Publication A",
+                        AnyLiveReleaseHasData = false
+                    })
+                }
+            }
+        };
+
+        await AssertPublicationTreeEmpty(publicationTree, PublicationTreeFilter.DataCatalogue);
+    }
+
     [Fact]
     public async Task GetPublicationTree_DataTables_NonSupersededPublicationWithDataOnLatestRelease_Included()
     {

src/GovUk.Education.ExploreEducationStatistics.Content.Services/Cache/PublicationCacheService.cs

@@ -129,6 +129,7 @@ private static bool FilterPublicationTreePublication(
         {
             case PublicationTreeFilter.DataTables:
                 return publication.LatestReleaseHasData;
+            case PublicationTreeFilter.DataCatalogue:
             case PublicationTreeFilter.FastTrack:
                 return publication.AnyLiveReleaseHasData;
             default:

src/GovUk.Education.ExploreEducationStatistics.Content.Services/Requests/PublicationTreeFilter.cs

@@ -1,8 +1,11 @@
+#nullable enable
+
 namespace GovUk.Education.ExploreEducationStatistics.Content.Services.Requests
 {
     public enum PublicationTreeFilter
     {
         DataTables,
+        DataCatalogue,
         FastTrack,
     }
 }