From fd3db3f03b42113968c49e772c4888a9c144a92a Mon Sep 17 00:00:00 2001 From: "kagbie3nn@mail.ru" Date: Fri, 12 Apr 2024 20:05:25 +0400 Subject: [PATCH 1/2] =?UTF-8?q?2=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/ComputerStorage.cs | 7 ++++++- .../ComputersShopListImplement/Implements/OrderStorage.cs | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ComputersShop/ComputersShopListImplement/Implements/ComputerStorage.cs b/ComputersShop/ComputersShopListImplement/Implements/ComputerStorage.cs index 06ec22d..fa6fc24 100644 --- a/ComputersShop/ComputersShopListImplement/Implements/ComputerStorage.cs +++ b/ComputersShop/ComputersShopListImplement/Implements/ComputerStorage.cs @@ -1,4 +1,9 @@ -using System; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopListImplement.Models; +using System; using System.Collections; using System.Collections.Generic; using System.Linq; diff --git a/ComputersShop/ComputersShopListImplement/Implements/OrderStorage.cs b/ComputersShop/ComputersShopListImplement/Implements/OrderStorage.cs index 9cbe65d..869030e 100644 --- a/ComputersShop/ComputersShopListImplement/Implements/OrderStorage.cs +++ b/ComputersShop/ComputersShopListImplement/Implements/OrderStorage.cs @@ -1,9 +1,13 @@ -using System; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopListImplement.Models; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Windows.Controls; namespace ComputersShopListImplement.Implements { -- 2.25.1 From 4f4215236d3f71daa6c9ad5c1a22480e0b78b670 Mon Sep 17 00:00:00 2001 From: "kagbie3nn@mail.ru" Date: Fri, 12 Apr 2024 21:41:16 +0400 Subject: [PATCH 2/2] =?UTF-8?q?2=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ComputersShop/ComputersShop.sln | 8 +- .../BusinessLogic/ComponentLogic.cs | 2 + .../ComputersShopBusinessLogic.csproj | 2 +- .../ComputersShopContracts.csproj | 2 +- .../ComputersShopFileImplement.csproj | 14 +++ .../DataFileSingleton.cs | 50 +++++++++++ .../Implements/ComponentStorage.cs | 81 +++++++++++++++++ .../Implements/ComputerStorage.cs | 81 +++++++++++++++++ .../Implements/OrderStorage.cs | 89 +++++++++++++++++++ .../Models/Component.cs | 66 ++++++++++++++ .../Models/Computer.cs | 83 +++++++++++++++++ .../Models/Order.cs | 88 ++++++++++++++++++ .../ComputersShopView.csproj | 1 + ComputersShop/ComputersShopView/Program.cs | 6 +- 14 files changed, 566 insertions(+), 7 deletions(-) create mode 100644 ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj create mode 100644 ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Component.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Computer.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Order.cs diff --git a/ComputersShop/ComputersShop.sln b/ComputersShop/ComputersShop.sln index 8600f82..970e25b 100644 --- a/ComputersShop/ComputersShop.sln +++ b/ComputersShop/ComputersShop.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34714.143 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopView", "ComputersShopView\ComputersShopView.csproj", "{67B93164-C2AC-4A4C-8D5E-3E7F6EA6A662}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopView", "ComputersShopView\ComputersShopView.csproj", "{67B93164-C2AC-4A4C-8D5E-3E7F6EA6A662}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopBusinessLogic", "ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj", "{14B3B9C9-08B7-4430-BDF6-090353500333}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopDataModels", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopListImplement", "ComputersShopListImplement\ComputersShopListImplement.csproj", "{6FB73624-7C34-42DE-9846-B550AE0D32F2}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopFileImplement", "ComputersShopFileImplement\ComputersShopFileImplement.csproj", "{E6E9ED14-BE04-46E4-AE5A-C9672B606616}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +41,10 @@ Global {6FB73624-7C34-42DE-9846-B550AE0D32F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {6FB73624-7C34-42DE-9846-B550AE0D32F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {6FB73624-7C34-42DE-9846-B550AE0D32F2}.Release|Any CPU.Build.0 = Release|Any CPU + {E6E9ED14-BE04-46E4-AE5A-C9672B606616}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6E9ED14-BE04-46E4-AE5A-C9672B606616}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6E9ED14-BE04-46E4-AE5A-C9672B606616}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6E9ED14-BE04-46E4-AE5A-C9672B606616}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogic/ComponentLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogic/ComponentLogic.cs index 8b5e893..2bb4cea 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogic/ComponentLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogic/ComponentLogic.cs @@ -4,6 +4,8 @@ using ComputersShopContracts.SearchModels; using ComputersShopContracts.StoragesContracts; using ComputersShopContracts.ViewModels; using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; namespace ComputersShopBusinessLogic.BusinessLogic { diff --git a/ComputersShop/ComputersShopBusinessLogic/ComputersShopBusinessLogic.csproj b/ComputersShop/ComputersShopBusinessLogic/ComputersShopBusinessLogic.csproj index f9270d7..1915704 100644 --- a/ComputersShop/ComputersShopBusinessLogic/ComputersShopBusinessLogic.csproj +++ b/ComputersShop/ComputersShopBusinessLogic/ComputersShopBusinessLogic.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net7.0 enable diff --git a/ComputersShop/ComputersShopContracts/ComputersShopContracts.csproj b/ComputersShop/ComputersShopContracts/ComputersShopContracts.csproj index 79540f3..5e03ea8 100644 --- a/ComputersShop/ComputersShopContracts/ComputersShopContracts.csproj +++ b/ComputersShop/ComputersShopContracts/ComputersShopContracts.csproj @@ -1,7 +1,7 @@ - net7.0-windows + net7.0 enable enable diff --git a/ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj b/ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj new file mode 100644 index 0000000..1b0116c --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net7.0 + enable + enable + + + + + + + + diff --git a/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs b/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..47a3a29 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs @@ -0,0 +1,50 @@ +namespace ComputersShopFileImplement +{ + public class DataFileSingleton + { + private static DataFileSingleton? instance; + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string ComputerFileName = "Computer.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Computers { 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 SaveComputers() => SaveData(Computers, ComputerFileName, "Computers", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Computers = LoadData(ComputerFileName, "Computer", x => Computer.Create(x)!)!; + Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + } + + 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/ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..8f91791 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplement.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/ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs new file mode 100644 index 0000000..83c9117 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplement.Implements +{ + public class ComputerStorage : IComputerStorage + { + private readonly DataFileSingleton source; + + public ComputerStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Computers.Select(x => x.GetViewModel).ToList(); + } + + public List GetFilteredList(ComputerSearchModel model) + { + if (string.IsNullOrEmpty(model.ComputerName)) + { + return new(); + } + return source.Computers.Where(x => x.ComputerName.Contains(model.ComputerName)).Select(x => x.GetViewModel).ToList(); + } + + public ComputerViewModel? GetElement(ComputerSearchModel model) + { + if (string.IsNullOrEmpty(model.ComputerName) && !model.Id.HasValue) + { + return null; + } + return source.Computers.FirstOrDefault(x => + (!string.IsNullOrEmpty(model.ComputerName) && x.ComputerName == model.ComputerName) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + + public ComputerViewModel? Insert(ComputerBindingModel model) + { + model.Id = source.Computers.Count > 0 ? source.Computers.Max(x => x.Id) + 1 : 1; + var newComputer = Computer.Create(model); + if (newComputer == null) + { + return null; + } + source.Computers.Add(newComputer); + source.SaveComputers(); + return newComputer.GetViewModel; + } + + public ComputerViewModel? Update(ComputerBindingModel model) + { + var Computer = source.Computers.FirstOrDefault(x => x.Id == model.Id); + if (Computer == null) + { + return null; + } + Computer.Update(model); + source.SaveComputers(); + return Computer.GetViewModel; + } + + public ComputerViewModel? Delete(ComputerBindingModel model) + { + var Computer = source.Computers.FirstOrDefault(x => x.Id == model.Id); + if (Computer != null) + { + source.Computers.Remove(Computer); + source.SaveComputers(); + return Computer.GetViewModel; + } + return null; + } + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..4fa0676 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() => source.Orders.Select(x => AttachComputerName(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 => AttachComputerName(x.GetViewModel)).ToList(); + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + return AttachComputerName(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 AttachComputerName(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 AttachComputerName(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 AttachComputerName(order.GetViewModel); + } + return null; + } + + private OrderViewModel? AttachComputerName(OrderViewModel? model) + { + if (model == null) + { + return null; + } + var computer = source.Computers.FirstOrDefault(x => x.Id == model.ComputerId); + if (computer != null) + { + model.ComputerName = computer.ComputerName; + } + return model; + } + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Models/Component.cs b/ComputersShop/ComputersShopFileImplement/Models/Component.cs new file mode 100644 index 0000000..fc4eb87 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Models/Component.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ComputersShopFileImplement.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/ComputersShop/ComputersShopFileImplement/Models/Computer.cs b/ComputersShop/ComputersShopFileImplement/Models/Computer.cs new file mode 100644 index 0000000..63b1ded --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Models/Computer.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ComputersShopFileImplement.Models +{ + public class Computer : IComputerModel + { + public int Id { get; private set; } + public string ComputerName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + private Dictionary? _computerComponents = null; + public Dictionary ComputerComponents + { + get + { + if (_computerComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _computerComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value)); + } + return _computerComponents; + } + } + public static Computer? Create(ComputerBindingModel model) + { + if (model == null) + { + return null; + } + return new Computer() + { + Id = model.Id, + ComputerName = model.ComputerName, + Price = model.Price, + Components = model.ComputerComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + public static Computer? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Computer() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComputerName = element.Element("ComputerName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("ComputerComponents")!.Elements("ComputerComponent").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), + x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(ComputerBindingModel model) + { + if (model == null) + { + return; + } + ComputerName = model.ComputerName; + Price = model.Price; + Components = model.ComputerComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _computerComponents = null; + } + public ComputerViewModel GetViewModel => new() + { + Id = Id, + ComputerName = ComputerName, + Price = Price, + ComputerComponents = ComputerComponents + }; + public XElement GetXElement => new("Computer", + new XAttribute("Id", Id), + new XElement("ComputerName", ComputerName), + new XElement("Price", Price.ToString()), + new XElement("ComputerComponents", Components.Select( + x => new XElement("ComputerComponent", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray())); + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Models/Order.cs b/ComputersShop/ComputersShopFileImplement/Models/Order.cs new file mode 100644 index 0000000..9ed9928 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Models/Order.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ComputersShopFileImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + public int ComputerId { 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, + ComputerId = model.ComputerId, + 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), + ComputerId = Convert.ToInt32(element.Element("ComputerId")!.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, + ComputerId = ComputerId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + }; + + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("ComputerId", ComputerId.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/ComputersShop/ComputersShopView/ComputersShopView.csproj b/ComputersShop/ComputersShopView/ComputersShopView.csproj index bc98c78..f042247 100644 --- a/ComputersShop/ComputersShopView/ComputersShopView.csproj +++ b/ComputersShop/ComputersShopView/ComputersShopView.csproj @@ -18,6 +18,7 @@ + diff --git a/ComputersShop/ComputersShopView/Program.cs b/ComputersShop/ComputersShopView/Program.cs index 483fa37..bed2e0c 100644 --- a/ComputersShop/ComputersShopView/Program.cs +++ b/ComputersShop/ComputersShopView/Program.cs @@ -1,12 +1,10 @@ -using ComputersShopBusinessLogic; using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.StoragesContracts; using Microsoft.Extensions.DependencyInjection; -using ComputersShopListImplement.Implements; +using ComputersShopFileImplement.Implements; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; -using ComputersShopDataModels; -using ComputersShopListImplement; + using ComputersShopView; using ComputersShopBusinessLogic.BusinessLogic; -- 2.25.1