merge with EnvelopeReceiverBasicDto

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs

@@ -1,67 +0,0 @@
-using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-
-/// <summary>
-/// 
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeReceiverBasicDto
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int EnvelopeId { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ReceiverId { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int Sequence { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [TemplatePlaceholder("[NAME_RECEIVER]")]
-    public string? Name { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? JobTitle { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? CompanyName { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? PrivateMessage { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime AddedWhen { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? ChangedWhen { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool HasPhoneNumber { get; init; }
-}

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs

@@ -1,13 +1,19 @@
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+/// <summary>
+/// 
+/// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
+public record EnvelopeReceiverDto : EnvelopeReceiverDto<ReceiverDto>;
 
 /// <summary>
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeReceiverDto<TReceiverDto> : EnvelopeReceiverBasicDto where TReceiverDto : ReceiverDto
+public record EnvelopeReceiverDto<TReceiverDto> where TReceiverDto : ReceiverDto
 {
     /// <summary>
     /// 
@@ -18,10 +24,60 @@ public record EnvelopeReceiverDto<TReceiverDto> : EnvelopeReceiverBasicDto where
     /// 
     /// </summary>
     public TReceiverDto? Receiver { get; set; }
-}
 
-/// <summary>
+    /// <summary>
-/// 
+    /// 
-/// </summary>
+    /// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
+    public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
-public record EnvelopeReceiverDto : EnvelopeReceiverDto<ReceiverDto>;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int EnvelopeId { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int ReceiverId { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int Sequence { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [TemplatePlaceholder("[NAME_RECEIVER]")]
+    public string? Name { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? JobTitle { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? CompanyName { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? PrivateMessage { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime AddedWhen { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime? ChangedWhen { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool HasPhoneNumber { get; init; }
+}

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

@@ -30,8 +30,8 @@ public class MappingProfile : Profile
         CreateMap<Document, DocumentDto>();
         CreateMap<Domain.Entities.History, HistoryDto>();
         CreateMap<Domain.Entities.History, HistoryCreateDto>();
-        CreateMap<Domain.Entities.History, EnvelopeReceiverDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverDto>();
-        CreateMap<Domain.Entities.History, EnvelopeReceiverSecretDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverSecretDto>();
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverSecretDto>();
@@ -49,7 +49,6 @@ public class MappingProfile : Profile
         CreateMap<EnvelopeReceiverDto, Domain.Entities.EnvelopeReceiver>();
         CreateMap<EnvelopeTypeDto, EnvelopeType>();
         CreateMap<ReceiverDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
-        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverBasicDto>();
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
 

EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverDto.cs

@@ -34,7 +34,7 @@ public class ReceiverDto
     /// 
     /// </summary>
     [JsonIgnore]
-    public IEnumerable<EnvelopeReceiverBasicDto>? EnvelopeReceivers { get; set; }
+    public IEnumerable<EnvelopeReceiverDto>? EnvelopeReceivers { get; set; }
 
     /// <summary>
     /// 

EnvelopeGenerator.Web/appsettings.json

@@ -153,8 +153,8 @@
     "TimeLimit": "90.00:00:00"
   },
   "DbTriggerParams": {
-    "Envelope": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
+    "Envelope": [ "TBSIG_ENVELOPE_AFT_INS" ],
-    "EnvelopeHistory": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
+    "History": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
     "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
     "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
     "Receiver": [],