From d1f15119b34ef8090f48fed652d4b80da279379f Mon Sep 17 00:00:00 2001 From: "A.Novopoltsev" Date: Tue, 28 Feb 2023 21:21:06 +0300 Subject: [PATCH] SecondWork02 --- RenovationWork/RenovationWork.sln | 6 + .../DataFileSingleton.cs | 61 ++++++++++ .../Implements/.editorconfig | 0 .../Implements/ComponentStorage.cs | 94 +++++++++++++++ .../Implements/OrderStorage.cs | 94 +++++++++++++++ .../Implements/PackageStorage.cs | 94 +++++++++++++++ .../Models/Component.cs | 77 ++++++++++++ .../Models/Order.cs | 112 ++++++++++++++++++ .../Models/Package.cs | 98 +++++++++++++++ .../RenovationWorkFileImplement.csproj | 27 +++++ RenovationWork/RenovationWorkView/Program.cs | 2 +- .../RenovationWorkView.csproj | 1 + 12 files changed, 665 insertions(+), 1 deletion(-) create mode 100644 RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs create mode 100644 RenovationWork/RenovationWorkFileImplement/Implements/.editorconfig create mode 100644 RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs create mode 100644 RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs create mode 100644 RenovationWork/RenovationWorkFileImplement/Implements/PackageStorage.cs create mode 100644 RenovationWork/RenovationWorkFileImplement/Models/Component.cs create mode 100644 RenovationWork/RenovationWorkFileImplement/Models/Order.cs create mode 100644 RenovationWork/RenovationWorkFileImplement/Models/Package.cs create mode 100644 RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj diff --git a/RenovationWork/RenovationWork.sln b/RenovationWork/RenovationWork.sln index 2fb3b9f..f97d4a2 100644 --- a/RenovationWork/RenovationWork.sln +++ b/RenovationWork/RenovationWork.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkListImplement EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkView", "RenovationWorkView\RenovationWorkView.csproj", "{A2B92456-59C0-4910-A8EF-AB01601EC95A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenovationWorkFileImplement", "RenovationWorkFileImplement\RenovationWorkFileImplement.csproj", "{143D97B8-5ECE-4685-99EE-47B6E50F1C42}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +41,10 @@ Global {A2B92456-59C0-4910-A8EF-AB01601EC95A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2B92456-59C0-4910-A8EF-AB01601EC95A}.Release|Any CPU.ActiveCfg = Release|Any CPU {A2B92456-59C0-4910-A8EF-AB01601EC95A}.Release|Any CPU.Build.0 = Release|Any CPU + {143D97B8-5ECE-4685-99EE-47B6E50F1C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {143D97B8-5ECE-4685-99EE-47B6E50F1C42}.Debug|Any CPU.Build.0 = Debug|Any CPU + {143D97B8-5ECE-4685-99EE-47B6E50F1C42}.Release|Any CPU.ActiveCfg = Release|Any CPU + {143D97B8-5ECE-4685-99EE-47B6E50F1C42}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs b/RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..0f39921 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs @@ -0,0 +1,61 @@ +using RenovationWorkFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace RenovationWorkFileImplement +{ + internal class DataFileSingleton + { + private static DataFileSingleton? instance; + + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string PackageFileName = "Package.xml"; + + public List Components { get; private set; } + public List Orders { get; private set; } + public List Packages { 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 SavePackages() => SaveData(Packages, PackageFileName, "Packages", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Packages = LoadData(PackageFileName, "Package", x => Package.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/RenovationWork/RenovationWorkFileImplement/Implements/.editorconfig b/RenovationWork/RenovationWorkFileImplement/Implements/.editorconfig new file mode 100644 index 0000000..e69de29 diff --git a/RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..201a191 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,94 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.SearchModels; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkContracts.ViewModels; +using RenovationWorkFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkFileImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataFileSingleton source; + + public ComponentStorage() + { + source = DataFileSingleton.GetInstance(); + } + + 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; + } + + 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 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 List GetFullList() + { + return source.Components.Select(x => x.GetViewModel).ToList(); + } + + 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; + } + } +} diff --git a/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..ceb7000 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,94 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.SearchModels; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkContracts.ViewModels; +using RenovationWorkFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public OrderViewModel? Delete(OrderBindingModel model) + { + var element = source.Orders.FirstOrDefault(x => x.Id == model.Id); + + if (element != null) + { + source.Orders.Remove(element); + source.SaveOrders(); + + return element.GetViewModel; + } + + return null; + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + + return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + + return source.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Orders.Select(x => x.GetViewModel).ToList(); + } + + 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 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 order.GetViewModel; + } + } +} diff --git a/RenovationWork/RenovationWorkFileImplement/Implements/PackageStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/PackageStorage.cs new file mode 100644 index 0000000..8c0fd77 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Implements/PackageStorage.cs @@ -0,0 +1,94 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.SearchModels; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkContracts.ViewModels; +using RenovationWorkFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkFileImplement.Implements +{ + public class PackageStorage : IPackageStorage + { + private readonly DataFileSingleton source; + + public PackageStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public PackageViewModel? Delete(PackageBindingModel model) + { + var element = source.Packages.FirstOrDefault(x => x.Id == model.Id); + + if (element != null) + { + source.Packages.Remove(element); + source.SavePackages(); + + return element.GetViewModel; + } + + return null; + } + + public PackageViewModel? GetElement(PackageSearchModel model) + { + if (string.IsNullOrEmpty(model.PackageName) && !model.Id.HasValue) + { + return null; + } + + return source.Packages.FirstOrDefault(x => (!string.IsNullOrEmpty(model.PackageName) && x.PackageName == model.PackageName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(PackageSearchModel model) + { + if (string.IsNullOrEmpty(model.PackageName)) + { + return new(); + } + + return source.Packages.Where(x => x.PackageName.Contains(model.PackageName)).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Packages.Select(x => x.GetViewModel).ToList(); + } + + public PackageViewModel? Insert(PackageBindingModel model) + { + model.Id = source.Packages.Count > 0 ? source.Packages.Max(x => x.Id) + 1 : 1; + var newPackage = Package.Create(model); + + if (newPackage == null) + { + return null; + } + + source.Packages.Add(newPackage); + source.SavePackages(); + + return newPackage.GetViewModel; + } + + public PackageViewModel? Update(PackageBindingModel model) + { + var package = source.Packages.FirstOrDefault(x => x.Id == model.Id); + + if (package == null) + { + return null; + } + + package.Update(model); + source.SavePackages(); + + return package.GetViewModel; + } + } +} diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Component.cs b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs new file mode 100644 index 0000000..f99ce17 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs @@ -0,0 +1,77 @@ + +using System; +using System.Collections.Generic; +using System.ComponentModel.Composition; +using System.ComponentModel.Composition.Hosting; +using System.ComponentModel.Composition.Primitives; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.ViewModels; +using RenovationWorkDataModels.Models; + + +namespace RenovationWorkFileImplement.Models +{ + internal class Component : IComponentModel + { + public string ComponentName { get; private set; } = string.Empty; + + public double Cost { get; set; } + + public int Id { get; private 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/RenovationWork/RenovationWorkFileImplement/Models/Order.cs b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs new file mode 100644 index 0000000..635025d --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs @@ -0,0 +1,112 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.ViewModels; +using RenovationWorkDataModels.Enums; +using RenovationWorkDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace RenovationWorkFileImplement.Models +{ + internal class Order : IOrderModel + { + public int PackageId { get; private set; } + + public string PackageName { get; private set; } = string.Empty; + + 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) + { + return null; + } + return new Order() + { + Id = model.Id, + PackageId = model.PackageId, + PackageName = model.PackageName, + 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; + } + + var order = new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + PackageId = Convert.ToInt32(element.Element("PackageId")!.Value), + PackageName = element.Element("PackageName")!.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 = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null) + }; + + DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl); + order.DateImplement = dateImpl; + + return order; + } + + public void Update(OrderBindingModel model) + { + if (model == null) + { + return; + } + PackageId = model.PackageId; + PackageName = model.PackageName; + Count = model.Count; + Sum = model.Sum; + Status = model.Status; + DateCreate = model.DateCreate; + DateImplement = model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + PackageId = PackageId, + PackageName = PackageName, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("PackageName", PackageName), + new XElement("PackageId", PackageId.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/RenovationWork/RenovationWorkFileImplement/Models/Package.cs b/RenovationWork/RenovationWorkFileImplement/Models/Package.cs new file mode 100644 index 0000000..40c795a --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Models/Package.cs @@ -0,0 +1,98 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.ViewModels; +using RenovationWorkDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace RenovationWorkFileImplement.Models +{ + internal class Package : IPackageModel + { + public string PackageName { get; private set; } = string.Empty; + + public double Price { get; private set; } + + public Dictionary Components { get; private set; } = new(); + + public Dictionary _packageComponents = null; + + public Dictionary PackageComponents + { + get + { + if (_packageComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _packageComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value)); + } + return _packageComponents; + } + } + + public int Id { get; private set; } + + public static Package? Create(PackageBindingModel model) + { + if (model == null) + { + return null; + } + return new Package() + { + Id = model.Id, + PackageName = model.PackageName, + Price = model.Price, + Components = model.PackageComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + + }; + } + + public static Package? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Package() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + PackageName = element.Element("PackageName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("PackageComponents")!.Elements("PackageComponent").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + + public void Update(PackageBindingModel model) + { + if (model == null) + { + return; + } + PackageName = model.PackageName; + Price = model.Price; + Components = model.PackageComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _packageComponents = null; + } + + public PackageViewModel GetViewModel => new() + { + Id = Id, + PackageName = PackageName, + Price = Price, + PackageComponents = PackageComponents + }; + + public XElement GetXElement => new("Package", + new XAttribute("Id", Id), + new XElement("PackageName", PackageName), + new XElement("Price", Price.ToString()), + new XElement("PackageComponents", Components.Select(x => + new XElement("PackageComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))).ToArray())); + } +} diff --git a/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj new file mode 100644 index 0000000..dc3e1fd --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj @@ -0,0 +1,27 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + + + + + + + diff --git a/RenovationWork/RenovationWorkView/Program.cs b/RenovationWork/RenovationWorkView/Program.cs index a6fc911..b812919 100644 --- a/RenovationWork/RenovationWorkView/Program.cs +++ b/RenovationWork/RenovationWorkView/Program.cs @@ -2,7 +2,7 @@ using RenovationWorkBusinessLogic.BusinessLogic; using Microsoft.Extensions.DependencyInjection; using RenovationWorkContracts.BusinessLogicsContracts; using RenovationWorkContracts.StoragesContracts; -using RenovationWorkListImplement.Implements; +using RenovationWorkFileImplement.Implements; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; diff --git a/RenovationWork/RenovationWorkView/RenovationWorkView.csproj b/RenovationWork/RenovationWorkView/RenovationWorkView.csproj index 6bae4f1..f811a92 100644 --- a/RenovationWork/RenovationWorkView/RenovationWorkView.csproj +++ b/RenovationWork/RenovationWorkView/RenovationWorkView.csproj @@ -15,6 +15,7 @@ +