diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs index 963cdfd..f1fda41 100644 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs +++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs @@ -35,7 +35,7 @@ namespace LawFirmBusinessLogic.BusinessLogics _logger.LogWarning("DoWork. Implementers is null"); return; } - var orders = _orderLogic.ReadList(new OrderSearchModel { Statuses = new() { OrderStatus.Принят, OrderStatus.Выполняется } }); + var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят }); if (orders == null || orders.Count == 0) { _logger.LogWarning("DoWork. Orders is null or empty"); diff --git a/LawFirm/LawFirmContracts/SearchModels/OrderSearchModel.cs b/LawFirm/LawFirmContracts/SearchModels/OrderSearchModel.cs index f0c30ac..a0c5366 100644 --- a/LawFirm/LawFirmContracts/SearchModels/OrderSearchModel.cs +++ b/LawFirm/LawFirmContracts/SearchModels/OrderSearchModel.cs @@ -14,6 +14,6 @@ namespace LawFirmContracts.SearchModels public DateTime? DateTo { get; set; } public int? ClientId { get; set; } public int? ImplementerId { get; set; } - public List? Statuses { get; set; } + public OrderStatus Status { get; set; } } } diff --git a/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs b/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs index 34fe4bd..5fa24a5 100644 --- a/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs +++ b/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs @@ -26,14 +26,14 @@ namespace LawFirmDatabaseImplement.Implements .Include(x => x.Client) .Include(x => x.Implementer) .FirstOrDefault(x => - (model.Statuses == null || model.Statuses != null && model.Statuses.Contains(x.Status)) && + (model.Status == null || model.Status != null && model.Status.Equals(x.Status)) && model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId || model.Id.HasValue && x.Id == model.Id)?.GetViewModel; } public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && model.Statuses == null) + if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && model.Status == null) { return new(); } @@ -47,12 +47,12 @@ namespace LawFirmDatabaseImplement.Implements .Select(x => x.GetViewModel) .ToList(); } - if (model.Statuses!= null) + if (model.Status!= null) { return context.Orders .Include(x => x.Client) .Include(x => x.Implementer) - .Where(x => model.Statuses.Contains(x.Status)) + .Where(x => model.Status.Equals(x.Status)) .Select(x => x.GetViewModel) .ToList(); } diff --git a/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs b/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs index 6cee37d..2c27a82 100644 --- a/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs +++ b/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs @@ -22,7 +22,7 @@ namespace LawFirmFileImplement.Implements public OrderViewModel? GetElement(OrderSearchModel model) { - if (model.ImplementerId.HasValue && model.Statuses != null) return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && model.Statuses.Contains(x.Status))?.GetViewModel; + if (model.ImplementerId.HasValue && model.Status != null) return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && model.Status.Equals(x.Status))?.GetViewModel; if (model.ImplementerId.HasValue) { return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel; @@ -36,7 +36,7 @@ namespace LawFirmFileImplement.Implements public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && model.Statuses == null) + if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && model.Status == null) { return new(); } @@ -47,10 +47,10 @@ namespace LawFirmFileImplement.Implements .Select(x => x.GetViewModel) .ToList(); } - if (model.Statuses != null) + if (model.Status != null) { return source.Orders - .Where(x => model.Statuses.Contains(x.Status)) + .Where(x => model.Status.Equals(x.Status)) .Select(x => x.GetViewModel) .ToList(); } diff --git a/LawFirm/LawFirmListImplements/Implements/OrderStorage.cs b/LawFirm/LawFirmListImplements/Implements/OrderStorage.cs index c85aea1..d0c5c43 100644 --- a/LawFirm/LawFirmListImplements/Implements/OrderStorage.cs +++ b/LawFirm/LawFirmListImplements/Implements/OrderStorage.cs @@ -32,7 +32,7 @@ namespace LawFirmListImplements.Implements { return GetViewModel(order); } - else if (model.ImplementerId.HasValue && model.Statuses != null && order.ImplementerId == model.ImplementerId && model.Statuses.Contains(order.Status)) + else if (model.ImplementerId.HasValue && model.Status != null && order.ImplementerId == model.ImplementerId && model.Status.Equals(order.Status)) { return GetViewModel(order); } @@ -77,11 +77,11 @@ namespace LawFirmListImplements.Implements } } } - if (model.Statuses != null) + if (model.Status != null) { foreach (var order in _source.Orders) { - if (model.Statuses.Contains(order.Status)) + if (model.Status.Equals(order.Status)) { result.Add(GetViewModel(order)); }