Merge pull request #5417 from dfe-analytical-services/EES-5694-approv…

…al-permissions-error-due-to-unused-images EES-5694 - allowing unused images to be removed on ReleaseVersion approval
dfe-analytical-services · Nov 29, 2024 · cebd825 · cebd825
2 parents 80bd0c2 + d90d6f3
commit cebd825
Show file tree

Hide file tree

Showing 6 changed files with 2,308 additions and 25 deletions.
diff --git a/...EducationStatistics.Admin.Tests/Services/Methodologies/MethodologyApprovalServiceTests.cs b/...EducationStatistics.Admin.Tests/Services/Methodologies/MethodologyApprovalServiceTests.cs
@@ -204,12 +204,12 @@ public async Task UpdateApprovalStatus_ApprovingMethodologyWithUnusedImages()
                     mock.GetContentBlocks<HtmlBlock>(methodologyVersion.Id))
                 .ReturnsAsync(new List<HtmlBlock>());
 
-            imageService.Setup(mock =>
-                    mock.Delete(methodologyVersion.Id, new List<Guid>
+            imageService.Setup(mock => mock.Delete(
+                    methodologyVersion.Id, new List<Guid>
                     {
                         imageFile1.File.Id,
                         imageFile2.File.Id
-                    }, false))
+                    }, true))
                 .ReturnsAsync(Unit.Instance);
 
             methodologyVersionRepository.Setup(mock =>
@@ -232,7 +232,7 @@ public async Task UpdateApprovalStatus_ApprovingMethodologyWithUnusedImages()
                     {
                         imageFile1.File.Id,
                         imageFile2.File.Id
-                    }, false), Times.Once);
+                    }, true), Times.Once);
 
                 VerifyAllMocks(contentService, imageService, methodologyVersionRepository);
 

diff --git a/....Education.ExploreEducationStatistics.Admin.Tests/Services/ReleaseApprovalServiceTests.cs b/....Education.ExploreEducationStatistics.Admin.Tests/Services/ReleaseApprovalServiceTests.cs
@@ -224,24 +224,30 @@ public async Task CreateReleaseStatus_Approved_FailsOnChecklistErrors()
                 await context.SaveChangesAsync();
             }
 
+            var contentService = new Mock<IContentService>(MockBehavior.Strict);
             var releaseChecklistService = new Mock<IReleaseChecklistService>(MockBehavior.Strict);
 
+            contentService.Setup(mock =>
+                    mock.GetContentBlocks<HtmlBlock>(releaseVersion.Id))
+                .ReturnsAsync(new List<HtmlBlock>());
+
+            releaseChecklistService
+                .Setup(s =>
+                    s.GetErrors(It.Is<ReleaseVersion>(rv => rv.Id == releaseVersion.Id)))
+                .ReturnsAsync(
+                    new List<ReleaseChecklistIssue>
+                    {
+                        new(DataFileImportsMustBeCompleted),
+                        new(DataFileReplacementsMustBeCompleted)
+                    }
+                );
+
             await using (var context = InMemoryApplicationDbContext(contextId))
             {
-                releaseChecklistService
-                    .Setup(s =>
-                        s.GetErrors(It.Is<ReleaseVersion>(rv => rv.Id == releaseVersion.Id)))
-                    .ReturnsAsync(
-                        new List<ReleaseChecklistIssue>
-                        {
-                            new(DataFileImportsMustBeCompleted),
-                            new(DataFileReplacementsMustBeCompleted)
-                        }
-                    );
-
                 var releaseService = BuildService(
                     context,
-                    releaseChecklistService: releaseChecklistService.Object);
+                    releaseChecklistService: releaseChecklistService.Object,
+                    contentService: contentService.Object);
 
                 var result = await releaseService
                     .CreateReleaseStatus(
@@ -260,7 +266,7 @@ public async Task CreateReleaseStatus_Approved_FailsOnChecklistErrors()
                         }
                     );
 
-                VerifyAllMocks(releaseChecklistService);
+                VerifyAllMocks(releaseChecklistService, contentService);
 
                 result.AssertBadRequest(
                     DataFileImportsMustBeCompleted,
@@ -764,10 +770,18 @@ public async Task CreateReleaseStatus_Approved_Scheduled_FailsChangingToDraft()
                 context.ReleaseVersions.Add(releaseVersion);
                 await context.SaveChangesAsync();
             }
+
+            var contentService = new Mock<IContentService>(MockBehavior.Strict);
+
+            contentService.Setup(mock =>
+                    mock.GetContentBlocks<HtmlBlock>(releaseVersion.Id))
+                .ReturnsAsync(new List<HtmlBlock>());
 
             await using (var context = InMemoryApplicationDbContext(contextId))
             {
-                var releaseService = BuildService(context);
+                var releaseService = BuildService(
+                    contentDbContext: context,
+                    contentService: contentService.Object);
 
                 var result = await releaseService
                     .CreateReleaseStatus(
@@ -777,6 +791,8 @@ public async Task CreateReleaseStatus_Approved_Scheduled_FailsChangingToDraft()
                             ApprovalStatus = ReleaseApprovalStatus.Draft,
                         }
                     );
+
+                VerifyAllMocks(contentService);
 
                 result.AssertBadRequest(PublishedReleaseCannotBeUnapproved);
             }
@@ -1382,7 +1398,7 @@ public async Task CreateReleaseStatus_ReleaseHasUnusedImages()
                             imageFile1.File.Id,
                             imageFile2.File.Id
                         },
-                        false))
+                        true))
                 .ReturnsAsync(Unit.Instance);
 
             userReleaseRoleService.Setup(mock =>
@@ -1422,7 +1438,7 @@ public async Task CreateReleaseStatus_ReleaseHasUnusedImages()
                                 imageFile1.File.Id,
                                 imageFile2.File.Id
                             },
-                            false),
+                            true),
                     Times.Once);
 
                 VerifyAllMocks(contentService, releaseFileService, userReleaseRoleService);