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

Refactor FinalizeDocumentJob config to use WorkerOptions

Browse Source 
Replaces JobOptions and PDFBurnerParams with a new WorkerOptions class that encapsulates all job configuration, including PDF burning parameters as a nested record. Updates service registration and job constructor to use IOptions<WorkerOptions>. Removes obsolete configuration classes and centralizes options management for improved maintainability.
This commit is contained in:
tekh
2026-02-25 13:27:01 +01:00
parent c5d2d79563
commit 9d5e2e6ad2
5 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EnvelopeGenerator.ServiceHost/Extensions/ServiceCollectionExtensions.cs
View File

@@ -8,7 +8,7 @@ public static class ServiceCollectionExtensions
{ {
public static IServiceCollection AddFinalizeDocumentJob(this IServiceCollection services, IConfiguration configuration) public static IServiceCollection AddFinalizeDocumentJob(this IServiceCollection services, IConfiguration configuration)
{ {
services.Configure<FinalizeDocumentJobOptions>(configuration.GetSection("FinalizeDocumentJob")); services.Configure<WorkerOptions>(configuration.GetSection(nameof(WorkerOptions)));
services.AddSingleton<FinalizeDocumentJob>(); services.AddSingleton<FinalizeDocumentJob>();
services.AddSingleton<IFinalizeDocumentJobRunner, FinalizeDocumentJobRunner>(); services.AddSingleton<IFinalizeDocumentJobRunner, FinalizeDocumentJobRunner>();
return services; return services;

18
EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFBurnerParams.cs
View File

@@ -1,18 +0,0 @@
using System.Drawing;
namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
public class PDFBurnerParams
{
public List<string> IgnoredLabels { get; set; } = new() { "Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung" };
public double TopMargin { get; set; } = 0.1;
public double YOffset { get; set; } = -0.3;
public string FontName { get; set; } = "Arial";
public int FontSize { get; set; } = 8;
public FontStyle FontStyle { get; set; } = FontStyle.Italic;
}

6
EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocumentJob.cs
View File

@@ -9,12 +9,14 @@ using EnvelopeGenerator.ServiceHost.Exceptions;
using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument; using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
using GdPicture14; using GdPicture14;
using Microsoft.Data.SqlClient; using Microsoft.Data.SqlClient;
using Quartz; using Microsoft.Extensions.Options;
namespace EnvelopeGenerator.ServiceHost.Jobs; namespace EnvelopeGenerator.ServiceHost.Jobs;
public class FinalizeDocumentJob : IJob public class FinalizeDocumentJob(IOptions<WorkerOptions> options, IConfiguration config)
{ {
private readonly WorkerOptions _options = options.Value;
private readonly LicenseManager _licenseManager = new(); private readonly LicenseManager _licenseManager = new();
private GdViewer? _gdViewer; private GdViewer? _gdViewer;

11
EnvelopeGenerator.ServiceHost/Jobs/JobOptions.cs
View File

@@ -1,11 +0,0 @@
using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
namespace EnvelopeGenerator.ServiceHost.Jobs;
public class JobOptions
{
public string ConnectionString { get; set; } = string.Empty;
public string GdPictureLicenseKey { get; set; } = string.Empty;
public bool Debug { get; set; }
public PDFBurnerParams PdfBurnerParams { get; set; } = new();
}

29
EnvelopeGenerator.ServiceHost/Jobs/WorkerOptions.cs Normal file
View File

@@ -0,0 +1,29 @@
using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
using System.Drawing;
namespace EnvelopeGenerator.ServiceHost.Jobs;
public class WorkerOptions
{
public string GdPictureLicenseKey { get; set; } = null!;
[Obsolete("Use ILogger.")]
public bool Debug { get; set; }
public PDFBurnerParams PdfBurnerParams { get; set; } = new();
public record PDFBurnerParams
{
public List<string> IgnoredLabels { get; set; } = ["Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung"];
public double TopMargin { get; set; } = 0.1;
public double YOffset { get; set; } = -0.3;
public string FontName { get; set; } = "Arial";
public int FontSize { get; set; } = 8;
public FontStyle FontStyle { get; set; } = FontStyle.Italic;
}
}