PM-31923 adding the whole report endpoints v2

src/Api/Dirt/Models/Request/AddOrganizationReportRequestModel.cs

@@ -0,0 +1,29 @@
+using System.Text.Json.Serialization;
+using Bit.Core.Dirt.Reports.ReportFeatures.Requests;
+
+namespace Bit.Api.Dirt.Models.Request;
+
+public class AddOrganizationReportRequestModel
+{
+    public string? ReportData { get; set; }
+    public string? ContentEncryptionKey { get; set; }
+    public string? SummaryData { get; set; }
+    public string? ApplicationData { get; set; }
+    [JsonPropertyName("metrics")]
+    public OrganizationReportMetrics? ReportMetrics { get; set; }
+    public long? FileSize { get; set; }
+
+    public AddOrganizationReportRequest ToData(Guid organizationId)
+    {
+        return new AddOrganizationReportRequest
+        {
+            OrganizationId = organizationId,
+            ReportData = ReportData,
+            ContentEncryptionKey = ContentEncryptionKey,
+            SummaryData = SummaryData,
+            ApplicationData = ApplicationData,
+            ReportMetrics = ReportMetrics,
+            FileSize = FileSize
+        };
+    }
+}

src/Api/Dirt/Models/Request/UpdateOrganizationReportApplicationDataRequestModel.cs

@@ -0,0 +1,18 @@
+using Bit.Core.Dirt.Reports.ReportFeatures.Requests;
+
+namespace Bit.Api.Dirt.Models.Request;
+
+public class UpdateOrganizationReportApplicationDataRequestModel
+{
+    public string? ApplicationData { get; set; }
+
+    public UpdateOrganizationReportApplicationDataRequest ToData(Guid organizationId, Guid reportId)
+    {
+        return new UpdateOrganizationReportApplicationDataRequest
+        {
+            OrganizationId = organizationId,
+            Id = reportId,
+            ApplicationData = ApplicationData
+        };
+    }
+}

src/Api/Dirt/Models/Request/UpdateOrganizationReportDataRequestModel.cs

@@ -0,0 +1,18 @@
+using Bit.Core.Dirt.Reports.ReportFeatures.Requests;
+
+namespace Bit.Api.Dirt.Models.Request;
+
+public class UpdateOrganizationReportDataRequestModel
+{
+    public string? ReportData { get; set; }
+
+    public UpdateOrganizationReportDataRequest ToData(Guid organizationId, Guid reportId)
+    {
+        return new UpdateOrganizationReportDataRequest
+        {
+            OrganizationId = organizationId,
+            ReportId = reportId,
+            ReportData = ReportData
+        };
+    }
+}

src/Api/Dirt/Models/Request/UpdateOrganizationReportSummaryRequestModel.cs

@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+using Bit.Core.Dirt.Reports.ReportFeatures.Requests;
+
+namespace Bit.Api.Dirt.Models.Request;
+
+public class UpdateOrganizationReportSummaryRequestModel
+{
+    public string? SummaryData { get; set; }
+    [JsonPropertyName("metrics")]
+    public OrganizationReportMetrics? ReportMetrics { get; set; }
+
+    public UpdateOrganizationReportSummaryRequest ToData(Guid organizationId, Guid reportId)
+    {
+        return new UpdateOrganizationReportSummaryRequest
+        {
+            OrganizationId = organizationId,
+            ReportId = reportId,
+            SummaryData = SummaryData,
+            ReportMetrics = ReportMetrics
+        };
+    }
+}

src/Api/Dirt/Models/Request/UpdateOrganizationReportV2RequestModel.cs

