From ee49538f1ef4a22e3311740ca3fcdabde18319a3 Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Wed, 5 Feb 2025 17:17:44 +0100
Subject: [PATCH] =?UTF-8?q?feat(Receiver):=20EnvelopeReceiver-Eigenschaft?=
 =?UTF-8?q?=20zu=20Entit=C3=A4t,=20ReadDto=20und=20Updated=20Dto=20hinzuge?=
 =?UTF-8?q?f=C3=BCgt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DTOs/Receiver/ReceiverReadDto.cs          | 33 +++++-----
 .../DTOs/Receiver/ReceiverUpdateDto.cs        |  7 +--
 EnvelopeGenerator.Domain/Entities/Receiver.cs | 60 ++++++++++---------
 3 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs b/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs
index 6d1b5a19..3a8fa8ec 100644
--- a/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs
@@ -4,23 +4,24 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using System.Text.Json.Serialization;
 
-namespace EnvelopeGenerator.Application.DTOs.Receiver
+namespace EnvelopeGenerator.Application.DTOs.Receiver;
+
+public record ReceiverReadDto(
+    int Id,
+    string EmailAddress,
+    string Signature,
+    DateTime AddedWhen
+    ) : BaseDTO<int>(Id), IUnique<int>
 {
-    public record ReceiverReadDto(
-        int Id,
-        string EmailAddress,
-        string Signature,
-        DateTime AddedWhen
-        ) : BaseDTO<int>(Id), IUnique<int>
-    {
-        [JsonIgnore]
-        public IEnumerable<EnvelopeReceiverBasicDto>? EnvelopeReceivers { get; init; }
+    [JsonIgnore]
+    public IEnumerable<EnvelopeReceiverBasicDto>? EnvelopeReceivers { get; init; }
+
+    public string? LastUsedName => EnvelopeReceivers?.LastOrDefault()?.Name;
 
-        public string? LastUsedName => EnvelopeReceivers?.LastOrDefault()?.Name;
+    public string? TotpSecretkey { get; set; } = null;
 
-        public string? TotpSecretkey { get; set; } = null;
+    [TemplatePlaceholder("[TFA_QR_EXPIRATION]")]
+    public DateTime? TotpExpiration { get; set; } = null;
 
-        [TemplatePlaceholder("[TFA_QR_EXPIRATION]")]
-        public DateTime? TotpExpiration { get; set; } = null;
-    };
-}
\ No newline at end of file
+    public DateTime? TfaRegDeadline { get; set; }
+};
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs b/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs
index 08ec5616..422b5f69 100644
--- a/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs
@@ -1,6 +1,5 @@
 using DigitalData.Core.Abstractions;
 
-namespace EnvelopeGenerator.Application.DTOs.Receiver
-{
-    public record ReceiverUpdateDto(int Id, string? TotpSecretkey = null, DateTime? TotpExpiration = null) : IUnique<int>;
-} 
\ No newline at end of file
+namespace EnvelopeGenerator.Application.DTOs.Receiver;
+
+public record ReceiverUpdateDto(int Id, string? TotpSecretkey = null, DateTime? TotpExpiration = null, DateTime? TfaRegDeadline = null) : IUnique<int>;
\ No newline at end of file
diff --git a/EnvelopeGenerator.Domain/Entities/Receiver.cs b/EnvelopeGenerator.Domain/Entities/Receiver.cs
index da0928f8..d1ab32cf 100644
--- a/EnvelopeGenerator.Domain/Entities/Receiver.cs
+++ b/EnvelopeGenerator.Domain/Entities/Receiver.cs
@@ -2,34 +2,36 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace EnvelopeGenerator.Domain.Entities
+namespace EnvelopeGenerator.Domain.Entities;
+
+[Table("TBSIG_RECEIVER", Schema = "dbo")]
+public class Receiver : IUnique<int>
 {
-    [Table("TBSIG_RECEIVER", Schema = "dbo")]
-    public class Receiver : IUnique<int>
-    {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-        
-        [Required, EmailAddress]
-        [Column("EMAIL_ADDRESS", TypeName = "nvarchar(128)")]
-        public required string EmailAddress { get; set; }
-
-        [Required]
-        [Column("SIGNATURE", TypeName = "nvarchar(64)")]
-        public required string Signature { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("TOTP_SECRET_KEY", TypeName = "nvarchar(MAX)")]
-        public string? TotpSecretkey { get; set; }
-
-        [Column("TOTP_EXPIRATION", TypeName = "datetime")]
-        public DateTime? TotpExpiration { get; set; }
-
-        public IEnumerable<EnvelopeReceiver>? EnvelopeReceivers { get; init; }
-    }
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+    
+    [Required, EmailAddress]
+    [Column("EMAIL_ADDRESS", TypeName = "nvarchar(128)")]
+    public required string EmailAddress { get; set; }
+
+    [Required]
+    [Column("SIGNATURE", TypeName = "nvarchar(64)")]
+    public required string Signature { get; set; }
+
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("TOTP_SECRET_KEY", TypeName = "nvarchar(MAX)")]
+    public string? TotpSecretkey { get; set; }
+
+    [Column("TOTP_EXPIRATION", TypeName = "datetime")]
+    public DateTime? TotpExpiration { get; set; }
+
+    [Column("TFA_REG_DEADLINE", TypeName = "datetime")]
+    public DateTime? TfaRegDeadline { get; set; }
+
+    public IEnumerable<EnvelopeReceiver>? EnvelopeReceivers { get; init; }
 }
\ No newline at end of file