d.agliullov/ISEbd-21_Agliullov.D.A._Confectionery
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Agliullov D. A. Lab Work 3 Hard #7

Closed
d.agliullov wants to merge 15 commits from Lab3_Hard into Lab2_Hard
pull from: Lab3_Hard
merge into: d.agliullov:Lab2_Hard
Conversation 1 Commits 15 Files Changed 22 +3 -5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8860c632ee - Show all commits

2
ConfectioneryDatabaseImplement/Pastry.cs
View File

@ -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);

6
ConfectioneryDatabaseImplement/PastryStorage.cs
View File

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