From 2750a3df1834c1c6623aa8c653504c7bc12cefd6 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 29 Jan 2020 00:17:45 +0800
Subject: ...

---
 Timeline/Entities/DatabaseContext.cs  |  2 +-
 Timeline/Entities/UserDetailEntity.cs | 21 ---------------------
 Timeline/Entities/UserEntity.cs       | 13 +++++++------
 3 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 Timeline/Entities/UserDetailEntity.cs

(limited to 'Timeline/Entities')

diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs
index 738440b2..ac4ad7b2 100644
--- a/Timeline/Entities/DatabaseContext.cs
+++ b/Timeline/Entities/DatabaseContext.cs
@@ -14,7 +14,7 @@ namespace Timeline.Entities
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<UserEntity>().Property(e => e.Version).HasDefaultValue(0);
-            modelBuilder.Entity<UserEntity>().HasIndex(e => e.Name).IsUnique();
+            modelBuilder.Entity<UserEntity>().HasIndex(e => e.Username).IsUnique();
         }
 
         public DbSet<UserEntity> Users { get; set; } = default!;
diff --git a/Timeline/Entities/UserDetailEntity.cs b/Timeline/Entities/UserDetailEntity.cs
deleted file mode 100644
index 1d9957f9..00000000
--- a/Timeline/Entities/UserDetailEntity.cs
+++ /dev/null
@@ -1,21 +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(26)]
-        public string? Nickname { get; set; }
-
-        [Column("user")]
-        public long UserId { get; set; }
-
-        [ForeignKey(nameof(UserId))]
-        public UserEntity User { get; set; } = default!;
-    }
-}
diff --git a/Timeline/Entities/UserEntity.cs b/Timeline/Entities/UserEntity.cs
index 83ef5621..dae6979f 100644
--- a/Timeline/Entities/UserEntity.cs
+++ b/Timeline/Entities/UserEntity.cs
@@ -17,21 +17,22 @@ namespace Timeline.Entities
         [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
 
-        [Column("name"), MaxLength(26), Required]
-        public string Name { get; set; } = default!;
+        [Column("username"), MaxLength(26), Required]
+        public string Username { get; set; } = default!;
 
         [Column("password"), Required]
-        public string EncryptedPassword { get; set; } = default!;
+        public string Password { get; set; } = default!;
 
         [Column("roles"), Required]
-        public string RoleString { get; set; } = default!;
+        public string Roles { get; set; } = default!;
 
         [Column("version"), Required]
         public long Version { get; set; }
 
-        public UserAvatarEntity? Avatar { get; set; }
+        [Column("nickname"), MaxLength(40)]
+        public string? Nickname { get; set; }
 
-        public UserDetailEntity? Detail { get; set; }
+        public UserAvatarEntity? Avatar { get; set; }
 
         public List<TimelineEntity> Timelines { get; set; } = default!;
 
-- 
cgit v1.2.3