Fixed dockerfiles and fixed chapter upserts

DBConnection/Migrations/PostgresSql/20220717133208_Fix up UserNovel model and add index on User Email.Designer.cs

@@ -0,0 +1,275 @@
+// <auto-generated />
+using System;
+using DBConnection.Contexts;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DBConnection.Migrations.PostgresSql
+{
+    [DbContext(typeof(PostgresSqlAppDbContext))]
+    [Migration("20220717133208_Fix up UserNovel model and add index on User Email")]
+    partial class FixupUserNovelmodelandaddindexonUserEmail
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.7")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("NovelTag", b =>
+                {
+                    b.Property<string>("NovelsUrl")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TagsTagValue")
+                        .HasColumnType("text");
+
+                    b.HasKey("NovelsUrl", "TagsTagValue");
+
+                    b.HasIndex("TagsTagValue");
+
+                    b.ToTable("NovelTag");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Author", b =>
+                {
+                    b.Property<string>("Url")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Url");
+
+                    b.ToTable("Authors");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Chapter", b =>
+                {
+                    b.Property<string>("Url")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ChapterNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Content")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DatePosted")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DateUpdated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("LastContentFetch")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("NovelUrl")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RawContent")
+                        .HasColumnType("text");
+
+                    b.HasKey("Url");
+
+                    b.HasIndex("NovelUrl");
+
+                    b.ToTable("Chapters");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Novel", b =>
+                {
+                    b.Property<string>("Url")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuthorUrl")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("DatePosted")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("Guid")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("LastUpdated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Url");
+
+                    b.HasIndex("AuthorUrl");
+
+                    b.HasIndex("Guid");
+
+                    b.ToTable("Novels");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Tag", b =>
+                {
+                    b.Property<string>("TagValue")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("TagValue");
+
+                    b.ToTable("Tags");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.UserNovel", b =>
+                {
+                    b.Property<string>("NovelUrl")
+                        .HasColumnType("text");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("LastChapterRead")
+                        .HasColumnType("integer");
+
+                    b.HasKey("NovelUrl", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserNovels");
+                });
+
+            modelBuilder.Entity("NovelTag", b =>
+                {
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", null)
+                        .WithMany()
+                        .HasForeignKey("NovelsUrl")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Tag", null)
+                        .WithMany()
+                        .HasForeignKey("TagsTagValue")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Chapter", b =>
+                {
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", "Novel")
+                        .WithMany("Chapters")
+                        .HasForeignKey("NovelUrl")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Novel");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Novel", b =>
+                {
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Author", "Author")
+                        .WithMany("Novels")
+                        .HasForeignKey("AuthorUrl");
+
+                    b.Navigation("Author");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.UserNovel", b =>
+                {
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", "Novel")
+                        .WithMany()
+                        .HasForeignKey("NovelUrl")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Treestar.Shared.Models.DBDomain.User", "User")
+                        .WithMany("WatchedNovels")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Novel");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Author", b =>
+                {
+                    b.Navigation("Novels");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Novel", b =>
+                {
+                    b.Navigation("Chapters");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.User", b =>
+                {
+                    b.Navigation("WatchedNovels");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DBConnection/Migrations/PostgresSql/20220717133208_Fix up UserNovel model and add index on User Email.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DBConnection.Migrations.PostgresSql
+{
+    public partial class FixupUserNovelmodelandaddindexonUserEmail : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_Users_Email",
+                table: "Users",
+                column: "Email");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_Users_Email",
+                table: "Users");
+        }
+    }
+}

DBConnection/Migrations/PostgresSql/PostgresSqlAppDbContextModelSnapshot.cs

@@ -176,6 +176,8 @@ namespace DBConnection.Migrations.PostgresSql
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Email");
+
                     b.ToTable("Users");
                 });
 
@@ -214,11 +216,13 @@ namespace DBConnection.Migrations.PostgresSql
 
             modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Chapter", b =>
                 {
-                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", null)
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", "Novel")
                         .WithMany("Chapters")
                         .HasForeignKey("NovelUrl")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Novel");
                 });
 
             modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Novel", b =>

DBConnection/Migrations/Sqlite/20220717133151_Fix up UserNovel model and add index on User Email.Designer.cs

@@ -0,0 +1,268 @@
+// <auto-generated />
+using System;
+using DBConnection.Contexts;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DBConnection.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteAppDbContext))]
+    [Migration("20220717133151_Fix up UserNovel model and add index on User Email")]
+    partial class FixupUserNovelmodelandaddindexonUserEmail
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.7");
+
+            modelBuilder.Entity("NovelTag", b =>
+                {
+                    b.Property<string>("NovelsUrl")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TagsTagValue")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("NovelsUrl", "TagsTagValue");
+
+                    b.HasIndex("TagsTagValue");
+
+                    b.ToTable("NovelTag");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Author", b =>
+                {
+                    b.Property<string>("Url")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Url");
+
+                    b.ToTable("Authors");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Chapter", b =>
+                {
+                    b.Property<string>("Url")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ChapterNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Content")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DatePosted")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateUpdated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastContentFetch")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NovelUrl")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RawContent")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Url");
+
+                    b.HasIndex("NovelUrl");
+
+                    b.ToTable("Chapters");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Novel", b =>
+                {
+                    b.Property<string>("Url")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AuthorUrl")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DatePosted")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastUpdated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Url");
+
+                    b.HasIndex("AuthorUrl");
+
+                    b.HasIndex("Guid");
+
+                    b.ToTable("Novels");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Tag", b =>
+                {
+                    b.Property<string>("TagValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("TagValue");
+
+                    b.ToTable("Tags");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.UserNovel", b =>
+                {
+                    b.Property<string>("NovelUrl")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LastChapterRead")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("NovelUrl", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserNovels");
+                });
+
+            modelBuilder.Entity("NovelTag", b =>
+                {
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", null)
+                        .WithMany()
+                        .HasForeignKey("NovelsUrl")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Tag", null)
+                        .WithMany()
+                        .HasForeignKey("TagsTagValue")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Chapter", b =>
+                {
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", "Novel")
+                        .WithMany("Chapters")
+                        .HasForeignKey("NovelUrl")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Novel");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Novel", b =>
+                {
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Author", "Author")
+                        .WithMany("Novels")
+                        .HasForeignKey("AuthorUrl");
+
+                    b.Navigation("Author");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.UserNovel", b =>
+                {
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", "Novel")
+                        .WithMany()
+                        .HasForeignKey("NovelUrl")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Treestar.Shared.Models.DBDomain.User", "User")
+                        .WithMany("WatchedNovels")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Novel");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Author", b =>
+                {
+                    b.Navigation("Novels");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Novel", b =>
+                {
+                    b.Navigation("Chapters");
+                });
+
+            modelBuilder.Entity("Treestar.Shared.Models.DBDomain.User", b =>
+                {
+                    b.Navigation("WatchedNovels");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DBConnection/Migrations/Sqlite/20220717133151_Fix up UserNovel model and add index on User Email.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DBConnection.Migrations.Sqlite
+{
+    public partial class FixupUserNovelmodelandaddindexonUserEmail : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_Users_Email",
+                table: "Users",
+                column: "Email");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_Users_Email",
+                table: "Users");
+        }
+    }
+}

DBConnection/Migrations/Sqlite/SqliteAppDbContextModelSnapshot.cs

@@ -169,6 +169,8 @@ namespace DBConnection.Migrations.Sqlite
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Email");
+
                     b.ToTable("Users");
                 });
 
@@ -207,11 +209,13 @@ namespace DBConnection.Migrations.Sqlite
 
             modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Chapter", b =>
                 {
-                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", null)
+                    b.HasOne("Treestar.Shared.Models.DBDomain.Novel", "Novel")
                         .WithMany("Chapters")
                         .HasForeignKey("NovelUrl")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Novel");
                 });
 
             modelBuilder.Entity("Treestar.Shared.Models.DBDomain.Novel", b =>

DBConnection/Repositories/NovelRepository.cs

@@ -19,24 +19,27 @@ public class NovelRepository : BaseRepository<Novel>, INovelRepository
 
     public override async Task<Novel> Upsert(Novel entity, bool saveAfter=true)
     {
+        var dbEntity = await GetIncluded(entity) ?? entity;
         // Author
         if (entity.Author != null)
         {
-            entity.Author = await _authorRepository.Upsert(entity.Author, saveAfter);
+            entity.Author = await _authorRepository.Upsert(entity.Author, false);
         }
 
         //Tags
         var newTags = await _tagRepository.UpsertMany(entity.Tags, false);
-        entity.Tags.Clear();
-        entity.Tags = newTags.ToList();
-        //chapters
+
+        //chapters are getting deleted now that their required...
         var newChapters = await _chapterRepository.UpsertMany(entity.Chapters, false);
-        entity.Chapters.Clear();
-        entity.Chapters = newChapters.ToList();
+
         // update in db
-        var dbEntity = await GetIncluded(entity) ?? entity;
         entity.Guid = dbEntity.Guid;
         DbContext.Entry(dbEntity).CurrentValues.SetValues(entity);
+        dbEntity.Tags.Clear();
+        dbEntity.Tags.AddRange(newTags);
+        dbEntity.Chapters.Clear();
+        dbEntity.Chapters.AddRange(newChapters);
+
         if (DbContext.Entry(dbEntity).State == EntityState.Detached)
         {
             dbEntity.Guid = Guid.NewGuid();