august/PIbd-21_Balberova_D.N._SushiBar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Balberova D.N. LabWork05Hard #10

Closed
august wants to merge 51 commits from LabWork05Hard into LabWork05
pull from: LabWork05Hard
merge into: august:LabWork05
Conversation 1 Commits 51 Files Changed 142 +7 -3
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 631b3fdb72 - Show all commits

3
SushiBar/SushiBarDatabaseImplement/Implements/ShopStorage.cs
View File

@ -76,7 +76,8 @@ namespace SushiBarDatabaseImplement.Implements
}
shop.Update(model);
context.SaveChanges();
shop.UpdateSushi(context, model);
if (model.ListSushi != null)
shop.UpdateSushi(context, model);
transaction.Commit();
return shop.GetViewModel;
}

3
SushiBar/SushiBarFileImplement/Models/Shop.cs
View File

@ -80,7 +80,8 @@ namespace SushiBarFileImplement.Models
Address = model.Address;
DateOpening = model.DateOpening;
MaxCountSushi = model.MaxCountSushi;
CountSushi = model.ListSushi.ToDictionary(x => x.Key, x => x.Value.Item2);
if (model.ListSushi != null)
CountSushi = model.ListSushi.ToDictionary(x => x.Key, x => x.Value.Item2);
_shopSushi = null;
}
public ShopViewModel GetViewModel => new()

3
SushiBar/SushiBarListImplement/Models/Shop.cs
View File

@ -39,7 +39,8 @@ namespace SushiBarListImplement.Models
ShopName = model.ShopName;
Address = model.Address;
DateOpening = model.DateOpening;
ListSushi = model.ListSushi;
if (model.ListSushi != null)
ListSushi = model.ListSushi;
}
public ShopViewModel GetViewModel => new()
{

1
SushiBar/SushiBarRestApi/Controllers/ShopController.cs
View File

@ -72,6 +72,7 @@ namespace SushiBarRestApi.Controllers
{
try
{
model.ListSushi = null!;
_shop.Update(model);
}
catch (Exception ex)