Merge pull request #5403 from dfe-analytical-services/EES-5660-replac…

…e-versioned-draft-folder-with-static-folder

Ees 5660 replace versioned draft folder with static folder

infrastructure/templates/template.json

@@ -1197,7 +1197,10 @@
       "[concat('Microsoft.Web/sites/', variables('importerAppName'))]",
       "[concat('Microsoft.Web/sites/', variables('contentAppName'))]",
       "[concat('Microsoft.Web/sites/', variables('dataAppName'))]"
-    ]
+    ],
+    "publicDataFileshareMountPath": "/data/public-api-data",
+    "publicDataFileshareName": "[concat(parameters('subscription'), '-ees-papi-fs-data')]",
+    "publicDataStorageAccountName": "[concat(parameters('subscription'), 'eespapisa')]"
   },
   "resources": [
     {
@@ -3283,9 +3286,32 @@
         "App:NotifierStorageConnectionString": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('ees-storage-notifications')).secretUriWithVersion, ')')]",
         "App:PublicStorageConnectionString": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('ees-storage-public')).secretUriWithVersion, ')')]",
         "App:PublisherStorageConnectionString": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('ees-storage-publisher')).secretUriWithVersion, ')')]",
+        "DataFiles:BasePath": "[parameters('publicDataFileshareMountPath')]",
         "PublicDataDbExists": "[parameters('publicDataDbExists')]"
       }
     },
+    {
+      "condition": "[parameters('publicDataDbExists')]",
+      "name": "[concat(variables('publisherAppName'), '/azurestorageaccounts')]",
+      "type": "Microsoft.Web/sites/config",
+      "location": "[resourceGroup().location]",
+      "apiVersion": "2019-08-01",
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites', variables('publisherAppName'))]",
+        "[variables('publicDataFileshareMountPath')]",
+        "[variables('publicDataFileshareName')]",
+        "[variables('publicDataStorageAccountName')]"
+      ],
+      "properties": {
+        "[variables('publicDataFileshareName')]": {
+          "type": "AzureFiles",
+          "accountName": "[variables('publicDataStorageAccountName')]",
+          "shareName": "[variables('publicDataFileshareName')]",
+          "mountPath": "[variables('publicDataFileshareMountPath')]",
+          "protocol": "Smb"
+        }
+      }
+    },
     {
       "type": "Microsoft.Storage/storageAccounts",
       "name": "[variables('publisherStorageAccountName')]",

src/GovUk.Education.ExploreEducationStatistics.Admin/Startup.cs

@@ -3,7 +3,6 @@
 using GovUk.Education.ExploreEducationStatistics.Admin.Database;
 using GovUk.Education.ExploreEducationStatistics.Admin.Hubs;
 using GovUk.Education.ExploreEducationStatistics.Admin.Hubs.Filters;
-using GovUk.Education.ExploreEducationStatistics.Admin.Migrations.Custom;
 using GovUk.Education.ExploreEducationStatistics.Admin.Models;
 using GovUk.Education.ExploreEducationStatistics.Admin.Options;
 using GovUk.Education.ExploreEducationStatistics.Admin.Requests.Public.Data;
@@ -782,8 +781,11 @@ private void UpdateDatabase(IApplicationBuilder app, IWebHostEnvironment env)
                 {
                     context.Database.SetCommandTimeout(int.MaxValue);
                     context.Database.Migrate();
+                }
 
-                    ApplyCustomMigrations();
+                if (!env.IsIntegrationTest())
+                {
+                    ApplyCustomMigrations(app);
                 }
             }
 
@@ -798,8 +800,14 @@ private void UpdateDatabase(IApplicationBuilder app, IWebHostEnvironment env)
             }
         }
 
