From e6d8183f6e5c9dec848fefa007b0e3ab428bbffa Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Fri, 31 Jan 2020 20:25:06 +0800
Subject: Fix a bug in url generation and add development database migration.

---
 .../DevelopmentDatabaseContextModelSnapshot.cs     | 92 ++++++++--------------
 1 file changed, 33 insertions(+), 59 deletions(-)

(limited to 'Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs')

diff --git a/Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs b/Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs
index 6fbaea5f..5da49dbe 100644
--- a/Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs
+++ b/Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs
@@ -14,7 +14,7 @@ namespace Timeline.Migrations.DevelopmentDatabase
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.0");
+                .HasAnnotation("ProductVersion", "3.1.1");
 
             modelBuilder.Entity("Timeline.Entities.TimelineEntity", b =>
                 {
@@ -110,44 +110,7 @@ namespace Timeline.Migrations.DevelopmentDatabase
                     b.ToTable("timeline_posts");
                 });
 
-            modelBuilder.Entity("Timeline.Entities.User", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("id")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("EncryptedPassword")
-                        .IsRequired()
-                        .HasColumnName("password")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnName("name")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(26);
-
-                    b.Property<string>("RoleString")
-                        .IsRequired()
-                        .HasColumnName("roles")
-                        .HasColumnType("TEXT");
-
-                    b.Property<long>("Version")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("version")
-                        .HasColumnType("INTEGER")
-                        .HasDefaultValue(0L);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("users");
-                });
-
-            modelBuilder.Entity("Timeline.Entities.UserAvatar", b =>
+            modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -172,6 +135,7 @@ namespace Timeline.Migrations.DevelopmentDatabase
                         .HasColumnType("TEXT");
 
                     b.Property<long>("UserId")
+                        .HasColumnName("user")
                         .HasColumnType("INTEGER");
 
                     b.HasKey("Id");
@@ -182,7 +146,7 @@ namespace Timeline.Migrations.DevelopmentDatabase
                     b.ToTable("user_avatars");
                 });
 
-            modelBuilder.Entity("Timeline.Entities.UserDetail", b =>
+            modelBuilder.Entity("Timeline.Entities.UserEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -192,22 +156,41 @@ namespace Timeline.Migrations.DevelopmentDatabase
                     b.Property<string>("Nickname")
                         .HasColumnName("nickname")
                         .HasColumnType("TEXT")
+                        .HasMaxLength(100);
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnName("password")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Roles")
+                        .IsRequired()
+                        .HasColumnName("roles")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnName("username")
+                        .HasColumnType("TEXT")
                         .HasMaxLength(26);
 
-                    b.Property<long>("UserId")
-                        .HasColumnType("INTEGER");
+                    b.Property<long>("Version")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("version")
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0L);
 
                     b.HasKey("Id");
 
-                    b.HasIndex("UserId")
+                    b.HasIndex("Username")
                         .IsUnique();
 
-                    b.ToTable("user_details");
+                    b.ToTable("users");
                 });
 
             modelBuilder.Entity("Timeline.Entities.TimelineEntity", b =>
                 {
-                    b.HasOne("Timeline.Entities.User", "Owner")
+                    b.HasOne("Timeline.Entities.UserEntity", "Owner")
                         .WithMany("Timelines")
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -222,7 +205,7 @@ namespace Timeline.Migrations.DevelopmentDatabase
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Timeline.Entities.User", "User")
+                    b.HasOne("Timeline.Entities.UserEntity", "User")
                         .WithMany("TimelinesJoined")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -231,7 +214,7 @@ namespace Timeline.Migrations.DevelopmentDatabase
 
             modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b =>
                 {
-                    b.HasOne("Timeline.Entities.User", "Author")
+                    b.HasOne("Timeline.Entities.UserEntity", "Author")
                         .WithMany("TimelinePosts")
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -244,20 +227,11 @@ namespace Timeline.Migrations.DevelopmentDatabase
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Timeline.Entities.UserAvatar", b =>
+            modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b =>
                 {
-                    b.HasOne("Timeline.Entities.User", null)
+                    b.HasOne("Timeline.Entities.UserEntity", "User")
                         .WithOne("Avatar")
-                        .HasForeignKey("Timeline.Entities.UserAvatar", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Timeline.Entities.UserDetail", b =>
-                {
-                    b.HasOne("Timeline.Entities.User", null)
-                        .WithOne("Detail")
-                        .HasForeignKey("Timeline.Entities.UserDetail", "UserId")
+                        .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
                 });
-- 
cgit v1.2.3