Refactor Envelope.Type to Envelope.Defaults

Replaced all references to `Envelope.Type` with `Envelope.Defaults` across the application for consistency and clarity.

- Updated `MappingProfile` to map `Defaults.Title` instead of `Type.Title` for `EnvelopeTypeTitle`.
- Modified `ReadEnvelopeQueryHandler` to use `Defaults` in place of `Type` and updated query includes.
- Renamed `Type` to `Defaults` in the `Envelope` entity while preserving its foreign key relationship.
- Updated `EnvelopeModel` to retrieve `Defaults` using `EnvelopeTypeModel.GetById`.
- Refactored `frmEnvelopeMainData` to replace all `Type` references with `Defaults` and adjusted logic for `ContractType` and `EnvelopeType`.

These changes ensure consistent naming and improve code readability.
This commit is contained in:
2026-11-12 16:57:50 +01:00
parent 17da3ea91e
commit f4d2b65943
5 changed files with 10 additions and 10 deletions

View File

@@ -30,7 +30,7 @@ public class MappingProfile : Profile
CreateMap<EmailTemplate, EmailTemplateDto>();
CreateMap<Envelope, EnvelopeDto>()
.ForMember(dest => dest.EnvelopeTypeTitle,
opt => opt.MapFrom(src => src.Type != null ? src.Type.Title : null));
opt => opt.MapFrom(src => src.Defaults != null ? src.Defaults.Title : null));
CreateMap<Document, DocumentDto>();
CreateMap<Document, DocumentDetailsDto>();
CreateMap<History, HistoryDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));

View File

@@ -183,7 +183,7 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
ExpiresWarningWhenDays = e.ExpiresWarningWhenDays,
UseAccessCode = e.UseAccessCode ?? true,
TFAEnabled = e.TfaEnabled ?? false,
EnvelopeTypeTitle = e.Type != null ? e.Type.Title : null,
EnvelopeTypeTitle = e.Defaults != null ? e.Defaults.Title : null,
IsAlreadySent = false,
DocResult = null,
Documents = null,
@@ -237,7 +237,7 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
}
var envelopes = await query
.Include(e => e.Type)
.Include(e => e.Defaults)
.Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
.Include(e => e.Histories)
.ToListAsync(cancel);

View File

@@ -72,7 +72,7 @@ Public Class EnvelopeModel
oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
oEnvelope.Histories = HistoryModel.List(oEnvelope.Id)
oEnvelope.Type = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
oEnvelope.Defaults = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
Return oEnvelope
End Function

View File

@@ -154,7 +154,7 @@ namespace EnvelopeGenerator.Domain.Entities
#if nullable
?
#endif
Type
Defaults
{ get; set; }
#if NETFRAMEWORK

View File

@@ -68,14 +68,14 @@ Public Class frmEnvelopeMainData
chked_2Faktor.EditValue = DEF_TF_ENABLED
Else
If IsNothing(Envelope.Type) Then
Envelope.Type = EnvelopeType
If IsNothing(Envelope.Defaults) Then
Envelope.Defaults = EnvelopeType
End If
If Envelope.Type.ContractType = 0 Then
If Envelope.Defaults.ContractType = 0 Then
cmbEnvelopeType.EditValue = EnvelopeType
Else
' This will trigger loading values from the type
cmbEnvelopeType.EditValue = Envelope.Type
cmbEnvelopeType.EditValue = Envelope.Defaults
' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.Type) - 1
' cmbEnvelopeType.SelectedIndex = Envelope.Type.Id - 1
' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of Type).Where(Function(i) i.Id = Envelope.Type.Id).SingleOrDefault()
@@ -126,7 +126,7 @@ Public Class frmEnvelopeMainData
oEnvelopeType = EnvelopeType
End If
Envelope.Title = txtTitle.EditValue.ToString
Envelope.Type = oEnvelopeType
Envelope.Defaults = oEnvelopeType
Envelope.EnvelopeTypeId = IIf(IsNothing(oEnvelopeType), 0, oEnvelopeType.Id)
Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1
Envelope.Language = cmbLanguage.EditValue