Merge branch 'lab3_base' into lab3_hard

FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230323163820_FixMigration.Designer.cs

@@ -0,0 +1,171 @@
+// <auto-generated />
+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
+    {
+        /// <inheritdoc />
+        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<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Furniture", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FurnitureName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Furnitures");
+                });
+
+            modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.FurnitureComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("FurnitureId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("FurnitureId");
+
+                    b.ToTable("FurnitureComponents");
+                });
+
+            modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("FurnitureId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<double>("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
+        }
+    }
+}

FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20230323163820_FixMigration.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace FurnitureAssemblyDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class FixMigration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ProductId",
+                table: "FurnitureComponents");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ProductId",
+                table: "FurnitureComponents",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+    }
+}

FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs

@@ -79,9 +79,6 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations
                     b.Property<int>("FurnitureId")
                         .HasColumnType("int");
 
-                    b.Property<int>("ProductId")
-                        .HasColumnType("int");
-
                     b.HasKey("Id");
 
                     b.HasIndex("ComponentId");

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

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; }