PM-31923 fixing code based on PR comments

Author: prograhamming

src/Api/Dirt/Controllers/OrganizationReportsController.cs

@@ -14,6 +14,7 @@
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using ZiggyCreatures.Caching.Fusion;
 
 namespace Bit.Api.Dirt.Controllers;
 
@@ -38,6 +39,7 @@ public class OrganizationReportsController : Controller
     private readonly IUpdateOrganizationReportV2Command _updateReportV2Command;
     private readonly IValidateOrganizationReportFileCommand _validateCommand;
     private readonly ILogger<OrganizationReportsController> _logger;
+    private readonly IFusionCache _cache;
 
     public OrganizationReportsController(
         ICurrentContext currentContext,
@@ -56,7 +58,8 @@ public OrganizationReportsController(
         IOrganizationReportRepository organizationReportRepo,
         IUpdateOrganizationReportV2Command updateReportV2Command,
         IValidateOrganizationReportFileCommand validateCommand,
-        ILogger<OrganizationReportsController> logger)
+        ILogger<OrganizationReportsController> logger,
+        [FromKeyedServices(OrganizationReportCacheConstants.CacheName)] IFusionCache cache)
     {
         _currentContext = currentContext;
         _getOrganizationReportQuery = getOrganizationReportQuery;
@@ -75,6 +78,7 @@ public OrganizationReportsController(
         _updateReportV2Command = updateReportV2Command;
         _validateCommand = validateCommand;
         _logger = logger;
+        _cache = cache;
     }
 
     /// <summary>
@@ -133,7 +137,6 @@ public async Task<IActionResult> CreateOrganizationReportAsync(
     /// <summary>
     /// Gets the most recent organization report for the specified organization.
     /// Includes a presigned download URL for the report file if one has been validated.
-    /// If no file is associated, the response contains inline ReportData.
     /// </summary>
     /// <param name="organizationId">The unique identifier of the organization.</param>
     /// <returns>An <see cref="OrganizationReportResponseModel"/> for the most recent report.</returns>
@@ -156,15 +159,13 @@ public async Task<IActionResult> GetLatestOrganizationReportAsync(Guid organizat
 
         var response = new OrganizationReportResponseModel(latestReport);
 
-        var fileData = latestReport.GetReportFile();
-        if (fileData == null)
-        {
-            return Ok(response);
-        }
-
-        if (fileData.Validated)
+        if (_featureService.IsEnabled(FeatureFlagKeys.AccessIntelligenceVersion2))
         {
-            response.ReportFileDownloadUrl = await _storageService.GetReportDataDownloadUrlAsync(latestReport, fileData);
+            var fileData = latestReport.GetReportFile();
+            if (fileData is { Validated: true })
+            {
+                response.ReportFileDownloadUrl = await _storageService.GetReportDataDownloadUrlAsync(latestReport, fileData);
+            }
         }
 
         return Ok(response);
@@ -174,7 +175,6 @@ public async Task<IActionResult> GetLatestOrganizationReportAsync(Guid organizat
     /// Gets a specific organization report by its report ID.
     /// Validates that the report belongs to the specified organization.
     /// Includes a presigned download URL for the report file if one has been validated.
-    /// If no file is associated, the response contains inline ReportData.
     /// </summary>
     /// <param name="organizationId">The unique identifier of the organization.</param>
     /// <param name="reportId">The unique identifier of the report to retrieve.</param>
@@ -227,7 +227,6 @@ public async Task<IActionResult> GetOrganizationReportAsync(Guid organizationId,
     /// <param name="request">The request model containing updated report data.</param>
     /// <returns>An <see cref="OrganizationReportResponseModel"/> with the updated report.</returns>
     [HttpPatch("{organizationId}/{reportId}")]
-    [RequestSizeLimit(Constants.FileSize501mb)]
     public async Task<IActionResult> UpdateOrganizationReportAsync(
         Guid organizationId,
         Guid reportId,
@@ -333,6 +332,9 @@ public async Task DeleteOrganizationReportAsync(Guid organizationId, Guid report
 
         await _organizationReportRepo.DeleteAsync(report);
 
+        await _cache.RemoveByTagAsync(
+            OrganizationReportCacheConstants.BuildCacheTagForOrganizationReports(organizationId));
+
         if (fileData != null && !string.IsNullOrEmpty(fileData.Id))
         {
             await _storageService.DeleteReportFilesAsync(report, fileData.Id);
@@ -497,6 +499,10 @@ await Request.GetFileAsync(async (stream) =>
         var (valid, length) = await _storageService.ValidateFileAsync(report, fileData, minimum, maximum);
         if (!valid)
         {
+            await _storageService.DeleteReportFilesAsync(report, fileData.Id!);
+            await _organizationReportRepo.DeleteAsync(report);
+            await _cache.RemoveByTagAsync(
+                OrganizationReportCacheConstants.BuildCacheTagForOrganizationReports(organizationId));
             throw new BadRequestException("File received does not match expected constraints.");
         }
 
@@ -505,6 +511,8 @@ await Request.GetFileAsync(async (stream) =>
         report.SetReportFile(fileData);
         report.RevisionDate = DateTime.UtcNow;
         await _organizationReportRepo.ReplaceAsync(report);
+        await _cache.RemoveByTagAsync(
+            OrganizationReportCacheConstants.BuildCacheTagForOrganizationReports(organizationId));
     }
 
     /// <summary>

src/Core/Dirt/Reports/ReportFeatures/ValidateOrganizationReportFileCommand.cs

@@ -2,7 +2,10 @@
 using Bit.Core.Dirt.Reports.ReportFeatures.Interfaces;
 using Bit.Core.Dirt.Reports.Services;
 using Bit.Core.Dirt.Repositories;
+using Bit.Core.Utilities;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using ZiggyCreatures.Caching.Fusion;
 
 namespace Bit.Core.Dirt.Reports.ReportFeatures;
 
@@ -11,15 +14,18 @@ public class ValidateOrganizationReportFileCommand : IValidateOrganizationReport
     private readonly IOrganizationReportRepository _organizationReportRepo;
     private readonly IOrganizationReportStorageService _storageService;
     private readonly ILogger<ValidateOrganizationReportFileCommand> _logger;
+    private readonly IFusionCache _cache;
 
     public ValidateOrganizationReportFileCommand(
         IOrganizationReportRepository organizationReportRepo,
         IOrganizationReportStorageService storageService,
-        ILogger<ValidateOrganizationReportFileCommand> logger)
+        ILogger<ValidateOrganizationReportFileCommand> logger,
+        [FromKeyedServices(OrganizationReportCacheConstants.CacheName)] IFusionCache cache)
     {
         _organizationReportRepo = organizationReportRepo;
         _storageService = storageService;
         _logger = logger;
+        _cache = cache;
     }
 
     public async Task<bool> ValidateAsync(OrganizationReport report, string reportFileId)
@@ -45,6 +51,8 @@ public async Task<bool> ValidateAsync(OrganizationReport report, string reportFi
                 report.Id, length);
             await _storageService.DeleteReportFilesAsync(report, reportFileId);
             await _organizationReportRepo.DeleteAsync(report);
+            await _cache.RemoveByTagAsync(
+                OrganizationReportCacheConstants.BuildCacheTagForOrganizationReports(report.OrganizationId));
             return false;
         }
 
@@ -53,6 +61,8 @@ public async Task<bool> ValidateAsync(OrganizationReport report, string reportFi
         report.SetReportFile(fileData);
         report.RevisionDate = DateTime.UtcNow;
         await _organizationReportRepo.ReplaceAsync(report);
+        await _cache.RemoveByTagAsync(
+            OrganizationReportCacheConstants.BuildCacheTagForOrganizationReports(report.OrganizationId));
         return true;
     }
 }

test/Api.Test/Dirt/OrganizationReportsControllerTests.cs

@@ -13,11 +13,13 @@
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Services;
+using Bit.Core.Utilities;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using Microsoft.AspNetCore.Mvc;
 using NSubstitute;
 using Xunit;
+using ZiggyCreatures.Caching.Fusion;
 
 namespace Bit.Api.Test.Dirt;
 
@@ -40,6 +42,10 @@ public async Task GetLatestOrganizationReportAsync_WithValidatedFile_ReturnsOkWi
 
         SetupAuthorization(sutProvider, orgId);
 
+        sutProvider.GetDependency<IFeatureService>()
+            .IsEnabled(FeatureFlagKeys.AccessIntelligenceVersion2)
+            .Returns(true);
+
         sutProvider.GetDependency<IGetOrganizationReportQuery>()
             .GetLatestOrganizationReportAsync(orgId)
             .Returns(expectedReport);
@@ -415,6 +421,11 @@ await sutProvider.GetDependency<IOrganizationReportRepository>()
         await sutProvider.GetDependency<IOrganizationReportStorageService>()
             .Received(1)
             .DeleteReportFilesAsync(report, "file-id");
+
+        await sutProvider.GetDependency<IFusionCache>()
+            .Received(1)
+            .RemoveByTagAsync(
+                OrganizationReportCacheConstants.BuildCacheTagForOrganizationReports(orgId));
     }
 
     [Theory, BitAutoData]
@@ -444,6 +455,11 @@ await sutProvider.GetDependency<IOrganizationReportRepository>()
         await sutProvider.GetDependency<IOrganizationReportStorageService>()
             .DidNotReceive()
             .DeleteReportFilesAsync(Arg.Any<OrganizationReport>(), Arg.Any<string>());
+
+        await sutProvider.GetDependency<IFusionCache>()
+            .Received(1)
+            .RemoveByTagAsync(
+                OrganizationReportCacheConstants.BuildCacheTagForOrganizationReports(orgId));
     }
 
     [Theory, BitAutoData]

test/Core.Test/Dirt/ReportFeatures/ValidateOrganizationReportFileCommandTests.cs

@@ -3,10 +3,12 @@
 using Bit.Core.Dirt.Reports.ReportFeatures;
 using Bit.Core.Dirt.Reports.Services;
 using Bit.Core.Dirt.Repositories;
+using Bit.Core.Utilities;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;
+using ZiggyCreatures.Caching.Fusion;
 
 namespace Bit.Core.Test.Dirt.ReportFeatures;
 
@@ -71,6 +73,11 @@ await sutProvider.GetDependency<IOrganizationReportStorageService>()
         await sutProvider.GetDependency<IOrganizationReportRepository>()
             .DidNotReceive()
             .DeleteAsync(Arg.Any<OrganizationReport>());
+
+        await sutProvider.GetDependency<IFusionCache>()
+            .Received(1)
+            .RemoveByTagAsync(
+                OrganizationReportCacheConstants.BuildCacheTagForOrganizationReports(organizationId));
     }
 
     [Theory]
@@ -105,6 +112,11 @@ await sutProvider.GetDependency<IOrganizationReportRepository>()
         await sutProvider.GetDependency<IOrganizationReportRepository>()
             .DidNotReceive()
             .ReplaceAsync(Arg.Any<OrganizationReport>());
+
+        await sutProvider.GetDependency<IFusionCache>()
+            .Received(1)
+            .RemoveByTagAsync(
+                OrganizationReportCacheConstants.BuildCacheTagForOrganizationReports(organizationId));
     }
 
     [Theory]
@@ -139,6 +151,10 @@ await sutProvider.GetDependency<IOrganizationReportRepository>()
         await sutProvider.GetDependency<IOrganizationReportRepository>()
             .DidNotReceive()
             .ReplaceAsync(Arg.Any<OrganizationReport>());
+
+        await sutProvider.GetDependency<IFusionCache>()
+            .DidNotReceive()
+            .RemoveByTagAsync(Arg.Any<string>());
     }
 
     [Theory]