4 files changed, 26 insertions, 11 deletions
diff --git a/BackEnd/Timeline/Entities/DatabaseContext.cs b/BackEnd/Timeline/Entities/DatabaseContext.cs
index ecadd703..e4203392 100644
--- a/BackEnd/Timeline/Entities/DatabaseContext.cs
+++ b/BackEnd/Timeline/Entities/DatabaseContext.cs
@@ -25,6 +25,7 @@ namespace Timeline.Entities
 
         public DbSet<UserEntity> Users { get; set; } = default!;
         public DbSet<UserAvatarEntity> UserAvatars { get; set; } = default!;
+        public DbSet<UserPermissionEntity> UserPermission { get; set; } = default!;
         public DbSet<TimelineEntity> Timelines { get; set; } = default!;
         public DbSet<TimelinePostEntity> TimelinePosts { get; set; } = default!;
         public DbSet<TimelineMemberEntity> TimelineMembers { get; set; } = default!;
diff --git a/BackEnd/Timeline/Entities/UserAvatarEntity.cs b/BackEnd/Timeline/Entities/UserAvatarEntity.cs
index 3c2720f7..96a8e3ff 100644
--- a/BackEnd/Timeline/Entities/UserAvatarEntity.cs
+++ b/BackEnd/Timeline/Entities/UserAvatarEntity.cs
@@ -4,7 +4,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Timeline.Entities
 {
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1819:Properties should not return arrays", Justification = "This is data base entity.")]
     [Table("user_avatars")]
     public class UserAvatarEntity
     {
diff --git a/BackEnd/Timeline/Entities/UserEntity.cs b/BackEnd/Timeline/Entities/UserEntity.cs
index 0cfaa335..6a256a31 100644
--- a/BackEnd/Timeline/Entities/UserEntity.cs
+++ b/BackEnd/Timeline/Entities/UserEntity.cs
@@ -5,13 +5,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Timeline.Entities
 {
-    public static class UserRoles
-    {
-        public const string Admin = "admin";
-        public const string User = "user";
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "This is an entity class.")]
     [Table("users")]
     public class UserEntity
     {
@@ -30,9 +23,6 @@ namespace Timeline.Entities
         [Column("password"), Required]
         public string Password { get; set; } = default!;
 
-        [Column("roles"), Required]
-        public string Roles { get; set; } = default!;
-
         [Column("version"), Required]
         public long Version { get; set; }
 
@@ -47,10 +37,14 @@ namespace Timeline.Entities
 
         public UserAvatarEntity? Avatar { get; set; }
 
+#pragma warning disable CA2227 // Collection properties should be read only
+        public List<UserPermissionEntity> Permissions { get; set; } = default!;
+
         public List<TimelineEntity> Timelines { get; set; } = default!;
 
         public List<TimelinePostEntity> TimelinePosts { get; set; } = default!;
 
         public List<TimelineMemberEntity> TimelinesJoined { get; set; } = default!;
+#pragma warning restore CA2227 // Collection properties should be read only
     }
 }
diff --git a/BackEnd/Timeline/Entities/UserPermissionEntity.cs b/BackEnd/Timeline/Entities/UserPermissionEntity.cs
new file mode 100644
index 00000000..395ad0bd
--- /dev/null
+++ b/BackEnd/Timeline/Entities/UserPermissionEntity.cs
@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Timeline.Entities
+{
+    [Table("user_permission")]
+    public class UserPermissionEntity
+    {
+        [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set; }
+
+        [Column("user_id")]
+        public long UserId { get; set; }
+
+        [ForeignKey(nameof(UserId))]
+        public UserEntity User { get; set; } = default!;
+
+        [Column("permission")]
+        public string Permission { get; set; } = default!;
+    }
+}