fixup! EES-5800 Update DataGuidanceFileWriter.DoWrite to use Release

Author: benoutram

src/GovUk.Education.ExploreEducationStatistics.Admin/Services/ReleaseFileService.cs

@@ -202,7 +202,7 @@ public async Task<Either<ActionResult, Unit>> ZipFilesToStream(
             return await _contentDbContext.ReleaseVersions
                 .Include(rv => rv.Release)
                 .ThenInclude(r => r.Publication)
-                .SingleOrNotFoundAsync(cancellationToken: cancellationToken)
+                .SingleOrNotFoundAsync(rv => rv.Id == releaseVersionId, cancellationToken: cancellationToken)
                 .OnSuccess(_userService.CheckCanViewReleaseVersion)
                 .OnSuccessVoid(
                     async releaseVersion =>

src/GovUk.Education.ExploreEducationStatistics.Content.Services.Tests/ReleaseFileServicePermissionTests.cs

@@ -3,22 +3,26 @@
 using System.Threading.Tasks;
 using GovUk.Education.ExploreEducationStatistics.Common.Services.Interfaces;
 using GovUk.Education.ExploreEducationStatistics.Common.Services.Interfaces.Security;
+using GovUk.Education.ExploreEducationStatistics.Common.Tests.Fixtures;
 using GovUk.Education.ExploreEducationStatistics.Common.Utils;
 using GovUk.Education.ExploreEducationStatistics.Content.Model;
 using GovUk.Education.ExploreEducationStatistics.Content.Model.Database;
+using GovUk.Education.ExploreEducationStatistics.Content.Model.Tests.Fixtures;
 using GovUk.Education.ExploreEducationStatistics.Content.Security;
 using GovUk.Education.ExploreEducationStatistics.Content.Services.Interfaces;
 using Moq;
 using Xunit;
-using static GovUk.Education.ExploreEducationStatistics.Common.Services.CollectionUtils;
 using static GovUk.Education.ExploreEducationStatistics.Common.Tests.Utils.MockUtils;
 using static GovUk.Education.ExploreEducationStatistics.Common.Tests.Utils.PermissionTestUtils;
+using static GovUk.Education.ExploreEducationStatistics.Content.Model.Tests.Utils.ContentDbUtils;
 using File = GovUk.Education.ExploreEducationStatistics.Content.Model.File;
 
 namespace GovUk.Education.ExploreEducationStatistics.Content.Services.Tests
 {
     public class ReleaseFileServicePermissionTests
     {
+        private readonly DataFixture _dataFixture = new();
+
         private static readonly ReleaseVersion ReleaseVersion = new()
         {
             Id = Guid.NewGuid()
@@ -41,7 +45,7 @@ await PolicyCheckBuilder<ContentSecurityPolicies>()
                         var persistenceHelper =
                             MockPersistenceHelper<ContentDbContext, ReleaseFile>(ReleaseFile);
 
-                        var service = BuildReleaseFileService(
+                        var service = BuildService(
                             userService: userService.Object,
                             persistenceHelper: persistenceHelper.Object
                         );
@@ -54,22 +58,34 @@ await PolicyCheckBuilder<ContentSecurityPolicies>()
         [Fact]
         public async Task ZipFilesToStream()
         {
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()));
+
             await PolicyCheckBuilder<ContentSecurityPolicies>()
-                .SetupResourceCheckToFail(ReleaseVersion, ContentSecurityPolicies.CanViewSpecificRelease)
+                .SetupResourceCheckToFailWithMatcher<ReleaseVersion>(rv => rv.Id == releaseVersion.Id,
+                    ContentSecurityPolicies.CanViewSpecificRelease)
                 .AssertForbidden(
-                    userService =>
+                    async userService =>
                     {
-                        var service = BuildReleaseFileService(userService: userService.Object);
-                        return service.ZipFilesToStream(
-                            releaseVersionId: ReleaseVersion.Id,
+                        await using var contextDbContext = InMemoryContentDbContext();
+                        contextDbContext.ReleaseVersions.Add(releaseVersion);
+                        await contextDbContext.SaveChangesAsync();
+
+                        var service = BuildService(
+                            contentDbContext: contextDbContext,
+                            userService: userService.Object);
+
+                        return await service.ZipFilesToStream(
+                            releaseVersionId: releaseVersion.Id,
                             outputStream: Stream.Null,
-                            fileIds: ListOf(Guid.NewGuid())
+                            fileIds: [Guid.NewGuid()]
                         );
                     }
                 );
         }
 
-        private ReleaseFileService BuildReleaseFileService(
+        private ReleaseFileService BuildService(
             ContentDbContext? contentDbContext = null,
             IPersistenceHelper<ContentDbContext>? persistenceHelper = null,
             IPublicBlobStorageService? publicBlobStorageService = null,

src/GovUk.Education.ExploreEducationStatistics.Content.Services.Tests/ReleaseFileServiceTests.cs

@@ -11,11 +11,13 @@
 using GovUk.Education.ExploreEducationStatistics.Common.Services.Interfaces;
 using GovUk.Education.ExploreEducationStatistics.Common.Services.Interfaces.Security;
 using GovUk.Education.ExploreEducationStatistics.Common.Tests.Extensions;
+using GovUk.Education.ExploreEducationStatistics.Common.Tests.Fixtures;
 using GovUk.Education.ExploreEducationStatistics.Common.Tests.Utils;
 using GovUk.Education.ExploreEducationStatistics.Common.Utils;
 using GovUk.Education.ExploreEducationStatistics.Content.Model;
 using GovUk.Education.ExploreEducationStatistics.Content.Model.Database;
 using GovUk.Education.ExploreEducationStatistics.Content.Model.Extensions;
+using GovUk.Education.ExploreEducationStatistics.Content.Model.Tests.Fixtures;
 using GovUk.Education.ExploreEducationStatistics.Content.Services.Interfaces;
 using Moq;
 using Xunit;
@@ -29,6 +31,7 @@ namespace GovUk.Education.ExploreEducationStatistics.Content.Services.Tests
 {
     public class ReleaseFileServiceTests : IDisposable
     {
+        private readonly DataFixture _dataFixture = new();
         private readonly List<string> _filePaths = new();
 
         public void Dispose()
@@ -203,14 +206,9 @@ public async Task StreamFile_BlobDoesNotExist()
         [Fact]
         public async Task ZipFilesToStream_ValidFileTypes()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()));
 
             var releaseFile1 = new ReleaseFile
             {
@@ -309,14 +307,9 @@ public async Task ZipFilesToStream_ValidFileTypes()
         [Fact]
         public async Task ZipFilesToStream_DataGuidanceForMultipleDataFiles()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()));
 
             var releaseFile1 = new ReleaseFile
             {
@@ -415,14 +408,9 @@ public async Task ZipFilesToStream_DataGuidanceForMultipleDataFiles()
         [Fact]
         public async Task ZipFilesToStream_OrderedAlphabetically()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()));
 
             var releaseFile1 = new ReleaseFile
             {
@@ -519,14 +507,9 @@ public async Task ZipFilesToStream_OrderedAlphabetically()
         [Fact]
         public async Task ZipFilesToStream_FiltersInvalidFileTypes()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()));
 
             var releaseFile1 = new ReleaseFile
             {
@@ -612,14 +595,9 @@ public async Task ZipFilesToStream_FiltersInvalidFileTypes()
         [Fact]
         public async Task ZipFilesToStream_FiltersFilesNotInBlobStorage()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()));
 
             var releaseFile1 = new ReleaseFile
             {
@@ -689,14 +667,9 @@ public async Task ZipFilesToStream_FiltersFilesNotInBlobStorage()
         [Fact]
         public async Task ZipFilesToStream_FiltersFilesForOtherReleases()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()));
 
             // Files are for other releases
             var releaseFile1 = new ReleaseFile
@@ -763,14 +736,9 @@ public async Task ZipFilesToStream_FiltersFilesForOtherReleases()
         [Fact]
         public async Task ZipFilesToStream_Empty()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()));
 
             var contentDbContextId = Guid.NewGuid().ToString();
 
