EES-4950 Re-model data set version change sets

src/GovUk.Education.ExploreEducationStatistics.Common.Tests/Converters/EnumToEnumValueListConverterTests.cs

@@ -0,0 +1,46 @@
+#nullable enable
+using System.Diagnostics.CodeAnalysis;
+using GovUk.Education.ExploreEducationStatistics.Common.Converters;
+using GovUk.Education.ExploreEducationStatistics.Common.Database;
+using Xunit;
+
+namespace GovUk.Education.ExploreEducationStatistics.Common.Tests.Converters;
+
+public abstract class EnumToEnumValueListConverterTests
+{
+    [SuppressMessage("ReSharper", "UnusedMember.Local")]
+    private enum Numbers
+    {
+        [EnumLabelValue("1", "Value-1")] One,
+        [EnumLabelValue("2", "Value-2")] Two,
+        [EnumLabelValue("3", "Value-3")] Three
+    }
+
+    private readonly EnumToEnumValueListConverter<Numbers> _converter = new();
+
+    public class ConvertToProviderTests : EnumToEnumValueListConverterTests
+    {
+        [Fact]
+        public void Success()
+        {
+            var converted = _converter.ConvertToProviderTyped([Numbers.Two, Numbers.Three]);
+
+            Assert.Equal(2, converted.Count);
+            Assert.Equal("Value-2", converted[0]);
+            Assert.Equal("Value-3", converted[1]);
+        }
+    }
+
+    public class ConvertFromProviderTests : EnumToEnumValueListConverterTests
+    {
+        [Fact]
+        public void Success()
+        {
+            var converted = _converter.ConvertFromProviderTyped(["Value-1", "Value-2"]);
+
+            Assert.Equal(2, converted.Count);
+            Assert.Equal(Numbers.One, converted[0]);
+            Assert.Equal(Numbers.Two, converted[1]);
+        }
+    }
+}

src/GovUk.Education.ExploreEducationStatistics.Common/Comparers/ListValueComparer.cs

@@ -0,0 +1,19 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+
+namespace GovUk.Education.ExploreEducationStatistics.Common.Comparers;
+
+public class ListValueComparer<TValue>(IEqualityComparer<TValue>? equalityComparer = null)
+    : ValueComparer<List<TValue>>(
+        equalsExpression: (list, otherList) => list != null
+                                               && otherList != null
+                                               && list.SequenceEqual(otherList, equalityComparer),
+        hashCodeExpression: list => list.Aggregate(0, (acc, value) =>
+            value != null
+                ? HashCode.Combine(acc, value!.GetHashCode())
+                : acc),
+        snapshotExpression: list => list.ToList()
+    );

src/GovUk.Education.ExploreEducationStatistics.Common/Converters/EnumToEnumValueListConverter.cs

@@ -0,0 +1,30 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace GovUk.Education.ExploreEducationStatistics.Common.Converters;
+
+public class EnumToEnumValueListConverter<TEnum>(ConverterMappingHints? mappingHints = null)
+    : ValueConverter<List<TEnum>, List<string>>(
+        value => ToProvider(value),
+        value => FromProvider(value),
+        mappingHints
+    )
+    where TEnum : Enum
+{
+    public static List<string> ToProvider(IList<TEnum> values)
+    {
+        return values
+            .Select(EnumToEnumValueConverter<TEnum>.ToProvider)
+            .ToList();
+    }
+
+    public static List<TEnum> FromProvider(IList<string> values)
+    {
+        return values
+            .Select(EnumToEnumValueConverter<TEnum>.FromProvider)
+            .ToList();
+    }
+}

src/GovUk.Education.ExploreEducationStatistics.Public.Data.Model.Tests/Fixtures/DataSetVersionGeneratorExtensions.cs

@@ -150,30 +150,40 @@ public static Generator<DataSetVersion> WithTimePeriodMetas(
         Func<IEnumerable<TimePeriodMeta>> metas)
         => generator.ForInstance(s => s.SetTimePeriodMetas(metas));
 
-    public static Generator<DataSetVersion> WithFilterChanges(
+    public static Generator<DataSetVersion> WithFilterMetaChanges(
         this Generator<DataSetVersion> generator,
-        IEnumerable<ChangeSetFilters> filterChanges)
-        => generator.ForInstance(s => s.SetFilterChanges(filterChanges));
+        IEnumerable<FilterMetaChange> metaChanges)
+        => generator.ForInstance(s => s.SetFilterMetaChanges(metaChanges));
 
