Serxionaft/PIbd-21_KozyrevSS_SewingDresses_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Lab5-Hard KozyrevSS SewingDresses #23

Closed
Serxionaft wants to merge 36 commits from Lab5-Hard into Lab5
pull from: Lab5-Hard
merge into: Serxionaft:Lab5
Conversation 1 Commits 36 Files Changed 144 +9 -6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 84a1a951d6 - Show all commits

15
SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
View File

@ -21,7 +21,9 @@ namespace SewingDressesDatabaseImplement.Implements
}
using var context = new SewingDressesDatabase();
if (model.Id.HasValue)
return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList(); return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
else if (model.ClientId.HasValue)
return context.Orders.Where(x => x.ClientId == model.ClientId).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
else
return context.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
}
@ -80,12 +82,13 @@ namespace SewingDressesDatabaseImplement.Implements
return null;
}
var dress = context.Dresses.FirstOrDefault(x => x.Id == model.DressId);
if (dress == null)
{
var client = context.Clients.FirstOrDefault(x => x.Id == model.ClientId);
if (client == null || dress == null)
return null;
}
model.DressName = dress.DressName;
return model;
model.DressName = dress.DressName;
model.ClientFIO = client.ClientFIO;
model.ClientId = client.Id;
return model;
}
}