diff --git a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs index 3d4598d..a6374b5 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs @@ -41,6 +41,10 @@ namespace SecuritySystemFileImplement.Implements { orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList(); } + if (model.ClientId.HasValue) + { + orders = orders.Where(x => x.ClientId == model.ClientId.Value).ToList(); + } return orders; } diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs index 85908a2..975a4ab 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs @@ -10,6 +10,7 @@ namespace SecuritySystemFileImplement.Models { public int Id { get; private set; } public int SecureId { get; private set; } + public int ClientId { get; private set; } public int Count { get; private set; } public double Sum { get; private set; } public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; diff --git a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs index 49affc5..7ceed9a 100644 --- a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs +++ b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs @@ -39,6 +39,10 @@ namespace SecuritySystemListImplement.Implements { orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList(); } + if (model.ClientId.HasValue) + { + orders = orders.Where(x => x.ClientId == model.ClientId.Value).ToList(); + } return orders; } public OrderViewModel? GetElement(OrderSearchModel model) diff --git a/SecuritySystem/SecuritySystemListImplement/Models/Order.cs b/SecuritySystem/SecuritySystemListImplement/Models/Order.cs index 47bc31d..514dfa9 100644 --- a/SecuritySystem/SecuritySystemListImplement/Models/Order.cs +++ b/SecuritySystem/SecuritySystemListImplement/Models/Order.cs @@ -7,19 +7,13 @@ namespace SecuritySystemListImplement.Models public class Order { public int SecureId { get; private set; } - + public int ClientId { get; private set; } public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } - public int Id { get; private set; } - public static Order? Create(OrderBindingModel? model) { if (model == null) @@ -37,7 +31,6 @@ namespace SecuritySystemListImplement.Models DateImplement = model.DateImplement, }; } - public void Update(OrderBindingModel? model) { if (model == null) @@ -47,7 +40,6 @@ namespace SecuritySystemListImplement.Models Status = model.Status; DateImplement = model.DateImplement; } - public OrderViewModel GetViewModel => new() { SecureId = SecureId,