Converted UploadedFile to HBObject

4 files changed, 389 insertions, 50 deletions

diff --git a/Media.cs b/Media.cs
index f039118..e2598a9 100644
--- a/Media.cs
+++ b/Media.cs
@@ -31,10 +31,7 @@ public class Media : HBObject {
     }
 }
 
-public record UploadedFile {
-    [Key]
-    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-    public         int       UploadedFileId   { get; set; }
+public class UploadedFile : HBObject {
     public         string    OriginalChecksum { get; set; }
     public         string?   Filename         { get; set; }
     public         long      Length           { get; set; }
diff --git a/Migrations/20230829235942_UploadedFilesToObjects.Designer.cs b/Migrations/20230829235942_UploadedFilesToObjects.Designer.cs
new file mode 100644
index 0000000..fb3afbc
--- /dev/null
+++ b/Migrations/20230829235942_UploadedFilesToObjects.Designer.cs
@@ -0,0 +1,267 @@
+// <auto-generated />
+using System;
+using HyperBooru;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace HyperBooru.Migrations
+{
+    [DbContext(typeof(HBContext))]
+    [Migration("20230829235942_UploadedFilesToObjects")]
+    partial class UploadedFilesToObjects
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("HyperBooru.HBObject", b =>
+                {
+                    b.Property<int>("ObjectId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ObjectId"));
+
+                    b.Property<Guid>("Guid")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("ObjectId");
+
+                    b.HasIndex("Guid");
+
+                    b.ToTable("Objects", (string)null);
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("TagDefinitionTagDefinition", b =>
+                {
+                    b.Property<int>("ImplicitTagsObjectId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("TagDefinitionObjectId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("ImplicitTagsObjectId", "TagDefinitionObjectId");
+
+                    b.HasIndex("TagDefinitionObjectId");
+
+                    b.ToTable("TagDefinitionTagDefinition");
+                });
+
+            modelBuilder.Entity("HyperBooru.Media", b =>
+                {
+                    b.HasBaseType("HyperBooru.HBObject");
+
+                    b.Property<string>("Checksum")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("LongDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("MimeType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ShortDescription")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("integer");
+
+                    b.ToTable("Media", (string)null);
+                });
+
+            modelBuilder.Entity("HyperBooru.Tag", b =>
+                {
+                    b.HasBaseType("HyperBooru.HBObject");
+
+                    b.Property<DateTime>("CreateTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("TagDefinitionId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("TargetObjectId")
+                        .HasColumnType("integer");
+
+                    b.HasIndex("TagDefinitionId");
+
+                    b.HasIndex("TargetObjectId");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("HyperBooru.TagDefinition", b =>
+                {
+                    b.HasBaseType("HyperBooru.HBObject");
+
+                    b.Property<string>("Alias")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Namespace")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Source")
+                        .HasColumnType("integer");
+
+                    b.ToTable("TagDefinitions", (string)null);
+
+                    b.HasData(
+                        new
+                        {
+                            ObjectId = -1,
+                            Guid = new Guid("ebdad4f8-455a-4351-8017-1d4854d6fa38"),
+                            Name = "nsfw",
+                            Source = 0
+                        },
+                        new
+                        {
+                            ObjectId = -2,
+                            Guid = new Guid("ea212801-5bcc-4c0e-814f-fb9d30db58bc"),
+                            Name = "ingest",
+                            Source = 0
+                        });
+                });
+
+            modelBuilder.Entity("HyperBooru.UploadedFile", b =>
+                {
+                    b.HasBaseType("HyperBooru.HBObject");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Filename")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastAccessTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("LastWriteTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long>("Length")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("MediaObjectId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("OriginalChecksum")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("UploadTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasIndex("MediaObjectId");
+
+                    b.ToTable("UploadedFiles", (string)null);
+                });
+
+            modelBuilder.Entity("TagDefinitionTagDefinition", b =>
+                {
+                    b.HasOne("HyperBooru.TagDefinition", null)
+                        .WithMany()
+                        .HasForeignKey("ImplicitTagsObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("HyperBooru.TagDefinition", null)
+                        .WithMany()
+                        .HasForeignKey("TagDefinitionObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("HyperBooru.Media", b =>
+                {
+                    b.HasOne("HyperBooru.HBObject", null)
+                        .WithOne()
+                        .HasForeignKey("HyperBooru.Media", "ObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("HyperBooru.Tag", b =>
+                {
+                    b.HasOne("HyperBooru.HBObject", null)
+                        .WithOne()
+                        .HasForeignKey("HyperBooru.Tag", "ObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("HyperBooru.TagDefinition", "TagDefinition")
+                        .WithMany()
+                        .HasForeignKey("TagDefinitionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("HyperBooru.HBObject", "Target")
+                        .WithMany("Tags")
+                        .HasForeignKey("TargetObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("TagDefinition");
+
+                    b.Navigation("Target");
+                });
+
+            modelBuilder.Entity("HyperBooru.TagDefinition", b =>
+                {
+                    b.HasOne("HyperBooru.HBObject", null)
+                        .WithOne()
+                        .HasForeignKey("HyperBooru.TagDefinition", "ObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("HyperBooru.UploadedFile", b =>
+                {
+                    b.HasOne("HyperBooru.Media", "Media")
+                        .WithMany("UploadedFiles")
+                        .HasForeignKey("MediaObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("HyperBooru.HBObject", null)
+                        .WithOne()
+                        .HasForeignKey("HyperBooru.UploadedFile", "ObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Media");
+                });
+
+            modelBuilder.Entity("HyperBooru.HBObject", b =>
+                {
+                    b.Navigation("Tags");
+                });
+
+            modelBuilder.Entity("HyperBooru.Media", b =>
+                {
+                    b.Navigation("UploadedFiles");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Migrations/20230829235942_UploadedFilesToObjects.cs b/Migrations/20230829235942_UploadedFilesToObjects.cs
new file mode 100644
index 0000000..07a402e
--- /dev/null
+++ b/Migrations/20230829235942_UploadedFilesToObjects.cs
@@ -0,0 +1,75 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace HyperBooru.Migrations
+{
+    /// <inheritdoc />
+    public partial class UploadedFilesToObjects : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "Guid",
+                table: "UploadedFiles",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.Sql(
+                "INSERT INTO \"Objects\" (\"Guid\") SELECT \"Guid\" FROM \"UploadedFiles\";");
+            migrationBuilder.Sql(
+                "UPDATE \"UploadedFiles\" AS uf SET \"UploadedFileId\" = o.\"ObjectId\" FROM \"Objects\" AS o WHERE o.\"Guid\" = uf.\"Guid\";");
+
+            migrationBuilder.DropColumn(
+                name: "Guid",
+                table: "UploadedFiles");
+
+            migrationBuilder.RenameColumn(
+                name: "UploadedFileId",
+                table: "UploadedFiles",
+                newName: "ObjectId");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "ObjectId",
+                table: "UploadedFiles",
+                type: "integer",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "integer")
+                .OldAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_UploadedFiles_Objects_ObjectId",
+                table: "UploadedFiles",
+                column: "ObjectId",
+                principalTable: "Objects",
+                principalColumn: "ObjectId",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_UploadedFiles_Objects_ObjectId",
+                table: "UploadedFiles");
+
+            migrationBuilder.RenameColumn(
+                name: "ObjectId",
+                table: "UploadedFiles",
+                newName: "UploadedFileId");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "UploadedFileId",
+                table: "UploadedFiles",
+                type: "integer",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "integer")
+                .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
+        }
+    }
+}
diff --git a/Migrations/HBContextModelSnapshot.cs b/Migrations/HBContextModelSnapshot.cs
index 8618cae..06b3e20 100644
--- a/Migrations/HBContextModelSnapshot.cs
+++ b/Migrations/HBContextModelSnapshot.cs
@@ -42,46 +42,6 @@ namespace HyperBooru.Migrations
                     b.UseTptMappingStrategy();
                 });
 
-            modelBuilder.Entity("HyperBooru.UploadedFile", b =>
-                {
-                    b.Property<int>("UploadedFileId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UploadedFileId"));
-
-                    b.Property<DateTime?>("CreateTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Filename")
-                        .HasColumnType("text");
-
-                    b.Property<DateTime?>("LastAccessTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime?>("LastWriteTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<long>("Length")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("MediaObjectId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("OriginalChecksum")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("UploadTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("UploadedFileId");
-
-                    b.HasIndex("MediaObjectId");
-
-                    b.ToTable("UploadedFiles", (string)null);
-                });
-
             modelBuilder.Entity("TagDefinitionTagDefinition", b =>
                 {
                     b.Property<int>("ImplicitTagsObjectId")
@@ -182,13 +142,36 @@ namespace HyperBooru.Migrations
 
             modelBuilder.Entity("HyperBooru.UploadedFile", b =>
                 {
-                    b.HasOne("HyperBooru.Media", "Media")
-                        .WithMany("UploadedFiles")
-                        .HasForeignKey("MediaObjectId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                    b.HasBaseType("HyperBooru.HBObject");
 
-                    b.Navigation("Media");
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Filename")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastAccessTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("LastWriteTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long>("Length")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("MediaObjectId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("OriginalChecksum")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("UploadTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasIndex("MediaObjectId");
+
+                    b.ToTable("UploadedFiles", (string)null);
                 });
 
             modelBuilder.Entity("TagDefinitionTagDefinition", b =>
@@ -249,6 +232,23 @@ namespace HyperBooru.Migrations
                         .IsRequired();
                 });
 
+            modelBuilder.Entity("HyperBooru.UploadedFile", b =>
+                {
+                    b.HasOne("HyperBooru.Media", "Media")
+                        .WithMany("UploadedFiles")
+                        .HasForeignKey("MediaObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("HyperBooru.HBObject", null)
+                        .WithOne()
+                        .HasForeignKey("HyperBooru.UploadedFile", "ObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Media");
+                });
+
             modelBuilder.Entity("HyperBooru.HBObject", b =>
                 {
                     b.Navigation("Tags");