From a5002a30386f174facc374653d9a68b6dc7b26ea Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Wed, 14 Aug 2024 19:05:15 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20Basis-DTO=20f=C3=BCr=20alle=20Erste?= =?UTF-8?q?llungs-,=20Lese-=20und=20Aktualisierungs-DTOs=20au=C3=9Fer=20Mo?= =?UTF-8?q?dule=20und=20ModuleOfUser=20vererbt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Vererbung von BaseDTO auf alle Erstellungs-, Lese- und Aktualisierungs-DTOs angewendet, mit Ausnahme von Module und ModuleOfUser. --- .../DTOs/GroupOfUser/GroupOfUserCreateDto.cs | 9 +++++---- .../DTOs/GroupOfUser/GroupOfUserReadDto.cs | 9 ++++++--- .../DTOs/GroupOfUser/GroupOfUserUpdateDto.cs | 9 +++++---- .../DTOs/User/UserCreateDto.cs | 7 ++++--- .../DTOs/User/UserUpdateDto.cs | 8 ++++---- .../DTOs/UserRep/UserRepCreateDto.cs | 6 ++++-- .../DTOs/UserRep/UserRepReadDto.cs | 10 +++++++--- .../DTOs/UserRep/UserRepUpdateDto.cs | 6 ++++-- DigitalData.UserManager.Domain/Entities/GroupOfUser.cs | 5 ----- DigitalData.UserManager.Domain/Entities/UserRep.cs | 5 ----- 10 files changed, 39 insertions(+), 35 deletions(-) diff --git a/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserCreateDto.cs b/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserCreateDto.cs index b8eb542..a24ed37 100644 --- a/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserCreateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserCreateDto.cs @@ -1,9 +1,10 @@ -namespace DigitalData.UserManager.Application.DTOs.GroupOfUser +using DigitalData.UserManager.Application.DTOs.Base; + +namespace DigitalData.UserManager.Application.DTOs.GroupOfUser { public record GroupOfUserCreateDto( int UserId, int GroupId, - string? Comment, - string? AddedWho - ); + string? Comment + ) : BaseCreateDto(); } diff --git a/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserReadDto.cs b/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserReadDto.cs index 86d285c..7d99a3f 100644 --- a/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserReadDto.cs +++ b/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserReadDto.cs @@ -1,4 +1,5 @@ -using DigitalData.UserManager.Application.DTOs.Group; +using DigitalData.UserManager.Application.DTOs.Base; +using DigitalData.UserManager.Application.DTOs.Group; using DigitalData.UserManager.Application.DTOs.User; namespace DigitalData.UserManager.Application.DTOs.GroupOfUser @@ -11,6 +12,8 @@ namespace DigitalData.UserManager.Application.DTOs.GroupOfUser string AddedWho, string? ChangedWho, UserReadDto User, - GroupReadDto Group - ); + GroupReadDto Group, + DateTime? AddedWhen, + DateTime? ChangedWhen + ) : BaseReadDto(Id, AddedWho, AddedWhen, ChangedWho, ChangedWhen); } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs b/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs index 74d007d..77a3c54 100644 --- a/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs @@ -1,10 +1,11 @@ -namespace DigitalData.UserManager.Application.DTOs.GroupOfUser +using DigitalData.UserManager.Application.DTOs.Base; + +namespace DigitalData.UserManager.Application.DTOs.GroupOfUser { public record GroupOfUserUpdateDto( int Id, int? UserId, int? GroupId, - string? Comment, - string? ChangedWho - ); + string? Comment + ) : BaseUpdateDto(); } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/DTOs/User/UserCreateDto.cs b/DigitalData.UserManager.Application/DTOs/User/UserCreateDto.cs index b48ff88..b153f67 100644 --- a/DigitalData.UserManager.Application/DTOs/User/UserCreateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/User/UserCreateDto.cs @@ -1,6 +1,8 @@ -namespace DigitalData.UserManager.Application.DTOs.User +using DigitalData.UserManager.Application.DTOs.Base; + +namespace DigitalData.UserManager.Application.DTOs.User { - public record class UserCreateDto + public record class UserCreateDto() : BaseCreateDto() { public string? Prename { get; init; } public string? Name { get; init; } @@ -11,7 +13,6 @@ public string? Comment { get; init; } public bool? Deleted { get; init; } public string DateFormat { get; init; } = "dd.MM.yyyy"; - public string AddedWho { get; init; } = "DEFAULT"; public string? ChangedWho { get; init; } public bool Active { get; init; } = true; } diff --git a/DigitalData.UserManager.Application/DTOs/User/UserUpdateDto.cs b/DigitalData.UserManager.Application/DTOs/User/UserUpdateDto.cs index afb8653..d002aa7 100644 --- a/DigitalData.UserManager.Application/DTOs/User/UserUpdateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/User/UserUpdateDto.cs @@ -1,4 +1,6 @@ -namespace DigitalData.UserManager.Application.DTOs.User +using DigitalData.UserManager.Application.DTOs.Base; + +namespace DigitalData.UserManager.Application.DTOs.User { public record UserUpdateDto( int Id, @@ -11,8 +13,6 @@ string? Comment, bool? Deleted, string? DateFormat, - string? AddedWho, - string? ChangedWho, bool? Active - ); + ) : BaseUpdateDto(); } diff --git a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepCreateDto.cs b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepCreateDto.cs index 00b18ed..6b22e40 100644 --- a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepCreateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepCreateDto.cs @@ -1,4 +1,6 @@ -namespace DigitalData.UserManager.Application.DTOs.UserRep +using DigitalData.UserManager.Application.DTOs.Base; + +namespace DigitalData.UserManager.Application.DTOs.UserRep { public record UserRepCreateDto( int UserId, @@ -6,5 +8,5 @@ int RightGroupId, string AddedWho, int RepUserId - ); + ) : BaseCreateDto(); } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepReadDto.cs b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepReadDto.cs index d837b47..9b9c71d 100644 --- a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepReadDto.cs +++ b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepReadDto.cs @@ -1,4 +1,5 @@ -using DigitalData.UserManager.Application.DTOs.Group; +using DigitalData.UserManager.Application.DTOs.Base; +using DigitalData.UserManager.Application.DTOs.Group; using DigitalData.UserManager.Application.DTOs.User; namespace DigitalData.UserManager.Application.DTOs.UserRep @@ -9,10 +10,13 @@ namespace DigitalData.UserManager.Application.DTOs.UserRep int? RepGroupId, int RightGroupId, string AddedWho, + string ChangedWho, int? RepUserId, UserReadDto? User, GroupReadDto? RepGroup, GroupReadDto? RightGroup, - UserReadDto? RepUser - ); + UserReadDto? RepUser, + DateTime? AddedWhen, + DateTime? ChangedWhen + ) : BaseReadDto(Id, AddedWho, AddedWhen, ChangedWho, ChangedWhen); } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepUpdateDto.cs b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepUpdateDto.cs index 119e9b6..02ffc0b 100644 --- a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepUpdateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepUpdateDto.cs @@ -1,9 +1,11 @@ -namespace DigitalData.UserManager.Application.DTOs.UserRep +using DigitalData.UserManager.Application.DTOs.Base; + +namespace DigitalData.UserManager.Application.DTOs.UserRep { public record UserRepUpdateDto( int UserId, int? RepGroupId, int RightGroupId, int RepUserId - ); + ) : BaseUpdateDto(); } \ No newline at end of file diff --git a/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs b/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs index 1ed9b16..82e3f64 100644 --- a/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs +++ b/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs @@ -18,15 +18,10 @@ namespace DigitalData.UserManager.Domain.Entities [StringLength(200)] public string? Comment { get; set; } - [StringLength(50)] - [Column("CHANGED_WHO")] - public string? ChangedWho { get; set; } - [ForeignKey("UserId")] public virtual User? User { get; set; } [ForeignKey("GroupId")] public virtual Group? Group { get; set; } } - } diff --git a/DigitalData.UserManager.Domain/Entities/UserRep.cs b/DigitalData.UserManager.Domain/Entities/UserRep.cs index 505894b..f19fe80 100644 --- a/DigitalData.UserManager.Domain/Entities/UserRep.cs +++ b/DigitalData.UserManager.Domain/Entities/UserRep.cs @@ -7,11 +7,6 @@ namespace DigitalData.UserManager.Domain.Entities [Table("TBDD_USER_REPRESENTATION", Schema = "dbo")] public class UserRep : BaseEntity { - [Column("GUID")] - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public int Id { get; set; } - [Required] [Column("USER_ID")] public int UserId { get; set; }