From a2077c58cae6ae7eb96a9c07a99e6dc89e124d0f Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Wed, 14 Aug 2024 18:56:56 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20BaseEntity-Vererbung=20f=C3=BCr=20a?= =?UTF-8?q?lle=20Entit=C3=A4ten=20au=C3=9Fer=20Module=20und=20ModuleOfUser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - BaseEntity-Vererbung auf alle Entitäten angewendet, außer für Module und ModuleOfUser. --- .../Entities/BaseEntity.cs | 1 - .../Entities/GroupOfUser.cs | 19 +------------- .../Entities/User.cs | 25 +------------------ .../Entities/UserRep.cs | 12 +-------- 4 files changed, 3 insertions(+), 54 deletions(-) diff --git a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs index 90a55bd..d3e011c 100644 --- a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs +++ b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs @@ -12,7 +12,6 @@ namespace DigitalData.UserManager.Domain.Entities public int Id { get; set; } [StringLength(50)] - [DefaultValue("DEFAULT")] [Column("ADDED_WHO")] public string? AddedWho { get; set; } diff --git a/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs b/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs index ba23951..1ed9b16 100644 --- a/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs +++ b/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs @@ -5,13 +5,8 @@ using System.ComponentModel.DataAnnotations.Schema; namespace DigitalData.UserManager.Domain.Entities { [Table("TBDD_GROUPS_USER", Schema = "dbo")] - public class GroupOfUser + public class GroupOfUser : BaseEntity { - [Column("GUID")] - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public int Id { get; set; } - [Required] [Column("USER_ID")] public int UserId { get; set; } @@ -23,11 +18,6 @@ namespace DigitalData.UserManager.Domain.Entities [StringLength(200)] public string? Comment { get; set; } - [StringLength(50)] - [DefaultValue("DEFAULT")] - [Column("ADDED_WHO")] - public string AddedWho { get; set; } = "DEFAULT"; - [StringLength(50)] [Column("CHANGED_WHO")] public string? ChangedWho { get; set; } @@ -37,13 +27,6 @@ namespace DigitalData.UserManager.Domain.Entities [ForeignKey("GroupId")] public virtual Group? Group { get; set; } - - #region IGNORED COLUMN - //[DefaultValue("getdate()")] - //public DateTime? AddedWhen { get; set; } - - //public DateTime? ChangedWhen { get; set; } - #endregion } } diff --git a/DigitalData.UserManager.Domain/Entities/User.cs b/DigitalData.UserManager.Domain/Entities/User.cs index c55c25d..080ee3f 100644 --- a/DigitalData.UserManager.Domain/Entities/User.cs +++ b/DigitalData.UserManager.Domain/Entities/User.cs @@ -5,13 +5,8 @@ using System.ComponentModel.DataAnnotations.Schema; namespace DigitalData.UserManager.Domain.Entities { [Table("TBDD_USER", Schema = "dbo")] - public class User + public class User : BaseEntity { - [Column("GUID")] - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public int Id { get; set; } - [Column("PRENAME")] [StringLength(50)] public string? Prename { get; set; } @@ -52,16 +47,6 @@ namespace DigitalData.UserManager.Domain.Entities [DefaultValue("dd.MM.yyyy")] public string DateFormat { get; set; } - [Required] - [Column("ADDED_WHO")] - [StringLength(50)] - [DefaultValue("DEFAULT")] - public string AddedWho { get; set; } - - [Column("CHANGED_WHO")] - [StringLength(50)] - public string? ChangedWho { get; set; } - [Required] [Column("ACTIVE")] public bool Active { get; set; } @@ -87,14 +72,6 @@ namespace DigitalData.UserManager.Domain.Entities //[Column("DELETED_WHO")] //[StringLength(50)] //public string? DeletedWho { get; set; } - - //[Required] - //[Column("ADDED_WHEN")] - //[DefaultValue("getdate()")] - //public DateTime? AddedWhen { get; set; } - - //[Column("CHANGED_WHEN")] - //public DateTime? ChangedWhen { get; set; } #endregion } } \ No newline at end of file diff --git a/DigitalData.UserManager.Domain/Entities/UserRep.cs b/DigitalData.UserManager.Domain/Entities/UserRep.cs index 4fd1c25..505894b 100644 --- a/DigitalData.UserManager.Domain/Entities/UserRep.cs +++ b/DigitalData.UserManager.Domain/Entities/UserRep.cs @@ -5,7 +5,7 @@ using System.ComponentModel; namespace DigitalData.UserManager.Domain.Entities { [Table("TBDD_USER_REPRESENTATION", Schema = "dbo")] - public class UserRep + public class UserRep : BaseEntity { [Column("GUID")] [Key] @@ -23,16 +23,6 @@ namespace DigitalData.UserManager.Domain.Entities [Column("RIGHT_GROUP")] public int RightGroupId { get; set; } - [Required] - [StringLength(50)] - [DefaultValue("DEFAULT")] - [Column("ADDED_WHO")] - public string AddedWho { get; set; } - - [StringLength(50)] - [Column("CHANGED_WHO")] - public string? ChangedWho { get; set; } - [Column("REPR_USER")] public int? RepUserId { get; set; }