diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs
similarity index 98%
rename from EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDto.cs
rename to EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs
index f6cb3eba..33c73a3f 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDefaultsDto.cs
@@ -5,7 +5,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
///
/// Data Transfer Object representing a type of envelope with its configuration settings.
///
-public class EnvelopeTypeDto
+public class EnvelopeTypeDefaultsDto
{
///
/// Gets or sets the unique identifier of the envelope type.
diff --git a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs
index e3d24ef6..9b8865ff 100644
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs
@@ -8,6 +8,6 @@ namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
///
///
[Obsolete("Use MediatR")]
-public interface IEnvelopeTypeService : IBasicCRUDService
+public interface IEnvelopeTypeService : IBasicCRUDService
{
}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Common/MappingProfile.cs b/EnvelopeGenerator.Application/Common/MappingProfile.cs
index 91203119..afa26d88 100644
--- a/EnvelopeGenerator.Application/Common/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/MappingProfile.cs
@@ -37,7 +37,7 @@ public class MappingProfile : Profile
CreateMap().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
CreateMap();
CreateMap();
- CreateMap();
+ CreateMap();
CreateMap();
CreateMap();
CreateMap();
@@ -55,7 +55,7 @@ public class MappingProfile : Profile
CreateMap().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
CreateMap().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
CreateMap();
- CreateMap();
+ CreateMap();
CreateMap().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
CreateMap();
CreateMap();
diff --git a/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs b/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs
index 6ddeb4e3..76e5c0d4 100644
--- a/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs
@@ -9,12 +9,12 @@ namespace EnvelopeGenerator.Application.EnvelopeTypes.Queries;
///
///
///
-public record ReadEnvelopeTypesQuery : IRequest>;
+public record ReadEnvelopeTypesQuery : IRequest>;
///
///
///
-public class ReadEnvelopeTypesQueryHandler : IRequestHandler>
+public class ReadEnvelopeTypesQueryHandler : IRequestHandler>
{
private readonly IRepository _repository;
@@ -33,13 +33,13 @@ public class ReadEnvelopeTypesQueryHandler : IRequestHandler
///
///
- public async Task> Handle(ReadEnvelopeTypesQuery request, CancellationToken cancellationToken)
+ public async Task> Handle(ReadEnvelopeTypesQuery request, CancellationToken cancellationToken)
{
// TODO: Temporary manual projection to avoid null-materialization crashes from legacy nullable DB columns in EnvelopeType.
// Revisit and switch to AutoMapper query projection (ProjectTo) after schema nullability and mapping contracts are stabilized.
return await _repository.Query
.AsNoTracking()
- .Select(t => new EnvelopeTypeDto
+ .Select(t => new EnvelopeTypeDefaultsDto
{
Id = t.Id,
Title = t.Title ?? string.Empty,
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs b/EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs
index 443e1e36..77a2e8c5 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs
@@ -14,7 +14,7 @@ namespace EnvelopeGenerator.Application.Services;
///
///
[Obsolete("Use MediatR")]
-public class EnvelopeTypeService : BasicCRUDService, IEnvelopeTypeService
+public class EnvelopeTypeService : BasicCRUDService, IEnvelopeTypeService
{
private static readonly Guid CacheKey = Guid.NewGuid();
@@ -36,8 +36,8 @@ public class EnvelopeTypeService : BasicCRUDService
///
- public override async Task>> ReadAllAsync()
+ public override async Task>> ReadAllAsync()
=> await _cache.GetOrCreateAsync(CacheKey, async entry => await base.ReadAllAsync())
- ?? Result.Fail>().Notice(LogLevel.Error, Flag.NotFound, "No cached envelope types are available in the database. If you have added any envelope types after the server started, please restart the server.");
+ ?? Result.Fail>().Notice(LogLevel.Error, Flag.NotFound, "No cached envelope types are available in the database. If you have added any envelope types after the server started, please restart the server.");
}
\ 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 7325473d..123389b7 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
@@ -423,7 +423,7 @@
public EventCallback StartEditorRequested { get; set; }
[Parameter]
- public IReadOnlyList EnvelopeTypes { get; set; } = [];
+ public IReadOnlyList EnvelopeTypes { get; set; } = [];
private const int TotalSteps = 4;
private static readonly System.ComponentModel.DataAnnotations.EmailAddressAttribute EmailValidator = new();
@@ -1002,7 +1002,7 @@
return bool.TryParse(args.Value?.ToString(), out var parsed) && parsed;
}
- private void ApplyEnvelopeTypeDefaults(EnvelopeTypeDto envelopeType)
+ private void ApplyEnvelopeTypeDefaults(EnvelopeTypeDefaultsDto envelopeType)
{
if (!string.IsNullOrWhiteSpace(envelopeType.Language))
_language = envelopeType.Language;
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
index 98c657dc..8d5c117d 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
@@ -698,7 +698,7 @@
string _envelopeMessage = string.Empty;
bool _titleTouched = false;
- List _envelopeTypes = [];
+ List _envelopeTypes = [];
int? _selectedEnvelopeTypeId;
string _language = "de-DE";
bool _useAccessCode;
@@ -986,7 +986,7 @@
return Task.CompletedTask;
}
- void ApplyEnvelopeTypeDefaults(EnvelopeTypeDto envelopeType)
+ void ApplyEnvelopeTypeDefaults(EnvelopeTypeDefaultsDto envelopeType)
{
if (!string.IsNullOrWhiteSpace(envelopeType.Language))
_language = envelopeType.Language;
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor
index 2793c2d8..cfb57aab 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor
@@ -626,7 +626,7 @@
private string? _deleteErrorMessage;
private bool _createWizardVisible = false;
- private IReadOnlyList _envelopeTypes = [];
+ private IReadOnlyList _envelopeTypes = [];
// StableDefaults keys used to store/restore each tab's layout in UserPreferences.GridLayouts
private const string GridKeyActive = "sender.active-envelopes";
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeTypeService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeTypeService.cs
index f43c855d..71e61156 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeTypeService.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeTypeService.cs
@@ -8,7 +8,7 @@ public class EnvelopeTypeService(IHttpClientFactory clientFactory)
{
private static readonly JsonSerializerOptions JsonOptions = new(JsonSerializerDefaults.Web);
- public async Task> GetAsync(CancellationToken cancel = default)
+ public async Task> GetAsync(CancellationToken cancel = default)
{
var http = clientFactory.CreateClient("EnvelopeGenerator.Server");
var response = await http.GetAsync("/api/EnvelopeType", cancel);
@@ -16,7 +16,7 @@ public class EnvelopeTypeService(IHttpClientFactory clientFactory)
if (!response.IsSuccessStatusCode)
return [];
- var data = await response.Content.ReadFromJsonAsync>(JsonOptions, cancel);
+ var data = await response.Content.ReadFromJsonAsync>(JsonOptions, cancel);
return data ?? [];
}
}
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs
index 21596601..536941b1 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs
@@ -5,7 +5,7 @@ using EnvelopeGenerator.Application.Common.Interfaces.Services;
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)
{