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 @@ @L("EnvelopeType", "Umschlagtyp") - @L("SenderEditor_SelectTemplate", "Vorlage auswählen") @@ -692,7 +692,7 @@ bool _titleTouched = false; List _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, diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor index 353e2ff7..ba3d4754 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor @@ -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, diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CreateEnvelopeBootstrapStorageService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CreateEnvelopeBootstrapStorageService.cs index d0c470ff..8048ddbf 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CreateEnvelopeBootstrapStorageService.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CreateEnvelopeBootstrapStorageService.cs @@ -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,