AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor ReportCreator: remove logging and simplify logic

Browse Source 
Removed ILogger dependency and all related logging from ReportCreator. Inlined DoCreateReport into CreateReportAsync and eliminated the try-catch block, allowing exceptions to propagate naturally. Improved the error message for missing report data. The class is now more focused and streamlined.
This commit is contained in:
tekh
2026-04-01 11:15:17 +02:00
parent 53a9a3e3eb
commit 052da02bd0
1 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs
View File

@@ -3,54 +3,28 @@ using DigitalData.Core.Abstraction.Application.Repository;
using EnvelopeGenerator.Domain.Constants; using EnvelopeGenerator.Domain.Constants;
using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Domain.Entities;
using EnvelopeGenerator.ServiceHost.Exceptions; using EnvelopeGenerator.ServiceHost.Exceptions;
using EnvelopeGenerator.ServiceHost.Extensions;
namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument; namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
public class ReportCreator(ILogger<ReportCreator> Logger, IRepository<EnvelopeReport> reportRepo) public class ReportCreator(IRepository<EnvelopeReport> reportRepo)
{ {
public async Task<byte[]> CreateReportAsync(Envelope envelope, CancellationToken cancel = default) public async Task<byte[]> CreateReportAsync(Envelope envelope, CancellationToken cancel = default)
{ {
try var reports = await reportRepo.Where(r => r.EnvelopeId == envelope.Id).ToListAsync(cancel);
{
Logger.LogDebug("Loading report data..");
var reports = await reportRepo.Where(r => r.EnvelopeId == envelope.Id).ToListAsync(cancel);
if (reports.Count == 0) if (reports.Count == 0)
{ throw new CreateReportException("Could not prepare report data! No report data found!");
throw new CreateReportException("No report data found!");
}
var items = reports var items = reports
.Select(r => ToReportItem(r, envelope)) .Select(r => ToReportItem(r, envelope))
.OrderByDescending(r => r.ItemDate) .OrderByDescending(r => r.ItemDate)
.ToList(); .ToList();
var buffer = DoCreateReport(items); var source = new ReportSource { Items = items };
Logger.LogDebug("Report created!");
return buffer;
}
catch (Exception ex) when (ex is not CreateReportException)
{
Logger.LogError(ex);
throw new CreateReportException("Could not prepare report data!", ex);
}
}
private byte[] DoCreateReport(List<ReportItem> reportItems)
{
var source = new ReportSource { Items = reportItems };
var report = new rptEnvelopeHistory { DataSource = source, DataMember = "Items" }; var report = new rptEnvelopeHistory { DataSource = source, DataMember = "Items" };
Logger.LogDebug("Creating report in memory..");
report.CreateDocument(); report.CreateDocument();
Logger.LogDebug("Exporting report to stream..");
using var stream = new MemoryStream(); using var stream = new MemoryStream();
report.ExportToPdf(stream); report.ExportToPdf(stream);
Logger.LogDebug("Writing report to buffer..");
return stream.ToArray(); return stream.ToArray();
} }