From 118f2aaaffc1c9ecad5ef1b757fb30df9336bb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Tue, 28 Mar 2023 16:41:11 +0400 Subject: [PATCH] correcting the foreign key in the dish --- .../FoodOrdersDatabaseImplement/Implements/DishStorage.cs | 3 ++- .../Migrations/FoodOrdersDatabaseModelSnapshot.cs | 8 ++++---- FoodOrders/FoodOrdersDatabaseImplement/Models/Dish.cs | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Implements/DishStorage.cs b/FoodOrders/FoodOrdersDatabaseImplement/Implements/DishStorage.cs index 1c3e474..82b8da8 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/Implements/DishStorage.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/Implements/DishStorage.cs @@ -93,7 +93,8 @@ namespace FoodOrdersDatabaseImplement.Implements using var context = new FoodOrdersDatabase(); var element = context.Dishes .Include(x => x.Components) - .FirstOrDefault(rec => rec.Id == model.Id); + .Include(x => x.Orders) + .FirstOrDefault(rec => rec.Id == model.Id); if (element != null) { context.Dishes.Remove(element); diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Migrations/FoodOrdersDatabaseModelSnapshot.cs b/FoodOrders/FoodOrdersDatabaseImplement/Migrations/FoodOrdersDatabaseModelSnapshot.cs index 6d911c5..eb64fbe 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/Migrations/FoodOrdersDatabaseModelSnapshot.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/Migrations/FoodOrdersDatabaseModelSnapshot.cs @@ -39,7 +39,7 @@ namespace FoodOrdersDatabaseImplement.Migrations b.HasKey("Id"); - b.ToTable("Components"); + b.ToTable("Components", (string)null); }); modelBuilder.Entity("FoodOrdersDatabaseImplement.Models.Dish", b => @@ -59,7 +59,7 @@ namespace FoodOrdersDatabaseImplement.Migrations b.HasKey("Id"); - b.ToTable("Dishes"); + b.ToTable("Dishes", (string)null); }); modelBuilder.Entity("FoodOrdersDatabaseImplement.Models.DishComponent", b => @@ -85,7 +85,7 @@ namespace FoodOrdersDatabaseImplement.Migrations b.HasIndex("DishId"); - b.ToTable("DishComponents"); + b.ToTable("DishComponents", (string)null); }); modelBuilder.Entity("FoodOrdersDatabaseImplement.Models.Order", b => @@ -118,7 +118,7 @@ namespace FoodOrdersDatabaseImplement.Migrations b.HasIndex("DishId"); - b.ToTable("Orders"); + b.ToTable("Orders", (string)null); }); modelBuilder.Entity("FoodOrdersDatabaseImplement.Models.DishComponent", b => diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Models/Dish.cs b/FoodOrders/FoodOrdersDatabaseImplement/Models/Dish.cs index 43eadf7..f6bb534 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/Models/Dish.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/Models/Dish.cs @@ -35,6 +35,9 @@ namespace FoodOrdersDatabaseImplement.Models [ForeignKey("DishId")] public virtual List Components { get; set; } = new(); + [ForeignKey("DishId")] + public virtual List Orders { get; set; } = new(); + public static Dish Create(FoodOrdersDatabase context, DishBindingModel model) { return new Dish()