From 1152bc4f7eac9a2546c6d30b4d39459bc6e1cd45 Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 5 Jul 2025 00:15:51 +0200 Subject: [PATCH] Changes on Database for Rolebased Users also started with Login Cookies. --- Docs/.$ER-Diagramm.drawio.bkp | 601 ++++++++++++++---- Docs/ER-Diagramm.drawio | 135 ++-- WatchLog/Data/Database/Global/Admin.cs | 17 - WatchLog/Data/Database/Global/GlobalEntity.cs | 2 +- WatchLog/Data/Database/Global/User.cs | 32 - WatchLog/Data/Database/Private/Label.cs | 2 +- .../Data/Database/Private/PrivateEntity.cs | 2 +- .../Data/Database/Private/UserWatchStatus.cs | 2 +- .../Database/Shared/LinkTableSharedUser.cs | 2 +- WatchLog/Data/WatchLogDataContext.cs | 3 +- WatchLog/Program.cs | 27 +- 11 files changed, 575 insertions(+), 250 deletions(-) delete mode 100644 WatchLog/Data/Database/Global/Admin.cs delete mode 100644 WatchLog/Data/Database/Global/User.cs diff --git a/Docs/.$ER-Diagramm.drawio.bkp b/Docs/.$ER-Diagramm.drawio.bkp index 7144f0f..4c71db0 100644 --- a/Docs/.$ER-Diagramm.drawio.bkp +++ b/Docs/.$ER-Diagramm.drawio.bkp @@ -1,11 +1,11 @@ - + - + - + @@ -28,7 +28,7 @@ - + @@ -46,8 +46,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -70,7 +96,7 @@ - + @@ -101,15 +127,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -157,7 +209,7 @@ - + @@ -243,44 +295,44 @@ - - + + - + - + - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + - + @@ -363,8 +415,34 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -393,7 +471,7 @@ - + @@ -408,21 +486,47 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -437,20 +541,46 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -474,23 +604,23 @@ - + - + - + - + @@ -498,20 +628,33 @@ - + - + + + + + + + + + + + + + + - + - + @@ -522,7 +665,7 @@ - + @@ -535,7 +678,7 @@ - + @@ -548,7 +691,7 @@ - + @@ -560,21 +703,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -597,7 +766,7 @@ - + @@ -641,8 +810,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -696,37 +891,65 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + - + + + + + + @@ -735,34 +958,34 @@ - + - - + + - + - + - + - + @@ -803,24 +1026,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - + @@ -849,7 +1098,7 @@ - + @@ -860,8 +1109,8 @@ - - + + @@ -876,51 +1125,30 @@ - - - - - - - - - - - - - - + - + - + - - + + - - + + - - - - - - - - - + @@ -931,14 +1159,173 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Docs/ER-Diagramm.drawio b/Docs/ER-Diagramm.drawio index 4c71db0..0159005 100644 --- a/Docs/ER-Diagramm.drawio +++ b/Docs/ER-Diagramm.drawio @@ -1,6 +1,6 @@ - + - + @@ -166,48 +166,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -240,8 +198,11 @@ + + + - + @@ -295,6 +256,19 @@ + + + + + + + + + + + + + @@ -1173,107 +1147,107 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1281,36 +1255,36 @@ - + - + - + - + - + - + - + - + @@ -1320,10 +1294,7 @@ - - - - + diff --git a/WatchLog/Data/Database/Global/Admin.cs b/WatchLog/Data/Database/Global/Admin.cs deleted file mode 100644 index c64629d..0000000 --- a/WatchLog/Data/Database/Global/Admin.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace WatchLog.Data -{ - public class Admin - { - [Key] - public int Id { get; set; } - - [Required] - [MaxLength(100)] - public required string Name { get; set; } - - [Required] - public required string PasswordHash { get; set; } // Important: Save as HASH - } -} \ No newline at end of file diff --git a/WatchLog/Data/Database/Global/GlobalEntity.cs b/WatchLog/Data/Database/Global/GlobalEntity.cs index 90efcd7..54985da 100644 --- a/WatchLog/Data/Database/Global/GlobalEntity.cs +++ b/WatchLog/Data/Database/Global/GlobalEntity.cs @@ -34,7 +34,7 @@ namespace WatchLog.Data public virtual Type Type { get; set; } = null!; [ForeignKey(nameof(CreatorId))] - public virtual User User { get; set; } = null!; + public virtual AppUser User { get; set; } = null!; public virtual ICollection LinkTableGlobalGenres { get; set; } = new List(); diff --git a/WatchLog/Data/Database/Global/User.cs b/WatchLog/Data/Database/Global/User.cs deleted file mode 100644 index cf73229..0000000 --- a/WatchLog/Data/Database/Global/User.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace WatchLog.Data -{ - public class User - { - [Key] - public int Id { get; set; } - - [Required] - [MaxLength(100)] - public required string Name { get; set; } - - [MaxLength(255)] - public string? Email { get; set; } - - [Required] - public required string PasswordHash { get; set; } // Important: Save as HASH - - - // --- Navigation Properties --- - public virtual ICollection PrivateEntities { get; set; } = new List(); - - public virtual ICollection GlobalEntities { get; set; } = new List(); - - public virtual ICollection