EES-5639 Simplifying some logic when deleting Release blob cache

Author: jack-hive

src/GovUk.Education.ExploreEducationStatistics.Content.Services.Tests/Cache/ReleaseCacheServiceTests.cs

@@ -3,6 +3,8 @@
 using System.Threading.Tasks;
 using GovUk.Education.ExploreEducationStatistics.Common.Model;
 using GovUk.Education.ExploreEducationStatistics.Common.Model.Chart;
+using GovUk.Education.ExploreEducationStatistics.Common.Services;
+using GovUk.Education.ExploreEducationStatistics.Common.Services.Interfaces;
 using GovUk.Education.ExploreEducationStatistics.Common.Tests.Extensions;
 using GovUk.Education.ExploreEducationStatistics.Common.Tests.Fixtures;
 using GovUk.Education.ExploreEducationStatistics.Content.Model;
@@ -373,10 +375,12 @@ private static ContentSectionViewModel ContentSectionWithHtmlBlock()
     }
 
     private static ReleaseCacheService BuildService(
-        IReleaseService? releaseService = null
+        IReleaseService? releaseService = null,
+        IPublicBlobStorageService? publicBlobStorageService = null
     )
     {
         return new ReleaseCacheService(
-            releaseService: releaseService ?? Mock.Of<IReleaseService>(Strict));
+            releaseService: releaseService ?? Mock.Of<IReleaseService>(Strict),
+            publicBlobStorageService: publicBlobStorageService ?? Mock.Of<IPublicBlobStorageService>(Strict));
     }
 }

src/GovUk.Education.ExploreEducationStatistics.Content.Services/Cache/ReleaseCacheService.cs

@@ -6,6 +6,7 @@
 using GovUk.Education.ExploreEducationStatistics.Common.Cache;
 using GovUk.Education.ExploreEducationStatistics.Common.Extensions;
 using GovUk.Education.ExploreEducationStatistics.Common.Model;
+using GovUk.Education.ExploreEducationStatistics.Common.Services;
 using GovUk.Education.ExploreEducationStatistics.Common.Services.Interfaces;
 using GovUk.Education.ExploreEducationStatistics.Content.Services.Interfaces;
 using GovUk.Education.ExploreEducationStatistics.Content.Services.Interfaces.Cache;
@@ -50,12 +51,11 @@ public async Task<Either<ActionResult, Unit>> RemoveRelease(
         string publicationSlug,
         string releaseSlug)
     {
-        await publicBlobStorageService.DeleteBlobs(
+        await publicBlobStorageService.DeleteBlob(
             containerName: BlobContainers.PublicContent,
-            options: new IBlobStorageService.DeleteBlobsOptions
-            {
-                IncludeRegex = new Regex($"^publications/{publicationSlug.TrimToLower()}/releases/{releaseSlug.TrimToLower()}.json")
-            }
+            path: FileStoragePathUtils.PublicContentReleasePath(
+                publicationSlug: publicationSlug,
+                releaseSlug: releaseSlug)
         );
 
         return Unit.Instance;