From 1c9d76a92bef3d9310432ca1622717f7fe2ee6e6 Mon Sep 17 00:00:00 2001 From: malimova Date: Fri, 15 Mar 2024 00:35:44 +0400 Subject: [PATCH 1/4] =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D0=B1=D1=8B=D0=B2?= =?UTF-8?q?=D0=B0=D1=8E=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BD=D0=BE=20=D1=8F=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Confectionery/Confectionery.sln | 6 ++ .../ConfectioneryFileImplement/Component.cs | 59 +++++++++++ .../ComponentStorage.cs | 82 ++++++++++++++ .../ConfectioneryFileImplement.csproj | 14 +++ .../DataFileSingleton.cs | 61 +++++++++++ .../ConfectioneryFileImplement/Order.cs | 86 +++++++++++++++ .../OrderStorage.cs | 93 ++++++++++++++++ .../ConfectioneryFileImplement/Pastry.cs | 100 ++++++++++++++++++ .../PastryStorage.cs | 86 +++++++++++++++ .../ConfectioneryView.csproj | 1 + Confectionery/ConfectioneryView/Program.cs | 3 +- 11 files changed, 589 insertions(+), 2 deletions(-) create mode 100644 Confectionery/ConfectioneryFileImplement/Component.cs create mode 100644 Confectionery/ConfectioneryFileImplement/ComponentStorage.cs create mode 100644 Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj create mode 100644 Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs create mode 100644 Confectionery/ConfectioneryFileImplement/Order.cs create mode 100644 Confectionery/ConfectioneryFileImplement/OrderStorage.cs create mode 100644 Confectionery/ConfectioneryFileImplement/Pastry.cs create mode 100644 Confectionery/ConfectioneryFileImplement/PastryStorage.cs diff --git a/Confectionery/Confectionery.sln b/Confectionery/Confectionery.sln index 109f825..16b38b4 100644 --- a/Confectionery/Confectionery.sln +++ b/Confectionery/Confectionery.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryListImplement" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryView", "ConfectioneryView\ConfectioneryView.csproj", "{90E59686-3070-4B0F-BCBF-AAE0FEFE35FA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryFileImplement", "ConfectioneryFileImplement\ConfectioneryFileImplement.csproj", "{BB6D6796-AD42-44BA-9BCC-27D8E1F6D068}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +41,10 @@ Global {90E59686-3070-4B0F-BCBF-AAE0FEFE35FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {90E59686-3070-4B0F-BCBF-AAE0FEFE35FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {90E59686-3070-4B0F-BCBF-AAE0FEFE35FA}.Release|Any CPU.Build.0 = Release|Any CPU + {BB6D6796-AD42-44BA-9BCC-27D8E1F6D068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB6D6796-AD42-44BA-9BCC-27D8E1F6D068}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB6D6796-AD42-44BA-9BCC-27D8E1F6D068}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB6D6796-AD42-44BA-9BCC-27D8E1F6D068}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Confectionery/ConfectioneryFileImplement/Component.cs b/Confectionery/ConfectioneryFileImplement/Component.cs new file mode 100644 index 0000000..38ab4a0 --- /dev/null +++ b/Confectionery/ConfectioneryFileImplement/Component.cs @@ -0,0 +1,59 @@ +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.ViewModels; +using ConfectioneryDataModels.Models; +using System.Xml.Linq; + +namespace ConfectioneryFileImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + public string ComponentName { get; private set; } = string.Empty; + public double Cost { get; set; } + public static Component? Create(ComponentBindingModel model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + public static Component? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Component() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComponentName = element.Element("ComponentName")!.Value, + Cost = Convert.ToDouble(element.Element("Cost")!.Value) + }; + } + public void Update(ComponentBindingModel model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + public XElement GetXElement => new("Component", + new XAttribute("Id", Id), + new XElement("ComponentName", ComponentName), + new XElement("Cost", Cost.ToString())); + } +} diff --git a/Confectionery/ConfectioneryFileImplement/ComponentStorage.cs b/Confectionery/ConfectioneryFileImplement/ComponentStorage.cs new file mode 100644 index 0000000..fa25810 --- /dev/null +++ b/Confectionery/ConfectioneryFileImplement/ComponentStorage.cs @@ -0,0 +1,82 @@ +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.SearchModels; +using ConfectioneryContracts.StoragesContracts; +using ConfectioneryContracts.ViewModels; +using ConfectioneryFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryFileImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataFileSingleton source; + public ComponentStorage() + { + source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return source.Components + .Select(x => x.GetViewModel) + .ToList(); + } + public List GetFilteredList(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName)) + { + return new(); + } + return source.Components + .Where(x => x.ComponentName.Contains(model.ComponentName)) + .Select(x => x.GetViewModel) + .ToList(); + } + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } + return source.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || + (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + public ComponentViewModel? Insert(ComponentBindingModel model) + { + model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1; + var newComponent = Component.Create(model); + if (newComponent == null) + { + return null; + } + source.Components.Add(newComponent); + source.SaveComponents(); + return newComponent.GetViewModel; + } + public ComponentViewModel? Update(ComponentBindingModel model) + { + var component = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (component == null) + { + return null; + } + component.Update(model); + source.SaveComponents(); + return component.GetViewModel; + } + public ComponentViewModel? Delete(ComponentBindingModel model) + { + var element = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Components.Remove(element); + source.SaveComponents(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj b/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj new file mode 100644 index 0000000..41b6c3e --- /dev/null +++ b/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..76cee5d --- /dev/null +++ b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryFileImplement.Models; +using System.Xml.Linq; + +namespace ConfectioneryFileImplement +{ + public class DataFileSingleton + { + private static DataFileSingleton? instance; + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string PastryFileName = "Pastry.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Pastrys { get; private set; } + public static DataFileSingleton GetInstance() + { + if (instance == null) + { + instance = new DataFileSingleton(); + } + return instance; + } + public void SaveComponents() => SaveData(Components, ComponentFileName, + "Components", x => x.GetXElement); + public void SavePastrys() => SaveData(Pastrys, PastryFileName, + "Pastrys", x => x.GetXElement); + public void SaveOrders() { } + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => + Component.Create(x)!)!; + Pastrys = LoadData(PastryFileName, "Pastry", x => + Pastry.Create(x)!)!; + Orders = new List(); + } + private static List? LoadData(string filename, string xmlNodeName, + Func selectFunction) + { + if (File.Exists(filename)) + { + return + XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); + } + return new List(); + } + private static void SaveData(List data, string filename, string + xmlNodeName, Func selectFunction) + { + if (data != null) + { + new XDocument(new XElement(xmlNodeName, + data.Select(selectFunction).ToArray())).Save(filename); + } + } + } +} diff --git a/Confectionery/ConfectioneryFileImplement/Order.cs b/Confectionery/ConfectioneryFileImplement/Order.cs new file mode 100644 index 0000000..6bad7b9 --- /dev/null +++ b/Confectionery/ConfectioneryFileImplement/Order.cs @@ -0,0 +1,86 @@ +using ConfectioneryDataModels.Enums; +using ConfectioneryDataModels.Models; +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.ViewModels; +using System.Xml.Linq; + +namespace ConfectioneryFileImplement +{ + public class Order + { + public int Id { get; private set; } + public int PastryId { 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 static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + PastryId = model.PastryId, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement, + }; + } + + public static Order? Create(XElement element) + { + if (element == null) + { + return null; + } + string dateImplement = element.Element("DateImplement")!.Value; + return new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + PastryId = Convert.ToInt32(element.Element("PastryId")!.Value), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + Status = (OrderStatus)(Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value)), + DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), + DateImplement = (dateImplement == "" || dateImplement is null) ? Convert.ToDateTime(null) : Convert.ToDateTime(dateImplement) + }; + } + + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + if (model.Status == OrderStatus.Выдан) DateImplement = model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + PastryId = PastryId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + }; + + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("PastryId", PastryId.ToString()), + new XElement("Count", Count.ToString()), + new XElement("Sum", Sum.ToString()), + new XElement("Status", Status.ToString()), + new XElement("DateCreate", DateCreate.ToString()), + new XElement("DateImplement", DateImplement.ToString())); + } +} diff --git a/Confectionery/ConfectioneryFileImplement/OrderStorage.cs b/Confectionery/ConfectioneryFileImplement/OrderStorage.cs new file mode 100644 index 0000000..4159a26 --- /dev/null +++ b/Confectionery/ConfectioneryFileImplement/OrderStorage.cs @@ -0,0 +1,93 @@ +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.SearchModels; +using ConfectioneryContracts.StoragesContracts; +using ConfectioneryContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() => source.Orders.Select(x => AttachPastryName(x.GetViewModel)).ToList(); + + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + return source.Orders.Where(x => x.Id == model.Id).Select(x => AttachPastryName(x.GetViewModel)).ToList(); + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + return AttachPastryName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel); + } + + public OrderViewModel? Insert(OrderBindingModel model) + { + model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1; + var newOrder = Order.Create(model); + if (newOrder == null) + { + return null; + } + source.Orders.Add(newOrder); + source.SaveOrders(); + return AttachPastryName(newOrder.GetViewModel); + } + + public OrderViewModel? Update(OrderBindingModel model) + { + var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order == null) + { + return null; + } + order.Update(model); + source.SaveOrders(); + return AttachPastryName(order.GetViewModel); + } + + public OrderViewModel? Delete(OrderBindingModel model) + { + var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order != null) + { + source.Orders.Remove(order); + source.SaveOrders(); + return AttachPastryName(order.GetViewModel); + } + return null; + } + + private OrderViewModel? AttachPastryName(OrderViewModel? model) + { + if (model == null) + { + return null; + } + var pastry = source.Pastrys.FirstOrDefault(x => x.Id == model.PastryId); + if (pastry != null) + { + model.PastryName = pastry.PastryName; + } + return model; + } + } +} diff --git a/Confectionery/ConfectioneryFileImplement/Pastry.cs b/Confectionery/ConfectioneryFileImplement/Pastry.cs new file mode 100644 index 0000000..c53c0cb --- /dev/null +++ b/Confectionery/ConfectioneryFileImplement/Pastry.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.ViewModels; +using ConfectioneryDataModels.Models; +using System.Xml.Linq; + +namespace ConfectioneryFileImplement.Models +{ + public class Pastry : IPastryModel + { + public int Id { get; private set; } + public string PastryName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + + private Dictionary? _productComponents = null; + public Dictionary PastryComponents + { + get + { + if (_productComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _productComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, + y.Value)); + } + return _productComponents; + } + } + public static Pastry? Create(PastryBindingModel model) + { + if (model == null) + { + return null; + } + return new Pastry() + { + Id = model.Id, + PastryName = model.PastryName, + Price = model.Price, + Components = model.PastryComponents.ToDictionary(x => x.Key, x + => x.Value.Item2) + }; + } + public static Pastry? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Pastry() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + PastryName = element.Element("PastryName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = +element.Element("PastryComponents")!.Elements("PastryComponent") + .ToDictionary(x => +Convert.ToInt32(x.Element("Key")?.Value), x => +Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(PastryBindingModel model) + { + if (model == null) + { + return; + } + PastryName = model.PastryName; + Price = model.Price; + Components = model.PastryComponents.ToDictionary(x => x.Key, x => + x.Value.Item2); + _productComponents = null; + } + public PastryViewModel GetViewModel => new() + { + Id = Id, + PastryName = PastryName, + Price = Price, + PastryComponents = PastryComponents + }; + public XElement GetXElement => new("Pastry", + new XAttribute("Id", Id), + new XElement("PastryName", PastryName), + new XElement("Price", Price.ToString()), + new XElement("PastryComponents", Components.Select(x => + new XElement("PastryComponent", + + new XElement("Key", x.Key), + + new XElement("Value", x.Value))) + + .ToArray())); + } +} diff --git a/Confectionery/ConfectioneryFileImplement/PastryStorage.cs b/Confectionery/ConfectioneryFileImplement/PastryStorage.cs new file mode 100644 index 0000000..784dca7 --- /dev/null +++ b/Confectionery/ConfectioneryFileImplement/PastryStorage.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.SearchModels; +using ConfectioneryContracts.StoragesContracts; +using ConfectioneryContracts.ViewModels; +using ConfectioneryFileImplement.Models; + +namespace ConfectioneryFileImplement.Implements +{ + public class PastryStorage : IPastryStorage + { + private readonly DataFileSingleton source; + + public PastryStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Pastrys.Select(x => x.GetViewModel).ToList(); + } + + public List GetFilteredList(PastrySearchModel model) + { + if (string.IsNullOrEmpty(model.PastryName)) + { + return new(); + } + return source.Pastrys.Where(x => x.PastryName.Contains(model.PastryName)).Select(x => x.GetViewModel).ToList(); + } + + public PastryViewModel? GetElement(PastrySearchModel model) + { + if (string.IsNullOrEmpty(model.PastryName) && !model.Id.HasValue) + { + return null; + } + return source.Pastrys.FirstOrDefault(x => + (!string.IsNullOrEmpty(model.PastryName) && x.PastryName == model.PastryName) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + + public PastryViewModel? Insert(PastryBindingModel model) + { + model.Id = source.Pastrys.Count > 0 ? source.Pastrys.Max(x => x.Id) + 1 : 1; + var newPastry = Pastry.Create(model); + if (newPastry == null) + { + return null; + } + source.Pastrys.Add(newPastry); + source.SavePastrys(); + return newPastry.GetViewModel; + } + + public PastryViewModel? Update(PastryBindingModel model) + { + var Pastry = source.Pastrys.FirstOrDefault(x => x.Id == model.Id); + if (Pastry == null) + { + return null; + } + Pastry.Update(model); + source.SavePastrys(); + return Pastry.GetViewModel; + } + + public PastryViewModel? Delete(PastryBindingModel model) + { + var Pastry = source.Pastrys.FirstOrDefault(x => x.Id == model.Id); + if (Pastry != null) + { + source.Pastrys.Remove(Pastry); + source.SavePastrys(); + return Pastry.GetViewModel; + } + return null; + } + } +} diff --git a/Confectionery/ConfectioneryView/ConfectioneryView.csproj b/Confectionery/ConfectioneryView/ConfectioneryView.csproj index c3d7fb7..28b6744 100644 --- a/Confectionery/ConfectioneryView/ConfectioneryView.csproj +++ b/Confectionery/ConfectioneryView/ConfectioneryView.csproj @@ -14,6 +14,7 @@ + diff --git a/Confectionery/ConfectioneryView/Program.cs b/Confectionery/ConfectioneryView/Program.cs index 7ae9212..2f49a44 100644 --- a/Confectionery/ConfectioneryView/Program.cs +++ b/Confectionery/ConfectioneryView/Program.cs @@ -1,8 +1,7 @@ using ConfectioneryBusinessLogic; using ConfectioneryContracts.BusinessLogicsContracts; using ConfectioneryContracts.StoragesContracts; -using ConfectioneryListImplement.Implements; -using ConfectioneryListImplement; +using ConfectioneryFileImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; -- 2.25.1 From d1ef782fa6cd31838cc6a00cb9450ac42046fdee Mon Sep 17 00:00:00 2001 From: malimova Date: Fri, 15 Mar 2024 00:36:15 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20=D1=83?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=D0=B0=20=D0=BF=D1=83=D1=81=D1=82?= =?UTF-8?q?=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Confectionery/ConfectioneryContracts/Class1.cs | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Confectionery/ConfectioneryContracts/Class1.cs diff --git a/Confectionery/ConfectioneryContracts/Class1.cs b/Confectionery/ConfectioneryContracts/Class1.cs deleted file mode 100644 index 0dcf35f..0000000 --- a/Confectionery/ConfectioneryContracts/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace ConfectioneryContracts -{ - public class Class1 - { - - } -} \ No newline at end of file -- 2.25.1 From c383eac7a5f2647502cdd3c1fc9e5a2d8e4451ce Mon Sep 17 00:00:00 2001 From: malimova Date: Fri, 15 Mar 2024 09:13:25 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BE=D1=87=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfectioneryFileImplement/DataFileSingleton.cs | 11 +++++------ Confectionery/ConfectioneryFileImplement/Order.cs | 4 ++-- .../ConfectioneryFileImplement/OrderStorage.cs | 7 ++++--- Confectionery/ConfectioneryFileImplement/Pastry.cs | 10 +++++----- Confectionery/ConfectioneryView/FormCreateOrder.cs | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs index 76cee5d..b54cfeb 100644 --- a/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs +++ b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs @@ -29,14 +29,13 @@ namespace ConfectioneryFileImplement "Components", x => x.GetXElement); public void SavePastrys() => SaveData(Pastrys, PastryFileName, "Pastrys", x => x.GetXElement); - public void SaveOrders() { } + public void SaveOrders() => SaveData(Orders, OrderFileName, + "Orders", x => x.GetXElement); private DataFileSingleton() { - Components = LoadData(ComponentFileName, "Component", x => - Component.Create(x)!)!; - Pastrys = LoadData(PastryFileName, "Pastry", x => - Pastry.Create(x)!)!; - Orders = new List(); + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Pastrys = LoadData(PastryFileName, "Pastry", x => Pastry.Create(x)!)!; + Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/Confectionery/ConfectioneryFileImplement/Order.cs b/Confectionery/ConfectioneryFileImplement/Order.cs index 6bad7b9..26a2c15 100644 --- a/Confectionery/ConfectioneryFileImplement/Order.cs +++ b/Confectionery/ConfectioneryFileImplement/Order.cs @@ -4,9 +4,9 @@ using ConfectioneryContracts.BindingModels; using ConfectioneryContracts.ViewModels; using System.Xml.Linq; -namespace ConfectioneryFileImplement +namespace ConfectioneryFileImplement.Models { - public class Order + public class Order : IOrderModel { public int Id { get; private set; } public int PastryId { get; private set; } diff --git a/Confectionery/ConfectioneryFileImplement/OrderStorage.cs b/Confectionery/ConfectioneryFileImplement/OrderStorage.cs index 4159a26..66954d5 100644 --- a/Confectionery/ConfectioneryFileImplement/OrderStorage.cs +++ b/Confectionery/ConfectioneryFileImplement/OrderStorage.cs @@ -2,6 +2,7 @@ using ConfectioneryContracts.SearchModels; using ConfectioneryContracts.StoragesContracts; using ConfectioneryContracts.ViewModels; +using ConfectioneryFileImplement.Models; using System; using System.Collections.Generic; using System.Linq; @@ -82,10 +83,10 @@ namespace ConfectioneryFileImplement.Implements { return null; } - var pastry = source.Pastrys.FirstOrDefault(x => x.Id == model.PastryId); - if (pastry != null) + var pizza = source.Pastrys.FirstOrDefault(x => x.Id == model.PastryId); + if (pizza != null) { - model.PastryName = pastry.PastryName; + model.PastryName = pizza.PastryName; } return model; } diff --git a/Confectionery/ConfectioneryFileImplement/Pastry.cs b/Confectionery/ConfectioneryFileImplement/Pastry.cs index c53c0cb..a82b204 100644 --- a/Confectionery/ConfectioneryFileImplement/Pastry.cs +++ b/Confectionery/ConfectioneryFileImplement/Pastry.cs @@ -17,19 +17,19 @@ namespace ConfectioneryFileImplement.Models public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); - private Dictionary? _productComponents = null; + private Dictionary? _pastryComponents = null; public Dictionary PastryComponents { get { - if (_productComponents == null) + if (_pastryComponents == null) { var source = DataFileSingleton.GetInstance(); - _productComponents = Components.ToDictionary(x => x.Key, y => + _pastryComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value)); } - return _productComponents; + return _pastryComponents; } } public static Pastry? Create(PastryBindingModel model) @@ -75,7 +75,7 @@ Convert.ToInt32(x.Element("Value")?.Value)) Price = model.Price; Components = model.PastryComponents.ToDictionary(x => x.Key, x => x.Value.Item2); - _productComponents = null; + _pastryComponents = null; } public PastryViewModel GetViewModel => new() { diff --git a/Confectionery/ConfectioneryView/FormCreateOrder.cs b/Confectionery/ConfectioneryView/FormCreateOrder.cs index c2665e7..835c490 100644 --- a/Confectionery/ConfectioneryView/FormCreateOrder.cs +++ b/Confectionery/ConfectioneryView/FormCreateOrder.cs @@ -92,9 +92,9 @@ namespace ConfectioneryView try { int id = Convert.ToInt32(comboBoxPastry.SelectedValue); - var product = _logicP.ReadElement(new PastrySearchModel { Id = id }); + var pastry = _logicP.ReadElement(new PastrySearchModel { Id = id }); int count = Convert.ToInt32(textBoxCount.Text); - textBoxSum.Text = Math.Round(count * (product?.Price ?? 0), 2).ToString(); + textBoxSum.Text = Math.Round(count * (pastry?.Price ?? 0), 2).ToString(); _logger.LogInformation("Расчет суммы заказа"); } catch (Exception ex) -- 2.25.1 From a798cf5d69c2f99be80b60f6f0357ed51a8926b1 Mon Sep 17 00:00:00 2001 From: malimova Date: Fri, 15 Mar 2024 10:52:30 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfectioneryFileImplement/DataFileSingleton.cs | 9 +++------ .../ConfectioneryFileImplement/OrderStorage.cs | 6 +++--- Confectionery/ConfectioneryFileImplement/Pastry.cs | 10 +++------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs index b54cfeb..939a2cc 100644 --- a/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs +++ b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs @@ -37,8 +37,7 @@ namespace ConfectioneryFileImplement Pastrys = LoadData(PastryFileName, "Pastry", x => Pastry.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; } - private static List? LoadData(string filename, string xmlNodeName, - Func selectFunction) + private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { if (File.Exists(filename)) { @@ -47,13 +46,11 @@ namespace ConfectioneryFileImplement } return new List(); } - private static void SaveData(List data, string filename, string - xmlNodeName, Func selectFunction) + private static void SaveData(List data, string filename, string xmlNodeName, Func selectFunction) { if (data != null) { - new XDocument(new XElement(xmlNodeName, - data.Select(selectFunction).ToArray())).Save(filename); + new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename); } } } diff --git a/Confectionery/ConfectioneryFileImplement/OrderStorage.cs b/Confectionery/ConfectioneryFileImplement/OrderStorage.cs index 66954d5..0ca29d8 100644 --- a/Confectionery/ConfectioneryFileImplement/OrderStorage.cs +++ b/Confectionery/ConfectioneryFileImplement/OrderStorage.cs @@ -83,10 +83,10 @@ namespace ConfectioneryFileImplement.Implements { return null; } - var pizza = source.Pastrys.FirstOrDefault(x => x.Id == model.PastryId); - if (pizza != null) + var pastry = source.Pastrys.FirstOrDefault(x => x.Id == model.PastryId); + if (pastry != null) { - model.PastryName = pizza.PastryName; + model.PastryName = pastry.PastryName; } return model; } diff --git a/Confectionery/ConfectioneryFileImplement/Pastry.cs b/Confectionery/ConfectioneryFileImplement/Pastry.cs index a82b204..7611b91 100644 --- a/Confectionery/ConfectioneryFileImplement/Pastry.cs +++ b/Confectionery/ConfectioneryFileImplement/Pastry.cs @@ -58,11 +58,8 @@ namespace ConfectioneryFileImplement.Models Id = Convert.ToInt32(element.Attribute("Id")!.Value), PastryName = element.Element("PastryName")!.Value, Price = Convert.ToDouble(element.Element("Price")!.Value), - Components = -element.Element("PastryComponents")!.Elements("PastryComponent") - .ToDictionary(x => -Convert.ToInt32(x.Element("Key")?.Value), x => -Convert.ToInt32(x.Element("Value")?.Value)) + Components = element.Element("PastryComponents")!.Elements("PastryComponent").ToDictionary + (x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value)) }; } public void Update(PastryBindingModel model) @@ -73,8 +70,7 @@ Convert.ToInt32(x.Element("Value")?.Value)) } PastryName = model.PastryName; Price = model.Price; - Components = model.PastryComponents.ToDictionary(x => x.Key, x => - x.Value.Item2); + Components = model.PastryComponents.ToDictionary(x => x.Key, x => x.Value.Item2); _pastryComponents = null; } public PastryViewModel GetViewModel => new() -- 2.25.1