Use DbWeightsData.Format property instead of hierarchy

Neakita · Mar 12, 2024 · f688177 · f688177
1 parent 3a53998
commit f688177
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 90 deletions.
diff --git a/SightKeeper.Data/Configuration/WeightsDataConfiguration.cs b/SightKeeper.Data/Configuration/WeightsDataConfiguration.cs
@@ -10,7 +10,7 @@ public void Configure(EntityTypeBuilder<DbWeightsData> builder)
 		builder.HasFlakeIdKey();
 		builder.ToTable("WeightsData");
 		builder.ComplexProperty(weightsData => weightsData.Data, subBuilder => subBuilder.Property(weights => weights.Content).HasColumnName("Content"));
-		builder.HasDiscriminator<byte>("Type").HasValue<ONNXWeightsData>(0).HasValue<PTWeightsData>(1);
-		builder.HasIndex("Type", "WeightsId").IsUnique();
+		builder.Property(weightsData => weightsData.Format);
+		builder.HasIndex("WeightsId", "Format").IsUnique();
 	}
 }
diff --git a/SightKeeper.Data/DbWeightsData.cs b/SightKeeper.Data/DbWeightsData.cs
@@ -2,18 +2,26 @@
 
 namespace SightKeeper.Data;
 
-internal abstract class DbWeightsData
+internal sealed class DbWeightsData
 {
+	public enum DataFormat
+	{
+		ONNX,
+		PT
+	}
+
 	public WeightsData Data { get; }
 	public Weights Weights { get; }
+	public DataFormat Format { get; }
 
-	protected DbWeightsData(WeightsData data, Weights weights)
+	public DbWeightsData(WeightsData data, Weights weights, DataFormat format)
 	{
 		Data = data;
 		Weights = weights;
+		Format = format;
 	}
 
-	protected DbWeightsData()
+	private DbWeightsData()
 	{
 		Data = null!;
 		Weights = null!;

diff --git a/...ations/20240312210313_Initial.Designer.cs → ...ations/20240312211014_Initial.Designer.cs b/...ations/20240312210313_Initial.Designer.cs → ...ations/20240312211014_Initial.Designer.cs
diff --git a/...Data/Migrations/20240312210313_Initial.cs → ...Data/Migrations/20240312211014_Initial.cs b/...Data/Migrations/20240312210313_Initial.cs → ...Data/Migrations/20240312211014_Initial.cs
@@ -225,7 +225,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 {
                     Id = table.Column<long>(type: "INTEGER", nullable: false),
                     WeightsId = table.Column<long>(type: "INTEGER", nullable: false),
-                    Type = table.Column<byte>(type: "INTEGER", nullable: false),
+                    Format = table.Column<int>(type: "INTEGER", nullable: false),
                     Content = table.Column<byte[]>(type: "BLOB", nullable: false)
                 },
                 constraints: table =>
@@ -404,16 +404,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 column: "LibraryId");
 
             migrationBuilder.CreateIndex(
-                name: "IX_WeightsData_Type_WeightsId",
+                name: "IX_WeightsData_WeightsId_Format",
                 table: "WeightsData",
-                columns: new[] { "Type", "WeightsId" },
+                columns: new[] { "WeightsId", "Format" },
                 unique: true);
 
-            migrationBuilder.CreateIndex(
-                name: "IX_WeightsData_WeightsId",
-                table: "WeightsData",
-                column: "WeightsId");
-
             migrationBuilder.CreateIndex(
                 name: "IX_WeightsItemClasses_ItemClassId",
                 table: "WeightsItemClasses",

diff --git a/SightKeeper.Data/Migrations/AppDbContextModelSnapshot.cs b/SightKeeper.Data/Migrations/AppDbContextModelSnapshot.cs
@@ -23,7 +23,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<long>("Id")
                         .HasColumnType("INTEGER");
 
-                    b.Property<byte>("Type")
+                    b.Property<int>("Format")
                         .HasColumnType("INTEGER");
 
                     b.Property<long>("WeightsId")
@@ -41,16 +41,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
-                    b.HasIndex("WeightsId");
-
-                    b.HasIndex("Type", "WeightsId")
+                    b.HasIndex("WeightsId", "Format")
                         .IsUnique();
 
                     b.ToTable("WeightsData", (string)null);
-
-                    b.HasDiscriminator<byte>("Type");
-
-                    b.UseTphMappingStrategy();
                 });
 
             modelBuilder.Entity("SightKeeper.Domain.Model.DataSets.Asset", b =>
@@ -385,20 +379,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("WeightsItemClasses");
                 });
 
-            modelBuilder.Entity("SightKeeper.Data.ONNXWeightsData", b =>
-                {
-                    b.HasBaseType("SightKeeper.Data.DbWeightsData");
-
-                    b.HasDiscriminator().HasValue((byte)0);
-                });
-
-            modelBuilder.Entity("SightKeeper.Data.PTWeightsData", b =>
-                {
-                    b.HasBaseType("SightKeeper.Data.DbWeightsData");
-
-                    b.HasDiscriminator().HasValue((byte)1);
-                });
-
             modelBuilder.Entity("SightKeeper.Data.DbWeightsData", b =>
                 {
                     b.HasOne("SightKeeper.Domain.Model.DataSets.Weights", "Weights")

diff --git a/SightKeeper.Data/ONNXWeightsData.cs b/SightKeeper.Data/ONNXWeightsData.cs
diff --git a/SightKeeper.Data/PTWeightsData.cs b/SightKeeper.Data/PTWeightsData.cs
diff --git a/SightKeeper.Data/Services/DbWeightsDataAccess.cs b/SightKeeper.Data/Services/DbWeightsDataAccess.cs
@@ -20,10 +20,8 @@ public override WeightsData LoadWeightsPTData(Weights weights)
 
     protected override void SaveWeightsData(Weights weights, WeightsData onnxData, WeightsData ptData)
     {
-	    ONNXWeightsData onnxWeightsData = new(onnxData, weights);
-	    PTWeightsData ptWeightsData = new(ptData, weights);
-	    _dbContext.Add(onnxWeightsData);
-	    _dbContext.Add(ptWeightsData);
+	    _dbContext.Add(new DbWeightsData(onnxData, weights, DbWeightsData.DataFormat.ONNX));
+	    _dbContext.Add(new DbWeightsData(ptData, weights, DbWeightsData.DataFormat.PT));
     }
     protected override void RemoveWeightsData(Weights weights)
     {