Merge pull request #4271 from dfe-analytical-services/dev

Merging dev into master
dfe-analytical-services · Sep 4, 2023 · 7ddc669 · 7ddc669
2 parents 80a258c + e2020fe
commit 7ddc669
Show file tree

Hide file tree

Showing 23 changed files with 3,045 additions and 257 deletions.
diff --git a/src/GovUk.Education.ExploreEducationStatistics.Admin.Tests/Services/ReleaseServiceTests.cs b/src/GovUk.Education.ExploreEducationStatistics.Admin.Tests/Services/ReleaseServiceTests.cs
@@ -319,7 +319,7 @@ public async Task RemoveDataFiles()
             releaseDataFileService.Setup(service => service.Delete(release.Id, file.Id, false))
                 .ReturnsAsync(Unit.Instance);
 
-            releaseSubjectRepository.Setup(service => service.SoftDeleteReleaseSubject(release.Id, subject.Id))
+            releaseSubjectRepository.Setup(service => service.DeleteReleaseSubject(release.Id, subject.Id, true))
                 .Returns(Task.CompletedTask);
 
             await using (var context = InMemoryApplicationDbContext(contentDbContextId))
@@ -481,7 +481,7 @@ public async Task RemoveDataFiles_ReplacementExists()
                 .ReturnsAsync(Unit.Instance);
 
             releaseSubjectRepository.Setup(service =>
-                    service.SoftDeleteReleaseSubject(release.Id, It.IsIn(subject.Id, replacementSubject.Id)))
+                    service.DeleteReleaseSubject(release.Id, It.IsIn(subject.Id, replacementSubject.Id), true))
                 .Returns(Task.CompletedTask);
 
             await using (var context = InMemoryApplicationDbContext(contentDbContextId))
@@ -519,8 +519,9 @@ public async Task RemoveDataFiles_ReplacementExists()
                 );
 
                 releaseSubjectRepository.Verify(
-                    mock => mock.SoftDeleteReleaseSubject(release.Id,
-                        It.IsIn(subject.Id, replacementSubject.Id)), Times.Exactly(2));
+                    mock => mock.DeleteReleaseSubject(release.Id,
+                        It.IsIn(subject.Id, replacementSubject.Id), true),
+                    Times.Exactly(2));
 
                 result.AssertRight();
             }
@@ -1017,7 +1018,7 @@ public async Task GetLatestPublishedRelease()
                 var latestIdTitleViewModel = result.AssertRight();
 
                 Assert.NotNull(latestIdTitleViewModel);
-                Assert.Equal(publication.LatestPublishedReleaseId, latestIdTitleViewModel!.Id);
+                Assert.Equal(publication.LatestPublishedReleaseId, latestIdTitleViewModel.Id);
                 Assert.Equal("Calendar year 2022", latestIdTitleViewModel.Title);
             }
         }
@@ -1214,7 +1215,7 @@ public async Task DeleteRelease()
                 mock.DeleteAll(release.Id, false)).ReturnsAsync(Unit.Instance);
 
             releaseSubjectRepository.Setup(mock =>
-                mock.SoftDeleteAllReleaseSubjects(release.Id)).Returns(Task.CompletedTask);
+                mock.DeleteAllReleaseSubjects(release.Id, true)).Returns(Task.CompletedTask);
 
             cacheService
                 .Setup(mock => mock.DeleteCacheFolderAsync(

diff --git a/src/GovUk.Education.ExploreEducationStatistics.Admin/Services/ReleaseService.cs b/src/GovUk.Education.ExploreEducationStatistics.Admin/Services/ReleaseService.cs
@@ -240,7 +240,7 @@ public Task<Either<ActionResult, Unit>> DeleteRelease(Guid releaseId)
 
                     await _context.SaveChangesAsync();
 
-                    await _releaseSubjectRepository.SoftDeleteAllReleaseSubjects(releaseId);
+                    await _releaseSubjectRepository.DeleteAllReleaseSubjects(releaseId: releaseId);
                 });
         }
 
@@ -559,8 +559,10 @@ public async Task<Either<ActionResult, Unit>> RemoveDataFiles(Guid releaseId, Gu
                 .OnSuccessDo(deletePlan => _dataBlockService.DeleteDataBlocks(deletePlan.DeleteDataBlockPlan))
                 .OnSuccessVoid(async deletePlan =>
                 {
-                    await _releaseSubjectRepository.SoftDeleteReleaseSubject(releaseId, deletePlan.SubjectId);
-                    await _cacheService.DeleteItemAsync(new PrivateSubjectMetaCacheKey(releaseId, deletePlan.SubjectId));
+                    await _releaseSubjectRepository.DeleteReleaseSubject(releaseId: releaseId,
+                        subjectId: deletePlan.SubjectId);
+                    await _cacheService.DeleteItemAsync(new PrivateSubjectMetaCacheKey(releaseId: releaseId,
+                        subjectId: deletePlan.SubjectId));
                 })
                 .OnSuccess(() => _releaseDataFileService.Delete(releaseId, fileId));
         }

diff --git a/src/GovUk.Education.ExploreEducationStatistics.Admin/Services/TopicService.cs b/src/GovUk.Education.ExploreEducationStatistics.Admin/Services/TopicService.cs
@@ -282,7 +282,8 @@ private async Task DeleteStatsDbRelease(Guid releaseId)
 
             if (statsRelease != null)
             {
-                await _releaseSubjectRepository.DeleteAllReleaseSubjects(statsRelease.Id);
+                await _releaseSubjectRepository.DeleteAllReleaseSubjects(releaseId: statsRelease.Id,
+                    softDeleteOrphanedSubjects: false);
                 _statisticsContext.Release.Remove(statsRelease);
                 await _statisticsContext.SaveChangesAsync();
             }

diff --git a/src/GovUk.Education.ExploreEducationStatistics.Common/Model/Chart/ChartAxisConfiguration.cs b/src/GovUk.Education.ExploreEducationStatistics.Common/Model/Chart/ChartAxisConfiguration.cs
@@ -18,6 +18,7 @@ public class ChartAxisConfiguration
         public AxisGroupBy? GroupBy;
 
         public string? GroupByFilter;
+        public bool GroupByFilterGroups;
 
         public string SortBy = null!;
         public bool SortAsc = true;