d.agliullov/ISEbd-21_Agliullov.D.A._Confectionery
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлено хранилище заказов

Browse Source
This commit is contained in:
Данияр Аглиуллов 2023-03-06 16:32:22 +04:00
parent 476bd776ea
commit dfd97c6416
1 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ConfectioneryDatabaseImplement/OrderStorage.cs
View File

@ -4,7 +4,6 @@ using ConfectioneryContracts.StoragesContract;
using ConfectioneryContracts.ViewModels;
using ConfectioneryDatabaseImplement.Models;
using Microsoft.EntityFrameworkCore;
using System.Security.Cryptography.X509Certificates;
namespace ConfectioneryDatabaseImplement.Implements
{
@ -13,7 +12,10 @@ namespace ConfectioneryDatabaseImplement.Implements
public OrderViewModel? Delete(OrderBindingModel model)
{
using var context = new ConfectioneryDatabase();
var element = context.Orders.Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id);
var element = context.Orders
.Include(x => x.Client)
.Include(x => x.Implementer)
.FirstOrDefault(x => x.Id == model.Id);
if (element != null)
{
context.Orders.Remove(element);
@ -26,17 +28,14 @@ namespace ConfectioneryDatabaseImplement.Implements
public OrderViewModel? GetElement(OrderSearchModel model)
{
using var context = new ConfectioneryDatabase();
if (model.ImplementerId.HasValue)
{
return context.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
}
if (!model.Id.HasValue)
{
return null;
}
// Находим первого либо по айди заказа, либо по айди исполнителя, исходя из того что есть в модели
return context.Orders
.Include(x => x.Client)
.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
.Include(x => x.Implementer)
.FirstOrDefault(x =>
model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
model.Id.HasValue && x.Id == model.Id
)
?.GetViewModel;
}
@ -47,38 +46,41 @@ namespace ConfectioneryDatabaseImplement.Implements
var result = GetElement(model);
return result != null ? new() { result } : new();
}
using var context = new ConfectioneryDatabase();
IQueryable<Order>? queryWhere = null;
if (model.DateFrom.HasValue && model.DateTo.HasValue) // если не ищем по айдишнику, значит ищем по диапазону дат
{
return context.Orders
.Where(x => model.DateFrom <= x.DateCreate.Date && x.DateCreate <= model.DateTo)
.Include(x => x.Client)
.Select(x => x.GetViewModel)
.ToList();
queryWhere = context.Orders
.Where(x => model.DateFrom <= x.DateCreate.Date &&
x.DateCreate.Date <= model.DateTo);
}
if (model.Status.HasValue)
else if (model.Status.HasValue)
{
return context.Orders
.Where(x => x.Status == model.Status)
.Select(x => x.GetViewModel)
.ToList();
queryWhere = context.Orders.Where(x => x.Status == model.Status);
}
if (model.ClientId.HasValue)
else if (model.ClientId.HasValue)
{
return context.Orders
.Where(x => x.Client.Id == model.ClientId)
.Include(x => x.Client)
.Select(x => x.GetViewModel)
.ToList();
queryWhere = context.Orders.Where(x => x.Client.Id == model.ClientId);
}
else
{
return new();
}
return queryWhere
.Include(x => x.Client)
.Include(x => x.Implementer)
.Select(x => x.GetViewModel)
.ToList();
}
public List<OrderViewModel> GetFullList()
{
using var context = new ConfectioneryDatabase();
return context.Orders
.Include(x => x.Client)
.Include(x => x.Implementer)
.Select(x => x.GetViewModel)
.ToList();
}
@ -101,6 +103,7 @@ namespace ConfectioneryDatabaseImplement.Implements
using var context = new ConfectioneryDatabase();
var order = context.Orders
.Include(x => x.Client)
.Include(x => x.Implementer)
.FirstOrDefault(x => x.Id == model.Id);
if (order == null)
{