From 48b2fc0eca5088da92dc2acbc07e2085016da768 Mon Sep 17 00:00:00 2001 From: TekH Date: Fri, 13 Nov 2026 11:46:56 +0100 Subject: [PATCH] Refactor: Replace EnvelopeTypeId with EnvelopeType enum Replaced all instances of `EnvelopeTypeId` (int/int?) with `Type` (EnvelopeType/EnvelopeType?) across the codebase to improve type safety and readability. Updated affected properties, methods, and logic in DTOs, commands, handlers, and Razor components. Introduced conditional compilation to handle differences between .NET and .NET Framework where necessary. Removed obsolete helper methods for `EnvelopeTypeId`. This refactor ensures consistent use of the strongly-typed `EnvelopeType` enum, reducing the risk of invalid values and aligning with best practices. --- .../Common/Dto/EnvelopeDto.cs | 2 +- .../Common/Dto/EnvelopeTypeDefaultsDto.cs | 2 +- .../Commands/CreateEnvelopeCommand.cs | 2 +- .../Commands/CreateEnvelopeCommandHandler.cs | 22 +++++------ .../Envelopes/Queries/ReadEnvelopeQuery.cs | 2 +- .../Constants/EnvelopeType.cs | 2 +- EnvelopeGenerator.Domain/Entities/Envelope.cs | 9 ++++- .../Entities/EnvelopeTypeDefaults.cs | 2 +- .../Interfaces/IEnvelope.cs | 39 +++++++++---------- .../Sender/CreateEnvelopeWizardPopup.razor | 11 +++--- .../Sender/CreateEnvelopeWizardResult.cs | 2 +- .../Models/EnvelopeReceiverDto.cs | 4 +- .../Pages/SenderEditorPage.razor | 16 ++++---- .../Pages/SenderPage.razor | 2 +- .../CreateEnvelopeBootstrapStorageService.cs | 2 +- 15 files changed, 63 insertions(+), 56 deletions(-) diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs index 5f882a0e..033f2ad1 100644 --- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs +++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs @@ -67,7 +67,7 @@ public record EnvelopeDto : IEnvelope /// /// /// - public int? EnvelopeTypeId { get; set; } + public EnvelopeType? Type { get; set; } // TODO: use ReadAndConfirm property name /// diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs index 78b8ecec..46f616e0 100644 --- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs +++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs @@ -10,7 +10,7 @@ public class EnvelopeTypeDefaultsDto /// /// Gets or sets the unique identifier of the envelope type. /// - public int Id { get; set; } + public EnvelopeType Id { get; set; } /// /// Gets or sets the title of the envelope type. diff --git a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs index a40f20d5..ac95a37e 100644 --- a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs +++ b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs @@ -22,7 +22,7 @@ public record CreateEnvelopeCommand : IRequest /// /// Kennung des ausgewaehlten Umschlagtyps (Vorlage). /// - public int? EnvelopeTypeId { get; set; } + public EnvelopeType? Type { get; set; } /// /// Sprachcode fuer Umschlaginhalt und Benachrichtigungen. diff --git a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs index 694a4df2..4b048b70 100644 --- a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs +++ b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs @@ -93,7 +93,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map e.Title = title; e.Message = message; e.TfaEnabled = request.TFAEnabled; - e.EnvelopeTypeId = settings.EnvelopeTypeId; + e.Type = settings.Type; e.Language = settings.Language; e.UseAccessCode = settings.UseAccessCode; e.FinalEmailToCreator = settings.FinalEmailToCreator; @@ -112,7 +112,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map envelope.Title = title; envelope.Message = message; envelope.TfaEnabled = request.TFAEnabled; - envelope.EnvelopeTypeId = settings.EnvelopeTypeId; + envelope.Type = settings.Type; envelope.Language = settings.Language; envelope.UseAccessCode = settings.UseAccessCode; envelope.FinalEmailToCreator = settings.FinalEmailToCreator; @@ -141,7 +141,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map AddedWhen = now, ChangedWhen = now, Comment = string.Empty, - EnvelopeTypeId = settings.EnvelopeTypeId, + Type = settings.Type, Language = settings.Language, TfaEnabled = request.TFAEnabled, UseAccessCode = settings.UseAccessCode, @@ -163,7 +163,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map e.Title = title; e.Message = message; e.TfaEnabled = request.TFAEnabled; - e.EnvelopeTypeId = settings.EnvelopeTypeId; + e.Type = settings.Type; e.Language = settings.Language; e.UseAccessCode = settings.UseAccessCode; e.FinalEmailToCreator = settings.FinalEmailToCreator; @@ -182,7 +182,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map envelope.Title = title; envelope.Message = message; envelope.TfaEnabled = request.TFAEnabled; - envelope.EnvelopeTypeId = settings.EnvelopeTypeId; + envelope.Type = settings.Type; envelope.Language = settings.Language; envelope.UseAccessCode = settings.UseAccessCode; envelope.FinalEmailToCreator = settings.FinalEmailToCreator; @@ -224,11 +224,11 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map private async Task ResolveEnvelopeSettingsAsync(CreateEnvelopeCommand request, Envelope? existing, CancellationToken cancel) { EnvelopeTypeDefaults? selectedType = null; - if (request.EnvelopeTypeId is int envelopeTypeId && envelopeTypeId > 0) + if (request.Type is EnvelopeType type) { selectedType = await EnvelopeTypeRepository.Query - .FirstOrDefaultAsync(t => t.Id == envelopeTypeId, cancel) - ?? throw new BadRequestException($"Envelope type {envelopeTypeId} not found."); + .FirstOrDefaultAsync(t => t.Id == type, cancel) + ?? throw new BadRequestException($"Envelope type {type} not found."); } var expiresWhenDays = Math.Max(0, @@ -252,7 +252,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map useAccessCode = true; return new EnvelopeSettings( - EnvelopeTypeId: request.EnvelopeTypeId ?? existing?.EnvelopeTypeId, + Type: request.Type ?? existing?.Type, Language: ResolveLanguage(request.Language, selectedType?.Language, existing?.Language), UseAccessCode: useAccessCode, FinalEmailToCreator: request.FinalEmailToCreator @@ -298,7 +298,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map } private sealed record EnvelopeSettings( - int? EnvelopeTypeId, + EnvelopeType? Type, string Language, bool UseAccessCode, int FinalEmailToCreator, @@ -570,7 +570,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map { await EnvNtfService.Notify(er.Receiver.EmailAddress, new DocumentReceivedNotification { - AdvancedSignature = envelope.Type() == EnvelopeType.AdvancedSignature, + AdvancedSignature = envelope.Type == EnvelopeType.AdvancedSignature, DocumentTitle = envelope.Title ?? string.Empty, NameReceiver = er.Name ?? string.Empty, EnvelopeUuid = envelope.Uuid, diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs index 62c9b10f..e6466378 100644 --- a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs +++ b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs @@ -171,7 +171,7 @@ public class ReadEnvelopeQueryHandler : IRequestHandler(this TEnvelope envelope, EnvelopeType type) where TEnvelope : IEnvelope - { - envelope.SetType(type); - return envelope; - } } } \ No newline at end of file diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor index 2ddbf5bb..78ab5efe 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor @@ -543,10 +543,11 @@ { _validationMessage = null; var raw = args.Value?.ToString(); - if (int.TryParse(raw, out var id) && id > 0) + if (int.TryParse(raw, out var typeInt)) { - _selectedEnvelopeType = id.ToEnvelopeType(); - var selectedType = EnvelopeTypes.FirstOrDefault(x => x.Id == id); + var type = typeInt.ToEnvelopeType(); + _selectedEnvelopeType = type; + var selectedType = EnvelopeTypes.FirstOrDefault(x => x.Id == type); if (selectedType is not null) ApplyEnvelopeTypeDefaults(selectedType); @@ -756,7 +757,7 @@ var result = new CreateEnvelopeWizardResult( Title: _title.Trim(), Message: _message.Trim(), - EnvelopeTypeId: (int?)_selectedEnvelopeType, + Type: _selectedEnvelopeType, Language: string.IsNullOrWhiteSpace(_language) ? "de-DE" : _language, UseAccessCode: _useAccessCode, TFAEnabled: _tfaEnabled, @@ -1085,7 +1086,7 @@ if (!_selectedEnvelopeType.HasValue) return; - var selectedType = EnvelopeTypes.FirstOrDefault(x => x.Id == (int)_selectedEnvelopeType); + var selectedType = EnvelopeTypes.FirstOrDefault(x => x.Id == _selectedEnvelopeType); if (selectedType is not null) ApplyEnvelopeTypeDefaults(selectedType); } diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardResult.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardResult.cs index fa3a6855..87f68eba 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardResult.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardResult.cs @@ -5,7 +5,7 @@ namespace EnvelopeGenerator.Server.Client.Components.Sender; public sealed record CreateEnvelopeWizardResult( string Title, string Message, - int? EnvelopeTypeId, + EnvelopeType? Type, string Language, bool UseAccessCode, bool TFAEnabled, diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/EnvelopeReceiverDto.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/EnvelopeReceiverDto.cs index 4c39a486..9f2eb991 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/EnvelopeReceiverDto.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/EnvelopeReceiverDto.cs @@ -1,3 +1,5 @@ +using EnvelopeGenerator.Domain.Constants; + namespace EnvelopeGenerator.Server.Client.Models; /// @@ -38,7 +40,7 @@ public record EnvelopeClientDto public DateTime AddedWhen { get; init; } public DateTime? ChangedWhen { get; init; } public string Language { get; init; } = "de-DE"; - public int? EnvelopeTypeId { get; init; } + public EnvelopeType? Type { get; init; } public string? EnvelopeTypeTitle { get; init; } public bool UseAccessCode { get; init; } public bool TFAEnabled { get; init; } diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor index afebe44b..f3524112 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor @@ -100,7 +100,7 @@
-