-    public static Generator<DataSetVersion> WithFilterOptionChanges(
+    public static Generator<DataSetVersion> WithFilterOptionMetaChanges(
         this Generator<DataSetVersion> generator,
-        IEnumerable<ChangeSetFilterOptions> filterOptionChanges)
-        => generator.ForInstance(s => s.SetFilterOptionChanges(filterOptionChanges));
+        IEnumerable<FilterOptionMetaChange> metaChanges)
+        => generator.ForInstance(s => s.SetFilterOptionMetaChanges(metaChanges));
 
-    public static Generator<DataSetVersion> WithIndicatorChanges(
+    public static Generator<DataSetVersion> WithGeographicLevelMetaChanges(
         this Generator<DataSetVersion> generator,
-        IEnumerable<ChangeSetIndicators> indicatorChanges)
-        => generator.ForInstance(s => s.SetIndicatorChanges(indicatorChanges));
+        GeographicLevelMetaChange metaChange)
+        => generator.ForInstance(s => s.SetGeographicLevelMetaChange(metaChange));
 
-    public static Generator<DataSetVersion> WithLocationChanges(
+    public static Generator<DataSetVersion> WithIndicatorMetaChanges(
         this Generator<DataSetVersion> generator,
-        IEnumerable<ChangeSetLocations> locationChanges)
-        => generator.ForInstance(s => s.SetLocationChanges(locationChanges));
+        IEnumerable<IndicatorMetaChange> metaChanges)
+        => generator.ForInstance(s => s.SetIndicatorMetaChanges(metaChanges));
 
-    public static Generator<DataSetVersion> WithTimePeriodChanges(
+    public static Generator<DataSetVersion> WithLocationMetaChanges(
         this Generator<DataSetVersion> generator,
-        IEnumerable<ChangeSetTimePeriods> timePeriodChanges)
-        => generator.ForInstance(s => s.SetTimePeriodChanges(timePeriodChanges));
+        IEnumerable<LocationMetaChange> metaChanges)
+        => generator.ForInstance(s => s.SetLocationMetaChanges(metaChanges));
+
+    public static Generator<DataSetVersion> WithLocationOptionMetaChanges(
+        this Generator<DataSetVersion> generator,
+        IEnumerable<LocationOptionMetaChange> metaChanges)
+        => generator.ForInstance(s => s.SetLocationOptionMetaChanges(metaChanges));
+
+    public static Generator<DataSetVersion> WithTimePeriodMetaChanges(
+        this Generator<DataSetVersion> generator,
+        IEnumerable<TimePeriodMetaChange> metaChanges)
+        => generator.ForInstance(s => s.SetTimePeriodMetaChanges(metaChanges));
 
     public static Generator<DataSetVersion> WithPreviewTokens(
         this Generator<DataSetVersion> generator,
@@ -408,81 +418,110 @@ public static InstanceSetters<DataSetVersion> SetTimePeriodMetas(
             }
         );
 
-    public static InstanceSetters<DataSetVersion> SetFilterChanges(
+    public static InstanceSetters<DataSetVersion> SetFilterMetaChanges(
         this InstanceSetters<DataSetVersion> instanceSetter,
-        IEnumerable<ChangeSetFilters> filterChanges)
+        IEnumerable<FilterMetaChange> filterChanges)
         => instanceSetter.Set(
-            dsv => dsv.FilterChanges,
+            dsv => dsv.FilterMetaChanges,
             (_, dsv) => filterChanges.Select(
-                    changeSet =>
+                    change =>
                     {
-                        changeSet.DataSetVersionId = dsv.Id;
-                        changeSet.DataSetVersion = dsv;
-                        return changeSet;
+                        change.DataSetVersion = dsv;
+                        change.DataSetVersionId = dsv.Id;
+                        return change;
                     }
                 )
                 .ToList()
         );
 
