fix the issue where a column is generated for a column that does not …

…exist ifd pipeline is generating a column that does not exist, because there is no foreign key relationship but we have a navigation property
DFE-Digital · Dec 18, 2023 · 786da43 · 786da43
1 parent 46d3d74
commit 786da43
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 39 deletions.
diff --git a/...ations/20231218095513_Initial.Designer.cs → ...ations/20231218104547_Initial.Designer.cs b/...ations/20231218095513_Initial.Designer.cs → ...ations/20231218104547_Initial.Designer.cs
diff --git a/...ture/Migrations/20231218095513_Initial.cs → ...ture/Migrations/20231218104547_Initial.cs b/...ture/Migrations/20231218095513_Initial.cs → ...ture/Migrations/20231218104547_Initial.cs
@@ -184,18 +184,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     ParliamentaryConstituencycode = table.Column<string>(name: "ParliamentaryConstituency(code)", type: "nvarchar(max)", nullable: true),
                     PhaseOfEducationcode = table.Column<int>(name: "PhaseOfEducation(code)", type: "int", nullable: true),
                     SenUnitCapacity = table.Column<int>(type: "int", nullable: true),
-                    SenUnitOnRoll = table.Column<int>(type: "int", nullable: true),
-                    IfdPipelineSK = table.Column<long>(type: "bigint", nullable: true)
+                    SenUnitOnRoll = table.Column<int>(type: "int", nullable: true)
                 },
                 constraints: table =>
                 {
                     table.PrimaryKey("PK_EducationEstablishment", x => x.SK);
-                    table.ForeignKey(
-                        name: "FK_EducationEstablishment_IfdPipeline_IfdPipelineSK",
-                        column: x => x.IfdPipelineSK,
-                        principalSchema: "mstr",
-                        principalTable: "IfdPipeline",
-                        principalColumn: "SK");
                     table.ForeignKey(
                         name: "FK_EducationEstablishment_Ref_EducationEstablishmentType_FK_EstablishmentType",
                         column: x => x.FK_EstablishmentType,
@@ -313,12 +306,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table: "EducationEstablishment",
                 column: "FK_LocalAuthority");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_EducationEstablishment_IfdPipelineSK",
-                schema: "mstr",
-                table: "EducationEstablishment",
-                column: "IfdPipelineSK");
-
             migrationBuilder.CreateIndex(
                 name: "IX_Trust_FK_TrustType",
                 schema: "mstr",
@@ -337,11 +324,11 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 schema: "mstr");
 
             migrationBuilder.DropTable(
-                name: "Trust",
+                name: "IfdPipeline",
                 schema: "mstr");
 
             migrationBuilder.DropTable(
-                name: "IfdPipeline",
+                name: "Trust",
                 schema: "mstr");
 
             migrationBuilder.DropTable(

diff --git a/Dfe.Academies.Api.Infrastructure/Migrations/MstrContextModelSnapshot.cs b/Dfe.Academies.Api.Infrastructure/Migrations/MstrContextModelSnapshot.cs
@@ -158,9 +158,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("HeadTitle");
 
-                    b.Property<long?>("IfdPipelineSK")
-                        .HasColumnType("bigint");
-
                     b.Property<DateTime?>("InspectionEndDate")
                         .HasColumnType("datetime2")
                         .HasColumnName("Inspection end date");
@@ -405,8 +402,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("EstablishmentTypeId");
 
-                    b.HasIndex("IfdPipelineSK");
-
                     b.HasIndex("LocalAuthorityId");
 
                     b.ToTable("EducationEstablishment", "mstr");
@@ -737,18 +732,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .WithMany()
                         .HasForeignKey("EstablishmentTypeId");
 
-                    b.HasOne("Dfe.Academies.Domain.Establishment.IfdPipeline", "IfdPipeline")
-                        .WithMany()
-                        .HasForeignKey("IfdPipelineSK");
-
                     b.HasOne("Dfe.Academies.Domain.Establishment.LocalAuthority", "LocalAuthority")
                         .WithMany()
                         .HasForeignKey("LocalAuthorityId");
 
                     b.Navigation("EstablishmentType");
 
-                    b.Navigation("IfdPipeline");
-
                     b.Navigation("LocalAuthority");
                 });
 

diff --git a/Dfe.Academies.Api.Infrastructure/MstrContext.cs b/Dfe.Academies.Api.Infrastructure/MstrContext.cs
@@ -157,6 +157,10 @@ private void ConfigureEstablishment(EntityTypeBuilder<Establishment> establishme
             .WithMany()
             .HasForeignKey(x => x.LocalAuthorityId)
             .IsRequired(false);
+
+        // No relationship exists yet
+        // Make sure entity framework doesn't generate one
+        establishmentConfiguration.Ignore(x => x.IfdPipeline);
     }
 
     /// <summary>