diff options
| author | crupest <crupest@outlook.com> | 2020-02-21 11:59:58 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2020-02-21 11:59:58 +0800 |
| commit | 3fa9899e17df4b1012e8b645915ac15022b84f9b (patch) | |
| tree | a143ff8698660608d188428957a1ad56d620cca6 | |
| parent | 1fe7642e88d373d8ed00a434cd7c73af422c261a (diff) | |
| download | timeline-3fa9899e17df4b1012e8b645915ac15022b84f9b.tar.gz timeline-3fa9899e17df4b1012e8b645915ac15022b84f9b.tar.bz2 timeline-3fa9899e17df4b1012e8b645915ac15022b84f9b.zip | |
Migrate to use sqlite.
26 files changed, 47 insertions, 1742 deletions
diff --git a/Timeline.Tests/Helpers/TestApplication.cs b/Timeline.Tests/Helpers/TestApplication.cs index bc5deeec..5fbc2fb0 100644 --- a/Timeline.Tests/Helpers/TestApplication.cs +++ b/Timeline.Tests/Helpers/TestApplication.cs @@ -1,9 +1,11 @@ using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.TestHost;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using System;
+using System.Collections.Generic;
+using System.IO;
using Timeline.Entities;
namespace Timeline.Tests.Helpers
@@ -14,25 +16,37 @@ namespace Timeline.Tests.Helpers public WebApplicationFactory<Startup> Factory { get; }
+ public string WorkDir { get; }
+
public TestApplication(WebApplicationFactory<Startup> factory)
{
+ WorkDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+ Directory.CreateDirectory(WorkDir);
+
DatabaseConnection = new SqliteConnection("Data Source=:memory:;");
DatabaseConnection.Open();
- var options = new DbContextOptionsBuilder<DevelopmentDatabaseContext>()
+ var options = new DbContextOptionsBuilder<DatabaseContext>()
.UseSqlite(DatabaseConnection)
.Options;
- using (var context = new DevelopmentDatabaseContext(options))
+ using (var context = new DatabaseContext(options))
{
context.Database.EnsureCreated();
}
Factory = factory.WithWebHostBuilder(builder =>
{
+ builder.ConfigureAppConfiguration((context, config) =>
+ {
+ config.AddInMemoryCollection(new Dictionary<string, string>
+ {
+ ["WorkDir"] = WorkDir
+ });
+ });
builder.ConfigureServices(services =>
{
- services.AddDbContext<DatabaseContext, DevelopmentDatabaseContext>(options =>
+ services.AddDbContext<DatabaseContext>(options =>
{
options.UseSqlite(DatabaseConnection);
});
@@ -44,6 +58,8 @@ namespace Timeline.Tests.Helpers {
DatabaseConnection.Close();
DatabaseConnection.Dispose();
+
+ Directory.Delete(WorkDir, true);
}
}
}
diff --git a/Timeline/Configs/DatabaseConfig.cs b/Timeline/Configs/DatabaseConfig.cs deleted file mode 100644 index e1231bcd..00000000 --- a/Timeline/Configs/DatabaseConfig.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Timeline.Configs
-{
- public class DatabaseConfig
- {
- public bool UseDevelopment { get; set; } = false;
-
- public string ConnectionString { get; set; } = default!;
-
- public string DevelopmentConnectionString { get; set; } = default!;
- }
-}
diff --git a/Timeline/Configs/JwtConfig.cs b/Timeline/Configs/JwtConfiguration.cs index 8a17825e..fc27f4ee 100644 --- a/Timeline/Configs/JwtConfig.cs +++ b/Timeline/Configs/JwtConfiguration.cs @@ -1,6 +1,6 @@ -namespace Timeline.Configs
+namespace Timeline.Configs
{
- public class JwtConfig
+ public class JwtConfiguration
{
public string Issuer { get; set; } = default!;
public string Audience { get; set; } = default!;
diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs index cac33379..18e3e660 100644 --- a/Timeline/Entities/DatabaseContext.cs +++ b/Timeline/Entities/DatabaseContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; namespace Timeline.Entities
{
- public abstract class DatabaseContext : DbContext
+ public class DatabaseContext : DbContext
{
public DatabaseContext(DbContextOptions options)
: base(options)
@@ -22,21 +22,4 @@ namespace Timeline.Entities public DbSet<TimelinePostEntity> TimelinePosts { get; set; } = default!;
public DbSet<TimelineMemberEntity> TimelineMembers { get; set; } = default!;
}
- public class ProductionDatabaseContext : DatabaseContext
- {
- public ProductionDatabaseContext(DbContextOptions<ProductionDatabaseContext> options)
- : base(options)
- {
-
- }
- }
-
- public class DevelopmentDatabaseContext : DatabaseContext
- {
- public DevelopmentDatabaseContext(DbContextOptions<DevelopmentDatabaseContext> options)
- : base(options)
- {
-
- }
- }
}
diff --git a/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.Designer.cs b/Timeline/Migrations/20200105150407_Initialize.Designer.cs index 6fe1044c..5594262a 100644 --- a/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.Designer.cs +++ b/Timeline/Migrations/20200105150407_Initialize.Designer.cs @@ -8,7 +8,7 @@ using Timeline.Entities; namespace Timeline.Migrations.DevelopmentDatabase
{
- [DbContext(typeof(DevelopmentDatabaseContext))]
+ [DbContext(typeof(DatabaseContext))]
[Migration("20200105150407_Initialize")]
partial class Initialize
{
diff --git a/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.cs b/Timeline/Migrations/20200105150407_Initialize.cs index c6efaa4b..c6efaa4b 100644 --- a/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.cs +++ b/Timeline/Migrations/20200105150407_Initialize.cs diff --git a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.Designer.cs b/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs index 13e322c8..f494810a 100644 --- a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.Designer.cs +++ b/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs @@ -8,7 +8,7 @@ using Timeline.Entities; namespace Timeline.Migrations.DevelopmentDatabase
{
- [DbContext(typeof(DevelopmentDatabaseContext))]
+ [DbContext(typeof(DatabaseContext))]
[Migration("20200131100517_RefactorUser")]
partial class RefactorUser
{
diff --git a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs b/Timeline/Migrations/20200131100517_RefactorUser.cs index ade65eb1..ade65eb1 100644 --- a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs +++ b/Timeline/Migrations/20200131100517_RefactorUser.cs diff --git a/Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs b/Timeline/Migrations/DatabaseContextModelSnapshot.cs index 5da49dbe..e635a1b1 100644 --- a/Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs +++ b/Timeline/Migrations/DatabaseContextModelSnapshot.cs @@ -7,8 +7,8 @@ using Timeline.Entities; namespace Timeline.Migrations.DevelopmentDatabase
{
- [DbContext(typeof(DevelopmentDatabaseContext))]
- partial class DevelopmentDatabaseContextModelSnapshot : ModelSnapshot
+ [DbContext(typeof(DatabaseContext))]
+ partial class DatabaseContextModelSnapshot : ModelSnapshot
{
protected override void BuildModel(ModelBuilder modelBuilder)
{
diff --git a/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.Designer.cs b/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.Designer.cs deleted file mode 100644 index cd584b3c..00000000 --- a/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.Designer.cs +++ /dev/null @@ -1,137 +0,0 @@ -// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Timeline.Entities;
-
-namespace Timeline.Migrations.ProductionDatabase
-{
- [DbContext(typeof(ProductionDatabaseContext))]
- [Migration("20191031064541_Initialize")]
- partial class Initialize
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "3.0.0")
- .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
- modelBuilder.Entity("Timeline.Entities.User", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<string>("EncryptedPassword")
- .IsRequired()
- .HasColumnName("password")
- .HasColumnType("longtext");
-
- b.Property<string>("Name")
- .IsRequired()
- .HasColumnName("name")
- .HasColumnType("varchar(26)")
- .HasMaxLength(26);
-
- b.Property<string>("RoleString")
- .IsRequired()
- .HasColumnName("roles")
- .HasColumnType("longtext");
-
- b.Property<long>("Version")
- .ValueGeneratedOnAdd()
- .HasColumnName("version")
- .HasColumnType("bigint")
- .HasDefaultValue(0L);
-
- b.HasKey("Id");
-
- b.HasIndex("Name")
- .IsUnique();
-
- b.ToTable("users");
- });
-
- modelBuilder.Entity("Timeline.Entities.UserAvatar", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<byte[]>("Data")
- .HasColumnName("data")
- .HasColumnType("longblob");
-
- b.Property<string>("ETag")
- .HasColumnName("etag")
- .HasColumnType("varchar(30)")
- .HasMaxLength(30);
-
- b.Property<DateTime>("LastModified")
- .HasColumnName("last_modified")
- .HasColumnType("datetime(6)");
-
- b.Property<string>("Type")
- .HasColumnName("type")
- .HasColumnType("longtext");
-
- b.Property<long>("UserId")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId")
- .IsUnique();
-
- b.ToTable("user_avatars");
- });
-
- modelBuilder.Entity("Timeline.Entities.UserDetail", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<string>("Nickname")
- .HasColumnName("nickname")
- .HasColumnType("varchar(26)")
- .HasMaxLength(26);
-
- b.Property<long>("UserId")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId")
- .IsUnique();
-
- b.ToTable("user_details");
- });
-
- modelBuilder.Entity("Timeline.Entities.UserAvatar", b =>
- {
- b.HasOne("Timeline.Entities.User", null)
- .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")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.cs b/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.cs deleted file mode 100644 index dc989a96..00000000 --- a/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Timeline.Migrations.ProductionDatabase
-{
- public partial class Initialize : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "users",
- columns: table => new
- {
- id = table.Column<long>(nullable: false)
- .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
- name = table.Column<string>(maxLength: 26, nullable: false),
- password = table.Column<string>(nullable: false),
- roles = table.Column<string>(nullable: false),
- version = table.Column<long>(nullable: false, defaultValue: 0L)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_users", x => x.id);
- });
-
- migrationBuilder.CreateTable(
- name: "user_avatars",
- columns: table => new
- {
- id = table.Column<long>(nullable: false)
- .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
- data = table.Column<byte[]>(nullable: true),
- type = table.Column<string>(nullable: true),
- etag = table.Column<string>(maxLength: 30, nullable: true),
- last_modified = table.Column<DateTime>(nullable: false),
- UserId = table.Column<long>(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_user_avatars", x => x.id);
- table.ForeignKey(
- name: "FK_user_avatars_users_UserId",
- column: x => x.UserId,
- principalTable: "users",
- principalColumn: "id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateTable(
- name: "user_details",
- columns: table => new
- {
- id = table.Column<long>(nullable: false)
- .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
- nickname = table.Column<string>(maxLength: 26, nullable: true),
- UserId = table.Column<long>(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_user_details", x => x.id);
- table.ForeignKey(
- name: "FK_user_details_users_UserId",
- column: x => x.UserId,
- principalTable: "users",
- principalColumn: "id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateIndex(
- name: "IX_user_avatars_UserId",
- table: "user_avatars",
- column: "UserId",
- unique: true);
-
- migrationBuilder.CreateIndex(
- name: "IX_user_details_UserId",
- table: "user_details",
- column: "UserId",
- unique: true);
-
- migrationBuilder.CreateIndex(
- name: "IX_users_name",
- table: "users",
- column: "name",
- unique: true);
-
- // Add a init user. Username is "administrator". Password is "crupest".
- migrationBuilder.InsertData("users", new string[] { "name", "password", "roles" },
- new object[] { "administrator", "AQAAAAEAACcQAAAAENsspZrk8Wo+UuMyg6QuWJsNvRg6gVu4K/TumVod3h9GVLX9zDVuQQds3o7V8QWJ2w==", "user,admin" });
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "user_avatars");
-
- migrationBuilder.DropTable(
- name: "user_details");
-
- migrationBuilder.DropTable(
- name: "users");
- }
- }
-}
diff --git a/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.Designer.cs b/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.Designer.cs deleted file mode 100644 index d50e8330..00000000 --- a/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.Designer.cs +++ /dev/null @@ -1,270 +0,0 @@ -// <auto-generated /> -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations.ProductionDatabase -{ - [DbContext(typeof(ProductionDatabaseContext))] - [Migration("20191120104512_InitTimeline")] - partial class InitTimeline - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.0.1") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.Property<long>("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property<DateTime>("CreateTime") - .HasColumnName("create_time") - .HasColumnType("datetime(6)"); - - b.Property<string>("Description") - .HasColumnName("description") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property<string>("Name") - .HasColumnName("name") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property<long>("OwnerId") - .HasColumnName("owner") - .HasColumnType("bigint"); - - b.Property<int>("Visibility") - .HasColumnName("visibility") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.ToTable("timelines"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.Property<long>("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property<long>("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.Property<long>("UserId") - .HasColumnName("user") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("TimelineId"); - - b.HasIndex("UserId"); - - b.ToTable("TimelineMembers"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.Property<long>("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property<long>("AuthorId") - .HasColumnName("author") - .HasColumnType("bigint"); - - b.Property<string>("Content") - .HasColumnName("content") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property<DateTime>("LastUpdated") - .HasColumnName("last_updated") - .HasColumnType("datetime(6)"); - - b.Property<DateTime>("Time") - .HasColumnName("time") - .HasColumnType("datetime(6)"); - - b.Property<long>("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("AuthorId"); - - b.HasIndex("TimelineId"); - - b.ToTable("timeline_posts"); - }); - - modelBuilder.Entity("Timeline.Entities.User", b => - { - b.Property<long>("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property<string>("EncryptedPassword") - .IsRequired() - .HasColumnName("password") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property<string>("Name") - .IsRequired() - .HasColumnName("name") - .HasColumnType("varchar(26) CHARACTER SET utf8mb4") - .HasMaxLength(26); - - b.Property<string>("RoleString") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property<long>("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("bigint") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.Property<long>("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property<byte[]>("Data") - .HasColumnName("data") - .HasColumnType("longblob"); - - b.Property<string>("ETag") - .HasColumnName("etag") - .HasColumnType("varchar(30) CHARACTER SET utf8mb4") - .HasMaxLength(30); - - b.Property<DateTime>("LastModified") - .HasColumnName("last_modified") - .HasColumnType("datetime(6)"); - - b.Property<string>("Type") - .HasColumnName("type") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property<long>("UserId") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.Property<long>("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property<string>("Nickname") - .HasColumnName("nickname") - .HasColumnType("varchar(26) CHARACTER SET utf8mb4") - .HasMaxLength(26); - - b.Property<long>("UserId") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_details"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.HasOne("Timeline.Entities.User", "Owner") - .WithMany("Timelines") - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Members") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.User", "User") - .WithMany("TimelinesJoined") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.HasOne("Timeline.Entities.User", "Author") - .WithMany("TimelinePosts") - .HasForeignKey("AuthorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Posts") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.HasOne("Timeline.Entities.User", null) - .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") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.cs b/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.cs deleted file mode 100644 index 9b80ad30..00000000 --- a/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.cs +++ /dev/null @@ -1,229 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Timeline.Migrations.ProductionDatabase -{ - public partial class InitTimeline : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn<string>( - name: "roles", - table: "users", - nullable: false, - oldClrType: typeof(string), - oldType: "longtext"); - - migrationBuilder.AlterColumn<string>( - name: "name", - table: "users", - maxLength: 26, - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(26)", - oldMaxLength: 26); - - migrationBuilder.AlterColumn<string>( - name: "password", - table: "users", - nullable: false, - oldClrType: typeof(string), - oldType: "longtext"); - - migrationBuilder.AlterColumn<string>( - name: "nickname", - table: "user_details", - maxLength: 26, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(26)", - oldMaxLength: 26, - oldNullable: true); - - migrationBuilder.AlterColumn<string>( - name: "type", - table: "user_avatars", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true); - - migrationBuilder.AlterColumn<string>( - name: "etag", - table: "user_avatars", - maxLength: 30, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(30)", - oldMaxLength: 30, - oldNullable: true); - - migrationBuilder.CreateTable( - name: "timelines", - columns: table => new - { - id = table.Column<long>(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - name = table.Column<string>(nullable: true), - description = table.Column<string>(nullable: true), - owner = table.Column<long>(nullable: false), - visibility = table.Column<int>(nullable: false), - create_time = table.Column<DateTime>(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_timelines", x => x.id); - table.ForeignKey( - name: "FK_timelines_users_owner", - column: x => x.owner, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "timeline_posts", - columns: table => new - { - id = table.Column<long>(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - timeline = table.Column<long>(nullable: false), - author = table.Column<long>(nullable: false), - content = table.Column<string>(nullable: true), - time = table.Column<DateTime>(nullable: false), - last_updated = table.Column<DateTime>(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_timeline_posts", x => x.id); - table.ForeignKey( - name: "FK_timeline_posts_users_author", - column: x => x.author, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_timeline_posts_timelines_timeline", - column: x => x.timeline, - principalTable: "timelines", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "TimelineMembers", - columns: table => new - { - id = table.Column<long>(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - user = table.Column<long>(nullable: false), - timeline = table.Column<long>(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_TimelineMembers", x => x.id); - table.ForeignKey( - name: "FK_TimelineMembers_timelines_timeline", - column: x => x.timeline, - principalTable: "timelines", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_TimelineMembers_users_user", - column: x => x.user, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "IX_timeline_posts_author", - table: "timeline_posts", - column: "author"); - - migrationBuilder.CreateIndex( - name: "IX_timeline_posts_timeline", - table: "timeline_posts", - column: "timeline"); - - migrationBuilder.CreateIndex( - name: "IX_TimelineMembers_timeline", - table: "TimelineMembers", - column: "timeline"); - - migrationBuilder.CreateIndex( - name: "IX_TimelineMembers_user", - table: "TimelineMembers", - column: "user"); - - migrationBuilder.CreateIndex( - name: "IX_timelines_owner", - table: "timelines", - column: "owner"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "timeline_posts"); - - migrationBuilder.DropTable( - name: "TimelineMembers"); - - migrationBuilder.DropTable( - name: "timelines"); - - migrationBuilder.AlterColumn<string>( - name: "roles", - table: "users", - type: "longtext", - nullable: false, - oldClrType: typeof(string)); - - migrationBuilder.AlterColumn<string>( - name: "name", - table: "users", - type: "varchar(26)", - maxLength: 26, - nullable: false, - oldClrType: typeof(string), - oldMaxLength: 26); - - migrationBuilder.AlterColumn<string>( - name: "password", - table: "users", - type: "longtext", - nullable: false, - oldClrType: typeof(string)); - - migrationBuilder.AlterColumn<string>( - name: "nickname", - table: "user_details", - type: "varchar(26)", - maxLength: 26, - nullable: true, - oldClrType: typeof(string), - oldMaxLength: 26, - oldNullable: true); - - migrationBuilder.AlterColumn<string>( - name: "type", - table: "user_avatars", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldNullable: true); - - migrationBuilder.AlterColumn<string>( - name: "etag", - table: "user_avatars", - type: "varchar(30)", - maxLength: 30, - nullable: true, - oldClrType: typeof(string), - oldMaxLength: 30, - oldNullable: true); - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.Designer.cs b/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.Designer.cs deleted file mode 100644 index 356406fa..00000000 --- a/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.Designer.cs +++ /dev/null @@ -1,270 +0,0 @@ -// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Timeline.Entities;
-
-namespace Timeline.Migrations.ProductionDatabase
-{
- [DbContext(typeof(ProductionDatabaseContext))]
- [Migration("20200105151839_RenameTimelineMember")]
- partial class RenameTimelineMember
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "3.1.0")
- .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
- modelBuilder.Entity("Timeline.Entities.TimelineEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<DateTime>("CreateTime")
- .HasColumnName("create_time")
- .HasColumnType("datetime(6)");
-
- b.Property<string>("Description")
- .HasColumnName("description")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<string>("Name")
- .HasColumnName("name")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<long>("OwnerId")
- .HasColumnName("owner")
- .HasColumnType("bigint");
-
- b.Property<int>("Visibility")
- .HasColumnName("visibility")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.HasIndex("OwnerId");
-
- b.ToTable("timelines");
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<long>("TimelineId")
- .HasColumnName("timeline")
- .HasColumnType("bigint");
-
- b.Property<long>("UserId")
- .HasColumnName("user")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("TimelineId");
-
- b.HasIndex("UserId");
-
- b.ToTable("timeline_members");
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<long>("AuthorId")
- .HasColumnName("author")
- .HasColumnType("bigint");
-
- b.Property<string>("Content")
- .HasColumnName("content")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<DateTime>("LastUpdated")
- .HasColumnName("last_updated")
- .HasColumnType("datetime(6)");
-
- b.Property<DateTime>("Time")
- .HasColumnName("time")
- .HasColumnType("datetime(6)");
-
- b.Property<long>("TimelineId")
- .HasColumnName("timeline")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("AuthorId");
-
- b.HasIndex("TimelineId");
-
- b.ToTable("timeline_posts");
- });
-
- modelBuilder.Entity("Timeline.Entities.User", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<string>("EncryptedPassword")
- .IsRequired()
- .HasColumnName("password")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<string>("Name")
- .IsRequired()
- .HasColumnName("name")
- .HasColumnType("varchar(26) CHARACTER SET utf8mb4")
- .HasMaxLength(26);
-
- b.Property<string>("RoleString")
- .IsRequired()
- .HasColumnName("roles")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<long>("Version")
- .ValueGeneratedOnAdd()
- .HasColumnName("version")
- .HasColumnType("bigint")
- .HasDefaultValue(0L);
-
- b.HasKey("Id");
-
- b.HasIndex("Name")
- .IsUnique();
-
- b.ToTable("users");
- });
-
- modelBuilder.Entity("Timeline.Entities.UserAvatar", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<byte[]>("Data")
- .HasColumnName("data")
- .HasColumnType("longblob");
-
- b.Property<string>("ETag")
- .HasColumnName("etag")
- .HasColumnType("varchar(30) CHARACTER SET utf8mb4")
- .HasMaxLength(30);
-
- b.Property<DateTime>("LastModified")
- .HasColumnName("last_modified")
- .HasColumnType("datetime(6)");
-
- b.Property<string>("Type")
- .HasColumnName("type")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<long>("UserId")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId")
- .IsUnique();
-
- b.ToTable("user_avatars");
- });
-
- modelBuilder.Entity("Timeline.Entities.UserDetail", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<string>("Nickname")
- .HasColumnName("nickname")
- .HasColumnType("varchar(26) CHARACTER SET utf8mb4")
- .HasMaxLength(26);
-
- b.Property<long>("UserId")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId")
- .IsUnique();
-
- b.ToTable("user_details");
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelineEntity", b =>
- {
- b.HasOne("Timeline.Entities.User", "Owner")
- .WithMany("Timelines")
- .HasForeignKey("OwnerId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b =>
- {
- b.HasOne("Timeline.Entities.TimelineEntity", "Timeline")
- .WithMany("Members")
- .HasForeignKey("TimelineId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("Timeline.Entities.User", "User")
- .WithMany("TimelinesJoined")
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b =>
- {
- b.HasOne("Timeline.Entities.User", "Author")
- .WithMany("TimelinePosts")
- .HasForeignKey("AuthorId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("Timeline.Entities.TimelineEntity", "Timeline")
- .WithMany("Posts")
- .HasForeignKey("TimelineId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Timeline.Entities.UserAvatar", b =>
- {
- b.HasOne("Timeline.Entities.User", null)
- .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")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.cs b/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.cs deleted file mode 100644 index 8aef42d7..00000000 --- a/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.cs +++ /dev/null @@ -1,107 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Timeline.Migrations.ProductionDatabase
-{
- public partial class RenameTimelineMember : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropForeignKey(
- name: "FK_TimelineMembers_timelines_timeline",
- table: "TimelineMembers");
-
- migrationBuilder.DropForeignKey(
- name: "FK_TimelineMembers_users_user",
- table: "TimelineMembers");
-
- migrationBuilder.DropPrimaryKey(
- name: "PK_TimelineMembers",
- table: "TimelineMembers");
-
- migrationBuilder.RenameTable(
- name: "TimelineMembers",
- newName: "timeline_members");
-
- migrationBuilder.RenameIndex(
- name: "IX_TimelineMembers_user",
- table: "timeline_members",
- newName: "IX_timeline_members_user");
-
- migrationBuilder.RenameIndex(
- name: "IX_TimelineMembers_timeline",
- table: "timeline_members",
- newName: "IX_timeline_members_timeline");
-
- migrationBuilder.AddPrimaryKey(
- name: "PK_timeline_members",
- table: "timeline_members",
- column: "id");
-
- migrationBuilder.AddForeignKey(
- name: "FK_timeline_members_timelines_timeline",
- table: "timeline_members",
- column: "timeline",
- principalTable: "timelines",
- principalColumn: "id",
- onDelete: ReferentialAction.Cascade);
-
- migrationBuilder.AddForeignKey(
- name: "FK_timeline_members_users_user",
- table: "timeline_members",
- column: "user",
- principalTable: "users",
- principalColumn: "id",
- onDelete: ReferentialAction.Cascade);
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropForeignKey(
- name: "FK_timeline_members_timelines_timeline",
- table: "timeline_members");
-
- migrationBuilder.DropForeignKey(
- name: "FK_timeline_members_users_user",
- table: "timeline_members");
-
- migrationBuilder.DropPrimaryKey(
- name: "PK_timeline_members",
- table: "timeline_members");
-
- migrationBuilder.RenameTable(
- name: "timeline_members",
- newName: "TimelineMembers");
-
- migrationBuilder.RenameIndex(
- name: "IX_timeline_members_user",
- table: "TimelineMembers",
- newName: "IX_TimelineMembers_user");
-
- migrationBuilder.RenameIndex(
- name: "IX_timeline_members_timeline",
- table: "TimelineMembers",
- newName: "IX_TimelineMembers_timeline");
-
- migrationBuilder.AddPrimaryKey(
- name: "PK_TimelineMembers",
- table: "TimelineMembers",
- column: "id");
-
- migrationBuilder.AddForeignKey(
- name: "FK_TimelineMembers_timelines_timeline",
- table: "TimelineMembers",
- column: "timeline",
- principalTable: "timelines",
- principalColumn: "id",
- onDelete: ReferentialAction.Cascade);
-
- migrationBuilder.AddForeignKey(
- name: "FK_TimelineMembers_users_user",
- table: "TimelineMembers",
- column: "user",
- principalTable: "users",
- principalColumn: "id",
- onDelete: ReferentialAction.Cascade);
- }
- }
-}
diff --git a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs b/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs deleted file mode 100644 index bb0bb5af..00000000 --- a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs +++ /dev/null @@ -1,244 +0,0 @@ -// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Timeline.Entities;
-
-namespace Timeline.Migrations.ProductionDatabase
-{
- [DbContext(typeof(ProductionDatabaseContext))]
- [Migration("20200131152033_RefactorUser")]
- partial class RefactorUser
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "3.1.1")
- .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
- modelBuilder.Entity("Timeline.Entities.TimelineEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<DateTime>("CreateTime")
- .HasColumnName("create_time")
- .HasColumnType("datetime(6)");
-
- b.Property<string>("Description")
- .HasColumnName("description")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<string>("Name")
- .HasColumnName("name")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<long>("OwnerId")
- .HasColumnName("owner")
- .HasColumnType("bigint");
-
- b.Property<int>("Visibility")
- .HasColumnName("visibility")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.HasIndex("OwnerId");
-
- b.ToTable("timelines");
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<long>("TimelineId")
- .HasColumnName("timeline")
- .HasColumnType("bigint");
-
- b.Property<long>("UserId")
- .HasColumnName("user")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("TimelineId");
-
- b.HasIndex("UserId");
-
- b.ToTable("timeline_members");
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<long>("AuthorId")
- .HasColumnName("author")
- .HasColumnType("bigint");
-
- b.Property<string>("Content")
- .HasColumnName("content")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<DateTime>("LastUpdated")
- .HasColumnName("last_updated")
- .HasColumnType("datetime(6)");
-
- b.Property<DateTime>("Time")
- .HasColumnName("time")
- .HasColumnType("datetime(6)");
-
- b.Property<long>("TimelineId")
- .HasColumnName("timeline")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("AuthorId");
-
- b.HasIndex("TimelineId");
-
- b.ToTable("timeline_posts");
- });
-
- modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<byte[]>("Data")
- .HasColumnName("data")
- .HasColumnType("longblob");
-
- b.Property<string>("ETag")
- .HasColumnName("etag")
- .HasColumnType("varchar(30) CHARACTER SET utf8mb4")
- .HasMaxLength(30);
-
- b.Property<DateTime>("LastModified")
- .HasColumnName("last_modified")
- .HasColumnType("datetime(6)");
-
- b.Property<string>("Type")
- .HasColumnName("type")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<long>("UserId")
- .HasColumnName("user")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId")
- .IsUnique();
-
- b.ToTable("user_avatars");
- });
-
- modelBuilder.Entity("Timeline.Entities.UserEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<string>("Nickname")
- .HasColumnName("nickname")
- .HasColumnType("varchar(100) CHARACTER SET utf8mb4")
- .HasMaxLength(100);
-
- b.Property<string>("Password")
- .IsRequired()
- .HasColumnName("password")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<string>("Roles")
- .IsRequired()
- .HasColumnName("roles")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<string>("Username")
- .IsRequired()
- .HasColumnName("username")
- .HasColumnType("varchar(26) CHARACTER SET utf8mb4")
- .HasMaxLength(26);
-
- b.Property<long>("Version")
- .ValueGeneratedOnAdd()
- .HasColumnName("version")
- .HasColumnType("bigint")
- .HasDefaultValue(0L);
-
- b.HasKey("Id");
-
- b.HasIndex("Username")
- .IsUnique();
-
- b.ToTable("users");
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelineEntity", b =>
- {
- b.HasOne("Timeline.Entities.UserEntity", "Owner")
- .WithMany("Timelines")
- .HasForeignKey("OwnerId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b =>
- {
- b.HasOne("Timeline.Entities.TimelineEntity", "Timeline")
- .WithMany("Members")
- .HasForeignKey("TimelineId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("Timeline.Entities.UserEntity", "User")
- .WithMany("TimelinesJoined")
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b =>
- {
- b.HasOne("Timeline.Entities.UserEntity", "Author")
- .WithMany("TimelinePosts")
- .HasForeignKey("AuthorId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("Timeline.Entities.TimelineEntity", "Timeline")
- .WithMany("Posts")
- .HasForeignKey("TimelineId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b =>
- {
- b.HasOne("Timeline.Entities.UserEntity", "User")
- .WithOne("Avatar")
- .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs b/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs deleted file mode 100644 index a0ca5212..00000000 --- a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Timeline.Migrations.ProductionDatabase
-{
- public partial class RefactorUser : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.Sql(@"
-START TRANSACTION;
-
-ALTER TABLE `users`
- CHANGE COLUMN `name` `username` varchar (26) NOT NULL,
- RENAME INDEX IX_users_name TO IX_users_username,
- ADD `nickname` varchar(100) CHARACTER SET utf8mb4 NULL;
-
-UPDATE users
- SET nickname = (
- SELECT nickname
- FROM user_details
- WHERE user_details.UserId = users.id
- );
-
-ALTER TABLE `user_avatars`
- CHANGE COLUMN `UserId` `user` bigint (20) NOT NULL,
- RENAME INDEX IX_user_avatars_UserId TO IX_user_avatars_user,
- DROP FOREIGN KEY FK_user_avatars_users_UserId,
- ADD CONSTRAINT FK_user_avatars_users_user FOREIGN KEY (`user`) REFERENCES `users` (`id`) ON DELETE CASCADE;
-
-COMMIT;
- ");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.Sql(@"
-START TRANSACTION;
-
-ALTER TABLE `users`
- CHANGE COLUMN `username` `name` varchar (26) NOT NULL,
- RENAME INDEX IX_users_username TO IX_users_name,
- DROP COLUMN `nickname`;
-
-ALTER TABLE `user_avatars`
- CHANGE COLUMN `user` `UserId` bigint (20) NOT NULL,
- RENAME INDEX IX_user_avatars_user TO IX_user_avatars_UserId,
- DROP FOREIGN KEY FK_user_avatars_users_user,
- ADD CONSTRAINT FK_user_avatars_users_UserId FOREIGN KEY (`UserId`) REFERENCES `users` (`id`) ON DELETE CASCADE;
-
-COMMIT;
- ");
- }
- }
-}
diff --git a/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs b/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs deleted file mode 100644 index bfc9b768..00000000 --- a/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs +++ /dev/null @@ -1,242 +0,0 @@ -// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Timeline.Entities;
-
-namespace Timeline.Migrations.ProductionDatabase
-{
- [DbContext(typeof(ProductionDatabaseContext))]
- partial class ProductionDatabaseContextModelSnapshot : ModelSnapshot
- {
- protected override void BuildModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "3.1.1")
- .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
- modelBuilder.Entity("Timeline.Entities.TimelineEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<DateTime>("CreateTime")
- .HasColumnName("create_time")
- .HasColumnType("datetime(6)");
-
- b.Property<string>("Description")
- .HasColumnName("description")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<string>("Name")
- .HasColumnName("name")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<long>("OwnerId")
- .HasColumnName("owner")
- .HasColumnType("bigint");
-
- b.Property<int>("Visibility")
- .HasColumnName("visibility")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.HasIndex("OwnerId");
-
- b.ToTable("timelines");
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<long>("TimelineId")
- .HasColumnName("timeline")
- .HasColumnType("bigint");
-
- b.Property<long>("UserId")
- .HasColumnName("user")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("TimelineId");
-
- b.HasIndex("UserId");
-
- b.ToTable("timeline_members");
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<long>("AuthorId")
- .HasColumnName("author")
- .HasColumnType("bigint");
-
- b.Property<string>("Content")
- .HasColumnName("content")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<DateTime>("LastUpdated")
- .HasColumnName("last_updated")
- .HasColumnType("datetime(6)");
-
- b.Property<DateTime>("Time")
- .HasColumnName("time")
- .HasColumnType("datetime(6)");
-
- b.Property<long>("TimelineId")
- .HasColumnName("timeline")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("AuthorId");
-
- b.HasIndex("TimelineId");
-
- b.ToTable("timeline_posts");
- });
-
- modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<byte[]>("Data")
- .HasColumnName("data")
- .HasColumnType("longblob");
-
- b.Property<string>("ETag")
- .HasColumnName("etag")
- .HasColumnType("varchar(30) CHARACTER SET utf8mb4")
- .HasMaxLength(30);
-
- b.Property<DateTime>("LastModified")
- .HasColumnName("last_modified")
- .HasColumnType("datetime(6)");
-
- b.Property<string>("Type")
- .HasColumnName("type")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<long>("UserId")
- .HasColumnName("user")
- .HasColumnType("bigint");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId")
- .IsUnique();
-
- b.ToTable("user_avatars");
- });
-
- modelBuilder.Entity("Timeline.Entities.UserEntity", b =>
- {
- b.Property<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<string>("Nickname")
- .HasColumnName("nickname")
- .HasColumnType("varchar(100) CHARACTER SET utf8mb4")
- .HasMaxLength(100);
-
- b.Property<string>("Password")
- .IsRequired()
- .HasColumnName("password")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<string>("Roles")
- .IsRequired()
- .HasColumnName("roles")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<string>("Username")
- .IsRequired()
- .HasColumnName("username")
- .HasColumnType("varchar(26) CHARACTER SET utf8mb4")
- .HasMaxLength(26);
-
- b.Property<long>("Version")
- .ValueGeneratedOnAdd()
- .HasColumnName("version")
- .HasColumnType("bigint")
- .HasDefaultValue(0L);
-
- b.HasKey("Id");
-
- b.HasIndex("Username")
- .IsUnique();
-
- b.ToTable("users");
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelineEntity", b =>
- {
- b.HasOne("Timeline.Entities.UserEntity", "Owner")
- .WithMany("Timelines")
- .HasForeignKey("OwnerId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b =>
- {
- b.HasOne("Timeline.Entities.TimelineEntity", "Timeline")
- .WithMany("Members")
- .HasForeignKey("TimelineId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("Timeline.Entities.UserEntity", "User")
- .WithMany("TimelinesJoined")
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b =>
- {
- b.HasOne("Timeline.Entities.UserEntity", "Author")
- .WithMany("TimelinePosts")
- .HasForeignKey("AuthorId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("Timeline.Entities.TimelineEntity", "Timeline")
- .WithMany("Posts")
- .HasForeignKey("TimelineId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b =>
- {
- b.HasOne("Timeline.Entities.UserEntity", "User")
- .WithOne("Avatar")
- .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/Timeline/Program.cs b/Timeline/Program.cs index b44aafde..1a7a723a 100644 --- a/Timeline/Program.cs +++ b/Timeline/Program.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Hosting;
using System.Resources;
@@ -16,8 +15,7 @@ namespace Timeline CreateWebHostBuilder(args)
.ConfigureAppConfiguration((context, config) =>
{
- if (context.HostingEnvironment.IsProduction())
- config.AddJsonFile(new PhysicalFileProvider("/etc/webapp/timeline/"), "config.json", true, true);
+ config.AddEnvironmentVariables("TIMELINE_");
})
.Build().Run();
}
diff --git a/Timeline/Properties/launchSettings.json b/Timeline/Properties/launchSettings.json index 2daf38db..3819fe0f 100644 --- a/Timeline/Properties/launchSettings.json +++ b/Timeline/Properties/launchSettings.json @@ -3,7 +3,8 @@ "Timeline": { "commandName": "Project", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Development", + "TIMELINE_WORKDIR": "D:\\timeline-development" } } } diff --git a/Timeline/Services/UserTokenService.cs b/Timeline/Services/UserTokenService.cs index cf7286f4..731eb1db 100644 --- a/Timeline/Services/UserTokenService.cs +++ b/Timeline/Services/UserTokenService.cs @@ -43,13 +43,13 @@ namespace Timeline.Services {
private const string VersionClaimType = "timeline_version";
- private readonly IOptionsMonitor<JwtConfig> _jwtConfig;
+ private readonly IOptionsMonitor<JwtConfiguration> _jwtConfig;
private readonly IClock _clock;
private readonly JwtSecurityTokenHandler _tokenHandler = new JwtSecurityTokenHandler();
private SymmetricSecurityKey _tokenSecurityKey;
- public JwtUserTokenService(IOptionsMonitor<JwtConfig> jwtConfig, IClock clock)
+ public JwtUserTokenService(IOptionsMonitor<JwtConfiguration> jwtConfig, IClock clock)
{
_jwtConfig = jwtConfig;
_clock = clock;
diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs index 2640a061..f305c39d 100644 --- a/Timeline/Startup.cs +++ b/Timeline/Startup.cs @@ -8,9 +8,8 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;
-using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
-using Pomelo.EntityFrameworkCore.MySql.Storage;
using System;
+using System.IO;
using System.Text.Json.Serialization;
using Timeline.Auth;
using Timeline.Configs;
@@ -37,6 +36,12 @@ namespace Timeline // This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services)
{
+ var workDir = Configuration.GetValue<string?>("WorkDir");
+ if (workDir == null)
+ {
+ throw new InvalidOperationException("Please set a work directory first.");
+ }
+
services.AddControllers(setup =>
{
setup.InputFormatters.Add(new StringInputFormatter());
@@ -51,7 +56,7 @@ namespace Timeline options.InvalidModelStateResponseFactory = InvalidModelResponseFactory.Factory;
});
- services.Configure<JwtConfig>(Configuration.GetSection(nameof(JwtConfig)));
+ services.Configure<JwtConfiguration>(Configuration.GetSection("Jwt"));
services.AddAuthentication(AuthenticationConstants.Scheme)
.AddScheme<MyAuthenticationOptions, MyAuthenticationHandler>(AuthenticationConstants.Scheme, AuthenticationConstants.DisplayName, o => { });
services.AddAuthorization();
@@ -94,27 +99,11 @@ namespace Timeline services.TryAddSingleton<IActionContextAccessor, ActionContextAccessor>();
- var databaseConfig = Configuration.GetSection(nameof(DatabaseConfig)).Get<DatabaseConfig>();
-
- if (databaseConfig.UseDevelopment)
+ var dbConnectionString = $"Data Source={Path.Combine(workDir, "timeline.db")}";
+ services.AddDbContext<DatabaseContext>(options =>
{
- services.AddDbContext<DatabaseContext, DevelopmentDatabaseContext>(options =>
- {
- if (databaseConfig.DevelopmentConnectionString == null)
- throw new InvalidOperationException("DatabaseConfig.DevelopmentConnectionString is not set. Please set it as a sqlite connection string.");
- options.UseSqlite(databaseConfig.DevelopmentConnectionString);
- });
- }
- else
- {
- services.AddDbContext<DatabaseContext, ProductionDatabaseContext>(options =>
- {
- if (databaseConfig.ConnectionString == null)
- throw new InvalidOperationException("DatabaseConfig.ConnectionString is not set. Please set it as a mysql connection string.");
- options.UseMySql(databaseConfig.ConnectionString,
- mySqlOptions => mySqlOptions.ServerVersion(new ServerVersion(new Version(5, 7), ServerType.MySql)));
- });
- }
+ options.UseSqlite(dbConnectionString);
+ });
}
diff --git a/Timeline/Timeline.csproj b/Timeline/Timeline.csproj index a20048a9..e82e80f9 100644 --- a/Timeline/Timeline.csproj +++ b/Timeline/Timeline.csproj @@ -28,8 +28,6 @@ <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
- <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-dev002868" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
</ItemGroup>
diff --git a/Timeline/appsettings.Development.json b/Timeline/appsettings.Development.json index 50eb9256..a2880cbf 100644 --- a/Timeline/appsettings.Development.json +++ b/Timeline/appsettings.Development.json @@ -5,11 +5,5 @@ "System": "Information",
"Microsoft": "Information"
}
- },
- "DatabaseConfig": {
- "UseDevelopment": true
- },
- "JwtConfig": {
- "SigningKey": "this is very very very very very long secret"
}
}
diff --git a/Timeline/appsettings.Production.json b/Timeline/appsettings.Production.json deleted file mode 100644 index 5d3db1bc..00000000 --- a/Timeline/appsettings.Production.json +++ /dev/null @@ -1,5 +0,0 @@ -{
- "DatabaseConfig": {
- "UseDevelopment": false
- }
-}
diff --git a/Timeline/appsettings.json b/Timeline/appsettings.json index 61491ff5..d55d0597 100644 --- a/Timeline/appsettings.json +++ b/Timeline/appsettings.json @@ -4,9 +4,10 @@ "Default": "Warning"
}
},
- "JwtConfig": {
+ "Jwt": {
"Issuer": "api.crupest.xyz",
- "Audience": "api.crupest.xyz"
+ "Audience": "api.crupest.xyz",
+ "SigningKey": "this is very very very very very long secret"
},
"Cors": [ "https://www.crupest.xyz", "https://crupest.xyz" ]
}
|