-    public static InstanceSetters<DataSetVersion> SetFilterOptionChanges(
+    public static InstanceSetters<DataSetVersion> SetFilterOptionMetaChanges(
         this InstanceSetters<DataSetVersion> instanceSetter,
-        IEnumerable<ChangeSetFilterOptions> filterOptionChanges)
+        IEnumerable<FilterOptionMetaChange> filterOptionChanges)
         => instanceSetter.Set(
-            dsv => dsv.FilterOptionChanges,
+            dsv => dsv.FilterOptionMetaChanges,
             (_, dsv) => filterOptionChanges.Select(
-                    changeSet =>
+                    change =>
                     {
-                        changeSet.DataSetVersionId = dsv.Id;
-                        changeSet.DataSetVersion = dsv;
-                        return changeSet;
+                        change.DataSetVersion = dsv;
+                        change.DataSetVersionId = dsv.Id;
+                        return change;
                     }
                 )
                 .ToList()
         );
+
+    public static InstanceSetters<DataSetVersion> SetGeographicLevelMetaChange(
+        this InstanceSetters<DataSetVersion> instanceSetter,
+        GeographicLevelMetaChange change)
+        => instanceSetter.Set(
+            dsv => dsv.GeographicLevelMetaChange,
+            (_, dsv) =>
+            {
+                change.DataSetVersion = dsv;
+                change.DataSetVersionId = dsv.Id;
+                return change;
+            }
+        );
 
-    public static InstanceSetters<DataSetVersion> SetIndicatorChanges(
+    public static InstanceSetters<DataSetVersion> SetIndicatorMetaChanges(
         this InstanceSetters<DataSetVersion> instanceSetter,
-        IEnumerable<ChangeSetIndicators> indicatorChanges)
+        IEnumerable<IndicatorMetaChange> indicatorChanges)
         => instanceSetter.Set(
-            dsv => dsv.IndicatorChanges,
+            dsv => dsv.IndicatorMetaChanges,
             (_, dsv) => indicatorChanges.Select(
-                    changeSet =>
+                    change =>
                     {
-                        changeSet.DataSetVersionId = dsv.Id;
-                        changeSet.DataSetVersion = dsv;
-                        return changeSet;
+                        change.DataSetVersion = dsv;
+                        change.DataSetVersionId = dsv.Id;
+                        return change;
                     }
                 )
                 .ToList()
         );
 
-    public static InstanceSetters<DataSetVersion> SetLocationChanges(
+    public static InstanceSetters<DataSetVersion> SetLocationMetaChanges(
         this InstanceSetters<DataSetVersion> instanceSetter,
-        IEnumerable<ChangeSetLocations> locationChanges)
+        IEnumerable<LocationMetaChange> locationChanges)
         => instanceSetter.Set(
-            dsv => dsv.LocationChanges,
+            dsv => dsv.LocationMetaChanges,
             (_, dsv) => locationChanges.Select(
-                    changeSet =>
+                    change =>
+                    {
+                        change.DataSetVersion = dsv;
+                        change.DataSetVersionId = dsv.Id;
+                        return change;
+                    }
+                )
+                .ToList()
+        );
+
+    public static InstanceSetters<DataSetVersion> SetLocationOptionMetaChanges(
+        this InstanceSetters<DataSetVersion> instanceSetter,
+        IEnumerable<LocationOptionMetaChange> locationOptionChanges)
+        => instanceSetter.Set(
+            dsv => dsv.LocationOptionMetaChanges,
+            (_, dsv) => locationOptionChanges.Select(
+                    change =>
                     {
-                        changeSet.DataSetVersionId = dsv.Id;
-                        changeSet.DataSetVersion = dsv;
-                        return changeSet;
+                        change.DataSetVersion = dsv;
+                        change.DataSetVersionId = dsv.Id;
+                        return change;
                     }
                 )
                 .ToList()
         );
 
-    public static InstanceSetters<DataSetVersion> SetTimePeriodChanges(
+    public static InstanceSetters<DataSetVersion> SetTimePeriodMetaChanges(
         this InstanceSetters<DataSetVersion> instanceSetter,
-        IEnumerable<ChangeSetTimePeriods> timePeriodChanges)
+        IEnumerable<TimePeriodMetaChange> timePeriodChanges)
         => instanceSetter.Set(
-            dsv => dsv.TimePeriodChanges,
+            dsv => dsv.TimePeriodMetaChanges,
             (_, dsv) => timePeriodChanges.Select(
-                    changeSet =>
+                    change =>
                     {
-                        changeSet.DataSetVersionId = dsv.Id;
-                        changeSet.DataSetVersion = dsv;
-                        return changeSet;
+                        change.DataSetVersion = dsv;
+                        change.DataSetVersionId = dsv.Id;
+                        return change;
                     }
                 )
                 .ToList()