bekodeg/SushiBarBase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-22 Боровков М В 5 лабораторная работа #6

Closed
bekodeg wants to merge 44 commits from labWork5 into labWork4
pull from: labWork5
merge into: bekodeg:labWork4
Conversation 0 Commits 44 Files Changed 62 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit df4012be0b - Show all commits

4
SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs
View File

@ -24,8 +24,7 @@ namespace SushiBarDatabaseImplement.Implements
return context.Orders return context.Orders
.Include(o => o.Sushi) .Include(o => o.Sushi)
.Where(o => .Where(o =>
(model.Id.HasValue && o.Id == model.Id) || (model.Id.HasValue && o.Id == model.Id))
(model.DateFrom.HasValue && model.DateTo.HasValue && model.DateFrom < o.DateCreate && o.DateCreate < model.DateTo))
.Select(o => o.GetViewModel) .Select(o => o.GetViewModel)
.ToList(); .ToList();
} }
@ -79,6 +78,7 @@ namespace SushiBarDatabaseImplement.Implements
{ {
using var context = new SushiBarDatabase(); using var context = new SushiBarDatabase();
var element = context.Orders var element = context.Orders
.Include(o => o.Sushi)
.FirstOrDefault(o => o.Id == model.Id); .FirstOrDefault(o => o.Id == model.Id);
if (element != null) if (element != null)
{ {