Victoria_Presnyakova/Pibd-22_Presnyakova.V.V_JewelryStore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Presnyakova V.V Lab_4 #4

Closed
Victoria_Presnyakova wants to merge 15 commits from Lab_4 into Lab_3
pull from: Lab_4
merge into: Victoria_Presnyakova:Lab_3
Conversation 1 Commits 15 Files Changed 44 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3f0071aa7b - Show all commits

5
JewelryStoreDatabaseImplement/Implements/OrderStorage.cs
View File

@ -8,6 +8,7 @@ using JewelryStoreContracts.SearchModels;
using JewelryStoreContracts.StoragesContracts;
using JewelryStoreContracts.ViewModels;
using JewelryStoreDatabaseImplement.Models;
using Microsoft.EntityFrameworkCore;
namespace JewelryStoreDatabaseImplement.Implements
{
@ -44,14 +45,14 @@ namespace JewelryStoreDatabaseImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue)
if (!model.DateFrom.HasValue || ! model.DateTo.HasValue)
{
return new();
}
using var context = new JewelryStoreDataBase();
return context.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
return context.Orders.Include(x => x.Jewel).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
}
public List<OrderViewModel> GetFullList()