From 9a163719b76958374d1c27616393368e54e8b8a5 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 +++---------------------------------
 Timeline/Entities/User.cs            | 32 +++++++++++++++++++++++++++++++
 Timeline/Entities/UserDetail.cs      | 29 ----------------------------
 3 files changed, 35 insertions(+), 63 deletions(-)
 create mode 100644 Timeline/Entities/User.cs
 delete mode 100644 Timeline/Entities/UserDetail.cs

(limited to 'Timeline/Entities')

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!;
     }
 }
diff --git a/Timeline/Entities/User.cs b/Timeline/Entities/User.cs
new file mode 100644
index 00000000..6e8e4967
--- /dev/null
+++ b/Timeline/Entities/User.cs
@@ -0,0 +1,32 @@
+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; }
+    }
+}
diff --git a/Timeline/Entities/UserDetail.cs b/Timeline/Entities/UserDetail.cs
deleted file mode 100644
index e02d15c4..00000000
--- a/Timeline/Entities/UserDetail.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Timeline.Entities
-{
-    [Table("user_details")]
-    public class UserDetailEntity
-    {
-        [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public long Id { get; set; }
-
-        [Column("nickname"), MaxLength(15)]
-        public string? Nickname { get; set; }
-
-        [Column("qq"), MaxLength(15)]
-        public string? QQ { get; set; }
-
-        [Column("email"), MaxLength(50)]
-        public string? Email { get; set; }
-
-        [Column("phone_number"), MaxLength(15)]
-        public string? PhoneNumber { get; set; }
-
-        [Column("description")]
-        public string? Description { get; set; }
-
-        public long UserId { get; set; }
-    }
-}
-- 
cgit v1.2.3