Merge EnvelopeReceiver and EnvelopeReceiverBase

EnvelopeGenerator.Application/Configurations/MailParams.cs

@@ -1,6 +1,4 @@
-using System.Collections.Immutable;
-
-namespace EnvelopeGenerator.Application.Configurations;
+namespace EnvelopeGenerator.Application.Configurations;
 
 /// <summary>
 /// 
@@ -10,5 +8,5 @@ public class MailParams
     /// <summary>
     /// 
     /// </summary>
-    public required ImmutableDictionary<string, string> Placeholders { get; init; }
+    public required Dictionary<string, string> Placeholders { get; init; }
 }

EnvelopeGenerator.Application/DTOs/MappingProfile.cs

@@ -54,7 +54,7 @@ public class MappingProfile : Profile
         CreateMap<ReceiverReadDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
         CreateMap<ReceiverCreateDto, Domain.Entities.Receiver>();
         CreateMap<ReceiverUpdateDto, Domain.Entities.Receiver>();
-        CreateMap<EnvelopeReceiverBase, EnvelopeReceiverBasicDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverBasicDto>();
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
 

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -138,12 +138,15 @@ namespace EnvelopeGenerator.Domain.Entities
         public byte[] DOC_RESULT { get; set; }
 
         // TODO: * Check the Form App and remove the default value
+        [NotMapped]
         public List<EnvelopeDocument> Documents { get; set; } = new List<EnvelopeDocument>();
 
         // TODO: * Check the Form App and remove the default value
+        [NotMapped]
         public List<EnvelopeHistory> History { get; set; } = new List<EnvelopeHistory>();
 
         // TODO: * Check the Form App and remove the default value
+        [NotMapped]
         public List<Receiver> Receivers { get; set; } = new List<Receiver>();
 
         /// <summary>

EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs

@@ -1,10 +1,59 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+#if NETFRAMEWORK
+using System;
+#endif
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-    public class EnvelopeReceiver : EnvelopeReceiverBase
+    public class EnvelopeReceiver
     {
+        [Key]
+        [Column("ENVELOPE_ID")]
+        public int EnvelopeId { get; set; }
+
+        [Key]
+        [Column("RECEIVER_ID")]
+        public int ReceiverId { get; set; }
+
+        [Required]
+        [Column("SEQUENCE")]
+        public int Sequence { get; set; }
+
+        [Column("NAME", TypeName = "nvarchar(128)")]
+        public string Name { get; set; }
+
+        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
+        public string JobTitle { get; set; }
+
+        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
+        public string CompanyName { get; set; }
+
+        [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
+        public string PrivateMessage { get; set; }
+
+        [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
+        public string AccessCode { get; set; }
+
+        [Required]
+        [Column("ADDED_WHEN", TypeName = "datetime")]
+        public DateTime AddedWhen { get; set; }
+
+        [Column("CHANGED_WHEN", TypeName = "datetime")]
+        public DateTime ChangedWhen { get; set; }
+
+        [Column("PHONE_NUMBER")]
+        [StringLength(20)]
+        [RegularExpression(@"^\+[0-9]+$", ErrorMessage = "Phone number must start with '+' followed by digits.")]
+        public string PhoneNumber { get; set; }
+
+        [NotMapped]
+        public Tuple<int, int> Id => Tuple.Create(EnvelopeId, ReceiverId);
+
+        [NotMapped]
+        public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber);
+
         [ForeignKey("EnvelopeId")]
         public Envelope Envelope { get; set; }
 

EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs

@@ -1,57 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-#if NETFRAMEWORK
-using System;
-#endif
-
-namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-    public class EnvelopeReceiverBase
-    {
-        [Key]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-
-        [Key]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
-
-        [Required]
-        [Column("SEQUENCE")]
-        public int Sequence { get; set; }
-
-        [Column("NAME", TypeName = "nvarchar(128)")]
-        public string Name { get; set; }
-
-        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
-        public string JobTitle { get; set; }
-
-        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
-        public string CompanyName { get; set; }
-
-        [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
-        public string PrivateMessage { get; set; }
-
-        [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
-        public string AccessCode { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        [Column("PHONE_NUMBER")]
-        [StringLength(20)]
-        [RegularExpression(@"^\+[0-9]+$", ErrorMessage = "Phone number must start with '+' followed by digits.")]
-        public string PhoneNumber { get; set; }
-        
-        [NotMapped]
-        public Tuple<int, int> Id => Tuple.Create(EnvelopeId, ReceiverId);
-
-        [NotMapped]
-        public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber);
-    }
-}