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 17:14:11 +04:00
parent 6457bc4afa
commit fb5507c55c
6 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ConfectionaryBusinessLogic/OrderLogic.cs
View File

@ -90,16 +90,17 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
} }
if ((int)vmodel.Status + 1 != (int)orderStatus) if ((int)vmodel.Status + 1 != (int)orderStatus)
{ {
throw new ArgumentException($"Попытка перевести заказ не в следующий статус: " + throw new InvalidOperationException($"Попытка перевести заказ не в следующий статус: " +
$"Текущий статус: {vmodel.Status} \n" + $"Текущий статус: {vmodel.Status} \n" +
$"Планируемый статус: {orderStatus} \n" + $"Планируемый статус: {orderStatus} \n" +
$"Доступный статус: {(OrderStatus)((int)vmodel.Status + 1)}", $"Доступный статус: {(OrderStatus)((int)vmodel.Status + 1)}");
nameof(vmodel));
} }
model.Status = orderStatus; model.Status = orderStatus;
model.DateCreate = vmodel.DateCreate; model.DateCreate = vmodel.DateCreate;
if (model.DateImplement == null) if (model.DateImplement == null)
model.DateImplement = vmodel.DateImplement; model.DateImplement = vmodel.DateImplement;
if (vmodel.ImplementerId.HasValue)
model.ImplementerId = vmodel.ImplementerId;
model.PastryId = vmodel.PastryId; model.PastryId = vmodel.PastryId;
model.Sum = vmodel.Sum; model.Sum = vmodel.Sum;
model.Count= vmodel.Count; model.Count= vmodel.Count;

9
ConfectionaryBusinessLogic/WorkModeling.cs
View File

@ -2,6 +2,7 @@
using ConfectioneryContracts.BusinessLogicsContracts; using ConfectioneryContracts.BusinessLogicsContracts;
using ConfectioneryContracts.SearchModels; using ConfectioneryContracts.SearchModels;
using ConfectioneryContracts.ViewModels; using ConfectioneryContracts.ViewModels;
using ConfectioneryDataModels.Enums;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -34,7 +35,7 @@ namespace ConfectioneryBusinessLogic
_logger.LogWarning("DoWork. Implementers is null"); _logger.LogWarning("DoWork. Implementers is null");
return; return;
} }
var orders = _orderLogic.ReadList(new OrderSearchModel { /*Status = OrderStatus.Принят*/ }); var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
if (orders == null || orders.Count == 0) if (orders == null || orders.Count == 0)
{ {
_logger.LogWarning("DoWork. Orders is null or empty"); _logger.LogWarning("DoWork. Orders is null or empty");
@ -71,7 +72,7 @@ namespace ConfectioneryBusinessLogic
_orderLogic.TakeOrderInWork(new OrderBindingModel _orderLogic.TakeOrderInWork(new OrderBindingModel
{ {
Id = order.Id, Id = order.Id,
// ImplementerId = implementer.Id ImplementerId = implementer.Id
}); });
// делаем работу // делаем работу
Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count); Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
@ -113,8 +114,8 @@ namespace ConfectioneryBusinessLogic
{ {
var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
{ {
// ImplementerId = implementer.Id, ImplementerId = implementer.Id,
// Status = OrderStatus.Выполняется Status = OrderStatus.Выполняется
})); }));
if (runOrder == null) if (runOrder == null)
{ {

5
ConfectionaryFileImplement/Order.cs
View File

@ -41,7 +41,7 @@ namespace ConfectioneryFileImplement.Models
Status = model.Status, Status = model.Status,
DateCreate = model.DateCreate, DateCreate = model.DateCreate,
DateImplement = model.DateImplement, DateImplement = model.DateImplement,
ImplementerId = model.ImplementerId, ImplementerId = model.ImplementerId,
Id = model.Id, Id = model.Id,
}; };
} }
@ -77,8 +77,9 @@ namespace ConfectioneryFileImplement.Models
Sum = model.Sum; Sum = model.Sum;
Status = model.Status; Status = model.Status;
DateCreate = model.DateCreate; DateCreate = model.DateCreate;
ImplementerId = model.ImplementerId;
DateImplement = model.DateImplement; DateImplement = model.DateImplement;
Id = model.Id; Id = model.Id;
} }
public OrderViewModel GetViewModel => new() public OrderViewModel GetViewModel => new()
{ {

1
ConfectionaryListImplement/Order.cs
View File

@ -56,6 +56,7 @@ namespace ConfectioneryListImplement.Models
Status = model.Status; Status = model.Status;
DateCreate = model.DateCreate; DateCreate = model.DateCreate;
DateImplement = model.DateImplement; DateImplement = model.DateImplement;
ImplementerId = model.ImplementerId;
Id = model.Id; Id = model.Id;
} }
public OrderViewModel GetViewModel => new() public OrderViewModel GetViewModel => new()

1
ConfectioneryDatabaseImplement/Order.cs
View File

@ -78,6 +78,7 @@ namespace ConfectioneryDatabaseImplement.Models
Status = model.Status; Status = model.Status;
DateCreate = model.DateCreate; DateCreate = model.DateCreate;
DateImplement = model.DateImplement; DateImplement = model.DateImplement;
ImplementerId = model.ImplementerId;
Id = model.Id; Id = model.Id;
} }
public OrderViewModel GetViewModel public OrderViewModel GetViewModel

6
ConfectioneryDatabaseImplement/OrderStorage.cs
View File

@ -56,13 +56,17 @@ namespace ConfectioneryDatabaseImplement.Implements
.Where(x => model.DateFrom <= x.DateCreate.Date && .Where(x => model.DateFrom <= x.DateCreate.Date &&
x.DateCreate.Date <= model.DateTo); x.DateCreate.Date <= model.DateTo);
} }
else if (model.Status.HasValue && model.ImplementerId.HasValue)
{
queryWhere = context.Orders.Where(x => x.ImplementerId == model.ImplementerId && x.Status == model.Status);
}
else if (model.Status.HasValue) else if (model.Status.HasValue)
{ {
queryWhere = context.Orders.Where(x => x.Status == model.Status); queryWhere = context.Orders.Where(x => x.Status == model.Status);
} }
else if (model.ClientId.HasValue) else if (model.ClientId.HasValue)
{ {
queryWhere = context.Orders.Where(x => x.Client.Id == model.ClientId); queryWhere = context.Orders.Where(x => x.ClientId == model.ClientId);
} }
else else
{ {