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.
This commit is contained in:
2026-11-13 11:46:56 +01:00
parent 18fbc2100f
commit 48b2fc0eca
15 changed files with 63 additions and 56 deletions

View File

@@ -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);
}

View File

@@ -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,

View File

@@ -1,3 +1,5 @@
using EnvelopeGenerator.Domain.Constants;
namespace EnvelopeGenerator.Server.Client.Models;
/// <summary>
@@ -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; }

View File

@@ -100,7 +100,7 @@
<div class="sender-settings-grid">
<div class="sender-settings-field">
<label class="sender-settings-label">@L("EnvelopeType", "Umschlagtyp")</label>
<select value="@(_selectedEnvelopeTypeId?.ToString() ?? string.Empty)"
<select value="@(_selectedType?.ToString() ?? string.Empty)"
@onchange="OnEnvelopeTypeChanged"
class="sender-settings-select">
<option value="">@L("SenderEditor_SelectTemplate", "Vorlage auswählen")</option>
@@ -692,7 +692,7 @@
bool _titleTouched = false;
List<EnvelopeTypeDefaultsDto> _envelopeTypes = [];
int? _selectedEnvelopeTypeId;
EnvelopeType? _selectedType;
string _language = "de-DE";
bool _useAccessCode;
bool _tfaEnabled;
@@ -778,7 +778,7 @@
_envelopeTitle = envelope.Title ?? string.Empty;
_envelopeMessage = envelope.Message ?? string.Empty;
_selectedEnvelopeTypeId = envelope.EnvelopeTypeId;
_selectedType = envelope.Type;
_language = string.IsNullOrWhiteSpace(envelope.Language) ? "de-DE" : envelope.Language;
_useAccessCode = envelope.UseAccessCode;
_tfaEnabled = envelope.TFAEnabled;
@@ -963,13 +963,15 @@
Task OnEnvelopeTypeChanged(ChangeEventArgs e)
{
var raw = e.Value?.ToString();
if (!int.TryParse(raw, out var id) || id <= 0)
if (!int.TryParse(raw, out var idInt) || idInt <= 0)
{
_selectedEnvelopeTypeId = null;
_selectedType = null;
return Task.CompletedTask;
}
_selectedEnvelopeTypeId = id;
var id = idInt.ToEnvelopeType();
_selectedType = id;
var selectedType = _envelopeTypes.FirstOrDefault(x => x.Id == id);
if (selectedType is not null)
ApplyEnvelopeTypeDefaults(selectedType);
@@ -1350,7 +1352,7 @@
return new CreateEnvelopeCommand
{
EnvelopeId = envelopeId,
EnvelopeTypeId = _selectedEnvelopeTypeId,
Type = _selectedType,
Title = _envelopeTitle,
Message = _envelopeMessage,
Language = _language,

View File

@@ -796,7 +796,7 @@
var command = new CreateEnvelopeCommand
{
EnvelopeTypeId = result.EnvelopeTypeId,
Type = result.Type,
Title = result.Title,
Message = result.Message,
Language = string.IsNullOrWhiteSpace(result.Language) ? "de-DE" : result.Language,

View File

@@ -46,7 +46,7 @@ public sealed class CreateEnvelopeBootstrapStorageService(IJSRuntime jsRuntime)
public sealed record CreateEnvelopeBootstrapPayload(
string Title,
string Message,
int? EnvelopeTypeId,
EnvelopeType? Type,
string Language,
bool UseAccessCode,
bool TFAEnabled,