From 50ad3af48aa21e203c9e7f7e2482df26e9749d03 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Wed, 26 Aug 2020 14:08:42 -0500 Subject: [PATCH] =?UTF-8?q?refactor(directory):=20=E2=99=BB=20ren=20langua?= =?UTF-8?q?ge=20key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...esigner.cs => 20200826190733_Initial.Designer.cs} | 10 +++++----- ...25215253_Initial.cs => 20200826190733_Initial.cs} | 12 ++++++------ .../Migrations/QueryDbContextModelSnapshot.cs | 8 ++++---- .../Queries/Entities/FilterListLanguage.cs | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) rename services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/{20200825215253_Initial.Designer.cs => 20200826190733_Initial.Designer.cs} (98%) rename services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/{20200825215253_Initial.cs => 20200826190733_Initial.cs} (98%) diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200825215253_Initial.Designer.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200826190733_Initial.Designer.cs similarity index 98% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200825215253_Initial.Designer.cs rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200826190733_Initial.Designer.cs index cc53e217a..37ae8b596 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200825215253_Initial.Designer.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200826190733_Initial.Designer.cs @@ -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("FilterListId") .HasColumnType("integer"); - b.Property("LanguageIso6391") + b.Property("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(); }); diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200825215253_Initial.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200826190733_Initial.cs similarity index 98% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200825215253_Initial.cs rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200826190733_Initial.cs index 3348df95f..753bd5628 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200825215253_Initial.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200826190733_Initial.cs @@ -179,11 +179,11 @@ protected override void Up(MigrationBuilder migrationBuilder) columns: table => new { FilterListId = table.Column(nullable: false), - LanguageIso6391 = table.Column(nullable: false) + Iso6391 = table.Column(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", diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs index d61807247..c7ba18f48 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs @@ -90,12 +90,12 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("FilterListId") .HasColumnType("integer"); - b.Property("LanguageIso6391") + b.Property("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(); }); diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs index bbf3a8353..89da050b5 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs @@ -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 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(); } }