EES-4856 Changes after resolving merge conflict

Author: mmyoungman

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

@@ -1843,7 +1843,6 @@ public async Task FetchDataSetDetails_Success()
                     .WithDataSetFileMeta(_fixture.DefaultDataSetFileMeta())
                     .WithPublicApiDataSetId(Guid.NewGuid())
                     .WithPublicApiDataSetVersion(major: 1, minor: 0)
-                    .WithSubjectId(Guid.NewGuid())
                 );
 
             var publicBlobStorageService = new PublicBlobStorageService(
@@ -2028,7 +2027,6 @@ public async Task FetchDataSetFiltersOrdered_Success()
                     new FilterSequenceEntry(filter3Id, new List<FilterGroupSequenceEntry>()),
                 ])
                 .WithFile(_fixture.DefaultFile()
-                    .WithSubjectId(Guid.NewGuid())
                     .WithDataSetFileMeta(_fixture.DefaultDataSetFileMeta()
                         .WithFilters([
                             new FilterMeta { Id = filter3Id, Label = "Filter 3", },
@@ -2095,7 +2093,6 @@ public async Task FetchDataSetIndicatorsOrdered_Success()
                         new List<Guid> { indicator3Id, indicator4Id })
                 ])
                 .WithFile(_fixture.DefaultFile()
-                    .WithSubjectId(Guid.NewGuid())
                     .WithDataSetFileMeta(_fixture.DefaultDataSetFileMeta()
                         .WithIndicators([
                             new IndicatorMeta { Id = indicator3Id, Label = "Indicator 3", },
@@ -2349,7 +2346,6 @@ public async Task AmendmentNotPublished_ReturnsOk()
                     .WithTheme(_fixture.DefaultTheme()));
 
             File file = _fixture.DefaultFile()
-                .WithSubjectId(Guid.NewGuid())
                 .WithDataSetFileMeta(_fixture.DefaultDataSetFileMeta());
 
             ReleaseFile releaseFile0 = _fixture.DefaultReleaseFile()

src/GovUk.Education.ExploreEducationStatistics.Content.Model.Tests/Fixtures/FileGeneratorExtensions.cs

@@ -20,6 +20,7 @@ public static InstanceSetters<File> SetDefaults(this InstanceSetters<File> sette
             .SetDefault(f => f.Id)
             .SetDefault(f => f.RootPath)
             .SetDefault(f => f.DataSetFileId)
+            .SetDefault(f => f.SubjectId)
             .SetContentLength(1024 * 1024)
             .SetContentType("text/csv")
             .SetType(FileType.Data)
@@ -28,7 +29,7 @@ public static InstanceSetters<File> SetDefaults(this InstanceSetters<File> sette
             {
                 GeographicLevels = [GeographicLevel.Country.GetEnumLabel()],
                 TimeIdentifier = TimeIdentifier.CalendarYear,
-                Years = [ 2000, 2001 ],
+                Years = [2000, 2001],
                 Filters = [new() { Id = Guid.NewGuid(), Label = "Filter 1", }],
                 Indicators = [new() { Id = Guid.NewGuid(), Label = "Indicator 1" }],
             })

src/GovUk.Education.ExploreEducationStatistics.Public.Data.Processor.Tests/Functions/CreateInitialDataSetVersionFunctionTests.cs

@@ -40,6 +40,7 @@ public async Task Success()
                 .WithFiles(_fixture.DefaultFile()
                     .ForIndex(0, s => s.SetType(FileType.Data))
                     .ForIndex(1, s => s.SetType(FileType.Metadata))
+                    .WithSubjectId(Guid.NewGuid())
                     .Generate(2))
                 .GenerateList()
                 .ToTuple2();