diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
index 143aa527..63fe8206 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
@@ -79,12 +79,12 @@ public record EnvelopeDto : IEnvelope
///
///
///
- public int? FinalEmailToCreator { get; set; }
+ public FinalEmailType? FinalEmailToCreator { get; set; }
///
///
///
- public int? FinalEmailToReceivers { get; set; }
+ public FinalEmailType? FinalEmailToReceivers { get; set; }
///
///
diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs
index 46f616e0..fb7c2cb8 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs
@@ -35,12 +35,12 @@ public class EnvelopeTypeDefaultsDto
///
/// Gets or sets the final email template ID to be sent to the creator.
///
- public int? FinalEmailToCreator { get; set; }
+ public FinalEmailType? FinalEmailToCreator { get; set; }
///
/// Gets or sets the final email template ID to be sent to the receivers.
///
- public int? FinalEmailToReceivers { get; set; }
+ public FinalEmailType? FinalEmailToReceivers { get; set; }
///
/// Gets or sets the timestamp when this envelope type was added.
diff --git a/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs b/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs
index 22580918..f582916e 100644
--- a/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs
@@ -46,8 +46,8 @@ public class ReadEnvelopeTypesQueryHandler : IRequestHandler
///
/// Finale E-Mail-Einstellung fuer den Ersteller.
///
- public int? FinalEmailToCreator { get; set; }
+ public FinalEmailType? FinalEmailToCreator { get; set; }
///
/// Finale E-Mail-Einstellung fuer die Empfaenger.
///
- public int? FinalEmailToReceivers { get; set; }
+ public FinalEmailType? FinalEmailToReceivers { get; set; }
///
/// Gibt an, ob Erinnerungs-E-Mails aktiviert sind.
diff --git a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs
index 4b048b70..73323b49 100644
--- a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs
@@ -256,13 +256,13 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map
Language: ResolveLanguage(request.Language, selectedType?.Language, existing?.Language),
UseAccessCode: useAccessCode,
FinalEmailToCreator: request.FinalEmailToCreator
- ?? (int?)selectedType?.FinalEmailToCreator
+ ?? selectedType?.FinalEmailToCreator
?? existing?.FinalEmailToCreator
- ?? (int)FinalEmailType.No,
+ ?? FinalEmailType.No,
FinalEmailToReceivers: request.FinalEmailToReceivers
- ?? (int?)selectedType?.FinalEmailToReceivers
+ ?? selectedType?.FinalEmailToReceivers
?? existing?.FinalEmailToReceivers
- ?? (int)FinalEmailType.No,
+ ?? FinalEmailType.No,
SendReminderEmails: request.SendReminderEmails
?? selectedType?.SendReminderEmails
?? existing?.SendReminderEmails
@@ -301,8 +301,8 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map
EnvelopeType? Type,
string Language,
bool UseAccessCode,
- int FinalEmailToCreator,
- int FinalEmailToReceivers,
+ FinalEmailType FinalEmailToCreator,
+ FinalEmailType FinalEmailToReceivers,
bool SendReminderEmails,
int FirstReminderDays,
int ReminderIntervalDays,
diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs
index 0b65ed7d..6dc27ac5 100644
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -128,10 +128,10 @@ namespace EnvelopeGenerator.Domain.Entities
public bool? UseAccessCode { get; set; }
[Column("FINAL_EMAIL_TO_CREATOR")]
- public int? FinalEmailToCreator { get; set; }
+ public FinalEmailType? FinalEmailToCreator { get; set; }
[Column("FINAL_EMAIL_TO_RECEIVERS")]
- public int? FinalEmailToReceivers { get; set; }
+ public FinalEmailType? FinalEmailToReceivers { get; set; }
[Column("EXPIRES_WHEN_DAYS")]
public int? ExpiresWhenDays { get; set; }
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
index e40537f1..2f7bfa91 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
@@ -439,8 +439,8 @@
private string _language = "de-DE";
private bool _useAccessCode;
private bool _tfaEnabled;
- private int _finalEmailToCreator = (int)FinalEmailType.No;
- private int _finalEmailToReceivers = (int)FinalEmailType.No;
+ private FinalEmailType _finalEmailToCreator = FinalEmailType.No;
+ private FinalEmailType _finalEmailToReceivers = FinalEmailType.No;
private bool _sendReminderEmails;
private int _firstReminderDays;
private int _reminderIntervalDays;
@@ -1097,8 +1097,8 @@
_language = "de-DE";
_useAccessCode = false;
_tfaEnabled = false;
- _finalEmailToCreator = (int)FinalEmailType.No;
- _finalEmailToReceivers = (int)FinalEmailType.No;
+ _finalEmailToCreator = FinalEmailType.No;
+ _finalEmailToReceivers = FinalEmailType.No;
_sendReminderEmails = false;
_firstReminderDays = 0;
_reminderIntervalDays = 0;
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardResult.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardResult.cs
index 87f68eba..48e2c9c8 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardResult.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardResult.cs
@@ -9,8 +9,8 @@ public sealed record CreateEnvelopeWizardResult(
string Language,
bool UseAccessCode,
bool TFAEnabled,
- int FinalEmailToCreator,
- int FinalEmailToReceivers,
+ FinalEmailType FinalEmailToCreator,
+ FinalEmailType FinalEmailToReceivers,
bool SendReminderEmails,
int FirstReminderDays,
int ReminderIntervalDays,
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
index f3524112..5e5fe336 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
@@ -696,8 +696,8 @@
string _language = "de-DE";
bool _useAccessCode;
bool _tfaEnabled;
- int _finalEmailToCreator = (int)FinalEmailType.No;
- int _finalEmailToReceivers = (int)FinalEmailType.No;
+ FinalEmailType _finalEmailToCreator = FinalEmailType.No;
+ FinalEmailType _finalEmailToReceivers = FinalEmailType.No;
bool _sendReminderEmails;
int _firstReminderDays;
int _reminderIntervalDays;
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CreateEnvelopeBootstrapStorageService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CreateEnvelopeBootstrapStorageService.cs
index 8048ddbf..a70ea918 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CreateEnvelopeBootstrapStorageService.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CreateEnvelopeBootstrapStorageService.cs
@@ -50,8 +50,8 @@ public sealed record CreateEnvelopeBootstrapPayload(
string Language,
bool UseAccessCode,
bool TFAEnabled,
- int FinalEmailToCreator,
- int FinalEmailToReceivers,
+ FinalEmailType FinalEmailToCreator,
+ FinalEmailType FinalEmailToReceivers,
bool SendReminderEmails,
int FirstReminderDays,
int ReminderIntervalDays,
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs
index 536941b1..84f46a8c 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs
@@ -1,11 +1,12 @@
using EnvelopeGenerator.Domain.Entities;
using EnvelopeGenerator.Application.Common.Dto;
using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using EnvelopeGenerator.Domain.Constants;
namespace EnvelopeGenerator.Web.Controllers.Test;
[Obsolete("Use MediatR")]
-public class TestEnvelopeTypeController : TestControllerBase
+public class TestEnvelopeTypeController : TestControllerBase
{
public TestEnvelopeTypeController(ILogger logger, IEnvelopeTypeService service) : base(logger, service)
{