From 21d61b9c40a56911f331885223b9971e87cec651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B8=D0=BD=D0=B0?= <Алина@DESKTOP-PH8VQJA> Date: Tue, 5 Mar 2024 20:56:09 +0400 Subject: [PATCH 1/4] =?UTF-8?q?=D0=B2=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Typography/Typography.sln | 6 ++ .../BindingModels/ComponentBindingModel.cs | 7 +- .../DataFileSingleton.cs | 62 ++++++++++++ .../Implements/ComponentStorage.cs | 85 +++++++++++++++++ .../Implements/OrderStorage .cs | 94 +++++++++++++++++++ .../Implements/PrintedStorage.cs | 86 +++++++++++++++++ .../Models/Component.cs | 65 +++++++++++++ .../TypographyFileImplement/Models/Order.cs | 90 ++++++++++++++++++ .../TypographyFileImplement/Models/Printed.cs | 92 ++++++++++++++++++ .../TypographyFileImplement.csproj | 16 ++++ Typography/TypographyView/Program.cs | 2 +- .../TypographyView/TypographyView.csproj | 2 +- 12 files changed, 599 insertions(+), 8 deletions(-) create mode 100644 Typography/TypographyFileImplement/DataFileSingleton.cs create mode 100644 Typography/TypographyFileImplement/Implements/ComponentStorage.cs create mode 100644 Typography/TypographyFileImplement/Implements/OrderStorage .cs create mode 100644 Typography/TypographyFileImplement/Implements/PrintedStorage.cs create mode 100644 Typography/TypographyFileImplement/Models/Component.cs create mode 100644 Typography/TypographyFileImplement/Models/Order.cs create mode 100644 Typography/TypographyFileImplement/Models/Printed.cs create mode 100644 Typography/TypographyFileImplement/TypographyFileImplement.csproj diff --git a/Typography/Typography.sln b/Typography/Typography.sln index 7d6ed57..28bc28e 100644 --- a/Typography/Typography.sln +++ b/Typography/Typography.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TypographyBusinessLogic", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TypographyDataModels", "TypographyDataModels\TypographyDataModels.csproj", "{75576C57-02E9-4D1D-9A02-D39C1EBE992D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TypographyFileImplement", "TypographyFileImplement\TypographyFileImplement.csproj", "{C5D1C1C8-9221-40E9-8F1E-0DD6BB46FC4B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +41,10 @@ Global {75576C57-02E9-4D1D-9A02-D39C1EBE992D}.Debug|Any CPU.Build.0 = Debug|Any CPU {75576C57-02E9-4D1D-9A02-D39C1EBE992D}.Release|Any CPU.ActiveCfg = Release|Any CPU {75576C57-02E9-4D1D-9A02-D39C1EBE992D}.Release|Any CPU.Build.0 = Release|Any CPU + {C5D1C1C8-9221-40E9-8F1E-0DD6BB46FC4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C5D1C1C8-9221-40E9-8F1E-0DD6BB46FC4B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C5D1C1C8-9221-40E9-8F1E-0DD6BB46FC4B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C5D1C1C8-9221-40E9-8F1E-0DD6BB46FC4B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Typography/TypographyContracts/BindingModels/ComponentBindingModel.cs b/Typography/TypographyContracts/BindingModels/ComponentBindingModel.cs index 15f49db..2ff41c6 100644 --- a/Typography/TypographyContracts/BindingModels/ComponentBindingModel.cs +++ b/Typography/TypographyContracts/BindingModels/ComponentBindingModel.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TypographyDataModels.Models; +using TypographyDataModels.Models; namespace TypographyContracts.BindingModels { diff --git a/Typography/TypographyFileImplement/DataFileSingleton.cs b/Typography/TypographyFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..bdbcb17 --- /dev/null +++ b/Typography/TypographyFileImplement/DataFileSingleton.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyFileImplement.Models; +using System.Xml.Linq; + +namespace TypographyFileImplement +{ + public class DataFileSingleton + { + private static DataFileSingleton? instance; + + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string PrintedFileName = "Printed.xml"; + + public List Components { get; private set; } + public List Orders { get; private set; } + public List Printeds { 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 SavePrinteds() => SaveData(Printeds, PrintedFileName, "Printeds", x => x.GetXElement); + + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Printeds = LoadData(PrintedFileName, "Product", x => Printed.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/Typography/TypographyFileImplement/Implements/ComponentStorage.cs b/Typography/TypographyFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..a13cbab --- /dev/null +++ b/Typography/TypographyFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,85 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.StoragesContracts; +using TypographyContracts.ViewModels; +using TypographyFileImplement.Models; + +namespace TypographyFileImplement.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/Typography/TypographyFileImplement/Implements/OrderStorage .cs b/Typography/TypographyFileImplement/Implements/OrderStorage .cs new file mode 100644 index 0000000..1576f57 --- /dev/null +++ b/Typography/TypographyFileImplement/Implements/OrderStorage .cs @@ -0,0 +1,94 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.StoragesContracts; +using TypographyContracts.ViewModels; +using TypographyFileImplement.Models; + +namespace TypographyFileImplement.Implements +{ + public class OrderStorage : IOrderStorage { + + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Orders + .Select(x => DefinePrintedName(x.GetViewModel)) + .ToList(); + } + + private OrderViewModel DefinePrintedName(OrderViewModel model) + { + string? printedName = source.Printeds.FirstOrDefault(x => model.PrintedId == x.Id)?.PrintedName; + if (printedName != null) + { + model.PrintedName = printedName; + } + return model; + } + + public List GetFilteredList(OrderSearchModel model) + { + if (model.Id == null) + { + return new(); + } + return source.Orders + .Where(x => x.Id == model.Id) + .Select(x => DefinePrintedName(x.GetViewModel)) + .ToList(); + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + return DefinePrintedName(source.Orders + .FirstOrDefault(x => (model.Id.HasValue && 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 DefinePrintedName(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 DefinePrintedName(order.GetViewModel); + } + + 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 DefinePrintedName(element.GetViewModel); + } + return null; + } + } +} diff --git a/Typography/TypographyFileImplement/Implements/PrintedStorage.cs b/Typography/TypographyFileImplement/Implements/PrintedStorage.cs new file mode 100644 index 0000000..cc7bf9a --- /dev/null +++ b/Typography/TypographyFileImplement/Implements/PrintedStorage.cs @@ -0,0 +1,86 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.StoragesContracts; +using TypographyContracts.ViewModels; +using TypographyFileImplement.Models; + +namespace TypographyFileImplement.Implements +{ + public class PrintedStorage : IPrintedStorage + { + + private readonly DataFileSingleton source; + + public PrintedStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Printeds + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(PrintedSearchModel model) + { + if (string.IsNullOrEmpty(model.PrintedName)) + { + return new(); + } + return source.Printeds + .Where(x => x.PrintedName.Contains(model.PrintedName)) + .Select(x => x.GetViewModel) + .ToList(); + } + + public PrintedViewModel? GetElement(PrintedSearchModel model) + { + if (string.IsNullOrEmpty(model.PrintedName) && !model.Id.HasValue) + { + return null; + } + return source.Printeds + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.PrintedName) && x.PrintedName == model.PrintedName) || + (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public PrintedViewModel? Insert(PrintedBindingModel model) + { + model.Id = source.Printeds.Count > 0 ? source.Printeds.Max(x => x.Id) + 1 : 1; + var newPrinted = Printed.Create(model); + if (newPrinted == null) + { + return null; + } + source.Printeds.Add(newPrinted); + source.SavePrinteds(); + return newPrinted.GetViewModel; + } + + public PrintedViewModel? Update(PrintedBindingModel model) + { + var printed = source.Printeds.FirstOrDefault(x => x.Id == model.Id); + if (printed == null) + { + return null; + } + printed.Update(model); + source.SavePrinteds(); + return printed.GetViewModel; + } + + public PrintedViewModel? Delete(PrintedBindingModel model) + { + var element = source.Printeds.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Printeds.Remove(element); + source.SavePrinteds(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/Typography/TypographyFileImplement/Models/Component.cs b/Typography/TypographyFileImplement/Models/Component.cs new file mode 100644 index 0000000..d07ae16 --- /dev/null +++ b/Typography/TypographyFileImplement/Models/Component.cs @@ -0,0 +1,65 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.ViewModels; +using TypographyDataModels.Models; +using System.Xml.Linq; + +namespace TypographyFileImplement.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/Typography/TypographyFileImplement/Models/Order.cs b/Typography/TypographyFileImplement/Models/Order.cs new file mode 100644 index 0000000..db7130f --- /dev/null +++ b/Typography/TypographyFileImplement/Models/Order.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; +using TypographyDataModels.Enums; +using TypographyDataModels.Models; +using TypographyContracts.BindingModels; + +namespace TypographyFileImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + public int PrintedId { 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, + PrintedId = model.PrintedId, + 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; + } + return new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + PrintedId = Convert.ToInt32(element.Element("PrintedId")!.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 = 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() + { + Id = Id, + PrintedId = PrintedId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("PrintedId", PrintedId), + new XElement("Count", Count), + new XElement("Sum", Sum.ToString()), + new XElement("Status", Status.ToString()), + new XElement("DateCreate", DateCreate.ToString()), + new XElement("DateImplement", DateImplement.ToString())); + } +} diff --git a/Typography/TypographyFileImplement/Models/Printed.cs b/Typography/TypographyFileImplement/Models/Printed.cs new file mode 100644 index 0000000..0c18043 --- /dev/null +++ b/Typography/TypographyFileImplement/Models/Printed.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; +using TypographyDataModels.Models; + +namespace TypographyFileImplement.Models +{ + public class Printed : IPrintedModel + { + public int Id { get; private set; } + public string PrintedName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + + private Dictionary? _productComponents = null; + + public Dictionary PrintedComponents + { + 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 Printed? Create(PrintedBindingModel model) + { + if (model == null) + { + return null; + } + return new Printed() + { + Id = model.Id, + PrintedName = model.PrintedName, + Price = model.Price, + Components = model.PrintedComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + public static Printed? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Printed() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + PrintedName = element.Element("ProductName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("ProductComponents")!.Elements("ProductComponent").ToDictionary(x => + Convert.ToInt32(x.Element("Key")?.Value), x => + Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(PrintedBindingModel model) + { + if (model == null) + { + return; + } + PrintedName = model.PrintedName; + Price = model.Price; + Components = model.PrintedComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _productComponents = null; + } + public PrintedViewModel GetViewModel => new() + { + Id = Id, + PrintedName = PrintedName, + Price = Price, + PrintedComponents = PrintedComponents + }; + public XElement GetXElement => new("Product", + new XAttribute("Id", Id), + new XElement("ProductName", PrintedName), + new XElement("Price", Price.ToString()), + new XElement("ProductComponents", Components.Select(x => + new XElement("ProductComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))) + .ToArray())); + + } +} diff --git a/Typography/TypographyFileImplement/TypographyFileImplement.csproj b/Typography/TypographyFileImplement/TypographyFileImplement.csproj new file mode 100644 index 0000000..fe9f0c9 --- /dev/null +++ b/Typography/TypographyFileImplement/TypographyFileImplement.csproj @@ -0,0 +1,16 @@ + + + + net6.0 + enable + enable + + + + + + + + + + diff --git a/Typography/TypographyView/Program.cs b/Typography/TypographyView/Program.cs index 20a1e90..c7e0a99 100644 --- a/Typography/TypographyView/Program.cs +++ b/Typography/TypographyView/Program.cs @@ -1,7 +1,7 @@ using TypographyBusinessLogic.BusinessLogics; using TypographyContracts.BusinessLogicsContracts; using TypographyContracts.StoragesContracts; -using TypographyListImplement.Implements; +using TypographyFileImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; diff --git a/Typography/TypographyView/TypographyView.csproj b/Typography/TypographyView/TypographyView.csproj index d5e8cf5..e6c718b 100644 --- a/Typography/TypographyView/TypographyView.csproj +++ b/Typography/TypographyView/TypographyView.csproj @@ -26,7 +26,7 @@ - + -- 2.25.1 From a99b59f54ada7e93b34ac866e2cc05d159c0bc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B8=D0=BD=D0=B0?= <Алина@DESKTOP-PH8VQJA> Date: Wed, 6 Mar 2024 09:08:22 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B8=D1=88=20=D0=B1?= =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Typography/TypographyFileImplement/Models/Order.cs | 1 + Typography/TypographyFileImplement/Models/Printed.cs | 3 ++- Typography/TypographyView/Program.cs | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Typography/TypographyFileImplement/Models/Order.cs b/Typography/TypographyFileImplement/Models/Order.cs index db7130f..f8f5678 100644 --- a/Typography/TypographyFileImplement/Models/Order.cs +++ b/Typography/TypographyFileImplement/Models/Order.cs @@ -7,6 +7,7 @@ using System.Xml.Linq; using TypographyDataModels.Enums; using TypographyDataModels.Models; using TypographyContracts.BindingModels; +using TypographyContracts.ViewModels; namespace TypographyFileImplement.Models { diff --git a/Typography/TypographyFileImplement/Models/Printed.cs b/Typography/TypographyFileImplement/Models/Printed.cs index 0c18043..7a5ff47 100644 --- a/Typography/TypographyFileImplement/Models/Printed.cs +++ b/Typography/TypographyFileImplement/Models/Printed.cs @@ -4,6 +4,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; +using TypographyContracts.BindingModels; +using TypographyContracts.ViewModels; using TypographyDataModels.Models; namespace TypographyFileImplement.Models @@ -87,6 +89,5 @@ namespace TypographyFileImplement.Models new XElement("Key", x.Key), new XElement("Value", x.Value))) .ToArray())); - } } diff --git a/Typography/TypographyView/Program.cs b/Typography/TypographyView/Program.cs index c7e0a99..aea75eb 100644 --- a/Typography/TypographyView/Program.cs +++ b/Typography/TypographyView/Program.cs @@ -28,7 +28,6 @@ namespace TypographyView _serviceProvider = services.BuildServiceProvider(); Application.Run(_serviceProvider.GetRequiredService()); } - private static void ConfigureServices(ServiceCollection services) { services.AddLogging(option => -- 2.25.1 From 5988b92709bff190410d6e13bebac42fab055010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B8=D0=BD=D0=B0?= <Алина@DESKTOP-PH8VQJA> Date: Thu, 7 Mar 2024 18:50:50 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=202=20=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TypographyFileImplement/Implements/OrderStorage .cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Typography/TypographyFileImplement/Implements/OrderStorage .cs b/Typography/TypographyFileImplement/Implements/OrderStorage .cs index 1576f57..b1f5cf9 100644 --- a/Typography/TypographyFileImplement/Implements/OrderStorage .cs +++ b/Typography/TypographyFileImplement/Implements/OrderStorage .cs @@ -25,10 +25,11 @@ namespace TypographyFileImplement.Implements private OrderViewModel DefinePrintedName(OrderViewModel model) { string? printedName = source.Printeds.FirstOrDefault(x => model.PrintedId == x.Id)?.PrintedName; - if (printedName != null) + if (printedName == null) { - model.PrintedName = printedName; + return null; } + model.PrintedName = printedName; return model; } -- 2.25.1 From 43084d7f8a8c839c475242c67574c7195c320ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B8=D0=BD=D0=B0?= <Алина@DESKTOP-PH8VQJA> Date: Fri, 22 Mar 2024 22:58:30 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=202=20=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TypographyFileImplement/Implements/OrderStorage .cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Typography/TypographyFileImplement/Implements/OrderStorage .cs b/Typography/TypographyFileImplement/Implements/OrderStorage .cs index b1f5cf9..1576f57 100644 --- a/Typography/TypographyFileImplement/Implements/OrderStorage .cs +++ b/Typography/TypographyFileImplement/Implements/OrderStorage .cs @@ -25,11 +25,10 @@ namespace TypographyFileImplement.Implements private OrderViewModel DefinePrintedName(OrderViewModel model) { string? printedName = source.Printeds.FirstOrDefault(x => model.PrintedId == x.Id)?.PrintedName; - if (printedName == null) + if (printedName != null) { - return null; + model.PrintedName = printedName; } - model.PrintedName = printedName; return model; } -- 2.25.1