ekallin/PIbd-21_Bakalskaya_E.D._SushiBar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd - 21 Bakalskaya E.D. LabWork03 HARD #15

Closed
ekallin wants to merge 10 commits from LabWork13 into LabWork12
pull from: LabWork13
merge into: ekallin:LabWork12
Conversation 1 Commits 10 Files Changed 19 +4 -8
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c234c1a19d - Show all commits

1
SushiBar/Program.cs
View File

@ -28,7 +28,6 @@ namespace SushiBar
ConfigureServices(services);
_serviceProvider = services.BuildServiceProvider();
Application.Run(_serviceProvider.GetRequiredService<FormMain>());
//Application.Run(new Form1());
}
private static void ConfigureServices(ServiceCollection services)

11
SushiBarDatabaseImplement/Implements/SushiStorage.cs
View File

@ -45,11 +45,9 @@ namespace SushiBarDatabaseImplement.Implements
return context.Sushis
.Include(x => x.Components)
.ThenInclude(x => x.Component)
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.SushiName) &&
x.SushiName == model.SushiName) ||
(model.Id.HasValue && x.Id ==
model.Id))
?.GetViewModel;
.FirstOrDefault(x =>
(!string.IsNullOrEmpty(model.SushiName) && x.SushiName ==
model.SushiName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
}
public SushiViewModel? Insert(SushiBindingModel model)
{
@ -69,8 +67,7 @@ namespace SushiBarDatabaseImplement.Implements
using var transaction = context.Database.BeginTransaction();
try
{
var Sushi = context.Sushis.FirstOrDefault(rec =>
rec.Id == model.Id);
var Sushi = context.Sushis.FirstOrDefault(rec => rec.Id == model.Id);
if (Sushi == null)
{
return null;