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.
This commit is contained in:
2026-02-09 15:32:41 +01:00
parent e2afbc5a62
commit 910a870ddf
9 changed files with 321 additions and 409 deletions

View File

@@ -2,15 +2,10 @@
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace EnvelopeGenerator.Domain.Entities namespace EnvelopeGenerator.Domain.Entities
#if NET
;
#elif NETFRAMEWORK
{
#endif
[Table("TBSIG_CONFIG", Schema = "dbo")]
public class Config
{ {
[Table("TBSIG_CONFIG", Schema = "dbo")]
public class Config
{
[Column("SENDING_PROFILE", TypeName = "int")] [Column("SENDING_PROFILE", TypeName = "int")]
[Required] [Required]
public int SendingProfile { get; set; } public int SendingProfile { get; set; }
@@ -24,8 +19,5 @@ public class Config
[Column("EXPORT_PATH", TypeName = "nvarchar(256)")] [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
public string ExportPath { get; set; } public string ExportPath { get; set; }
}
#if NETFRAMEWORK
} }
#endif }

View File

@@ -9,15 +9,10 @@ using System.Linq;
#endif #endif
namespace EnvelopeGenerator.Domain.Entities namespace EnvelopeGenerator.Domain.Entities
#if NET
;
#elif NETFRAMEWORK
{
#endif
[Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
public class Document : IHasEnvelope, IHasAddedWhen
{ {
[Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
public class Document : IHasEnvelope, IHasAddedWhen
{
public Document() public Document()
{ {
#if NETFRAMEWORK #if NETFRAMEWORK
@@ -86,8 +81,5 @@ public class Document : IHasEnvelope, IHasAddedWhen
[NotMapped] [NotMapped]
public int PageCount { get; set; } public int PageCount { get; set; }
#endif #endif
}
#if NETFRAMEWORK
} }
#endif }

View File

@@ -4,19 +4,11 @@ using System.ComponentModel.DataAnnotations.Schema;
using DigitalData.Core.Abstractions.Interfaces; using DigitalData.Core.Abstractions.Interfaces;
using EnvelopeGenerator.Domain.Interfaces; using EnvelopeGenerator.Domain.Interfaces;
#if NETFRAMEWORK
#endif
namespace EnvelopeGenerator.Domain.Entities namespace EnvelopeGenerator.Domain.Entities
#if NET
;
#elif NETFRAMEWORK
{
#endif
[Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
{ {
[Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
{
public DocumentStatus() public DocumentStatus()
{ {
// TODO: * check Form Application and remove default value // TODO: * check Form Application and remove default value
@@ -54,19 +46,16 @@ public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen
[ForeignKey("EnvelopeId")] [ForeignKey("EnvelopeId")]
public virtual Envelope public virtual Envelope
#if NET #if nullable
? ?
#endif #endif
Envelope { get; set; } Envelope { get; set; }
[ForeignKey("ReceiverId")] [ForeignKey("ReceiverId")]
public virtual Receiver public virtual Receiver
#if NET #if nullable
? ?
#endif #endif
Receiver { get; set; } Receiver { get; set; }
}
#if NETFRAMEWORK
} }
#endif }

View File

@@ -6,15 +6,10 @@ using System.ComponentModel.DataAnnotations.Schema;
#endif #endif
namespace EnvelopeGenerator.Domain.Entities namespace EnvelopeGenerator.Domain.Entities
#if NET
;
#elif NETFRAMEWORK
{
#endif
[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION")]
public class ElementAnnotation : IHasAddedWhen, IHasChangedWhen, IHasChangedWho
{ {
[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION")]
public class ElementAnnotation : IHasAddedWhen, IHasChangedWhen, IHasChangedWho
{
[Key] [Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)] [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Column("GUID", TypeName = "bigint")] [Column("GUID", TypeName = "bigint")]
@@ -39,28 +34,28 @@ public class ElementAnnotation : IHasAddedWhen, IHasChangedWhen, IHasChangedWho
[Column("POSITION_X", TypeName = "float")] [Column("POSITION_X", TypeName = "float")]
public double public double
#if NET #if nullable
? ?
#endif #endif
X { get; set; } X { get; set; }
[Column("POSITION_Y", TypeName = "float")] [Column("POSITION_Y", TypeName = "float")]
public double public double
#if NET #if nullable
? ?
#endif #endif
Y { get; set; } Y { get; set; }
[Column("WIDTH", TypeName = "float")] [Column("WIDTH", TypeName = "float")]
public double public double
#if NET #if nullable
? ?
#endif #endif
Width { get; set; } Width { get; set; }
[Column("HEIGHT", TypeName = "float")] [Column("HEIGHT", TypeName = "float")]
public double public double
#if NET #if nullable
? ?
#endif #endif
Height { get; set; } Height { get; set; }
@@ -86,8 +81,5 @@ public class ElementAnnotation : IHasAddedWhen, IHasChangedWhen, IHasChangedWho
? ?
#endif #endif
Element { get; set; } Element { get; set; }
}
#if NETFRAMEWORK
} }
#endif }

View File

@@ -4,19 +4,12 @@ using EnvelopeGenerator.Domain.Interfaces;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
#if NETFRAMEWORK
#endif
namespace EnvelopeGenerator.Domain.Entities namespace EnvelopeGenerator.Domain.Entities
#if NET
;
#elif NETFRAMEWORK
{
#endif
[Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
public class EmailTemplate : IEntity, IHasAddedWhen, IHasChangedWhen
{ {
[Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
public class EmailTemplate : IEntity, IHasAddedWhen, IHasChangedWhen
{
[Key] [Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)] [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Column("GUID")] [Column("GUID")]
@@ -38,8 +31,5 @@ public class EmailTemplate : IEntity, IHasAddedWhen, IHasChangedWhen
[Column("CHANGED_WHEN", TypeName = "datetime")] [Column("CHANGED_WHEN", TypeName = "datetime")]
public DateTime? ChangedWhen { get; set; } public DateTime? ChangedWhen { get; set; }
}
#if NETFRAMEWORK
} }
#endif }

View File

@@ -4,19 +4,11 @@ using System.ComponentModel.DataAnnotations.Schema;
using DigitalData.Core.Abstractions.Interfaces; using DigitalData.Core.Abstractions.Interfaces;
using EnvelopeGenerator.Domain.Interfaces; using EnvelopeGenerator.Domain.Interfaces;
#if NETFRAMEWORK
#endif
namespace EnvelopeGenerator.Domain.Entities namespace EnvelopeGenerator.Domain.Entities
#if NET
;
#elif NETFRAMEWORK
{
#endif
[Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
{ {
[Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
{
public EnvelopeReceiver() public EnvelopeReceiver()
{ {
#if NETFRAMEWORK #if NETFRAMEWORK
@@ -94,11 +86,6 @@ public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWh
[NotMapped] [NotMapped]
public bool HasEmailAndName => public bool HasEmailAndName =>
!string.IsNullOrWhiteSpace(Receiver.EmailAddress) &&
!string.IsNullOrWhiteSpace(Name);
#endregion #endregion
} }
}
#if NETFRAMEWORK
}
#endif

View File

@@ -7,15 +7,10 @@ using EnvelopeGenerator.Domain.Constants;
using DigitalData.Core.Abstractions.Interfaces; using DigitalData.Core.Abstractions.Interfaces;
namespace EnvelopeGenerator.Domain.Entities namespace EnvelopeGenerator.Domain.Entities
#if NET
;
#elif NETFRAMEWORK
{
#endif
[Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
public class History : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
{ {
[Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
public class History : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
{
[Key] [Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)] [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Column("GUID")] [Column("GUID")]
@@ -43,28 +38,28 @@ public class History : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasC
[Column("COMMENT", TypeName = "nvarchar(max)")] [Column("COMMENT", TypeName = "nvarchar(max)")]
public string public string
#if NET #if nullable
? ?
#endif #endif
Comment { get; set; } Comment { get; set; }
[ForeignKey("EnvelopeId")] [ForeignKey("EnvelopeId")]
public virtual Envelope public virtual Envelope
#if NET #if nullable
? ?
#endif #endif
Envelope { get; set; } Envelope { get; set; }
[ForeignKey("UserReference")] [ForeignKey("UserReference")]
public virtual User public virtual User
#if NET #if nullable
? ?
#endif #endif
Sender { get; set; } Sender { get; set; }
[ForeignKey("UserReference")] [ForeignKey("UserReference")]
public virtual Receiver public virtual Receiver
#if NET #if nullable
? ?
#endif #endif
Receiver { get; set; } Receiver { get; set; }
@@ -73,8 +68,5 @@ public class History : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasC
[NotMapped] [NotMapped]
public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString()); public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
#endif #endif
}
#if NETFRAMEWORK
} }
#endif }

View File

@@ -1,22 +1,11 @@
namespace EnvelopeGenerator.Domain.Interfaces namespace EnvelopeGenerator.Domain.Interfaces
#if NET
;
#elif NETFRAMEWORK
{
#endif
public interface IHasEnvelope
{ {
#if NET public interface IHasEnvelope
public {
#endif
Entities.Envelope Entities.Envelope
#if NET #if nullable
? ?
#endif #endif
Envelope { get; set; } Envelope { get; set; }
}
} }
#if NETFRAMEWORK
}
#endif

View File

@@ -1,22 +1,11 @@
namespace EnvelopeGenerator.Domain.Interfaces namespace EnvelopeGenerator.Domain.Interfaces
#if NET {
; public interface IHasReceiver
#elif NETFRAMEWORK
{ {
#endif
public interface IHasReceiver
{
#if NET
public
#endif
Entities.Receiver Entities.Receiver
#if NET #if nullable
? ?
#endif #endif
Receiver { get; set; } Receiver { get; set; }
}
} }
#if NETFRAMEWORK
}
#endif