From bdf2527fc1cb1fdc220d4f6d1141053d9180cd70 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Fri, 16 May 2025 09:56:44 +0200 Subject: [PATCH] Refactor using directives and add User entity - Updated `using` directives in `Config.cs` and `EnvelopeType.cs` to include additional namespaces and removed `DigitalData.Core.Abstractions`. - Adjusted formatting for `StatusName` and `IsAlreadySent` properties in `Envelope.cs` for consistency. - Simplified `User` property in `Envelope.cs` by removing the namespace prefix. - Introduced a new `User` class in `User.cs` with various properties and data annotations for database mapping. - Removed the `` property from `EnvelopeGenerator.Domain.csproj`, which may impact nullability handling. --- EnvelopeGenerator.Domain/Entities/Config.cs | 3 +- EnvelopeGenerator.Domain/Entities/Envelope.cs | 6 +- .../Entities/EnvelopeType.cs | 3 +- EnvelopeGenerator.Domain/Entities/User.cs | 96 +++++++++++++++++++ .../EnvelopeGenerator.Domain.csproj | 1 - 5 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 EnvelopeGenerator.Domain/Entities/User.cs diff --git a/EnvelopeGenerator.Domain/Entities/Config.cs b/EnvelopeGenerator.Domain/Entities/Config.cs index 6a824a46..22e0f9fb 100644 --- a/EnvelopeGenerator.Domain/Entities/Config.cs +++ b/EnvelopeGenerator.Domain/Entities/Config.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs index ff24fe35..cf31a002 100644 --- a/EnvelopeGenerator.Domain/Entities/Envelope.cs +++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs @@ -21,7 +21,7 @@ namespace EnvelopeGenerator.Domain.Entities public int Status { get; set; } [NotMapped] - public string StatusName => ((Constants.EnvelopeStatus)Status).ToString(); + public string StatusName => ((Constants.EnvelopeStatus)Status).ToString(); [Required] [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")] @@ -92,7 +92,7 @@ namespace EnvelopeGenerator.Domain.Entities /// The sender of envelope /// [ForeignKey("UserId")] - public DigitalData.UserManager.Domain.Entities.User User { get; set; } + public User User { get; set; } [ForeignKey("EnvelopeTypeId")] public EnvelopeType EnvelopeType { get; set; } @@ -101,7 +101,7 @@ namespace EnvelopeGenerator.Domain.Entities public string EnvelopeTypeTitle => EnvelopeType.Title; [NotMapped] - public bool IsAlreadySent => Status > (int) Constants.EnvelopeStatus.EnvelopeSaved; + public bool IsAlreadySent => Status > (int)Constants.EnvelopeStatus.EnvelopeSaved; public IEnumerable Documents { get; set; } diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs index 740ce22f..ff9f81ff 100644 --- a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs +++ b/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace EnvelopeGenerator.Domain.Entities diff --git a/EnvelopeGenerator.Domain/Entities/User.cs b/EnvelopeGenerator.Domain/Entities/User.cs new file mode 100644 index 00000000..a0515f4b --- /dev/null +++ b/EnvelopeGenerator.Domain/Entities/User.cs @@ -0,0 +1,96 @@ +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel; + +namespace EnvelopeGenerator.Domain.Entities +{ + [Table("TBDD_USER", Schema = "dbo")] + public class User + { + [Column("GUID")] + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int Id { get; set; } + + [StringLength(50)] + [Column("ADDED_WHO")] + public string AddedWho { get; set; } + + [StringLength(50)] + [Column("CHANGED_WHO")] + public string ChangedWho { get; set; } + + //TODO: assign it to default value in create dto, not here! + [Column("ADDED_WHEN", TypeName = "datetime")] + [DefaultValue("GETDATE()")] + public DateTime AddedWhen { get; set; } = DateTime.Now; + + [Column("CHANGED_WHEN", TypeName = "datetime")] + public DateTime ChangedWhen { get; set; } + + [Column("PRENAME")] + [StringLength(50)] + public string Prename { get; set; } + + [Column("NAME")] + [StringLength(50)] + public string Name { get; set; } + + [Required] + [Column("USERNAME")] + [StringLength(50)] + public string Username { get; set; } + + [Column("SHORTNAME")] + [StringLength(30)] + public string Shortname { get; set; } + + [Column("EMAIL")] + [StringLength(100)] + public string Email { get; set; } + + [Required] + [Column("LANGUAGE")] + [StringLength(5)] + [DefaultValue("de-DE")] + public string Language { get; set; } + + [Column("COMMENT")] + [StringLength(500)] + public string Comment { get; set; } + + [Column("DELETED")] + public bool Deleted { get; set; } + + [Required] + [Column("DATE_FORMAT")] + [StringLength(10)] + [DefaultValue("dd.MM.yyyy")] + public string DateFormat { get; set; } + + [Required] + [Column("ACTIVE")] + public bool Active { get; set; } + + [Required] + [Column("GENERAL_VIEWER")] + [StringLength(30)] + [DefaultValue("NONE")] + public string GeneralViewer { get; set; } + + [Required] + [Column("WAN_ENVIRONMENT")] + public bool WanEnvironment { get; set; } + + [Required] + [Column("USERID_FK_INT_ECM")] + public int UseridFkIntEcm { get; set; } + + [Column("DELETED_WHEN")] + public DateTime DeletedWhen { get; set; } + + [Column("DELETED_WHO")] + [StringLength(50)] + public string DeletedWho { get; set; } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj index 38cf73d7..a049b07e 100644 --- a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj +++ b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj @@ -3,7 +3,6 @@ net462;net7.0;net8.0;net9.0 enable - enable