diff --git a/SecuritySystem/SecuritySystemContracts/SearchModels/OrderSearchModel.cs b/SecuritySystem/SecuritySystemContracts/SearchModels/OrderSearchModel.cs index 9d9142a..c1ba2fb 100644 --- a/SecuritySystem/SecuritySystemContracts/SearchModels/OrderSearchModel.cs +++ b/SecuritySystem/SecuritySystemContracts/SearchModels/OrderSearchModel.cs @@ -1,4 +1,6 @@ -namespace SecuritySystemContracts.SearchModels +using SecuritySystemDataModels.Enums; + +namespace SecuritySystemContracts.SearchModels { public class OrderSearchModel { @@ -7,5 +9,6 @@ public DateTime? DateTo { get; set; } public int? ClientId { get; set; } public int? ImplementerId { get; set; } + public OrderStatus? Status { get; set; } } } diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs index f371691..d27bb1b 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs @@ -25,12 +25,21 @@ namespace SecuritySystemDatabaseImplement.Implements var orders = context.Orders .Include(x => x.Secure) .Include(x => x.Client) + .Include(x => x.Implementer) .Select(x => x.GetViewModel) .ToList(); if (model.Id.HasValue) { orders = orders.Where(x => x.Id == model.Id.Value).ToList(); } + if (model.Status.HasValue) + { + orders = orders.Where(x => x.Status == model.Status.Value).ToList(); + } + if (model.ImplementerId.HasValue) + { + orders = orders.Where(x => x.ImplementerId == model.ImplementerId.Value).ToList(); + } if (model.DateFrom.HasValue) { orders = orders.Where(x => x.DateCreate >= model.DateFrom.Value).ToList(); diff --git a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs index a6374b5..4e8e820 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs @@ -33,6 +33,14 @@ namespace SecuritySystemFileImplement.Implements { orders = orders.Where(x => x.Id == model.Id.Value).ToList(); } + if (model.Status.HasValue) + { + orders = orders.Where(x => x.Status == model.Status.Value).ToList(); + } + if (model.ImplementerId.HasValue) + { + orders = orders.Where(x => x.ImplementerId == model.ImplementerId.Value).ToList(); + } if (model.DateFrom.HasValue) { orders = orders.Where(x => x.DateCreate >= model.DateFrom.Value).ToList(); diff --git a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs index 7ceed9a..28977ce 100644 --- a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs +++ b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs @@ -31,6 +31,14 @@ namespace SecuritySystemListImplement.Implements { orders = orders.Where(x => x.Id == model.Id.Value).ToList(); } + if (model.Status.HasValue) + { + orders = orders.Where(x => x.Status == model.Status.Value).ToList(); + } + if (model.ImplementerId.HasValue) + { + orders = orders.Where(x => x.ImplementerId == model.ImplementerId.Value).ToList(); + } if (model.DateFrom.HasValue) { orders = orders.Where(x => x.DateCreate >= model.DateFrom.Value).ToList();