diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs index 08068066..9e1f9cfa 100644 --- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs +++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs @@ -139,7 +139,7 @@ public record EnvelopeDto : IEnvelope /// /// /// - public EnvelopeType? EnvelopeType { get; set; } + public EnvelopeTypeDefaults? EnvelopeType { get; set; } /// /// diff --git a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeTypeRepository.cs b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeTypeRepository.cs index dc661d5e..dcacece1 100644 --- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeTypeRepository.cs +++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeTypeRepository.cs @@ -7,6 +7,6 @@ namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories; /// /// [Obsolete("Use IRepository")] -public interface IEnvelopeTypeRepository : ICRUDRepository +public interface IEnvelopeTypeRepository : ICRUDRepository { } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs index fe80cf1a..e3d24ef6 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 c2b5c2d5..91203119 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 232db96a..6ddeb4e3 100644 --- a/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs +++ b/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs @@ -16,13 +16,13 @@ public record ReadEnvelopeTypesQuery : IRequest>; /// public class ReadEnvelopeTypesQueryHandler : IRequestHandler> { - private readonly IRepository _repository; + private readonly IRepository _repository; /// /// /// /// - public ReadEnvelopeTypesQueryHandler(IRepository repository) + public ReadEnvelopeTypesQueryHandler(IRepository repository) { _repository = repository; } diff --git a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs index aa382312..0b553347 100644 --- a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs +++ b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs @@ -41,7 +41,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map private IRepository EnvelopeReceiverRepository => Provider.GetRequiredService>(); - private IRepository EnvelopeTypeRepository => Provider.GetRequiredService>(); + private IRepository EnvelopeTypeRepository => Provider.GetRequiredService>(); private IRepository ReceiverRepository => Provider.GetRequiredService>(); @@ -233,7 +233,7 @@ public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Map private async Task ResolveEnvelopeSettingsAsync(CreateEnvelopeCommand request, Envelope? existing, CancellationToken cancel) { - EnvelopeType? selectedType = null; + EnvelopeTypeDefaults? selectedType = null; if (request.EnvelopeTypeId is int envelopeTypeId && envelopeTypeId > 0) { selectedType = await EnvelopeTypeRepository.Query diff --git a/EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs b/EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs index 3594c53d..443e1e36 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(); diff --git a/EnvelopeGenerator.CommonServices/Models/EnvelopeTypeModel.vb b/EnvelopeGenerator.CommonServices/Models/EnvelopeTypeModel.vb index 466467b1..61c906a2 100644 --- a/EnvelopeGenerator.CommonServices/Models/EnvelopeTypeModel.vb +++ b/EnvelopeGenerator.CommonServices/Models/EnvelopeTypeModel.vb @@ -8,8 +8,8 @@ Public Class EnvelopeTypeModel MyBase.New(pState) End Sub - Private Function ToEnvelopeType(pRow As DataRow) As EnvelopeType - Return New EnvelopeType() With { + Private Function ToEnvelopeType(pRow As DataRow) As EnvelopeTypeDefaults + Return New EnvelopeTypeDefaults() With { .Id = pRow.ItemEx("GUID", 0), .Title = pRow.ItemEx("TITLE", ""), .UseAccessCode = pRow.ItemEx("USE_ACCESS_CODE", False), @@ -27,7 +27,7 @@ Public Class EnvelopeTypeModel } End Function - Public Function GetById(pEnvelopeTypeId As Integer) As EnvelopeType + Public Function GetById(pEnvelopeTypeId As Integer) As EnvelopeTypeDefaults Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE WHERE GUID = {pEnvelopeTypeId}" Dim oTable As DataTable = Database.GetDatatable(oSql) @@ -39,7 +39,7 @@ Public Class EnvelopeTypeModel Return ToEnvelopeType(oRow) End Function - Public Function List() As IEnumerable(Of EnvelopeType) + Public Function List() As IEnumerable(Of EnvelopeTypeDefaults) Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE" Dim oTable As DataTable = Database.GetDatatable(oSql) diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs index 43c53390..2785ca2e 100644 --- a/EnvelopeGenerator.Domain/Entities/Envelope.cs +++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs @@ -150,7 +150,7 @@ namespace EnvelopeGenerator.Domain.Entities { get; set; } [ForeignKey("EnvelopeTypeId")] - public virtual EnvelopeType + public virtual EnvelopeTypeDefaults #if nullable ? #endif diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeTypeDefaults.cs similarity index 98% rename from EnvelopeGenerator.Domain/Entities/EnvelopeType.cs rename to EnvelopeGenerator.Domain/Entities/EnvelopeTypeDefaults.cs index 40f7847d..308b61ad 100644 --- a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs +++ b/EnvelopeGenerator.Domain/Entities/EnvelopeTypeDefaults.cs @@ -9,7 +9,7 @@ using System; namespace EnvelopeGenerator.Domain.Entities { [Table("TBSIG_ENVELOPE_TYPE", Schema = "dbo")] - public class EnvelopeType + public class EnvelopeTypeDefaults { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb index bd15ae8e..f5f2ab4a 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb @@ -14,7 +14,7 @@ Public Class frmEnvelopeMainData Private Property EnvelopeTypeModel As EnvelopeTypeModel - Private Property EnvelopeType As New EnvelopeType + Private Property EnvelopeType As New EnvelopeTypeDefaults Public Property State As State @@ -121,7 +121,7 @@ Public Class frmEnvelopeMainData Return End If - Dim oEnvelopeType = DirectCast(cmbEnvelopeType.EditValue, EnvelopeType) + Dim oEnvelopeType = DirectCast(cmbEnvelopeType.EditValue, EnvelopeTypeDefaults) If IsNothing(oEnvelopeType) Then oEnvelopeType = EnvelopeType End If @@ -162,7 +162,7 @@ Public Class frmEnvelopeMainData End Sub Private Sub cmbContractType_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbEnvelopeType.SelectedValueChanged - Dim oSelectedType As EnvelopeType = cmbEnvelopeType.SelectedItem + Dim oSelectedType As EnvelopeTypeDefaults = cmbEnvelopeType.SelectedItem If oSelectedType Is Nothing Then Exit Sub diff --git a/EnvelopeGenerator.Infrastructure/EGDbContext.cs b/EnvelopeGenerator.Infrastructure/EGDbContext.cs index b66f856f..cdcb86f8 100644 --- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs +++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs @@ -57,7 +57,7 @@ public abstract class EGDbContextBase : DbContext public DbSet EnvelopeHistories { get; set; } - public DbSet EnvelopeTypes { get; set; } + public DbSet EnvelopeTypes { get; set; } public DbSet Receivers { get; set; } @@ -233,7 +233,7 @@ public abstract class EGDbContextBase : DbContext AddTrigger(); AddTrigger(); AddTrigger(); - AddTrigger(); + AddTrigger(); AddTrigger(); #if NET AddTrigger(); diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs index 2d0d2022..8c01e789 100644 --- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs @@ -6,7 +6,7 @@ using EnvelopeGenerator.Application.Common.Interfaces.Repositories; namespace EnvelopeGenerator.Infrastructure.Repositories; [Obsolete("Use IRepository")] -public class EnvelopeTypeRepository : CRUDRepository, IEnvelopeTypeRepository +public class EnvelopeTypeRepository : CRUDRepository, IEnvelopeTypeRepository { public EnvelopeTypeRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeTypes) { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor index b154cbc6..2793c2d8 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderPage.razor @@ -628,7 +628,7 @@ private bool _createWizardVisible = false; private IReadOnlyList _envelopeTypes = []; - // Stable keys used to store/restore each tab's layout in UserPreferences.GridLayouts + // StableDefaults keys used to store/restore each tab's layout in UserPreferences.GridLayouts private const string GridKeyActive = "sender.active-envelopes"; private const string GridKeyCompleted = "sender.completed-envelopes"; diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs index c7e8a4c4..21596601 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) {