Skip to content

Zip report files #4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnsimons merged 1 commit into from
May 7, 2025
Merged

Zip report files #4971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions src/Particular.LicensingComponent/WebApi/LicensingController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace Particular.LicensingComponent.WebApi
{
using System.IO.Compression;
using System.Text.Json;
using System.Threading;
using Contracts;
Expand Down Expand Up @@ -42,17 +43,28 @@ public async Task<ReportGenerationState> CanThroughputReportBeGenerated(Cancella
public async Task<IActionResult> GetThroughputReportFile([FromQuery(Name = "spVersion")] string? spVersion, CancellationToken cancellationToken)
{
var reportStatus = await CanThroughputReportBeGenerated(cancellationToken);
if (reportStatus.ReportCanBeGenerated)
if (!reportStatus.ReportCanBeGenerated)
{
var report = await throughputCollector.GenerateThroughputReport(
spVersion ?? "Unknown",
null,
cancellationToken);
return BadRequest($"Report cannot be generated - {reportStatus.Reason}");
}

var report = await throughputCollector.GenerateThroughputReport(
spVersion ?? "Unknown",
null,
cancellationToken);

return File(JsonSerializer.SerializeToUtf8Bytes(report, SerializationOptions.IndentedWithNoEscaping), "application/json", fileDownloadName: $"{report.ReportData.CustomerName}.throughput-report-{report.ReportData.EndTime:yyyyMMdd-HHmmss}.json");
var fileName = $"{report.ReportData.CustomerName}.throughput-report-{report.ReportData.EndTime:yyyyMMdd-HHmmss}";

using var memoryStream = new MemoryStream();
using (var archive = new ZipArchive(memoryStream, ZipArchiveMode.Create, true))
{
var entry = archive.CreateEntry($"{fileName}.json");
await using var entryStream = entry.Open();
await JsonSerializer.SerializeAsync(entryStream, report, SerializationOptions.IndentedWithNoEscaping, cancellationToken);
}

return BadRequest($"Report cannot be generated - {reportStatus.Reason}");
memoryStream.Position = 0;
return File(memoryStream, "application/zip", fileDownloadName: $"{fileName}.zip");
}

[Route("settings/info")]
Expand Down