diff --git a/Pizzeria/PizzeriaDataModels/Models/IOrderModel.cs b/Pizzeria/PizzeriaDataModels/Models/IOrderModel.cs index 83a7f89..0b9e79c 100644 --- a/Pizzeria/PizzeriaDataModels/Models/IOrderModel.cs +++ b/Pizzeria/PizzeriaDataModels/Models/IOrderModel.cs @@ -10,8 +10,8 @@ namespace PizzeriaDataModels.Models public interface IOrderModel : IId { int PizzaId { get; } - int ClientId { get; } - int Count { get; } + int ClientId { get; } + int Count { get; } double Sum { get; } OrderStatus Status { get; } DateTime DateCreate { get; } diff --git a/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs b/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs index db48867..cf67701 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs @@ -8,71 +8,71 @@ namespace PizzeriaDatabaseImplement.Models { public class Order : IOrderModel { - public int Id { get; private set; } + public int Id { get; private set; } - [Required] - public int ClientId { get; private set; } + [Required] + public int ClientId { get; private set; } - public virtual Client Client { get; private set; } = new(); + public virtual Client Client { get; private set; } = new(); - [Required] - public int PizzaId { get; private set; } + [Required] + public int PizzaId { get; private set; } - public virtual Pizza Pizza { get; set; } = new(); + public virtual Pizza Pizza { get; set; } = new(); - [Required] - public int Count { get; private set; } + [Required] + public int Count { get; private set; } - [Required] - public double Sum { get; private set; } + [Required] + public double Sum { get; private set; } - [Required] - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [Required] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - [Required] - public DateTime DateCreate { get; private set; } = DateTime.Now; + [Required] + public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } + public DateTime? DateImplement { get; private set; } - public static Order Create(PizzeriaDatabase context, OrderBindingModel model) - { - return new Order() - { - Id = model.Id, - ClientId = model.ClientId, - Client = context.Clients.First(x => x.Id == model.ClientId), - PizzaId = model.PizzaId, - Pizza = context.Pizzas.First(x => x.Id == model.PizzaId), - Count = model.Count, - Sum = model.Sum, - Status = model.Status, - DateCreate = model.DateCreate, - DateImplement = model.DateImplement, - }; - } + public static Order Create(PizzeriaDatabase context, OrderBindingModel model) + { + return new Order() + { + Id = model.Id, + ClientId = model.ClientId, + Client = context.Clients.First(x => x.Id == model.ClientId), + PizzaId = model.PizzaId, + Pizza = context.Pizzas.First(x => x.Id == model.PizzaId), + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement, + }; + } - public void Update(OrderBindingModel? model) - { - if (model == null) - { - return; - } - Status = model.Status; - DateImplement = model.DateImplement; - } + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + DateImplement = model.DateImplement; + } - public OrderViewModel GetViewModel => new() - { - Id = Id, - ClientId = ClientId, - ClientFIO = Client.ClientFIO, - PizzaId = PizzaId, - PizzaName = Pizza.PizzaName, - Count = Count, - Sum = Sum, - Status = Status, - DateCreate = DateCreate, - DateImplement = DateImplement, - }; - } + public OrderViewModel GetViewModel => new() + { + Id = Id, + ClientId = ClientId, + ClientFIO = Client.ClientFIO, + PizzaId = PizzaId, + PizzaName = Pizza.PizzaName, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + }; + } } diff --git a/Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs b/Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs index 92d3d9a..1f2c293 100644 --- a/Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs +++ b/Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs @@ -14,13 +14,13 @@ namespace PizzeriaFileImplement private readonly string ComponentFileName = "Component.xml"; private readonly string OrderFileName = "Order.xml"; private readonly string PizzaFileName = "Pizza.xml"; - private readonly string ClientFileName = "Client.xml"; - public List Components { get; private set; } + private readonly string ClientFileName = "Client.xml"; + public List Components { get; private set; } public List Orders { get; private set; } public List Pizzas { get; private set; } - public List Clients { get; private set; } + public List Clients { get; private set; } - public static DataFileSingleton GetInstance() + public static DataFileSingleton GetInstance() { if (instance == null) { @@ -32,15 +32,15 @@ namespace PizzeriaFileImplement public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); public void SavePizzas() => SaveData(Pizzas, PizzaFileName, "Pizzas", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); - public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); + public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); - private DataFileSingleton() + private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Pizzas = LoadData(PizzaFileName, "Pizza", x => Pizza.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; - Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; - } + Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; + } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { diff --git a/Pizzeria/PizzeriaFileImplement/Implements/OrderStorage.cs b/Pizzeria/PizzeriaFileImplement/Implements/OrderStorage.cs index c1ce0f6..c926a60 100644 --- a/Pizzeria/PizzeriaFileImplement/Implements/OrderStorage.cs +++ b/Pizzeria/PizzeriaFileImplement/Implements/OrderStorage.cs @@ -19,23 +19,23 @@ namespace PizzeriaFileImplement.Implements public List GetFilteredList(OrderSearchModel model) { - if (model.DateFrom.HasValue) + if (model.DateFrom.HasValue) { - return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) - .Select(x => GetViewModel(x)).ToList(); - } + return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) + .Select(x => GetViewModel(x)).ToList(); + } - if (model.ClientId.HasValue && !model.Id.HasValue) + if (model.ClientId.HasValue && !model.Id.HasValue) { - return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); - } + return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); + } - if (model.Id.HasValue) + if (model.Id.HasValue) { - return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList(); - } - return new(); - } + return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList(); + } + return new(); + } public OrderViewModel? GetElement(OrderSearchModel model) { @@ -46,25 +46,25 @@ namespace PizzeriaFileImplement.Implements return AttachPizzaName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel); } - private OrderViewModel GetViewModel(Order order) - { - var viewModel = order.GetViewModel; + private OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; - var pizza = source.Pizzas.FirstOrDefault(x => x.Id == order.PizzaId); - var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId); + var pizza = source.Pizzas.FirstOrDefault(x => x.Id == order.PizzaId); + var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId); if (pizza != null) { viewModel.PizzaName = pizza.PizzaName; } - if (client != null) + if (client != null) { - viewModel.ClientFIO = client.ClientFIO; - } - return viewModel; - } + viewModel.ClientFIO = client.ClientFIO; + } + return viewModel; + } - public OrderViewModel? Insert(OrderBindingModel model) + public OrderViewModel? Insert(OrderBindingModel model) { model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1; var newOrder = Order.Create(model); diff --git a/Pizzeria/PizzeriaListImplement/DataListSingleton.cs b/Pizzeria/PizzeriaListImplement/DataListSingleton.cs index b459700..97fbd34 100644 --- a/Pizzeria/PizzeriaListImplement/DataListSingleton.cs +++ b/Pizzeria/PizzeriaListImplement/DataListSingleton.cs @@ -13,15 +13,15 @@ namespace PizzeriaListImplement public List Components { get; set; } public List Orders { get; set; } public List Pizzas { get; set; } - public List Clients { get; set; } + public List Clients { get; set; } - private DataListSingleton() + private DataListSingleton() { Components = new List(); Orders = new List(); Pizzas = new List(); - Clients = new List(); - } + Clients = new List(); + } public static DataListSingleton GetInstance() { diff --git a/Pizzeria/PizzeriaListImplement/Implements/OrderStorage.cs b/Pizzeria/PizzeriaListImplement/Implements/OrderStorage.cs index 1558544..90c7aef 100644 --- a/Pizzeria/PizzeriaListImplement/Implements/OrderStorage.cs +++ b/Pizzeria/PizzeriaListImplement/Implements/OrderStorage.cs @@ -33,62 +33,62 @@ namespace PizzeriaListImplement.Implements public List GetFilteredList(OrderSearchModel model) { var result = new List(); - if (model.DateFrom.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo) - { - result.Add(GetViewModel(order)); - } - } - } - else if (model.ClientId.HasValue && !model.Id.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.ClientId == model.ClientId) - { - result.Add(GetViewModel(order)); - } - } - } - else if (model.Id.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.Id == model.Id) - { - result.Add(GetViewModel(order)); - } - } - } - return result; + if (model.DateFrom.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo) + { + result.Add(GetViewModel(order)); + } + } + } + else if (model.ClientId.HasValue && !model.Id.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.ClientId == model.ClientId) + { + result.Add(GetViewModel(order)); + } + } + } + else if (model.Id.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(GetViewModel(order)); + } + } + } + return result; } - private OrderViewModel GetViewModel(Order order) - { - var viewModel = order.GetViewModel; - foreach (var package in _source.Pizzas) - { - if (package.Id == order.PizzaId) - { - viewModel.PizzaName = package.PizzaName; - break; - } - } - foreach (var client in _source.Clients) - { - if (client.Id == order.ClientId) - { - viewModel.ClientFIO = client.ClientFIO; - break; - } - } - return viewModel; - } + private OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; + foreach (var package in _source.Pizzas) + { + if (package.Id == order.PizzaId) + { + viewModel.PizzaName = package.PizzaName; + break; + } + } + foreach (var client in _source.Clients) + { + if (client.Id == order.ClientId) + { + viewModel.ClientFIO = client.ClientFIO; + break; + } + } + return viewModel; + } - public OrderViewModel? GetElement(OrderSearchModel model) + public OrderViewModel? GetElement(OrderSearchModel model) { if (!model.Id.HasValue) { diff --git a/Pizzeria/PizzeriaListImplement/Models/Order.cs b/Pizzeria/PizzeriaListImplement/Models/Order.cs index 26de80c..acbeb21 100644 --- a/Pizzeria/PizzeriaListImplement/Models/Order.cs +++ b/Pizzeria/PizzeriaListImplement/Models/Order.cs @@ -14,8 +14,8 @@ namespace PizzeriaListImplement.Models { public int Id { get; private set; } public int PizzaId { get; private set; } - public int ClientId { get; private set; } - public int Count { 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; @@ -31,8 +31,8 @@ namespace PizzeriaListImplement.Models { Id = model.Id, PizzaId = model.PizzaId, - ClientId = model.ClientId, - Count = model.Count, + ClientId = model.ClientId, + Count = model.Count, Sum = model.Sum, Status = model.Status, DateCreate = model.DateCreate, @@ -54,8 +54,8 @@ namespace PizzeriaListImplement.Models { Id = Id, PizzaId = PizzaId, - ClientId = ClientId, - Count = Count, + ClientId = ClientId, + Count = Count, Sum = Sum, Status = Status, DateCreate = DateCreate, diff --git a/Pizzeria/PizzeriaView/Program.cs b/Pizzeria/PizzeriaView/Program.cs index 27cc781..995f581 100644 --- a/Pizzeria/PizzeriaView/Program.cs +++ b/Pizzeria/PizzeriaView/Program.cs @@ -39,14 +39,14 @@ namespace Pizzeria option.AddNLog("nlog.config"); }); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -63,8 +63,8 @@ namespace Pizzeria services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - } + services.AddTransient(); + services.AddTransient(); + } } } \ No newline at end of file