@@ -808,14 +776,9 @@ public async Task ZipFilesToStream_Empty()
         [Fact]
         public async Task ZipFilesToStream_Cancelled()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()));
 
             var releaseFile1 = new ReleaseFile
             {
@@ -900,14 +863,10 @@ public async Task ZipFilesToStream_Cancelled()
         [Fact]
         public async Task ZipFilesToStream_NoFileIds_NoCachedAllFilesZip()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()
+                        .WithSlug("publication-slug")));
 
             var releaseFile1 = new ReleaseFile
             {
@@ -1024,14 +983,10 @@ public async Task ZipFilesToStream_NoFileIds_NoCachedAllFilesZip()
         [Fact]
         public async Task ZipFilesToStream_NoFileIds_CachedAllFilesZip()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()
+                        .WithSlug("publication-slug")));
 
             var contentDbContextId = Guid.NewGuid().ToString();
 
@@ -1087,14 +1042,10 @@ public async Task ZipFilesToStream_NoFileIds_CachedAllFilesZip()
         [Fact]
         public async Task ZipFilesToStream_NoFileIds_StaleCachedAllFilesZip()
         {
-            var releaseVersion = new ReleaseVersion
-            {
-                Publication = new Publication
-                {
-                    Slug = "publication-slug"
-                },
-                Slug = "release-slug"
-            };
+            ReleaseVersion releaseVersion = _dataFixture.DefaultReleaseVersion()
+                .WithRelease(_dataFixture.DefaultRelease()
+                    .WithPublication(_dataFixture.DefaultPublication()
+                        .WithSlug("publication-slug")));
 
             var releaseFile1 = new ReleaseFile
             {

src/GovUk.Education.ExploreEducationStatistics.Content.Services/ReleaseFileService.cs

@@ -123,10 +123,10 @@ public async Task<Either<ActionResult, Unit>> ZipFilesToStream(
             IEnumerable<Guid>? fileIds = null,
             CancellationToken cancellationToken = default)
         {
-            return await persistenceHelper.CheckEntityExists<ReleaseVersion>(
-                    releaseVersionId,
-                    q => q.Include(rv => rv.Publication)
-                )
+            return await contentDbContext.ReleaseVersions
+                .Include(rv => rv.Release)
+                .ThenInclude(r => r.Publication)
+                .SingleOrNotFoundAsync(rv => rv.Id == releaseVersionId, cancellationToken: cancellationToken)
                 .OnSuccess(userService.CheckCanViewReleaseVersion)
                 .OnSuccessVoid(
                     async release =>