diff --git a/ConfectionaryBusinessLogic/WorkModeling.cs b/ConfectionaryBusinessLogic/WorkModeling.cs
index 086925a..c4d1bcc 100644
--- a/ConfectionaryBusinessLogic/WorkModeling.cs
+++ b/ConfectionaryBusinessLogic/WorkModeling.cs
@@ -35,24 +35,15 @@ namespace ConfectioneryBusinessLogic
_logger.LogWarning("DoWork. Implementers is null");
return;
}
- var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
+ // Поскольку у нас могут быть заказы в работе мы не дожны заканчивать работы, если нет Принятых заказов
+ // Поэтому находим заказы в работе и продолжаем работу, если они есть
+ var orders = _orderLogic.ReadList(new OrderSearchModel { Statusses = new() { OrderStatus.Принят, OrderStatus.Выполняется } });
if (orders == null || orders.Count == 0)
{
- // Поскольку у нас могут быть заказы в работе мы не дожны заканчивать работы, если нет Принятых заказов
- // Поэтому находим заказы в работе и продолжаем работу, если они есть
- var workingOrders = _orderLogic.ReadList(new() { Status = OrderStatus.Выполняется });
- if (workingOrders == null || workingOrders.Count == 0)
- {
- _logger.LogWarning("DoWork. Orders is null or empty");
- return;
- }
- else
- {
- _logger.LogWarning("DoWork. Еще есть заказы в работе. для {Count} заказов", workingOrders.Count);
- }
+ _logger.LogWarning("DoWork. Orders is null or empty");
+ return;
}
- else
- _logger.LogDebug("DoWork for {Count} orders", orders.Count);
+ _logger.LogDebug("DoWork for {Count} orders", orders.Count);
foreach (var implementer in implementers)
{
Task.Run(() => WorkerWorkAsync(implementer, orders));
@@ -70,7 +61,7 @@ namespace ConfectioneryBusinessLogic
{
return;
}
- await RunOrderInWork(implementer);
+ await RunOrderInWork(implementer, orders);
await Task.Run(() => RunWorkToOrders(implementer, orders));
@@ -118,19 +109,16 @@ namespace ConfectioneryBusinessLogic
///
///
///
- private async Task RunOrderInWork(ImplementerViewModel implementer)
+ private async Task RunOrderInWork(ImplementerViewModel implementer, List allOrders)
{
- if (_orderLogic == null || implementer == null)
+ if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0)
{
return;
}
try
{
- var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
- {
- ImplementerId = implementer.Id,
- Status = OrderStatus.Выполняется
- }));
+ // Выбираем из всех заказов тот, который выполняется данным исполнителем
+ var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
if (runOrder == null)
{
return;
diff --git a/ConfectionaryFileImplement/OrderStorage.cs b/ConfectionaryFileImplement/OrderStorage.cs
index ecd3a9b..160eae9 100644
--- a/ConfectionaryFileImplement/OrderStorage.cs
+++ b/ConfectionaryFileImplement/OrderStorage.cs
@@ -28,6 +28,13 @@ namespace ConfectioneryFileImplement
public OrderViewModel? GetElement(OrderSearchModel model)
{
+ if (model.ImplementerId.HasValue && model.Statusses != null)
+ {
+ return _source.Orders
+ .FirstOrDefault(x => x.ImplementerId == model.ImplementerId &&
+ model.Statusses.Contains(x.Status))
+ ?.GetViewModel;
+ }
if (model.ImplementerId.HasValue)
{
return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
@@ -55,10 +62,10 @@ namespace ConfectioneryFileImplement
.Select(x => x.GetViewModel)
.ToList();
}
- if (!model.Id.HasValue && model.Status.HasValue)
+ if (!model.Id.HasValue && model.Statusses != null)
{
return _source.Orders
- .Where(x => x.Status == model.Status)
+ .Where(x => model.Statusses.Contains(x.Status))
.Select(x => x.GetViewModel)
.ToList();
}
diff --git a/ConfectionaryListImplement/OrderStorage.cs b/ConfectionaryListImplement/OrderStorage.cs
index 7159bf2..43fd901 100644
--- a/ConfectionaryListImplement/OrderStorage.cs
+++ b/ConfectionaryListImplement/OrderStorage.cs
@@ -30,7 +30,14 @@ namespace ConfectioneryListImplement
public OrderViewModel? GetElement(OrderSearchModel model)
{
- if (model.ImplementerId.HasValue)
+ if (model.ImplementerId.HasValue && model.Statusses != null)
+ {
+ return _source.Orders
+ .FirstOrDefault(x => x.ImplementerId == model.ImplementerId &&
+ model.Statusses.Contains(x.Status))
+ ?.GetViewModel;
+ }
+ if (model.ImplementerId.HasValue)
{
return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
}
@@ -65,10 +72,10 @@ namespace ConfectioneryListImplement
.Select(x => x.GetViewModel)
.ToList();
}
- if (!model.Id.HasValue && model.Status.HasValue)
+ if (!model.Id.HasValue && model.Statusses != null)
{
return _source.Orders
- .Where(x => x.Status == model.Status)
+ .Where(x => model.Statusses.Contains(x.Status))
.Select(x => x.GetViewModel)
.ToList();
}
diff --git a/ConfectioneryContracts/SearchModels/OrderSearchModel.cs b/ConfectioneryContracts/SearchModels/OrderSearchModel.cs
index 606260e..a593019 100644
--- a/ConfectioneryContracts/SearchModels/OrderSearchModel.cs
+++ b/ConfectioneryContracts/SearchModels/OrderSearchModel.cs
@@ -14,6 +14,6 @@ namespace ConfectioneryContracts.SearchModels
public int? ImplementerId { get; set; }
- public OrderStatus? Status { get; set; }
+ public List? Statusses { get; set; }
}
}
diff --git a/ConfectioneryDatabaseImplement/OrderStorage.cs b/ConfectioneryDatabaseImplement/OrderStorage.cs
index 14ef8b7..f1e161d 100644
--- a/ConfectioneryDatabaseImplement/OrderStorage.cs
+++ b/ConfectioneryDatabaseImplement/OrderStorage.cs
@@ -33,7 +33,7 @@ namespace ConfectioneryDatabaseImplement.Implements
.Include(x => x.Client)
.Include(x => x.Implementer)
.FirstOrDefault(x =>
- (!model.Status.HasValue || model.Status.HasValue && x.Status == model.Status) &&
+ (model.Statusses == null || model.Statusses != null && model.Statusses.Contains(x.Status)) &&
model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
model.Id.HasValue && x.Id == model.Id
)
@@ -57,9 +57,9 @@ namespace ConfectioneryDatabaseImplement.Implements
.Where(x => model.DateFrom <= x.DateCreate.Date &&
x.DateCreate.Date <= model.DateTo);
}
- else if (model.Status.HasValue)
+ else if (model.Statusses != null)
{
- queryWhere = context.Orders.Where(x => x.Status == model.Status);
+ queryWhere = context.Orders.Where(x => model.Statusses.Contains(x.Status));
}
else if (model.ClientId.HasValue)
{