@@ -0,0 +1,30 @@
+using Bit.Core.Dirt.Reports.ReportFeatures.Requests;
+
+namespace Bit.Api.Dirt.Models.Request;
+
+public class UpdateOrganizationReportV2RequestModel
+{
+    public string? ReportData { get; set; }
+    public string? ContentEncryptionKey { get; set; }
+    public string? SummaryData { get; set; }
+    public string? ApplicationData { get; set; }
+    public OrganizationReportMetrics? ReportMetrics { get; set; }
+    public bool RequiresNewFileUpload { get; set; }
+    public long? FileSize { get; set; }
+
+    public UpdateOrganizationReportV2Request ToData(Guid organizationId, Guid reportId)
+    {
+        return new UpdateOrganizationReportV2Request
+        {
+            OrganizationId = organizationId,
+            ReportId = reportId,
+            ReportData = ReportData,
+            ContentEncryptionKey = ContentEncryptionKey,
+            SummaryData = SummaryData,
+            ApplicationData = ApplicationData,
+            ReportMetrics = ReportMetrics,
+            RequiresNewFileUpload = RequiresNewFileUpload,
+            FileSize = FileSize
+        };
+    }
+}

src/Api/Dirt/Models/Response/OrganizationReportApplicationDataResponseModel.cs

@@ -0,0 +1,13 @@
+using Bit.Core.Dirt.Models.Data;
+
+namespace Bit.Api.Dirt.Models.Response;
+
+public class OrganizationReportApplicationDataResponseModel
+{
+    public OrganizationReportApplicationDataResponseModel(OrganizationReportApplicationDataResponse applicationDataResponse)
+    {
+        ApplicationData = applicationDataResponse.ApplicationData;
+    }
+
+    public string? ApplicationData { get; set; }
+}

src/Api/Dirt/Models/Response/OrganizationReportDataResponseModel.cs

@@ -0,0 +1,13 @@
+using Bit.Core.Dirt.Models.Data;
+
+namespace Bit.Api.Dirt.Models.Response;
+
+public class OrganizationReportDataResponseModel
+{
+    public OrganizationReportDataResponseModel(OrganizationReportDataResponse reportDataResponse)
+    {
+        ReportData = reportDataResponse.ReportData;
+    }
+
+    public string? ReportData { get; set; }
+}

src/Api/Dirt/Models/Response/OrganizationReportFileResponseModel.cs

@@ -0,0 +1,12 @@
+using Bit.Core.Enums;
+
+namespace Bit.Api.Dirt.Models.Response;
+
+public class OrganizationReportFileResponseModel
+{
+    public OrganizationReportFileResponseModel() { }
+
+    public string ReportFileUploadUrl { get; set; } = string.Empty;
+    public OrganizationReportResponseModel ReportResponse { get; set; } = null!;
+    public FileUploadType FileUploadType { get; set; }
+}

src/Api/Dirt/Models/Response/OrganizationReportResponseModel.cs

@@ -1,4 +1,5 @@
 using Bit.Core.Dirt.Entities;
+using Bit.Core.Dirt.Models.Data;
 
 namespace Bit.Api.Dirt.Models.Response;
 
@@ -10,11 +11,10 @@ public class OrganizationReportResponseModel
     public string? ContentEncryptionKey { get; set; }
     public string? SummaryData { get; set; }
     public string? ApplicationData { get; set; }
-    public int? PasswordCount { get; set; }
-    public int? PasswordAtRiskCount { get; set; }
-    public int? MemberCount { get; set; }
-    public DateTime? CreationDate { get; set; } = null;
-    public DateTime? RevisionDate { get; set; } = null;
+    public ReportFile? ReportFile { get; set; }
+    public string? ReportFileDownloadUrl { get; set; }
+    public DateTime? CreationDate { get; set; }
+    public DateTime? RevisionDate { get; set; }
 
     public OrganizationReportResponseModel(OrganizationReport organizationReport)
     {
@@ -29,9 +29,7 @@ public OrganizationReportResponseModel(OrganizationReport organizationReport)
         ContentEncryptionKey = organizationReport.ContentEncryptionKey;
         SummaryData = organizationReport.SummaryData;
         ApplicationData = organizationReport.ApplicationData;
-        PasswordCount = organizationReport.PasswordCount;
-        PasswordAtRiskCount = organizationReport.PasswordAtRiskCount;
-        MemberCount = organizationReport.MemberCount;
+        ReportFile = organizationReport.GetReportFile();
         CreationDate = organizationReport.CreationDate;
         RevisionDate = organizationReport.RevisionDate;
     }

