refactor(directory): ♻ ren language key

This commit is contained in:
Collin M. Barrett 2020-08-26 14:08:42 -05:00
parent 0e2059fe4c
commit 50ad3af48a
4 changed files with 17 additions and 17 deletions

View file

@ -10,7 +10,7 @@
namespace FilterLists.Directory.Infrastructure.Migrations.Migrations
{
[DbContext(typeof(QueryDbContext))]
[Migration("20200825215253_Initial")]
[Migration("20200826190733_Initial")]
partial class Initial
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -92,12 +92,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.Property<int>("FilterListId")
.HasColumnType("integer");
b.Property<string>("LanguageIso6391")
b.Property<string>("Iso6391")
.HasColumnType("text");
b.HasKey("FilterListId", "LanguageIso6391");
b.HasKey("FilterListId", "Iso6391");
b.HasIndex("LanguageIso6391");
b.HasIndex("Iso6391");
b.ToTable("FilterListLanguages");
});
@ -406,7 +406,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.HasOne("FilterLists.Directory.Infrastructure.Persistence.Queries.Entities.Language", "Language")
.WithMany("FilterListLanguages")
.HasForeignKey("LanguageIso6391")
.HasForeignKey("Iso6391")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});

View file

@ -179,11 +179,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
columns: table => new
{
FilterListId = table.Column<int>(nullable: false),
LanguageIso6391 = table.Column<string>(nullable: false)
Iso6391 = table.Column<string>(nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_FilterListLanguages", x => new { x.FilterListId, x.LanguageIso6391 });
table.PrimaryKey("PK_FilterListLanguages", x => new { x.FilterListId, x.Iso6391 });
table.ForeignKey(
name: "FK_FilterListLanguages_FilterLists_FilterListId",
column: x => x.FilterListId,
@ -191,8 +191,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_FilterListLanguages_Languages_LanguageIso6391",
column: x => x.LanguageIso6391,
name: "FK_FilterListLanguages_Languages_Iso6391",
column: x => x.Iso6391,
principalTable: "Languages",
principalColumn: "Iso6391",
onDelete: ReferentialAction.Cascade);
@ -365,9 +365,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
column: "DependentFilterListId");
migrationBuilder.CreateIndex(
name: "IX_FilterListLanguages_LanguageIso6391",
name: "IX_FilterListLanguages_Iso6391",
table: "FilterListLanguages",
column: "LanguageIso6391");
column: "Iso6391");
migrationBuilder.CreateIndex(
name: "IX_FilterListMaintainers_MaintainerId",

View file

@ -90,12 +90,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<int>("FilterListId")
.HasColumnType("integer");
b.Property<string>("LanguageIso6391")
b.Property<string>("Iso6391")
.HasColumnType("text");
b.HasKey("FilterListId", "LanguageIso6391");
b.HasKey("FilterListId", "Iso6391");
b.HasIndex("LanguageIso6391");
b.HasIndex("Iso6391");
b.ToTable("FilterListLanguages");
});
@ -404,7 +404,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.HasOne("FilterLists.Directory.Infrastructure.Persistence.Queries.Entities.Language", "Language")
.WithMany("FilterListLanguages")
.HasForeignKey("LanguageIso6391")
.HasForeignKey("Iso6391")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});

View file

@ -8,7 +8,7 @@ public class FilterListLanguage
{
public int FilterListId { get; private set; }
public FilterList FilterList { get; private set; } = null!;
public string LanguageIso6391 { get; private set; } = null!;
public string Iso6391 { get; private set; } = null!;
public Language Language { get; private set; } = null!;
}
@ -18,7 +18,7 @@ public virtual void Configure(EntityTypeBuilder<FilterListLanguage> builder)
{
_ = builder ?? throw new ArgumentNullException(nameof(builder));
builder.ToTable(nameof(FilterListLanguage) + "s");
builder.HasKey(fll => new {fll.FilterListId, fll.LanguageIso6391});
builder.HasKey(fll => new {fll.FilterListId, fll.Iso6391});
builder.HasDataJsonFile<FilterListLanguage>();
}
}