diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230323163820_FixMigration.Designer.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230323163820_FixMigration.Designer.cs
new file mode 100644
index 0000000..693634d
--- /dev/null
+++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230323163820_FixMigration.Designer.cs
@@ -0,0 +1,171 @@
+//
+using System;
+using FurnitureAssemblyDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace FurnitureAssemblyDatabaseImplement.Migrations
+{
+ [DbContext(typeof(FurnitureAssemblyDatabase))]
+ [Migration("20230323163820_FixMigration")]
+ partial class FixMigration
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "7.0.3")
+ .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+ SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+ modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Component", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ComponentName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Cost")
+ .HasColumnType("float");
+
+ b.HasKey("Id");
+
+ b.ToTable("Components");
+ });
+
+ modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Furniture", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("FurnitureName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Price")
+ .HasColumnType("float");
+
+ b.HasKey("Id");
+
+ b.ToTable("Furnitures");
+ });
+
+ modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureComponent", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ComponentId")
+ .HasColumnType("int");
+
+ b.Property("Count")
+ .HasColumnType("int");
+
+ b.Property("FurnitureId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ComponentId");
+
+ b.HasIndex("FurnitureId");
+
+ b.ToTable("FurnitureComponents");
+ });
+
+ modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Order", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("Count")
+ .HasColumnType("int");
+
+ b.Property("DateCreate")
+ .HasColumnType("datetime2");
+
+ b.Property("DateImplement")
+ .HasColumnType("datetime2");
+
+ b.Property("FurnitureId")
+ .HasColumnType("int");
+
+ b.Property("Status")
+ .HasColumnType("int");
+
+ b.Property("Sum")
+ .HasColumnType("float");
+
+ b.HasKey("Id");
+
+ b.HasIndex("FurnitureId");
+
+ b.ToTable("Orders");
+ });
+
+ modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureComponent", b =>
+ {
+ b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Component", "Component")
+ .WithMany("FurnitureComponents")
+ .HasForeignKey("ComponentId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Furniture", "Furniture")
+ .WithMany("Components")
+ .HasForeignKey("FurnitureId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Component");
+
+ b.Navigation("Furniture");
+ });
+
+ modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Order", b =>
+ {
+ b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Furniture", "Furniture")
+ .WithMany("Orders")
+ .HasForeignKey("FurnitureId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Furniture");
+ });
+
+ modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Component", b =>
+ {
+ b.Navigation("FurnitureComponents");
+ });
+
+ modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Furniture", b =>
+ {
+ b.Navigation("Components");
+
+ b.Navigation("Orders");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230323163820_FixMigration.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230323163820_FixMigration.cs
new file mode 100644
index 0000000..6da5598
--- /dev/null
+++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230323163820_FixMigration.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace FurnitureAssemblyDatabaseImplement.Migrations
+{
+ ///
+ public partial class FixMigration : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "ProductId",
+ table: "FurnitureComponents");
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "ProductId",
+ table: "FurnitureComponents",
+ type: "int",
+ nullable: false,
+ defaultValue: 0);
+ }
+ }
+}
diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs
index e24f216..af45ba4 100644
--- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs
+++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs
@@ -79,9 +79,6 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
b.Property("FurnitureId")
.HasColumnType("int");
- b.Property("ProductId")
- .HasColumnType("int");
-
b.HasKey("Id");
b.HasIndex("ComponentId");
diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs
index 3e7fa61..992dc97 100644
--- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs
+++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs
@@ -66,7 +66,7 @@ namespace FurnitureAssemblyDatabaseImplement.Models
public void UpdateComponents(FurnitureAssemblyDatabase context, FurnitureBindingModel model)
{
- var furnitureComponents = context.FurnitureComponents.Where(rec => rec.ProductId == model.Id).ToList();
+ var furnitureComponents = context.FurnitureComponents.Where(rec => rec.FurnitureId == model.Id).ToList();
if (furnitureComponents != null && furnitureComponents.Count > 0)
{ // удалили те, которых нет в модели
context.FurnitureComponents.RemoveRange(furnitureComponents.Where(rec
diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/FurnitureComponent.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/FurnitureComponent.cs
index fe41e6d..67081f0 100644
--- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/FurnitureComponent.cs
+++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/FurnitureComponent.cs
@@ -11,7 +11,7 @@ namespace FurnitureAssemblyDatabaseImplement.Models
{
public int Id { get; set; }
[Required]
- public int ProductId { get; set; }
+ public int FurnitureId { get; set; }
[Required]
public int ComponentId { get; set; }