Merged presignedUrlGenerator into blobService

Author: kristan66

src/KeeperData.Core.Reports/Abstract/ICleanseReportPresignedUrlGenerator.cs

@@ -8,6 +8,7 @@
 using KeeperData.Core.Reports.Domain;
 using KeeperData.Core.Reports.Dtos;
 using KeeperData.Core.Reports.Strategies;
+using KeeperData.Core.Storage;
 using Microsoft.Extensions.Logging;
 
 namespace KeeperData.Core.Reports;
@@ -24,7 +25,7 @@ public class CleanseReportService(
     ICleanseAnalysisRepository analysisRepository,
     IDistributedLock distributedLock,
     ICleanseReportExportService exportService,
-    ICleanseReportPresignedUrlGenerator presignedUrlGenerator,
+    IBlobStorageServiceFactory blobStorageServiceFactory,
     ICleanseReportNotificationService notificationService,
     ILogger<CleanseReportService> logger,
     IEnumerable<ICleanseAnalysisStrategy> strategies) : ICleanseReportService
@@ -364,7 +365,8 @@ public async Task<RegenerateReportUrlResult> RegenerateReportUrlAsync(string ope
                 };
             }
 
-            var newUrl = presignedUrlGenerator.GeneratePresignedUrl(operation.ReportObjectKey);
+            var blobService = blobStorageServiceFactory.GetCleanseReportsBlobService();
+            var newUrl = blobService.GeneratePresignedUrl(operation.ReportObjectKey);
 
             await analysisRepository.UpdateReportUrlAsync(operationId, newUrl, ct);
 

src/KeeperData.Core.Reports/CleanseReportService.cs

@@ -20,18 +20,15 @@ public class CleanseReportExportService : ICleanseReportExportService
 
     private readonly ICleanseReportRepository _reportRepository;
     private readonly IBlobStorageServiceFactory _blobStorageServiceFactory;
-    private readonly ICleanseReportPresignedUrlGenerator _presignedUrlGenerator;
     private readonly ILogger<CleanseReportExportService> _logger;
 
     public CleanseReportExportService(
         ICleanseReportRepository reportRepository,
         IBlobStorageServiceFactory blobStorageServiceFactory,
-        ICleanseReportPresignedUrlGenerator presignedUrlGenerator,
         ILogger<CleanseReportExportService> logger)
     {
         _reportRepository = reportRepository;
         _blobStorageServiceFactory = blobStorageServiceFactory;
-        _presignedUrlGenerator = presignedUrlGenerator;
         _logger = logger;
     }
 
@@ -66,8 +63,8 @@ public async Task<CleanseReportExportResult> ExportAndUploadAsync(string operati
             await blobService.UploadAsync(zipFileName, zipContent, "application/zip", cancellationToken: ct);
             _logger.LogInformation("Uploaded report to S3 with key {ObjectKey}", zipFileName);
 
-            // Step 4: Generate presigned URL (using the zip file name as the key - factory adds the prefix)
-            var presignedUrl = _presignedUrlGenerator.GeneratePresignedUrl(zipFileName);
+            // Step 4: Generate presigned URL (using the zip file name as the key - blob service handles the prefix)
+            var presignedUrl = blobService.GeneratePresignedUrl(zipFileName);
             _logger.LogInformation(
                 "Generated presigned URL for cleanse report (operation {OperationId}): {ReportUrl}",
                 operationId, presignedUrl);

src/KeeperData.Core.Reports/Impl/CleanseReportExportService.cs

@@ -50,4 +50,12 @@ Task<bool> ExistsAsync(
         string objectKey,
         CancellationToken cancellationToken = default);
 
+    /// <summary>
+    /// Generates a presigned URL for downloading an object.
+    /// </summary>
+    /// <param name="objectKey">The object key.</param>
+    /// <param name="expiresIn">Optional expiry duration. Defaults to 7 days if not specified.</param>
+    /// <returns>A presigned URL for downloading the object.</returns>
+    string GeneratePresignedUrl(string objectKey, TimeSpan? expiresIn = null);
+
 }

src/KeeperData.Core/Storage/IBlobStorageServiceReadOnly.cs

@@ -4,10 +4,6 @@
 using KeeperData.Core.Reports.Setup;
 using KeeperData.Infrastructure.Notifications;
 using KeeperData.Infrastructure.Notifications.Configuration;
-using KeeperData.Infrastructure.Reports;
-using KeeperData.Infrastructure.Storage.Clients;
-using KeeperData.Infrastructure.Storage.Configuration;
-using KeeperData.Infrastructure.Storage.Factories;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System.Diagnostics.CodeAnalysis;
@@ -29,19 +25,6 @@ public static void AddCleanseReportServices(this IServiceCollection services, IC
         // Add core dependencies
         services.AddCleanseReportDependencies();
 
-        // Add infrastructure dependencies (presigned URL generator)
-        services.AddScoped<ICleanseReportPresignedUrlGenerator>(sp =>
-        {
-            var s3ClientFactory = sp.GetRequiredService<IS3ClientFactory>();
-            var storageConfig = sp.GetRequiredService<StorageConfiguration>();
-
-            var clientInfo = s3ClientFactory.GetClientInfo<InternalStorageClient>();
-            return new S3CleanseReportPresignedUrlGenerator(
-                clientInfo.Client,
-                clientInfo.BucketName,
-                storageConfig.TargetInternalPrefix);
-        });
-
         // Add notification service and configuration
         services.Configure<CleanseReportNotificationConfig>(
             configuration.GetSection(CleanseReportNotificationConfig.SectionName));

src/KeeperData.Infrastructure/Reports/S3CleanseReportPresignedUrlGenerator.cs

@@ -376,6 +376,25 @@ public void Dispose()
         }
     }
 
