From 5d3f73bb1318844ad362fb37d686a510b2f086ca Mon Sep 17 00:00:00 2001 From: TekH Date: Thu, 26 Jun 2025 13:20:54 +0200 Subject: [PATCH] Refactor entity properties for nullability and requirements Removed nullable indicators from string properties in BaseEntity.cs, ClientUser.cs, Group.cs, and User.cs. The Username property in User.cs is now marked as required for .NET 7 or greater, improving data integrity and reducing null reference risks. --- DigitalData.UserManager.Domain/Entities/BaseEntity.cs | 6 ++---- DigitalData.UserManager.Domain/Entities/ClientUser.cs | 6 ++---- DigitalData.UserManager.Domain/Entities/Group.cs | 3 +-- DigitalData.UserManager.Domain/Entities/User.cs | 6 +++++- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs index d6bee29..6426dcc 100644 --- a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs +++ b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs @@ -20,8 +20,7 @@ namespace DigitalData.UserManager.Domain.Entities #if NET7_0_OR_GREATER ? #endif - AddedWho - { get; set; } + AddedWho { get; set; } [StringLength(50)] [Column("CHANGED_WHO")] @@ -29,8 +28,7 @@ namespace DigitalData.UserManager.Domain.Entities #if NET7_0_OR_GREATER ? #endif - ChangedWho - { get; set; } + ChangedWho { get; set; } //TODO: assign it to default value in create dto, not here! [Column("ADDED_WHEN", TypeName = "datetime")] diff --git a/DigitalData.UserManager.Domain/Entities/ClientUser.cs b/DigitalData.UserManager.Domain/Entities/ClientUser.cs index 58a575b..43eeafc 100644 --- a/DigitalData.UserManager.Domain/Entities/ClientUser.cs +++ b/DigitalData.UserManager.Domain/Entities/ClientUser.cs @@ -28,8 +28,7 @@ namespace DigitalData.UserManager.Domain.Entities #if NET7_0_OR_GREATER ? #endif - Comment - { get; set; } + Comment { get; set; } [StringLength(50)] [Column("ADDED_WHO")] @@ -37,8 +36,7 @@ namespace DigitalData.UserManager.Domain.Entities #if NET7_0_OR_GREATER ? #endif - AddedWho - { get; set; } + AddedWho { get; set; } [Column("ADDED_WHEN", TypeName = "datetime")] [DefaultValue("GETDATE()")] diff --git a/DigitalData.UserManager.Domain/Entities/Group.cs b/DigitalData.UserManager.Domain/Entities/Group.cs index b20051e..af157c8 100644 --- a/DigitalData.UserManager.Domain/Entities/Group.cs +++ b/DigitalData.UserManager.Domain/Entities/Group.cs @@ -32,8 +32,7 @@ namespace DigitalData.UserManager.Domain.Entities #if NET7_0_OR_GREATER ? #endif - Comment - { get; set; } + Comment { get; set; } // TODO: this column should be assigned by triggers. despite this it is not null and this is problem for creation. talk with others [Required] diff --git a/DigitalData.UserManager.Domain/Entities/User.cs b/DigitalData.UserManager.Domain/Entities/User.cs index dfc181b..9f25833 100644 --- a/DigitalData.UserManager.Domain/Entities/User.cs +++ b/DigitalData.UserManager.Domain/Entities/User.cs @@ -26,7 +26,11 @@ namespace DigitalData.UserManager.Domain.Entities [Required] [Column("USERNAME")] [StringLength(50)] - public string Username { get; set; } + public +#if NET7_0_OR_GREATER + required +#endif + string Username { get; set; } [Column("SHORTNAME")] [StringLength(30)]