Небольшие исправления модели и обработчиков

This commit is contained in:
2025-05-21 15:57:43 +04:00
parent 00de4cb319
commit 4d01b100d1
13 changed files with 77 additions and 152 deletions
@@ -13,7 +13,7 @@ using Pf2eModel.Model.Enum;
namespace Pf2eModel.Migrations
{
[DbContext(typeof(Pf2eDbContext))]
[Migration("20250516162158_1")]
[Migration("20250521102908_1")]
partial class _1
{
/// <inheritdoc />
@@ -288,36 +288,11 @@ namespace Pf2eModel.Migrations
.HasColumnOrder(2)
.HasComment("Идентификатор цели");
b.Property<int>("LegacyEntitiesId")
.HasColumnType("integer")
.HasColumnName("legacy_entities_id");
b.Property<int>("LegacyEntityId")
.HasColumnType("integer")
.HasColumnName("legacy_entity_id");
b.Property<int>("RemasterEntitiesId")
.HasColumnType("integer")
.HasColumnName("remaster_entities_id");
b.Property<int>("RemasterEntityId")
.HasColumnType("integer")
.HasColumnName("remaster_entity_id");
b.HasKey("LegacyId", "RemasterId")
.HasName("pk_legacy_remasters");
b.HasIndex("LegacyEntitiesId")
.HasDatabaseName("ix_legacy_remasters_legacy_entities_id");
b.HasIndex("LegacyEntityId")
.HasDatabaseName("ix_legacy_remasters_legacy_entity_id");
b.HasIndex("RemasterEntitiesId")
.HasDatabaseName("ix_legacy_remasters_remaster_entities_id");
b.HasIndex("RemasterEntityId")
.HasDatabaseName("ix_legacy_remasters_remaster_entity_id");
b.HasIndex("RemasterId")
.HasDatabaseName("ix_legacy_remasters_remaster_id");
b.ToTable("legacy_remasters", (string)null);
});
@@ -1973,33 +1948,19 @@ namespace Pf2eModel.Migrations
modelBuilder.Entity("Pf2eModel.Model.Base.LegacyRemaster", b =>
{
b.HasOne("Pf2eModel.Model.Base.Entity", null)
.WithMany()
.HasForeignKey("LegacyEntitiesId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("fk_legacy_remasters_entities_legacy_entities_id");
b.HasOne("Pf2eModel.Model.Base.Entity", "LegacyEntity")
.WithMany()
.HasForeignKey("LegacyEntityId")
.WithMany("LegacyTransferEntities")
.HasForeignKey("LegacyId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("fk_legacy_remasters_entities_legacy_entity_id");
b.HasOne("Pf2eModel.Model.Base.Entity", null)
.WithMany()
.HasForeignKey("RemasterEntitiesId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("fk_legacy_remasters_entities_remaster_entities_id");
.HasConstraintName("fk_legacy_remasters_entities_legacy_id");
b.HasOne("Pf2eModel.Model.Base.Entity", "RemasterEntity")
.WithMany()
.HasForeignKey("RemasterEntityId")
.WithMany("RemasterTransferEntities")
.HasForeignKey("RemasterId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("fk_legacy_remasters_entities_remaster_entity_id");
.HasConstraintName("fk_legacy_remasters_entities_remaster_id");
b.Navigation("LegacyEntity");
@@ -2638,6 +2599,10 @@ namespace Pf2eModel.Migrations
b.Navigation("Externals");
b.Navigation("LegacyTransferEntities");
b.Navigation("RemasterTransferEntities");
b.Navigation("Sources");
});
@@ -316,36 +316,20 @@ namespace Pf2eModel.Migrations
columns: table => new
{
legacy_id = table.Column<int>(type: "integer", nullable: false, comment: "Идентификатор сущности"),
remaster_id = table.Column<int>(type: "integer", nullable: false, comment: "Идентификатор цели"),
legacy_entity_id = table.Column<int>(type: "integer", nullable: false),
remaster_entity_id = table.Column<int>(type: "integer", nullable: false),
legacy_entities_id = table.Column<int>(type: "integer", nullable: false),
remaster_entities_id = table.Column<int>(type: "integer", nullable: false)
remaster_id = table.Column<int>(type: "integer", nullable: false, comment: "Идентификатор цели")
},
constraints: table =>
{
table.PrimaryKey("pk_legacy_remasters", x => new { x.legacy_id, x.remaster_id });
table.ForeignKey(
name: "fk_legacy_remasters_entities_legacy_entities_id",
column: x => x.legacy_entities_id,
name: "fk_legacy_remasters_entities_legacy_id",
column: x => x.legacy_id,
principalTable: "entities",
principalColumn: "id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "fk_legacy_remasters_entities_legacy_entity_id",
column: x => x.legacy_entity_id,
principalTable: "entities",
principalColumn: "id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "fk_legacy_remasters_entities_remaster_entities_id",
column: x => x.remaster_entities_id,
principalTable: "entities",
principalColumn: "id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "fk_legacy_remasters_entities_remaster_entity_id",
column: x => x.remaster_entity_id,
name: "fk_legacy_remasters_entities_remaster_id",
column: x => x.remaster_id,
principalTable: "entities",
principalColumn: "id",
onDelete: ReferentialAction.Cascade);
@@ -1362,24 +1346,9 @@ namespace Pf2eModel.Migrations
column: "entity_id");
migrationBuilder.CreateIndex(
name: "ix_legacy_remasters_legacy_entities_id",
name: "ix_legacy_remasters_remaster_id",
table: "legacy_remasters",
column: "legacy_entities_id");
migrationBuilder.CreateIndex(
name: "ix_legacy_remasters_legacy_entity_id",
table: "legacy_remasters",
column: "legacy_entity_id");
migrationBuilder.CreateIndex(
name: "ix_legacy_remasters_remaster_entities_id",
table: "legacy_remasters",
column: "remaster_entities_id");
migrationBuilder.CreateIndex(
name: "ix_legacy_remasters_remaster_entity_id",
table: "legacy_remasters",
column: "remaster_entity_id");
column: "remaster_id");
migrationBuilder.CreateIndex(
name: "ix_ritual_checks_ritual_id",
@@ -285,36 +285,11 @@ namespace Pf2eModel.Migrations
.HasColumnOrder(2)
.HasComment("Идентификатор цели");
b.Property<int>("LegacyEntitiesId")
.HasColumnType("integer")
.HasColumnName("legacy_entities_id");
b.Property<int>("LegacyEntityId")
.HasColumnType("integer")
.HasColumnName("legacy_entity_id");
b.Property<int>("RemasterEntitiesId")
.HasColumnType("integer")
.HasColumnName("remaster_entities_id");
b.Property<int>("RemasterEntityId")
.HasColumnType("integer")
.HasColumnName("remaster_entity_id");
b.HasKey("LegacyId", "RemasterId")
.HasName("pk_legacy_remasters");
b.HasIndex("LegacyEntitiesId")
.HasDatabaseName("ix_legacy_remasters_legacy_entities_id");
b.HasIndex("LegacyEntityId")
.HasDatabaseName("ix_legacy_remasters_legacy_entity_id");
b.HasIndex("RemasterEntitiesId")
.HasDatabaseName("ix_legacy_remasters_remaster_entities_id");
b.HasIndex("RemasterEntityId")
.HasDatabaseName("ix_legacy_remasters_remaster_entity_id");
b.HasIndex("RemasterId")
.HasDatabaseName("ix_legacy_remasters_remaster_id");
b.ToTable("legacy_remasters", (string)null);
});
@@ -1970,33 +1945,19 @@ namespace Pf2eModel.Migrations
modelBuilder.Entity("Pf2eModel.Model.Base.LegacyRemaster", b =>
{
b.HasOne("Pf2eModel.Model.Base.Entity", null)
.WithMany()
.HasForeignKey("LegacyEntitiesId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("fk_legacy_remasters_entities_legacy_entities_id");
b.HasOne("Pf2eModel.Model.Base.Entity", "LegacyEntity")
.WithMany()
.HasForeignKey("LegacyEntityId")
.WithMany("LegacyTransferEntities")
.HasForeignKey("LegacyId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("fk_legacy_remasters_entities_legacy_entity_id");
b.HasOne("Pf2eModel.Model.Base.Entity", null)
.WithMany()
.HasForeignKey("RemasterEntitiesId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("fk_legacy_remasters_entities_remaster_entities_id");
.HasConstraintName("fk_legacy_remasters_entities_legacy_id");
b.HasOne("Pf2eModel.Model.Base.Entity", "RemasterEntity")
.WithMany()
.HasForeignKey("RemasterEntityId")
.WithMany("RemasterTransferEntities")
.HasForeignKey("RemasterId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("fk_legacy_remasters_entities_remaster_entity_id");
.HasConstraintName("fk_legacy_remasters_entities_remaster_id");
b.Navigation("LegacyEntity");
@@ -2635,6 +2596,10 @@ namespace Pf2eModel.Migrations
b.Navigation("Externals");
b.Navigation("LegacyTransferEntities");
b.Navigation("RemasterTransferEntities");
b.Navigation("Sources");
});