Merge pull request #496 from DFE-Digital/mattb/fix-preview-mode

Fix preview mode
DFE-Digital · Aug 7, 2024 · b8cc6cc · b8cc6cc
2 parents c9dc5ee + 78d8b49
commit b8cc6cc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/Childrens-Social-Care-CPD-Tests/DataAccess/ResourcesRepositoryTests.cs b/Childrens-Social-Care-CPD-Tests/DataAccess/ResourcesRepositoryTests.cs
@@ -176,6 +176,7 @@ public async Task FindByTagsAsync_Preview_Flag_Is_False_By_Default()
     public async Task FindByTagsAsync_Sets_Preview_Flag()
     {
         // arrange
+        _applicationConfiguration.AzureEnvironment.Returns(ApplicationEnvironment.PreProduction);
         _applicationConfiguration.ContentfulEnvironment.Returns(ApplicationEnvironment.PreProduction);
 
         var response = Substitute.For<GraphQLResponse<SearchResourcesByTags.ResponseType>>();
@@ -306,6 +307,7 @@ public async Task GetByIdAsync_Preview_Flag_Is_False_By_Default()
     public async Task GetByIdAsync_Sets_Preview_Flag()
     {
         // arrange
+        _applicationConfiguration.AzureEnvironment.Returns(ApplicationEnvironment.PreProduction);
         _applicationConfiguration.ContentfulEnvironment.Returns(ApplicationEnvironment.PreProduction);
 
         var collection = new ContentfulCollection<Content>

diff --git a/Childrens-Social-Care-CPD/Configuration/ContentfulConfiguration.cs b/Childrens-Social-Care-CPD/Configuration/ContentfulConfiguration.cs
@@ -7,10 +7,18 @@ public static class ContentfulConfiguration
 {
     public static bool IsPreviewEnabled(IApplicationConfiguration applicationConfiguration)
     {
-        var azureEnvironment = applicationConfiguration.AzureEnvironment;
-        return !string.IsNullOrEmpty(azureEnvironment)
-            && !string.Equals(azureEnvironment, ApplicationEnvironment.LoadTest, StringComparison.OrdinalIgnoreCase)
-            && !string.Equals(applicationConfiguration.ContentfulEnvironment, azureEnvironment, StringComparison.OrdinalIgnoreCase);
+        string azureEnvironment = applicationConfiguration.AzureEnvironment,
+            contentfulEnvironment = applicationConfiguration.ContentfulEnvironment;
+
+        // return true if azure environment is pre-prod
+        if (string.Equals(azureEnvironment, ApplicationEnvironment.PreProduction, StringComparison.OrdinalIgnoreCase)) return true;
+
+        // return true if azure environment is dev and contentful environment is test
+        if (string.Equals(azureEnvironment, ApplicationEnvironment.Development, StringComparison.OrdinalIgnoreCase)
+            && string.Equals(contentfulEnvironment, ApplicationEnvironment.Test, StringComparison.OrdinalIgnoreCase)) return true;
+
+        // for all other cases return false
+        return false;
     }
 
     public static ConfigurationManager GetContentfulConfiguration(ConfigurationManager configuration, IApplicationConfiguration applicationConfiguration)

diff --git a/Terraform/variables.tf b/Terraform/variables.tf
@@ -714,9 +714,9 @@ variable "cpd_contentful_env" {
   default = {
     Dev       = "dev"
     Test      = "test"
-    Load-Test = "prod"
-    Pre-Prod  = "prod"
-    Prod      = "prod"
+    Load-Test = "master"
+    Pre-Prod  = "master"
+    Prod      = "master"
   }
   description = "Contentful Environment Name"
 }