+    private static readonly TimeSpan DefaultPresignedUrlExpiry = TimeSpan.FromDays(7);
+
+    /// <inheritdoc />
+    public string GeneratePresignedUrl(string objectKey, TimeSpan? expiresIn = null)
+    {
+        var fullKey = GetFullObjectKey(objectKey);
+        var expiry = expiresIn ?? DefaultPresignedUrlExpiry;
+
+        var request = new GetPreSignedUrlRequest
+        {
+            BucketName = _bucketName,
+            Key = fullKey,
+            Verb = HttpVerb.GET,
+            Expires = DateTime.UtcNow.Add(expiry)
+        };
+
+        return _s3Client.GetPreSignedURL(request);
+    }
+
     /// <summary>
     /// Normalizes the top-level folder to ensure consistent format:
     /// - Removes leading and trailing slashes

src/KeeperData.Infrastructure/Setup/CleanseReportServiceCollectionExtensions.cs

@@ -18,7 +18,6 @@
 using KeeperData.Core.Storage;
 using KeeperData.Infrastructure.Database.Configuration;
 using KeeperData.Infrastructure.Locking;
-using KeeperData.Infrastructure.Reports;
 using KeeperData.Infrastructure.Storage;
 using MartinCostello.Logging.XUnit;
 using Microsoft.Extensions.Logging;
@@ -192,17 +191,10 @@ private Task SetupServices()
         // Create a factory that returns our real S3 service
         var blobStorageServiceFactory = new TestBlobStorageServiceFactory(blobStorageService);
 
-        // Create real presigned URL generator pointing to LocalStack
-        var presignedUrlGenerator = new S3CleanseReportPresignedUrlGenerator(
-            _s3Client,
-            TestBucket,
-            CleanseReportsFolder);
-
         // Create real export service using real S3
         var exportService = new CleanseReportExportService(
             _reportRepository,
             blobStorageServiceFactory,
-            presignedUrlGenerator,
             loggerFactory.CreateLogger<CleanseReportExportService>());
 
         // Create fake notification service to capture calls
@@ -215,7 +207,7 @@ private Task SetupServices()
             _analysisRepository,
             distributedLock,
             exportService,
-            presignedUrlGenerator,
+            blobStorageServiceFactory,
             _fakeNotificationService,
             loggerFactory.CreateLogger<CleanseReportService>(),
             new ICleanseAnalysisStrategy[] { new CtsSamAnalysisStrategy() });

src/KeeperData.Infrastructure/Storage/S3BlobStorageServiceReadOnly.cs

@@ -11,6 +11,7 @@
 using KeeperData.Core.Reports.Domain;
 using KeeperData.Core.Reports.Impl;
 using KeeperData.Core.Reports.Strategies;
+using KeeperData.Core.Storage;
 using KeeperData.Infrastructure.Database.Configuration;
 using KeeperData.Infrastructure.Locking;
 using Microsoft.Extensions.Logging;
@@ -101,11 +102,16 @@ private void InitializeServices()
             .Setup(x => x.ExportAndUploadAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(new CleanseReportExportResult { Success = true, ReportUrl = "https://example.com/report.zip", ObjectKey = "cleanse-reports/test.zip" });
 
-        var presignedUrlGeneratorMock = new Mock<ICleanseReportPresignedUrlGenerator>();
-        presignedUrlGeneratorMock
+        var blobStorageServiceMock = new Mock<IBlobStorageService>();
+        blobStorageServiceMock
             .Setup(x => x.GeneratePresignedUrl(It.IsAny<string>(), It.IsAny<TimeSpan?>()))
             .Returns("https://example.com/regenerated-report.zip");
 
+        var blobStorageServiceFactoryMock = new Mock<IBlobStorageServiceFactory>();
+        blobStorageServiceFactoryMock
+            .Setup(x => x.GetCleanseReportsBlobService())
+            .Returns(blobStorageServiceMock.Object);
+
         var notificationServiceMock = new Mock<ICleanseReportNotificationService>();
         notificationServiceMock
             .Setup(x => x.SendReportNotificationAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
@@ -120,7 +126,7 @@ private void InitializeServices()
             _analysisRepository,
             _distributedLock,
             exportServiceMock.Object,
-            presignedUrlGeneratorMock.Object,
+            blobStorageServiceFactoryMock.Object,
             notificationServiceMock.Object,
             loggerMock.Object,
             strategies);