src/Api/Dirt/Models/Response/OrganizationReportSummaryDataResponseModel.cs

@@ -0,0 +1,23 @@
+using System.Text.Json.Serialization;
+using Bit.Core.Dirt.Models.Data;
+
+namespace Bit.Api.Dirt.Models.Response;
+
+public class OrganizationReportSummaryDataResponseModel
+{
+    public OrganizationReportSummaryDataResponseModel(OrganizationReportSummaryDataResponse summaryDataResponse)
+    {
+        EncryptedData = summaryDataResponse.SummaryData;
+        EncryptionKey = summaryDataResponse.ContentEncryptionKey;
+        Date = summaryDataResponse.RevisionDate;
+    }
+
+    [JsonPropertyName("encryptedData")]
+    public string EncryptedData { get; set; }
+
+    [JsonPropertyName("encryptionKey")]
+    public string EncryptionKey { get; set; }
+
+    [JsonPropertyName("date")]
+    public DateTime Date { get; set; }
+}

src/Core/Constants.cs

@@ -269,6 +269,7 @@ public static class FeatureFlagKeys
     public const string ArchiveVaultItems = "pm-19148-innovation-archive";
 
     /* DIRT Team */
+    public const string AccessIntelligenceVersion2 = "pm-31920-access-intelligence-azure-file-storage";
     public const string EventManagementForDataDogAndCrowdStrike = "event-management-for-datadog-and-crowdstrike";
     public const string EventDiagnosticLogging = "pm-27666-siem-event-log-debugging";
     public const string EventManagementForHuntress = "event-management-for-huntress";

src/Core/Dirt/Entities/OrganizationReport.cs

@@ -1,5 +1,5 @@
-#nullable enable
-
+using System.Text.Json;
+using Bit.Core.Dirt.Models.Data;
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
@@ -29,6 +29,21 @@ public class OrganizationReport : ITableObject<Guid>
     public int? CriticalPasswordAtRiskCount { get; set; }
     public string? ReportFile { get; set; }
 
+    public ReportFile? GetReportFile()
+    {
+        if (string.IsNullOrWhiteSpace(ReportFile))
+        {
+            return null;
+        }
+
+        return JsonSerializer.Deserialize<ReportFile>(ReportFile);
+    }
+
+    public void SetReportFile(ReportFile data)
+    {
+        ReportFile = JsonSerializer.Serialize(data, JsonHelpers.IgnoreWritingNull);
+    }
+
     public void SetNewId()
     {
         Id = CoreHelpers.GenerateComb();

src/Core/Dirt/Models/Data/OrganizationReportMetricsData.cs

@@ -18,7 +18,7 @@ public class OrganizationReportMetricsData
     public int? CriticalPasswordCount { get; set; }
     public int? CriticalPasswordAtRiskCount { get; set; }
 
-    public static OrganizationReportMetricsData From(Guid organizationId, OrganizationReportMetricsRequest? request)
+    public static OrganizationReportMetricsData From(Guid organizationId, OrganizationReportMetrics? request)
     {
         if (request == null)
         {

src/Core/Dirt/Models/Data/ReportFile.cs

@@ -1,6 +1,4 @@
-#nullable enable
-
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using static System.Text.Json.Serialization.JsonNumberHandling;
 
@@ -28,5 +26,5 @@ public class ReportFile
     /// <summary>
     /// When true the uploaded file's length has been validated.
     /// </summary>
-    public bool Validated { get; set; } = true;
+    public bool Validated { get; set; } = false;
 }

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

@@ -41,7 +41,7 @@ public async Task<OrganizationReport> AddOrganizationReportAsync(AddOrganization
             throw new BadRequestException(errorMessage);
         }
 
-        var requestMetrics = request.Metrics ?? new OrganizationReportMetricsRequest();
+        var requestMetrics = request.ReportMetrics ?? new OrganizationReportMetrics();
 
         var organizationReport = new OrganizationReport
         {