From b67a26248d5dde4c3909c29b92b8a182248bdcc1 Mon Sep 17 00:00:00 2001
From: 杨宇千 <crupest@outlook.com>
Date: Wed, 23 Oct 2019 20:41:19 +0800
Subject: ...

---
 Timeline/Entities/DatabaseContext.cs | 37 +++---------------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

(limited to 'Timeline/Entities/DatabaseContext.cs')

diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs
index 550db216..e1b98e7d 100644
--- a/Timeline/Entities/DatabaseContext.cs
+++ b/Timeline/Entities/DatabaseContext.cs
@@ -1,38 +1,7 @@
 using Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Timeline.Entities
 {
-    public static class UserRoles
-    {
-        public const string Admin = "admin";
-        public const string User = "user";
-    }
-
-    [Table("users")]
-    public class User
-    {
-        [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public long Id { get; set; }
-
-        [Column("name"), MaxLength(26), Required]
-        public string Name { get; set; } = default!;
-
-        [Column("password"), Required]
-        public string EncryptedPassword { get; set; } = default!;
-
-        [Column("roles"), Required]
-        public string RoleString { get; set; } = default!;
-
-        [Column("version"), Required]
-        public long Version { get; set; }
-
-        public UserAvatar? Avatar { get; set; }
-
-        public UserDetailEntity? Detail { get; set; }
-    }
-
     public class DatabaseContext : DbContext
     {
         public DatabaseContext(DbContextOptions<DatabaseContext> options)
@@ -41,14 +10,14 @@ namespace Timeline.Entities
 
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1062:Validate arguments of public methods")]
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<User>().Property(e => e.Version).HasDefaultValue(0);
             modelBuilder.Entity<User>().HasIndex(e => e.Name).IsUnique();
         }
 
-        public DbSet<User> Users { get; set; }
-        public DbSet<UserAvatar> UserAvatars { get; set; }
-        public DbSet<UserDetailEntity> UserDetails { get; set; }
+        public DbSet<User> Users { get; set; } = default!;
+        public DbSet<UserAvatar> UserAvatars { get; set; } = default!;
     }
 }
-- 
cgit v1.2.3