From 8860c632eef5eb5568a2b3364b8e4464d2d116eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=8F=D1=80=20=D0=90=D0=B3=D0=BB?= =?UTF-8?q?=D0=B8=D1=83=D0=BB=D0=BB=D0=BE=D0=B2?= Date: Tue, 28 Feb 2023 23:10:17 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=B0=D1=83=D0=BD=D1=81=D0=BA=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20=D1=8D=D0=B3?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ConfectioneryDatabaseImplement/Pastry.cs | 2 +- ConfectioneryDatabaseImplement/PastryStorage.cs | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ConfectioneryDatabaseImplement/Pastry.cs b/ConfectioneryDatabaseImplement/Pastry.cs index cac6c89..8f69a58 100644 --- a/ConfectioneryDatabaseImplement/Pastry.cs +++ b/ConfectioneryDatabaseImplement/Pastry.cs @@ -79,7 +79,7 @@ namespace ConfectioneryDatabaseImplement.Models .ContainsKey(rec.ComponentId))); context.SaveChanges(); // обновили количество у существующих записей - foreach (var updateComponent in pastryComponents) + foreach (var updateComponent in pastryComponents.Where(x => model.PastryComponents.ContainsKey(x.ComponentId))) { updateComponent.Count = model.PastryComponents[updateComponent.ComponentId].Item2; model.PastryComponents.Remove(updateComponent.ComponentId); diff --git a/ConfectioneryDatabaseImplement/PastryStorage.cs b/ConfectioneryDatabaseImplement/PastryStorage.cs index 45eafbb..90ce3b6 100644 --- a/ConfectioneryDatabaseImplement/PastryStorage.cs +++ b/ConfectioneryDatabaseImplement/PastryStorage.cs @@ -72,10 +72,8 @@ namespace ConfectioneryDatabaseImplement.Implements { return null; } - newPastry = context.Pastries.Add(newPastry).Entity; + context.Pastries.Add(newPastry); context.SaveChanges(); - model.Id = newPastry.Id; - // newPastry.UpdateComponents(context, model); return newPastry.GetViewModel; } @@ -91,9 +89,9 @@ namespace ConfectioneryDatabaseImplement.Implements return null; } pastry.Update(model); - pastry.UpdateComponents(context, model); context.Update(pastry); context.SaveChanges(); + pastry.UpdateComponents(context, model); transaction.Commit(); return pastry.GetViewModel; }