From 678588e464cddeca1389464b628b3f657dd00eeb Mon Sep 17 00:00:00 2001 From: Safgerd Date: Sat, 11 Mar 2023 18:47:48 +0400 Subject: [PATCH 1/2] =?UTF-8?q?LabWork02=5FBase:=20=D0=93=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutomobilePlant/AutomobilePlant.sln | 16 ++- .../AutomobilePlant/AutomobilePlant.csproj | 1 + AutomobilePlant/AutomobilePlant/Program.cs | 4 +- .../AutomobilePlantFileImplement.csproj | 14 +++ .../DataFileSingleton.cs | 56 +++++++++ .../Implements/CarStorage.cs | 88 +++++++++++++++ .../Implements/ComponentStorage.cs | 87 ++++++++++++++ .../Implements/OrderStorage.cs | 86 ++++++++++++++ .../Models/Car.cs | 106 ++++++++++++++++++ .../Models/Component.cs | 72 ++++++++++++ .../Models/Order.cs | 104 +++++++++++++++++ 11 files changed, 628 insertions(+), 6 deletions(-) create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/AutomobilePlantFileImplement.csproj create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/DataFileSingleton.cs create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/Implements/CarStorage.cs create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/Implements/ComponentStorage.cs create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/Implements/OrderStorage.cs create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/Models/Car.cs create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/Models/Component.cs create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/Models/Order.cs diff --git a/AutomobilePlant/AutomobilePlant.sln b/AutomobilePlant/AutomobilePlant.sln index 7e4bb3f..93ebfba 100644 --- a/AutomobilePlant/AutomobilePlant.sln +++ b/AutomobilePlant/AutomobilePlant.sln @@ -3,15 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlant", "AutomobilePlant\AutomobilePlant.csproj", "{970E66D6-3147-419D-98DC-9E05B10232B5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomobilePlant", "AutomobilePlant\AutomobilePlant.csproj", "{970E66D6-3147-419D-98DC-9E05B10232B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlantDataModels", "AutomobilePlantDataModels\AutomobilePlantDataModels.csproj", "{27B6E4A1-BB53-4AF6-AACA-099A40B64D60}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomobilePlantDataModels", "AutomobilePlantDataModels\AutomobilePlantDataModels.csproj", "{27B6E4A1-BB53-4AF6-AACA-099A40B64D60}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlantContracts", "AutomobilePlantContracts\AutomobilePlantContracts.csproj", "{2F1D0A55-2722-48B4-87D1-0440E74D6E0A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomobilePlantContracts", "AutomobilePlantContracts\AutomobilePlantContracts.csproj", "{2F1D0A55-2722-48B4-87D1-0440E74D6E0A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlantBusinessLogic", "AutomobilePlantBusinessLogic\AutomobilePlantBusinessLogic.csproj", "{CC4E3C20-ABA4-4A54-B992-B68D39A1236E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomobilePlantBusinessLogic", "AutomobilePlantBusinessLogic\AutomobilePlantBusinessLogic.csproj", "{CC4E3C20-ABA4-4A54-B992-B68D39A1236E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlantListImplements", "AutomobilePlantListImplements\AutomobilePlantListImplements.csproj", "{B27736FF-39E9-4DEC-BCB4-35ACAF5ECEB9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomobilePlantListImplements", "AutomobilePlantListImplements\AutomobilePlantListImplements.csproj", "{B27736FF-39E9-4DEC-BCB4-35ACAF5ECEB9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlantFileImplement", "AutomobilePlantFileImplement\AutomobilePlantFileImplement.csproj", "{10818526-654C-4928-985F-9C02A2A02B15}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {B27736FF-39E9-4DEC-BCB4-35ACAF5ECEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU {B27736FF-39E9-4DEC-BCB4-35ACAF5ECEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU {B27736FF-39E9-4DEC-BCB4-35ACAF5ECEB9}.Release|Any CPU.Build.0 = Release|Any CPU + {10818526-654C-4928-985F-9C02A2A02B15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {10818526-654C-4928-985F-9C02A2A02B15}.Debug|Any CPU.Build.0 = Debug|Any CPU + {10818526-654C-4928-985F-9C02A2A02B15}.Release|Any CPU.ActiveCfg = Release|Any CPU + {10818526-654C-4928-985F-9C02A2A02B15}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AutomobilePlant/AutomobilePlant/AutomobilePlant.csproj b/AutomobilePlant/AutomobilePlant/AutomobilePlant.csproj index a64875e..18528cf 100644 --- a/AutomobilePlant/AutomobilePlant/AutomobilePlant.csproj +++ b/AutomobilePlant/AutomobilePlant/AutomobilePlant.csproj @@ -17,6 +17,7 @@ + diff --git a/AutomobilePlant/AutomobilePlant/Program.cs b/AutomobilePlant/AutomobilePlant/Program.cs index 263d671..3b193cf 100644 --- a/AutomobilePlant/AutomobilePlant/Program.cs +++ b/AutomobilePlant/AutomobilePlant/Program.cs @@ -1,7 +1,7 @@ using AutomobilePlantBusinessLogic.BusinessLogics; using AutomobilePlantContracts.BusinessLogicContracts; using AutomobilePlantContracts.StorageContracts; -using AutomobilePlantListImplements.Implements; +using AutomobilePlantFileImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; @@ -33,9 +33,11 @@ namespace AutomobilePlant services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/AutomobilePlant/AutomobilePlantFileImplement/AutomobilePlantFileImplement.csproj b/AutomobilePlant/AutomobilePlantFileImplement/AutomobilePlantFileImplement.csproj new file mode 100644 index 0000000..a6820c2 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/AutomobilePlantFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/AutomobilePlant/AutomobilePlantFileImplement/DataFileSingleton.cs b/AutomobilePlant/AutomobilePlantFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..6d72809 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/DataFileSingleton.cs @@ -0,0 +1,56 @@ +using AutomobilePlantFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Numerics; +using System.Reflection.Metadata; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace AutomobilePlantFileImplement +{ + public class DataFileSingleton + { + private static DataFileSingleton? instance; + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string CarFileName = "Car.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Cars { 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 SaveCars() => SaveData(Cars, CarFileName, "Cars", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Cars = LoadData(CarFileName, "Car", x => Car.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/AutomobilePlant/AutomobilePlantFileImplement/Implements/CarStorage.cs b/AutomobilePlant/AutomobilePlantFileImplement/Implements/CarStorage.cs new file mode 100644 index 0000000..42b3d4a --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/Implements/CarStorage.cs @@ -0,0 +1,88 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.SearchModels; +using AutomobilePlantContracts.StorageContracts; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection.Metadata; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace AutomobilePlantFileImplement.Implements +{ + public class CarStorage : ICarStorage + { + private readonly DataFileSingleton source; + + public CarStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public CarViewModel? GetElement(CarSearchModel model) + { + if (string.IsNullOrEmpty(model.CarName) && !model.Id.HasValue) + { + return null; + } + return source.Cars + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.CarName) && x.CarName == model.CarName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(CarSearchModel model) + { + if (string.IsNullOrEmpty(model.CarName)) + { + return new(); + } + return source.Cars + .Where(x => x.CarName.Contains(model.CarName)) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + return source.Cars.Select(x => x.GetViewModel).ToList(); + } + + public CarViewModel? Insert(CarBindingModel model) + { + model.Id = source.Cars.Count > 0 ? source.Cars.Max(x => x.Id) + 1 : 1; + var newCar = Car.Create(model); + if (newCar == null) + { + return null; + } + source.Cars.Add(newCar); + source.SaveCars(); + return newCar.GetViewModel; + } + + public CarViewModel? Update(CarBindingModel model) + { + var car = source.Cars.FirstOrDefault(x => x.Id == model.Id); + if (car == null) + { + return null; + } + car.Update(model); + source.SaveCars(); + return car.GetViewModel; + } + public CarViewModel? Delete(CarBindingModel model) + { + var car = source.Cars.FirstOrDefault(x => x.Id == model.Id); + if (car == null) + { + return null; + } + source.Cars.Remove(car); + source.SaveCars(); + return car.GetViewModel; + } + } +} diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Implements/ComponentStorage.cs b/AutomobilePlant/AutomobilePlantFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..fffc665 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,87 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.SearchModels; +using AutomobilePlantContracts.StorageContracts; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Numerics; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantFileImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataFileSingleton source; + + public ComponentStorage() + { + source = DataFileSingleton.GetInstance(); + } + + 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; + } + public ComponentViewModel? Delete(ComponentBindingModel model) + { + var component = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (component == null) + { + return null; + } + source.Components.Remove(component); + source.SaveComponents(); + return component.GetViewModel; + } + } +} diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Implements/OrderStorage.cs b/AutomobilePlant/AutomobilePlantFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..0804a33 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,86 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.SearchModels; +using AutomobilePlantContracts.StorageContracts; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + + 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; + } + public OrderViewModel? Delete(OrderBindingModel model) + { + var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order == null) + { + return null; + } + source.Orders.Remove(order); + source.SaveOrders(); + return order.GetViewModel; + } + } +} diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Models/Car.cs b/AutomobilePlant/AutomobilePlantFileImplement/Models/Car.cs new file mode 100644 index 0000000..47c09a5 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/Models/Car.cs @@ -0,0 +1,106 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection.Metadata; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace AutomobilePlantFileImplement.Models +{ + public class Car : ICarModel + { + public string CarName { get; private set; } = string.Empty; + + public double Price { get; private set; } + + public int Id { get; private set; } + + public Dictionary Components { get; private set; } = new(); + + private Dictionary? _carComponents = null; + public Dictionary CarComponents + { + get + { + if (_carComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _carComponents = Components.ToDictionary( + x => x.Key, + y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value) + ); + } + return _carComponents; + } + } + + + public static Car? Create(CarBindingModel? model) + { + if (model == null) + { + return null; + } + return new Car() + { + Id = model.Id, + CarName = model.CarName, + Price = model.Price, + Components = model.CarComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + + public static Car? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Car() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + CarName = element.Element("CarName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("CarComponents")!.Elements("CarComponent").ToDictionary( + x => Convert.ToInt32(x.Element("Key")?.Value), + x => Convert.ToInt32(x.Element("Value")?.Value) + ) + }; + } + + public void Update(CarBindingModel? model) + { + if (model == null) + { + return; + } + CarName = model.CarName; + Price = model.Price; + Components = model.CarComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _carComponents = null; + } + + public CarViewModel GetViewModel => new() + { + Id = Id, + CarName = CarName, + Price = Price, + CarComponents = CarComponents + }; + + public XElement GetXElement => new( + "Car", + new XAttribute("Id", Id), + new XElement("CarName", CarName), + new XElement("Price", Price.ToString()), + new XElement("CarComponents", Components.Select(x => + new XElement("CarComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))) + .ToArray())); + } +} diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Models/Component.cs b/AutomobilePlant/AutomobilePlantFileImplement/Models/Component.cs new file mode 100644 index 0000000..ab3185b --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/Models/Component.cs @@ -0,0 +1,72 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Numerics; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace AutomobilePlantFileImplement.Models +{ + public 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/AutomobilePlant/AutomobilePlantFileImplement/Models/Order.cs b/AutomobilePlant/AutomobilePlantFileImplement/Models/Order.cs new file mode 100644 index 0000000..f283405 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/Models/Order.cs @@ -0,0 +1,104 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantDataModels.Enums; +using AutomobilePlantDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace AutomobilePlantFileImplement.Models +{ + public class Order : IOrderModel + { + public int CarId { get; private set; } + + public string CarName { 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 + { + CarId = model.CarId, + CarName = model.CarName, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement, + Id = model.Id, + }; + } + + public static Order? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + CarName = element.Element("CarName")!.Value, + CarId = Convert.ToInt32(element.Element("CarId")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), + DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), + DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value) + }; + } + + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + DateImplement = model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + CarId = CarId, + CarName = CarName, + Count = Count, + Sum = Sum, + DateCreate = DateCreate, + DateImplement = DateImplement, + Id = Id, + Status = Status, + }; + + public XElement GetXElement => new( + "Order", + new XAttribute("Id", Id), + new XElement("CarName", CarName), + new XElement("CarId", CarId.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()) + ); + } +} From 818c4db5d6f208b49f72f7ce7f51cb665094d67f Mon Sep 17 00:00:00 2001 From: Safgerd Date: Sat, 11 Mar 2023 22:36:18 +0400 Subject: [PATCH 2/2] =?UTF-8?q?LabWork02=5FBase:=20=D0=98=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/OrderStorage.cs | 26 ++++++++++++++----- .../Models/Order.cs | 6 ----- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Implements/OrderStorage.cs b/AutomobilePlant/AutomobilePlantFileImplement/Implements/OrderStorage.cs index 0804a33..96f2011 100644 --- a/AutomobilePlant/AutomobilePlantFileImplement/Implements/OrderStorage.cs +++ b/AutomobilePlant/AutomobilePlantFileImplement/Implements/OrderStorage.cs @@ -26,8 +26,8 @@ namespace AutomobilePlantFileImplement.Implements { return null; } - return source.Orders - .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + return GetViewModel(source.Orders + .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))); } public List GetFilteredList(OrderSearchModel model) @@ -38,13 +38,13 @@ namespace AutomobilePlantFileImplement.Implements } return source.Orders .Where(x => x.Id == model.Id) - .Select(x => x.GetViewModel) + .Select(x => GetViewModel(x)) .ToList(); } public List GetFullList() { - return source.Orders.Select(x => x.GetViewModel).ToList(); + return source.Orders.Select(x => GetViewModel(x)).ToList(); } public OrderViewModel? Insert(OrderBindingModel model) @@ -57,7 +57,7 @@ namespace AutomobilePlantFileImplement.Implements } source.Orders.Add(newOrder); source.SaveOrders(); - return newOrder.GetViewModel; + return GetViewModel(newOrder); } public OrderViewModel? Update(OrderBindingModel model) @@ -69,8 +69,9 @@ namespace AutomobilePlantFileImplement.Implements } order.Update(model); source.SaveOrders(); - return order.GetViewModel; + return GetViewModel(order); } + public OrderViewModel? Delete(OrderBindingModel model) { var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); @@ -80,7 +81,18 @@ namespace AutomobilePlantFileImplement.Implements } source.Orders.Remove(order); source.SaveOrders(); - return order.GetViewModel; + return GetViewModel(order); + } + + private OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; + var car = source.Cars.FirstOrDefault(x => x.Id == order.CarId); + if (car != null) + { + viewModel.CarName = car.CarName; + } + return viewModel; } } } diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Models/Order.cs b/AutomobilePlant/AutomobilePlantFileImplement/Models/Order.cs index f283405..0c3bd01 100644 --- a/AutomobilePlant/AutomobilePlantFileImplement/Models/Order.cs +++ b/AutomobilePlant/AutomobilePlantFileImplement/Models/Order.cs @@ -15,8 +15,6 @@ namespace AutomobilePlantFileImplement.Models { public int CarId { get; private set; } - public string CarName { get; private set; } = string.Empty; - public int Count { get; private set; } public double Sum { get; private set; } @@ -38,7 +36,6 @@ namespace AutomobilePlantFileImplement.Models return new Order { CarId = model.CarId, - CarName = model.CarName, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -57,7 +54,6 @@ namespace AutomobilePlantFileImplement.Models return new Order() { Id = Convert.ToInt32(element.Attribute("Id")!.Value), - CarName = element.Element("CarName")!.Value, CarId = Convert.ToInt32(element.Element("CarId")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value), @@ -80,7 +76,6 @@ namespace AutomobilePlantFileImplement.Models public OrderViewModel GetViewModel => new() { CarId = CarId, - CarName = CarName, Count = Count, Sum = Sum, DateCreate = DateCreate, @@ -92,7 +87,6 @@ namespace AutomobilePlantFileImplement.Models public XElement GetXElement => new( "Order", new XAttribute("Id", Id), - new XElement("CarName", CarName), new XElement("CarId", CarId.ToString()), new XElement("Count", Count.ToString()), new XElement("Sum", Sum.ToString()),