-        private static void ApplyCustomMigrations(params ICustomMigration[] migrations)
+        private static void ApplyCustomMigrations(IApplicationBuilder app)
         {
+            using var serviceScope = app.ApplicationServices
+                .GetRequiredService<IServiceScopeFactory>()
+                .CreateScope();
+
+            var migrations = serviceScope.ServiceProvider.GetServices<ICustomMigration>();
+
             foreach (var migration in migrations)
             {
                 migration.Apply();

src/GovUk.Education.ExploreEducationStatistics.Common.Tests/Extensions/EnumerableExtensionsTests.cs

@@ -466,6 +466,96 @@ public void ContainsAll_SourceListContainsAllValues_ReturnsTrue()
         Assert.True(containsAll);
     }
 
+    public class CartesianTests
+    {
+        [Fact]
+        public void TwoLists_Cartesian()
+        {
+            List<int> list1 = [1, 2];
+            List<string> list2 = ["3", "4"];
+
+            List<(int, string)> expected =
+            [
+                new(1, "3"),
+                new(1, "4"),
+                new(2, "3"),
+                new(2, "4")
+            ];
+
+            var actual = list1.Cartesian(list2);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void TwoLists_EmptyList()
+        {
+            List<int> list1 = [1, 2];
+            Assert.Empty(list1.Cartesian(new List<string>()));
+        }
+
+        [Fact]
+        public void TwoLists_NullList()
+        {
+            List<int> list1 = [1, 2];
+            Assert.Empty(list1.Cartesian((List<string>?) null));
+        }
+
+        [Fact]
+        public void ThreeLists_Cartesian()
+        {
+            List<int> list1 = [1, 2];
+            List<string> list2 = ["3", "4"];
+            List<char> list3 = ['5', '6'];
+
+            List<(int, string, char)> expected =
+            [
+                new(1, "3", '5'),
+                new(1, "3", '6'),
+                new(1, "4", '5'),
+                new(1, "4", '6'),
+                new(2, "3", '5'),
+                new(2, "3", '6'),
+                new(2, "4", '5'),
+                new(2, "4", '6'),
+            ];
+
+            var actual = list1.Cartesian(list2, list3);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void ThreeLists_EmptyFirstList()
+        {
+            List<int> list1 = [1, 2];
+            List<char> list3 = ['5', '6'];
+            Assert.Empty(list1.Cartesian(new List<string>(), list3));
+        }
+
+        [Fact]
+        public void ThreeLists_EmptySecondList()
+        {
+            List<int> list1 = [1, 2];
+            List<string> list2 = ["3", "4"];
+            Assert.Empty(list1.Cartesian(list2, new List<char>()));
+        }
+
+        [Fact]
+        public void ThreeLists_NullFirstList()
+        {
+            List<int> list1 = [1, 2];
+            List<char> list3 = ['5', '6'];
+            Assert.Empty(list1.Cartesian((List<string>?) null, list3));
+        }
+
+        [Fact]
+        public void ThreeLists_NullSecondList()
+        {
+            List<int> list1 = [1, 2];
+            List<string> list2 = ["3", "4"];
+            Assert.Empty(list1.Cartesian(list2, (List<char>?) null));
+        }
+    }
+
     private static async Task<Either<Unit, int>> GetSuccessfulEither(int value)
     {
         await Task.Delay(5);

src/GovUk.Education.ExploreEducationStatistics.Common/Database/ICustomMigration.cs

@@ -0,0 +1,13 @@
+namespace GovUk.Education.ExploreEducationStatistics.Common.Database;
+
+/// <summary>
+/// Custom migrations that run on deployment / startup.
+/// These differ in use from EF database migrations in that they are not limited
+/// to running against a single database / DbContext. These can be simple
+/// standalone implementations or can use dependency injection if registered
+/// with a DI container.
+/// </summary>
+public interface ICustomMigration
+{
+    void Apply();
+}

src/GovUk.Education.ExploreEducationStatistics.Common/Extensions/EnumerableExtensions.cs

@@ -221,7 +221,7 @@ public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)
         }
 
         public static IAsyncEnumerable<T> WhereNotNull<T>(this IAsyncEnumerable<T?> source)
-            where T: class
+            where T : class
         {
             return source.Where(item => item is not null)!;
         }
@@ -264,7 +264,7 @@ public static bool IsSameAsIgnoringOrder<T>(this IEnumerable<T> first, IEnumerab
 
             return !(firstNotInSecond.Any() || secondNotInFirst.Any());
         }
-        
+
         public static Tuple<T, T> ToTuple2<T>(this IEnumerable<T> collection)
             where T : class
         {
@@ -275,10 +275,10 @@ public static Tuple<T, T> ToTuple2<T>(this IEnumerable<T> collection)
                 throw new ArgumentException(
                     $"Expected 2 list items when constructing a 2-tuple, but found {list.Count}");
             }
-            
+
             return new Tuple<T, T>(list[0], list[1]);
         }
-        
+
         public static Tuple<T, T, T> ToTuple3<T>(this IEnumerable<T> collection)
             where T : class
         {
@@ -289,15 +289,15 @@ public static Tuple<T, T, T> ToTuple3<T>(this IEnumerable<T> collection)
                 throw new ArgumentException(
                     $"Expected 3 list items when constructing a 3-tuple, but found {list.Count}");
             }
-            
+
             return new Tuple<T, T, T>(list[0], list[1], list[2]);
         }
 
         public static bool ContainsAll<T>(this IEnumerable<T> source, IEnumerable<T> values)
         {
             return values.All(id => source.Contains(id));
         }
-        
+
         /// <summary>
         /// Order some objects, according to a string key, in natural order for humans to read.
         /// </summary>
@@ -319,5 +319,30 @@ public static IOrderedEnumerable<T> NaturalThenBy<T>(
         {
             return source.ThenBy(keySelector, comparison.WithNaturalSort());
         }
+
+        public static List<(T1, T2)> Cartesian<T1, T2>(
+            this IEnumerable<T1> list1,
+            IEnumerable<T2>? list2)
+        {
+            return list2 == null
+                ? []
+                : list1
+                    .Join(list2, _ => true, _ => true, (t1, t2) => (t1, t2))
+                    .ToList();
+        }
+
+        public static List<(T1, T2, T3)> Cartesian<T1, T2, T3>(
+            this IEnumerable<T1> list1,
+            IEnumerable<T2>? list2,
+            IEnumerable<T3>? list3)
+        {
+            return list2 == null || list3 == null
+                ? []
+                : list1
+                    .Join(list2, _ => true, _ => true, (t1, t2) => (t1, t2))
+                    .Join(list3, _ => true, _ => true,
+                        (tuple, t3) => (tuple.t1, tuple.t2, t3))
+                    .ToList();
+        }
     }
 }