From 910a870ddfa168a88e2f0b0ca40b1e1499aa6cfe Mon Sep 17 00:00:00 2001 From: TekH Date: Mon, 9 Feb 2026 15:32:41 +0100 Subject: [PATCH] Refactor entities: remove preprocessor directives, unify style Large-scale cleanup of entity and interface classes: - Removed obsolete #if NET/NETFRAMEWORK preprocessor blocks - Unified class/property formatting and indentation - Standardized use of data annotations - Improved nullable reference type handling - Simplified interfaces (IHasEnvelope, IHasReceiver) - Removed redundant and dead code - No changes to business logic or data model These changes modernize and standardize the codebase for easier maintenance and .NET compatibility. --- EnvelopeGenerator.Domain/Entities/Config.cs | 36 ++---- EnvelopeGenerator.Domain/Entities/Document.cs | 98 +++++++------- .../Entities/DocumentStatus.cs | 85 ++++++------ .../Entities/ElementAnnotation.cs | 118 ++++++++--------- .../Entities/EmailTemplate.cs | 60 ++++----- .../Entities/EnvelopeReceiver.cs | 121 ++++++++---------- EnvelopeGenerator.Domain/Entities/History.cs | 100 +++++++-------- .../Interfaces/IHasEnvelope.cs | 23 +--- .../Interfaces/IHasReceiver.cs | 23 +--- 9 files changed, 288 insertions(+), 376 deletions(-) diff --git a/EnvelopeGenerator.Domain/Entities/Config.cs b/EnvelopeGenerator.Domain/Entities/Config.cs index 57b4034a..fe011b68 100644 --- a/EnvelopeGenerator.Domain/Entities/Config.cs +++ b/EnvelopeGenerator.Domain/Entities/Config.cs @@ -2,30 +2,22 @@ using System.ComponentModel.DataAnnotations.Schema; namespace EnvelopeGenerator.Domain.Entities -#if NET - ; -#elif NETFRAMEWORK - { -#endif - -[Table("TBSIG_CONFIG", Schema = "dbo")] -public class Config { - [Column("SENDING_PROFILE", TypeName = "int")] - [Required] - public int SendingProfile { get; set; } - - [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")] - [Required] - public string SignatureHost { get; set; } + [Table("TBSIG_CONFIG", Schema = "dbo")] + public class Config + { + [Column("SENDING_PROFILE", TypeName = "int")] + [Required] + public int SendingProfile { get; set; } - [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")] - public string ExternalProgramName { get; set; } + [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")] + [Required] + public string SignatureHost { get; set; } - [Column("EXPORT_PATH", TypeName = "nvarchar(256)")] - public string ExportPath { get; set; } -} + [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")] + public string ExternalProgramName { get; set; } -#if NETFRAMEWORK + [Column("EXPORT_PATH", TypeName = "nvarchar(256)")] + public string ExportPath { get; set; } } -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Entities/Document.cs b/EnvelopeGenerator.Domain/Entities/Document.cs index f481ede1..33c5472c 100644 --- a/EnvelopeGenerator.Domain/Entities/Document.cs +++ b/EnvelopeGenerator.Domain/Entities/Document.cs @@ -9,85 +9,77 @@ using System.Linq; #endif namespace EnvelopeGenerator.Domain.Entities -#if NET - ; -#elif NETFRAMEWORK { -#endif - -[Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")] -public class Document : IHasEnvelope, IHasAddedWhen -{ - public Document() + [Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")] + public class Document : IHasEnvelope, IHasAddedWhen { + public Document() + { #if NETFRAMEWORK - Elements = Enumerable.Empty().ToList(); + Elements = Enumerable.Empty().ToList(); #endif - } + } - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - [Column("GUID")] - public int Id { get; set; } + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Column("GUID")] + public int Id { get; set; } - [Required] - [Column("ENVELOPE_ID")] - public int EnvelopeId { get; set; } + [Required] + [Column("ENVELOPE_ID")] + public int EnvelopeId { get; set; } #if NETFRAMEWORK - = 0; + = 0; #endif - [Required] - [Column("ADDED_WHEN", TypeName = "datetime")] - public DateTime AddedWhen { get; set; } + [Required] + [Column("ADDED_WHEN", TypeName = "datetime")] + public DateTime AddedWhen { get; set; } - [Column("BYTE_DATA", TypeName = "varbinary(max)")] - public byte[] + [Column("BYTE_DATA", TypeName = "varbinary(max)")] + public byte[] #if nullable - ? + ? #endif - ByteData { get; set; } + ByteData { get; set; } - #region File - [Column("FILENAME", TypeName = "nvarchar(256)")] - public string Filename { get; set; } + #region File + [Column("FILENAME", TypeName = "nvarchar(256)")] + public string Filename { get; set; } - [Column("FILEPATH", TypeName = "nvarchar(256)")] - public string Filepath { get; set; } + [Column("FILEPATH", TypeName = "nvarchar(256)")] + public string Filepath { get; set; } - [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")] - public string + [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")] + public string #if nullable - ? + ? #endif - FileNameOriginal { get; set; } - #endregion + FileNameOriginal { get; set; } + #endregion - public virtual List + public virtual List #if nullable - ? + ? #endif - Elements { get; set; } + Elements { get; set; } - [ForeignKey("EnvelopeId")] - public virtual Envelope + [ForeignKey("EnvelopeId")] + public virtual Envelope #if nullable - ? + ? #endif - Envelope { get; set; } + Envelope { get; set; } #if NETFRAMEWORK - [NotMapped] - public bool IsTempFile { get; set; } + [NotMapped] + public bool IsTempFile { get; set; } - [NotMapped] - public Bitmap Thumbnail { get; set; } + [NotMapped] + public Bitmap Thumbnail { get; set; } - [NotMapped] - public int PageCount { get; set; } + [NotMapped] + public int PageCount { get; set; } #endif -} - -#if NETFRAMEWORK } -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs b/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs index 7d8c817b..2a5fe111 100644 --- a/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs +++ b/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs @@ -4,69 +4,58 @@ using System.ComponentModel.DataAnnotations.Schema; using DigitalData.Core.Abstractions.Interfaces; using EnvelopeGenerator.Domain.Interfaces; -#if NETFRAMEWORK -#endif - namespace EnvelopeGenerator.Domain.Entities -#if NET - ; -#elif NETFRAMEWORK { -#endif - -[Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")] -public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen -{ - public DocumentStatus() + [Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")] + public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen { - // TODO: * check Form Application and remove default value + public DocumentStatus() + { + // TODO: * check Form Application and remove default value #if NETFRAMEWORK - Status = Constants.DocumentStatus.Created; + Status = Constants.DocumentStatus.Created; #endif - } + } - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - [Column("GUID")] - public int Id { get; set; } + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Column("GUID")] + public int Id { get; set; } - [Required] - [Column("ENVELOPE_ID")] - public int EnvelopeId { get; set; } + [Required] + [Column("ENVELOPE_ID")] + public int EnvelopeId { get; set; } - [Required] - [Column("RECEIVER_ID")] - public int ReceiverId { get; set; } + [Required] + [Column("RECEIVER_ID")] + public int ReceiverId { get; set; } - [Required] - [Column("STATUS")] - public Constants.DocumentStatus Status { get; set; } + [Required] + [Column("STATUS")] + public Constants.DocumentStatus Status { 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("VALUE", TypeName = "nvarchar(max)")] - public string Value { get; set; } + [Column("VALUE", TypeName = "nvarchar(max)")] + public string Value { get; set; } - [ForeignKey("EnvelopeId")] - public virtual Envelope -#if NET - ? + [ForeignKey("EnvelopeId")] + public virtual Envelope +#if nullable + ? #endif - Envelope { get; set; } + Envelope { get; set; } - [ForeignKey("ReceiverId")] - public virtual Receiver -#if NET - ? + [ForeignKey("ReceiverId")] + public virtual Receiver +#if nullable + ? #endif Receiver { get; set; } -} - -#if NETFRAMEWORK } -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs b/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs index 7361a3a9..bf9acefe 100644 --- a/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs +++ b/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs @@ -6,88 +6,80 @@ using System.ComponentModel.DataAnnotations.Schema; #endif namespace EnvelopeGenerator.Domain.Entities -#if NET - ; -#elif NETFRAMEWORK { -#endif - -[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION")] -public class ElementAnnotation : IHasAddedWhen, IHasChangedWhen, IHasChangedWho -{ - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - [Column("GUID", TypeName = "bigint")] - public long Id { get; set; } + [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION")] + public class ElementAnnotation : IHasAddedWhen, IHasChangedWhen, IHasChangedWho + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Column("GUID", TypeName = "bigint")] + public long Id { get; set; } - [Required] - [Column("ELEMENT_ID", TypeName = "int")] - public int ElementId { get; set; } + [Required] + [Column("ELEMENT_ID", TypeName = "int")] + public int ElementId { get; set; } - [Required] - [Column("NAME", TypeName = "nvarchar(100)")] - [StringLength(100)] - public string Name { get; set; } + [Required] + [Column("NAME", TypeName = "nvarchar(100)")] + [StringLength(100)] + public string Name { get; set; } - [Required] - [Column("VALUE", TypeName = "nvarchar(max)")] - public string Value { get; set; } + [Required] + [Column("VALUE", TypeName = "nvarchar(max)")] + public string Value { get; set; } - [Required] - [Column("TYPE", TypeName = "nvarchar(50)")] - public string Type { get; set; } + [Required] + [Column("TYPE", TypeName = "nvarchar(50)")] + public string Type { get; set; } - [Column("POSITION_X", TypeName = "float")] - public double -#if NET - ? + [Column("POSITION_X", TypeName = "float")] + public double +#if nullable + ? #endif - X { get; set; } + X { get; set; } - [Column("POSITION_Y", TypeName = "float")] - public double -#if NET - ? + [Column("POSITION_Y", TypeName = "float")] + public double +#if nullable + ? #endif - Y { get; set; } + Y { get; set; } - [Column("WIDTH", TypeName = "float")] - public double -#if NET - ? + [Column("WIDTH", TypeName = "float")] + public double +#if nullable + ? #endif - Width { get; set; } + Width { get; set; } - [Column("HEIGHT", TypeName = "float")] - public double -#if NET - ? + [Column("HEIGHT", TypeName = "float")] + public double +#if nullable + ? #endif - Height { get; set; } + Height { 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("CHANGED_WHO", TypeName = "nvarchar(100)")] - [StringLength(100)] - public string + [Column("CHANGED_WHO", TypeName = "nvarchar(100)")] + [StringLength(100)] + public string #if nullable - ? + ? #endif - ChangedWho { get; set; } + ChangedWho { get; set; } - [ForeignKey("ElementId")] - public virtual Signature + [ForeignKey("ElementId")] + public virtual Signature #if nullable - ? + ? #endif - Element { get; set; } -} - -#if NETFRAMEWORK + Element { get; set; } } -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Entities/EmailTemplate.cs b/EnvelopeGenerator.Domain/Entities/EmailTemplate.cs index 2a5b2a6a..0ec5414b 100644 --- a/EnvelopeGenerator.Domain/Entities/EmailTemplate.cs +++ b/EnvelopeGenerator.Domain/Entities/EmailTemplate.cs @@ -4,42 +4,32 @@ using EnvelopeGenerator.Domain.Interfaces; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -#if NETFRAMEWORK -#endif namespace EnvelopeGenerator.Domain.Entities -#if NET - ; -#elif NETFRAMEWORK { -#endif - -[Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")] -public class EmailTemplate : IEntity, IHasAddedWhen, IHasChangedWhen -{ - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - [Column("GUID")] - public int Id { get; set; } - - [Column("NAME", TypeName = "nvarchar(64)")] - public string Name { get; set; } - - [Column("BODY", TypeName = "nvarchar(max)")] - public string Body { get; set; } - - [Column("SUBJECT", TypeName = "nvarchar(512)")] - public string Subject { get; set; } - - [Required] - [Column("ADDED_WHEN", TypeName = "datetime")] - [DefaultValue("GETDATE()")] - public DateTime AddedWhen { get; set; } - - [Column("CHANGED_WHEN", TypeName = "datetime")] - public DateTime? ChangedWhen { get; set; } -} - -#if NETFRAMEWORK + [Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")] + public class EmailTemplate : IEntity, IHasAddedWhen, IHasChangedWhen + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Column("GUID")] + public int Id { get; set; } + + [Column("NAME", TypeName = "nvarchar(64)")] + public string Name { get; set; } + + [Column("BODY", TypeName = "nvarchar(max)")] + public string Body { get; set; } + + [Column("SUBJECT", TypeName = "nvarchar(512)")] + public string Subject { get; set; } + + [Required] + [Column("ADDED_WHEN", TypeName = "datetime")] + [DefaultValue("GETDATE()")] + public DateTime AddedWhen { get; set; } + + [Column("CHANGED_WHEN", TypeName = "datetime")] + public DateTime? ChangedWhen { get; set; } } -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs index 92c85362..01868e87 100644 --- a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs +++ b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs @@ -4,101 +4,88 @@ using System.ComponentModel.DataAnnotations.Schema; using DigitalData.Core.Abstractions.Interfaces; using EnvelopeGenerator.Domain.Interfaces; -#if NETFRAMEWORK -#endif - namespace EnvelopeGenerator.Domain.Entities -#if NET - ; -#elif NETFRAMEWORK -{ -#endif - -[Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")] -public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen { - public EnvelopeReceiver() + [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")] + public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen { + public EnvelopeReceiver() + { #if NETFRAMEWORK - CompanyName = string.Empty; + CompanyName = string.Empty; #endif - } + } - [Column("ENVELOPE_ID")] - public int EnvelopeId { get; set; } + [Column("ENVELOPE_ID")] + public int EnvelopeId { get; set; } - [Column("RECEIVER_ID")] - public int ReceiverId { get; set; } + [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 + [Column("COMPANY_NAME", TypeName = "nvarchar(128)")] + public string #if nullable - ? + ? #endif - CompanyName { get; set; } + 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 + [ForeignKey("EnvelopeId")] + public Envelope #if nullable - ? + ? #endif - Envelope { get; set; } + Envelope { get; set; } - [ForeignKey("ReceiverId")] - public Receiver + [ForeignKey("ReceiverId")] + public Receiver #if nullable - ? + ? #endif - Receiver { get; set; } + Receiver { get; set; } - #region Model of old serice - [NotMapped] - public Constants.ReceiverStatus Status { get; set; } + #region Model of old serice + [NotMapped] + public Constants.ReceiverStatus Status { get; set; } - [NotMapped] - public bool HasId => Id.Item1 > 0 && Id.Item2 > 0; + [NotMapped] + public bool HasId => Id.Item1 > 0 && Id.Item2 > 0; - [NotMapped] - public bool HasEmailAndName => - !string.IsNullOrWhiteSpace(Receiver.EmailAddress) && - !string.IsNullOrWhiteSpace(Name); + [NotMapped] + public bool HasEmailAndName => #endregion } - -#if NETFRAMEWORK - } -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Entities/History.cs b/EnvelopeGenerator.Domain/Entities/History.cs index 1ee01d93..068f3995 100644 --- a/EnvelopeGenerator.Domain/Entities/History.cs +++ b/EnvelopeGenerator.Domain/Entities/History.cs @@ -7,74 +7,66 @@ using EnvelopeGenerator.Domain.Constants; using DigitalData.Core.Abstractions.Interfaces; namespace EnvelopeGenerator.Domain.Entities -#if NET - ; -#elif NETFRAMEWORK { -#endif - -[Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")] -public class History : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen -{ - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - [Column("GUID")] - public long Id { get; set; } + [Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")] + public class History : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Column("GUID")] + public long Id { get; set; } - [Required] - [Column("ENVELOPE_ID")] - public int EnvelopeId { get; set; } + [Required] + [Column("ENVELOPE_ID")] + public int EnvelopeId { get; set; } - [Required] - [Column("USER_REFERENCE", TypeName = "nvarchar(128)")] - public string UserReference { get; set; } + [Required] + [Column("USER_REFERENCE", TypeName = "nvarchar(128)")] + public string UserReference { get; set; } - [Required] - [Column("STATUS")] - public EnvelopeStatus Status { get; set; } + [Required] + [Column("STATUS")] + public EnvelopeStatus Status { get; set; } - [Required] - [Column("ADDED_WHEN", TypeName = "datetime")] - [DatabaseGenerated(DatabaseGeneratedOption.Computed)] - public DateTime AddedWhen { get; set; } + [Required] + [Column("ADDED_WHEN", TypeName = "datetime")] + [DatabaseGenerated(DatabaseGeneratedOption.Computed)] + public DateTime AddedWhen { get; set; } - [Column("ACTION_DATE", TypeName = "datetime")] - public DateTime? ChangedWhen { get; set; } - - [Column("COMMENT", TypeName = "nvarchar(max)")] - public string -#if NET - ? + [Column("ACTION_DATE", TypeName = "datetime")] + public DateTime? ChangedWhen { get; set; } + + [Column("COMMENT", TypeName = "nvarchar(max)")] + public string +#if nullable + ? #endif - Comment { get; set; } + Comment { get; set; } - [ForeignKey("EnvelopeId")] - public virtual Envelope -#if NET - ? + [ForeignKey("EnvelopeId")] + public virtual Envelope +#if nullable + ? #endif - Envelope { get; set; } + Envelope { get; set; } - [ForeignKey("UserReference")] - public virtual User -#if NET - ? + [ForeignKey("UserReference")] + public virtual User +#if nullable + ? #endif - Sender { get; set; } + Sender { get; set; } - [ForeignKey("UserReference")] - public virtual Receiver -#if NET - ? + [ForeignKey("UserReference")] + public virtual Receiver +#if nullable + ? #endif - Receiver { get; set; } + Receiver { get; set; } #if NETFRAMEWORK - [NotMapped] - public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString()); + [NotMapped] + public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString()); #endif -} - -#if NETFRAMEWORK } -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Interfaces/IHasEnvelope.cs b/EnvelopeGenerator.Domain/Interfaces/IHasEnvelope.cs index 93eea3bd..ec6cffb5 100644 --- a/EnvelopeGenerator.Domain/Interfaces/IHasEnvelope.cs +++ b/EnvelopeGenerator.Domain/Interfaces/IHasEnvelope.cs @@ -1,22 +1,11 @@ namespace EnvelopeGenerator.Domain.Interfaces -#if NET - ; -#elif NETFRAMEWORK - { -#endif - -public interface IHasEnvelope { -#if NET - public -#endif + public interface IHasEnvelope + { Entities.Envelope -#if NET - ? +#if nullable + ? #endif Envelope { get; set; } -} - -#if NETFRAMEWORK -} -#endif \ No newline at end of file + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Interfaces/IHasReceiver.cs b/EnvelopeGenerator.Domain/Interfaces/IHasReceiver.cs index 0b105a3e..373bfc26 100644 --- a/EnvelopeGenerator.Domain/Interfaces/IHasReceiver.cs +++ b/EnvelopeGenerator.Domain/Interfaces/IHasReceiver.cs @@ -1,22 +1,11 @@ namespace EnvelopeGenerator.Domain.Interfaces -#if NET - ; -#elif NETFRAMEWORK +{ + public interface IHasReceiver { -#endif - -public interface IHasReceiver - { -#if NET - public -#endif Entities.Receiver -#if NET - ? +#if nullable + ? #endif Receiver { get; set; } -} - -#if NETFRAMEWORK -} -#endif \ No newline at end of file + } +} \ No newline at end of file