From f4d2b659430485031ab5c3535ccc4ea6a7e3b9a7 Mon Sep 17 00:00:00 2001 From: TekH Date: Thu, 12 Nov 2026 16:57:50 +0100 Subject: [PATCH] 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. --- EnvelopeGenerator.Application/Common/MappingProfile.cs | 2 +- .../Envelopes/Queries/ReadEnvelopeQuery.cs | 4 ++-- .../Models/EnvelopeModel.vb | 2 +- EnvelopeGenerator.Domain/Entities/Envelope.cs | 2 +- EnvelopeGenerator.Form/frmEnvelopeMainData.vb | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EnvelopeGenerator.Application/Common/MappingProfile.cs b/EnvelopeGenerator.Application/Common/MappingProfile.cs index afa26d88..dc9f1d9e 100644 --- a/EnvelopeGenerator.Application/Common/MappingProfile.cs +++ b/EnvelopeGenerator.Application/Common/MappingProfile.cs @@ -30,7 +30,7 @@ public class MappingProfile : Profile CreateMap(); CreateMap() .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(); CreateMap(); CreateMap().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen)); diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs index 4d071404..8f41ca9c 100644 --- a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs +++ b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs @@ -183,7 +183,7 @@ public class ReadEnvelopeQueryHandler : IRequestHandler e.Type) + .Include(e => e.Defaults) .Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver) .Include(e => e.Histories) .ToListAsync(cancel); diff --git a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb index b7e864b5..4d42ff72 100644 --- a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb @@ -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 diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs index 2785ca2e..74d041d2 100644 --- a/EnvelopeGenerator.Domain/Entities/Envelope.cs +++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs @@ -154,7 +154,7 @@ namespace EnvelopeGenerator.Domain.Entities #if nullable ? #endif - Type + Defaults { get; set; } #if NETFRAMEWORK diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb index f5f2ab4a..51497fb1 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb @@ -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