From 3f5a58439948d2a407349809f815ab0d419cf6d4 Mon Sep 17 00:00:00 2001 From: TekH Date: Tue, 19 Aug 2025 15:11:42 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20Anpassung=20der=20Klassen-Definitio?= =?UTF-8?q?n=20f=C3=BCr=20EnvelopeHistory=20zur=20Unterst=C3=BCtzung=20von?= =?UTF-8?q?=20NET=20und=20NETFRAMEWORK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/EnvelopeHistory.cs | 3 - .../Entities/EnvelopeReceiver.cs | 88 ++++++++++--------- 2 files changed, 48 insertions(+), 43 deletions(-) diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs index 47b5ada5..aa02fadf 100644 --- a/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs +++ b/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs @@ -1,9 +1,6 @@ using DigitalData.UserManager.Domain.Entities; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -#if NETFRAMEWORK -using System; -#endif namespace EnvelopeGenerator.Domain.Entities #if NET diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs index 4e5990d6..0ad0c64e 100644 --- a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs +++ b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs @@ -5,59 +5,67 @@ using System; #endif namespace EnvelopeGenerator.Domain.Entities -{ - [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")] - public class EnvelopeReceiver +#if NET + ; +#elif NETFRAMEWORK { - [Key] - [Column("ENVELOPE_ID")] - public int EnvelopeId { get; set; } +#endif + +[Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")] +public class EnvelopeReceiver +{ + [Key] + [Column("ENVELOPE_ID")] + public int EnvelopeId { get; set; } + + [Key] + [Column("RECEIVER_ID")] + public int ReceiverId { get; set; } - [Key] - [Column("RECEIVER_ID")] - public int ReceiverId { get; set; } + [Required] + [Column("SEQUENCE")] + public int Sequence { get; set; } - [Required] - [Column("SEQUENCE")] - public int Sequence { get; set; } + [Column("NAME", TypeName = "nvarchar(128)")] + public string Name { get; set; } - [Column("NAME", TypeName = "nvarchar(128)")] - public string Name { get; set; } + [Column("JOB_TITLE", TypeName = "nvarchar(128)")] + public string JobTitle { 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("COMPANY_NAME", TypeName = "nvarchar(128)")] - public string CompanyName { get; set; } + [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")] + public string PrivateMessage { get; set; } - [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")] - public string PrivateMessage { get; set; } + [Column("ACCESS_CODE", TypeName = "nvarchar(64)")] + public string AccessCode { get; set; } - [Column("ACCESS_CODE", TypeName = "nvarchar(64)")] - public string AccessCode { get; set; } + [Required] + [Column("ADDED_WHEN", TypeName = "datetime")] + public DateTime AddedWhen { get; set; } - [Required] - [Column("ADDED_WHEN", TypeName = "datetime")] - public DateTime AddedWhen { get; set; } + [Column("CHANGED_WHEN", TypeName = "datetime")] + public DateTime ChangedWhen { 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; } - [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 Id => Tuple.Create(EnvelopeId, ReceiverId); - [NotMapped] - public Tuple Id => Tuple.Create(EnvelopeId, ReceiverId); + [NotMapped] + public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber); - [NotMapped] - public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber); + [ForeignKey("EnvelopeId")] + public Envelope Envelope { get; set; } - [ForeignKey("EnvelopeId")] - public Envelope Envelope { get; set; } + [ForeignKey("ReceiverId")] + public Receiver Receiver { get; set; } +} - [ForeignKey("ReceiverId")] - public Receiver Receiver { get; set; } +#if NETFRAMEWORK } -} \ No newline at end of file +#endif \ No newline at end of file