From 620f4ef4c75e92fb7d493daede9b4eb11127b1af Mon Sep 17 00:00:00 2001 From: ekallin Date: Sat, 24 Feb 2024 14:00:35 +0400 Subject: [PATCH 1/8] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=202=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=BD=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/FormMain.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/SushiBar/FormMain.cs b/SushiBar/FormMain.cs index f7d20cc..8e36fee 100644 --- a/SushiBar/FormMain.cs +++ b/SushiBar/FormMain.cs @@ -2,15 +2,8 @@ using SushiBar; using SushiBarContracts.BindingModel; using SushiBarContracts.BusinessLogicsContracts; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; + +// create labwork02 namespace SushiBarView { From fcba235a13b7f5334a8dde420eaa7180472e5416 Mon Sep 17 00:00:00 2001 From: ekallin Date: Sat, 24 Feb 2024 19:52:26 +0400 Subject: [PATCH 2/8] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20=D1=81=D0=B8=D0=BD?= =?UTF-8?q?=D0=B3=D0=BB=D1=82=D0=BE=D0=BD=20=D0=B8=20=D0=B2=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=89=D0=B5=D0=BC=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=20...?= =?UTF-8?q?FileImplement=20-=20=D0=BD=D0=B5=D0=BF=D0=BE=D0=BB=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/SushiBar.sln | 6 ++ SushiBarFileImplement/DataFileSingleton.cs | 57 ++++++++++++ SushiBarFileImplement/Models/Component.cs | 61 +++++++++++++ SushiBarFileImplement/Models/Order.cs | 81 +++++++++++++++++ SushiBarFileImplement/Models/Sushi.cs | 88 +++++++++++++++++++ .../SushiBarFileImplement.csproj | 19 ++++ SushiBarListImplement/Component.cs | 2 + SushiBarListImplement/Order.cs | 1 + SushiBarListImplement/Sushi.cs | 1 + 9 files changed, 316 insertions(+) create mode 100644 SushiBarFileImplement/DataFileSingleton.cs create mode 100644 SushiBarFileImplement/Models/Component.cs create mode 100644 SushiBarFileImplement/Models/Order.cs create mode 100644 SushiBarFileImplement/Models/Sushi.cs create mode 100644 SushiBarFileImplement/SushiBarFileImplement.csproj diff --git a/SushiBar/SushiBar.sln b/SushiBar/SushiBar.sln index 89f7155..aef3a5d 100644 --- a/SushiBar/SushiBar.sln +++ b/SushiBar/SushiBar.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarBusinessLogic", ".. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarListImplement", "..\SushiBarListImplement\SushiBarListImplement.csproj", "{99652DC5-71FC-4100-834F-4CD8D14A4AAA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarFileImplement", "..\SushiBarFileImplement\SushiBarFileImplement.csproj", "{3BBA0338-D51F-4F6F-AAF2-22CE85998289}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +41,10 @@ Global {99652DC5-71FC-4100-834F-4CD8D14A4AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU {99652DC5-71FC-4100-834F-4CD8D14A4AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU {99652DC5-71FC-4100-834F-4CD8D14A4AAA}.Release|Any CPU.Build.0 = Release|Any CPU + {3BBA0338-D51F-4F6F-AAF2-22CE85998289}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3BBA0338-D51F-4F6F-AAF2-22CE85998289}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3BBA0338-D51F-4F6F-AAF2-22CE85998289}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3BBA0338-D51F-4F6F-AAF2-22CE85998289}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SushiBarFileImplement/DataFileSingleton.cs b/SushiBarFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..9ec90da --- /dev/null +++ b/SushiBarFileImplement/DataFileSingleton.cs @@ -0,0 +1,57 @@ +using SushiBarFileImplement.Models; +using System.Xml.Linq; + +namespace SushiBarFileImplement +{ + public class DataFileSingleton + { + private static DataFileSingleton? instance; + + private readonly string ComponentFileName = "Component.xml"; + + private readonly string OrderFileName = "Order.xml"; + + private readonly string SushiFileName = "Sushi.xml"; + + public List Components { get; private set; } + public List Orders { get; private set; } + public List Sushis { 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 SaveSushis() => SaveData(Sushis, SushiFileName, "Sushis", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Sushis = LoadData(SushiFileName, "Sushi", x => Sushi.Create(x)!)!; + Orders = new List(); + } + + private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) + { + if (File.Exists(filename)) + { + return + XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); + } + return new List(); + } + private static void SaveData(List data, string filename, string xmlNodeName, Func selectFunction) + { + if (data != null) + { + new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename); + } + } + } +} diff --git a/SushiBarFileImplement/Models/Component.cs b/SushiBarFileImplement/Models/Component.cs new file mode 100644 index 0000000..ad98dad --- /dev/null +++ b/SushiBarFileImplement/Models/Component.cs @@ -0,0 +1,61 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.ViewModels; +using SushiBarDataModels.Models; +using System.Xml.Linq; + +namespace SushiBarFileImplement.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/SushiBarFileImplement/Models/Order.cs b/SushiBarFileImplement/Models/Order.cs new file mode 100644 index 0000000..b3d6258 --- /dev/null +++ b/SushiBarFileImplement/Models/Order.cs @@ -0,0 +1,81 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.ViewModels; +using SushiBarDataModels; +using SushiBarDataModels.Enums; +using System.Xml.Linq; + +namespace SushiBarFileImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + public int SushiId { get; private set; } + public int Count { get; private set; } + public double Sum { get; set; } + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + public DateTime DateCreate { get; set; } = DateTime.Now; + public DateTime? DateImplement { get; set; } + public static Order? Create(OrderBindingModel model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + SushiId = model.SushiId, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate + }; + } + public static Order? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + SushiId = Convert.ToInt32(element.Element("SushiId")!.Value), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + Status = (OrderStatus)Convert.ToInt32(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, + SushiId = SushiId, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + }; + public XElement GetXElement => + new("Order", + new XAttribute("Id", Id), + new XElement("SushiId", SushiId.ToString()), + new XElement("Count", SushiId.ToString()), + new XElement("Sum", Sum.ToString()), + new XElement("Status", Status.ToString()), + new XElement("DateCreate", DateCreate.ToString()), + new XElement("DateImplement", DateImplement.ToString()) + ); + } +} diff --git a/SushiBarFileImplement/Models/Sushi.cs b/SushiBarFileImplement/Models/Sushi.cs new file mode 100644 index 0000000..f2aaae8 --- /dev/null +++ b/SushiBarFileImplement/Models/Sushi.cs @@ -0,0 +1,88 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.ViewModels; +using SushiBarDataModels.Models; +using System.Xml.Linq; + +namespace SushiBarFileImplement.Models +{ + public class Sushi : ISushiModel + { + public int Id { get; private set; } + public string SushiName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + + private Dictionary? _sushiComponents = null; + public Dictionary SushiComponents + { + get + { + if (_sushiComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _sushiComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) + as IComponentModel)!, y.Value)); + } + return _sushiComponents; + } + } + public static Sushi? Create(SushiBindingModel model) + { + if (model == null) + { + return null; + } + return new Sushi() + { + Id = model.Id, + SushiName = model.SushiName, + Price = model.Price, + Components = model.SushiComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + public static Sushi? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Sushi() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + SushiName = element.Element("SushiName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("SushiComponents")!.Elements("SushiComponent").ToDictionary(x => + Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(SushiBindingModel model) + { + if (model == null) + { + return; + } + SushiName = model.SushiName; + Price = model.Price; + Components = model.SushiComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _sushiComponents = null; + } + public SushiViewModel GetViewModel => new() + { + Id = Id, + SushiName = SushiName, + Price = Price, + SushiComponents = SushiComponents + }; + public XElement GetXElement => + new("Sushi", + new XAttribute("Id", Id), + new XElement("SushiName", SushiName), + new XElement("Price", Price.ToString()), + new XElement("SushiComponents", Components.Select(x => + new XElement("SushiComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))).ToArray() + ) + ); + } +} diff --git a/SushiBarFileImplement/SushiBarFileImplement.csproj b/SushiBarFileImplement/SushiBarFileImplement.csproj new file mode 100644 index 0000000..1716a8e --- /dev/null +++ b/SushiBarFileImplement/SushiBarFileImplement.csproj @@ -0,0 +1,19 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + diff --git a/SushiBarListImplement/Component.cs b/SushiBarListImplement/Component.cs index 031a400..4bf4648 100644 --- a/SushiBarListImplement/Component.cs +++ b/SushiBarListImplement/Component.cs @@ -1,6 +1,8 @@ using SushiBarContracts.BindingModel; using SushiBarContracts.ViewModels; using SushiBarDataModels.Models; +using System.Diagnostics; +using System.Xml.Linq; namespace SushiBarListImplement.Models { diff --git a/SushiBarListImplement/Order.cs b/SushiBarListImplement/Order.cs index 58204c5..a872d8f 100644 --- a/SushiBarListImplement/Order.cs +++ b/SushiBarListImplement/Order.cs @@ -4,6 +4,7 @@ using SushiBarDataModels.Models; using SushiBarDataModels; using SushiBarDataModels.Enums; using System.Diagnostics; +using System.Xml.Linq; namespace SushiBarListImplement.Models { diff --git a/SushiBarListImplement/Sushi.cs b/SushiBarListImplement/Sushi.cs index b7f1f30..5ec7cea 100644 --- a/SushiBarListImplement/Sushi.cs +++ b/SushiBarListImplement/Sushi.cs @@ -1,6 +1,7 @@ using SushiBarContracts.BindingModel; using SushiBarContracts.ViewModels; using SushiBarDataModels.Models; +using System.Xml.Linq; namespace SushiBarListImplement.Models { From 3887c871c73b2b437314cfd49c3335aea8006ede Mon Sep 17 00:00:00 2001 From: ekallin Date: Sun, 25 Feb 2024 00:45:52 +0400 Subject: [PATCH 3/8] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D1=82=D0=B8=20=D0=B3?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=B0?= =?UTF-8?q?=202,=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D1=8C=20=D0=B1=D0=B0=D0=B3=20-=20=D0=B7=D0=B0=D0=BA?= =?UTF-8?q?=D0=B0=D0=B7=D1=8B=20=D0=BD=D0=B5=20=D1=81=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D1=83=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D1=8E?= =?UTF-8?q?=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/Program.cs | 6 +- SushiBar/SushiBarView.csproj | 1 + SushiBarFileImplement/DataFileSingleton.cs | 2 +- .../Implements/ComponentStorage.cs | 72 ++++++++++++++++ .../Implements/OrderStorage.cs | 83 +++++++++++++++++++ .../Implements/SushiStorage.cs | 77 +++++++++++++++++ SushiBarFileImplement/Models/Order.cs | 16 ++-- SushiBarFileImplement/Models/Sushi.cs | 6 +- .../SushiBarFileImplement.csproj | 4 - SushiBarListImplement/Order.cs | 4 - 10 files changed, 251 insertions(+), 20 deletions(-) create mode 100644 SushiBarFileImplement/Implements/ComponentStorage.cs create mode 100644 SushiBarFileImplement/Implements/OrderStorage.cs create mode 100644 SushiBarFileImplement/Implements/SushiStorage.cs diff --git a/SushiBar/Program.cs b/SushiBar/Program.cs index a0a80e2..0ace9a1 100644 --- a/SushiBar/Program.cs +++ b/SushiBar/Program.cs @@ -1,10 +1,11 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; + using SushiBarBusinessLogic.BusinessLogic; using SushiBarContracts.BusinessLogicsContracts; using SushiBarContracts.StoragesContracts; -using SushiBarListImplement.Implements; +using SushiBarFileImplement.Implements; using SushiBarView; namespace SushiBar @@ -28,7 +29,6 @@ namespace SushiBar ConfigureServices(services); _serviceProvider = services.BuildServiceProvider(); Application.Run(_serviceProvider.GetRequiredService()); - //Application.Run(new Form1()); } private static void ConfigureServices(ServiceCollection services) @@ -41,9 +41,11 @@ namespace SushiBar services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/SushiBar/SushiBarView.csproj b/SushiBar/SushiBarView.csproj index 4a36d5f..fadac92 100644 --- a/SushiBar/SushiBarView.csproj +++ b/SushiBar/SushiBarView.csproj @@ -34,6 +34,7 @@ + diff --git a/SushiBarFileImplement/DataFileSingleton.cs b/SushiBarFileImplement/DataFileSingleton.cs index 9ec90da..5e0dfa2 100644 --- a/SushiBarFileImplement/DataFileSingleton.cs +++ b/SushiBarFileImplement/DataFileSingleton.cs @@ -34,7 +34,7 @@ namespace SushiBarFileImplement { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Sushis = LoadData(SushiFileName, "Sushi", x => Sushi.Create(x)!)!; - Orders = new List(); + Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/SushiBarFileImplement/Implements/ComponentStorage.cs b/SushiBarFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..a4f138a --- /dev/null +++ b/SushiBarFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,72 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarFileImplement.Models; + +namespace SushiBarFileImplement.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/SushiBarFileImplement/Implements/OrderStorage.cs b/SushiBarFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..375b2f7 --- /dev/null +++ b/SushiBarFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,83 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarFileImplement.Models; + +namespace SushiBarFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return source.Orders.Select(x => GetViewModel(x)).ToList(); + } + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList(); + } + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + return GetViewModel(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)); + } + 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 GetViewModel(newOrder); + } + 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 GetViewModel(order); + } + 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 GetViewModel(element); + } + return null; + } + + public OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; + var sushi = source.Sushis.FirstOrDefault(x => x.Id == order.SushiId); + if(sushi != null) + { + viewModel.SushiName = sushi.SushiName; + } + return viewModel; + } + } +} diff --git a/SushiBarFileImplement/Implements/SushiStorage.cs b/SushiBarFileImplement/Implements/SushiStorage.cs new file mode 100644 index 0000000..956a984 --- /dev/null +++ b/SushiBarFileImplement/Implements/SushiStorage.cs @@ -0,0 +1,77 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarFileImplement.Models; + + +namespace SushiBarFileImplement.Implements +{ + public class SushiStorage : ISushiStorage + { + private readonly DataFileSingleton source; + public SushiStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Sushis.Select(x => x.GetViewModel).ToList(); + } + + public List GetFilteredList(SushiSearchModel model) + { + if (string.IsNullOrEmpty(model.SushiName)) + { + return new(); + } + return source.Sushis.Where(x => x.SushiName.Contains(model.SushiName)).Select(x => x.GetViewModel).ToList(); + } + + public SushiViewModel? GetElement(SushiSearchModel model) + { + if (string.IsNullOrEmpty(model.SushiName) && !model.Id.HasValue) + { + return null; + } + return source.Sushis.FirstOrDefault(x => (!string.IsNullOrEmpty(model.SushiName) && + x.SushiName == model.SushiName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public SushiViewModel? Insert(SushiBindingModel model) + { + model.Id = source.Sushis.Count > 0 ? source.Sushis.Max(x => x.Id) + 1 : 1; + var newSushi = Sushi.Create(model); + if (newSushi == null) + { + return null; + } + source.Sushis.Add(newSushi); + source.SaveSushis(); + return newSushi.GetViewModel; + } + public SushiViewModel? Update(SushiBindingModel model) + { + var sushi = source.Sushis.FirstOrDefault(x => x.Id == model.Id); + if (sushi == null) + { + return null; + } + sushi.Update(model); + source.SaveSushis(); + return sushi.GetViewModel; + } + public SushiViewModel? Delete(SushiBindingModel model) + { + var element = source.Sushis.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Sushis.Remove(element); + source.SaveSushis(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/SushiBarFileImplement/Models/Order.cs b/SushiBarFileImplement/Models/Order.cs index b3d6258..97b723b 100644 --- a/SushiBarFileImplement/Models/Order.cs +++ b/SushiBarFileImplement/Models/Order.cs @@ -11,11 +11,11 @@ namespace SushiBarFileImplement.Models public int Id { get; private set; } public int SushiId { get; private set; } public int Count { get; private set; } - public double Sum { get; set; } - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; set; } = DateTime.Now; - public DateTime? DateImplement { get; set; } - public static Order? Create(OrderBindingModel model) + 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) { @@ -28,7 +28,8 @@ namespace SushiBarFileImplement.Models Count = model.Count, Sum = model.Sum, Status = model.Status, - DateCreate = model.DateCreate + DateCreate = model.DateCreate, + DateImplement = model.DateImplement }; } public static Order? Create(XElement element) @@ -43,7 +44,7 @@ namespace SushiBarFileImplement.Models SushiId = Convert.ToInt32(element.Element("SushiId")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value), - Status = (OrderStatus)Convert.ToInt32(element.Element("Status")!.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) @@ -62,6 +63,7 @@ namespace SushiBarFileImplement.Models { Id = Id, SushiId = SushiId, + Count = Count, Sum = Sum, Status = Status, DateCreate = DateCreate, diff --git a/SushiBarFileImplement/Models/Sushi.cs b/SushiBarFileImplement/Models/Sushi.cs index f2aaae8..b5d914c 100644 --- a/SushiBarFileImplement/Models/Sushi.cs +++ b/SushiBarFileImplement/Models/Sushi.cs @@ -20,8 +20,10 @@ namespace SushiBarFileImplement.Models if (_sushiComponents == null) { var source = DataFileSingleton.GetInstance(); - _sushiComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) - as IComponentModel)!, y.Value)); + _sushiComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) + as IComponentModel)!, y.Value) + ); } return _sushiComponents; } diff --git a/SushiBarFileImplement/SushiBarFileImplement.csproj b/SushiBarFileImplement/SushiBarFileImplement.csproj index 1716a8e..04be97c 100644 --- a/SushiBarFileImplement/SushiBarFileImplement.csproj +++ b/SushiBarFileImplement/SushiBarFileImplement.csproj @@ -12,8 +12,4 @@ - - - - diff --git a/SushiBarListImplement/Order.cs b/SushiBarListImplement/Order.cs index a872d8f..ad2c3b1 100644 --- a/SushiBarListImplement/Order.cs +++ b/SushiBarListImplement/Order.cs @@ -42,11 +42,7 @@ namespace SushiBarListImplement.Models { return; } - SushiId = model.SushiId; - Count = model.Count; - Sum = model.Sum; Status = model.Status; - DateCreate = model.DateCreate; DateImplement = model.DateImplement; } From faa0a6db67e704970aaf92f0e261a3f81938e1fc Mon Sep 17 00:00:00 2001 From: ekallin Date: Sun, 25 Feb 2024 09:25:27 +0400 Subject: [PATCH 4/8] =?UTF-8?q?=D0=B2=D1=81=D0=B5,=20=D0=B1=D0=B0=D0=B3=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD,=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=20=D0=B6=D0=B4=D0=B5=D1=82=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D0=BE=D0=B9=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/FormMain.Designer.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/SushiBar/FormMain.Designer.cs b/SushiBar/FormMain.Designer.cs index 8fe0865..f46a473 100644 --- a/SushiBar/FormMain.Designer.cs +++ b/SushiBar/FormMain.Designer.cs @@ -150,6 +150,7 @@ MainMenuStrip = menuStrip1; Name = "FormMain"; Text = "Суши Бар"; + Load += FormMain_Load; menuStrip1.ResumeLayout(false); menuStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); From 174ebe6f4b5f86eab98eb2476331359598f33899 Mon Sep 17 00:00:00 2001 From: ekallin Date: Sun, 25 Feb 2024 09:43:27 +0400 Subject: [PATCH 5/8] =?UTF-8?q?=D0=B3=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=20=D0=B4=D0=BB=D1=8F=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B0=D1=87=D0=B8=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/SushiBar/Program.cs b/SushiBar/Program.cs index 0ace9a1..de0a8b2 100644 --- a/SushiBar/Program.cs +++ b/SushiBar/Program.cs @@ -12,6 +12,7 @@ namespace SushiBar { internal static class Program { + // 2 private static ServiceProvider? _serviceProvider; public static ServiceProvider? ServiceProvider => _serviceProvider; From 8b29b0dcc9fe38cd1057629773e48ed842a1aefb Mon Sep 17 00:00:00 2001 From: ekallin Date: Sun, 25 Feb 2024 00:45:52 +0400 Subject: [PATCH 6/8] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D1=82=D0=B8=20=D0=B3?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=B0?= =?UTF-8?q?=202,=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D1=8C=20=D0=B1=D0=B0=D0=B3=20-=20=D0=B7=D0=B0=D0=BA?= =?UTF-8?q?=D0=B0=D0=B7=D1=8B=20=D0=BD=D0=B5=20=D1=81=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D1=83=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D1=8E?= =?UTF-8?q?=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/Program.cs | 6 +- SushiBar/SushiBarView.csproj | 1 + SushiBarFileImplement/DataFileSingleton.cs | 2 +- .../Implements/ComponentStorage.cs | 72 ++++++++++++++++ .../Implements/OrderStorage.cs | 83 +++++++++++++++++++ .../Implements/SushiStorage.cs | 77 +++++++++++++++++ SushiBarFileImplement/Models/Order.cs | 16 ++-- SushiBarFileImplement/Models/Sushi.cs | 6 +- .../SushiBarFileImplement.csproj | 4 - SushiBarListImplement/Order.cs | 4 - 10 files changed, 251 insertions(+), 20 deletions(-) create mode 100644 SushiBarFileImplement/Implements/ComponentStorage.cs create mode 100644 SushiBarFileImplement/Implements/OrderStorage.cs create mode 100644 SushiBarFileImplement/Implements/SushiStorage.cs diff --git a/SushiBar/Program.cs b/SushiBar/Program.cs index a0a80e2..0ace9a1 100644 --- a/SushiBar/Program.cs +++ b/SushiBar/Program.cs @@ -1,10 +1,11 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; + using SushiBarBusinessLogic.BusinessLogic; using SushiBarContracts.BusinessLogicsContracts; using SushiBarContracts.StoragesContracts; -using SushiBarListImplement.Implements; +using SushiBarFileImplement.Implements; using SushiBarView; namespace SushiBar @@ -28,7 +29,6 @@ namespace SushiBar ConfigureServices(services); _serviceProvider = services.BuildServiceProvider(); Application.Run(_serviceProvider.GetRequiredService()); - //Application.Run(new Form1()); } private static void ConfigureServices(ServiceCollection services) @@ -41,9 +41,11 @@ namespace SushiBar services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/SushiBar/SushiBarView.csproj b/SushiBar/SushiBarView.csproj index 4a36d5f..fadac92 100644 --- a/SushiBar/SushiBarView.csproj +++ b/SushiBar/SushiBarView.csproj @@ -34,6 +34,7 @@ + diff --git a/SushiBarFileImplement/DataFileSingleton.cs b/SushiBarFileImplement/DataFileSingleton.cs index 9ec90da..5e0dfa2 100644 --- a/SushiBarFileImplement/DataFileSingleton.cs +++ b/SushiBarFileImplement/DataFileSingleton.cs @@ -34,7 +34,7 @@ namespace SushiBarFileImplement { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Sushis = LoadData(SushiFileName, "Sushi", x => Sushi.Create(x)!)!; - Orders = new List(); + Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/SushiBarFileImplement/Implements/ComponentStorage.cs b/SushiBarFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..a4f138a --- /dev/null +++ b/SushiBarFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,72 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarFileImplement.Models; + +namespace SushiBarFileImplement.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/SushiBarFileImplement/Implements/OrderStorage.cs b/SushiBarFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..375b2f7 --- /dev/null +++ b/SushiBarFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,83 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarFileImplement.Models; + +namespace SushiBarFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return source.Orders.Select(x => GetViewModel(x)).ToList(); + } + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList(); + } + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + return GetViewModel(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)); + } + 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 GetViewModel(newOrder); + } + 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 GetViewModel(order); + } + 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 GetViewModel(element); + } + return null; + } + + public OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; + var sushi = source.Sushis.FirstOrDefault(x => x.Id == order.SushiId); + if(sushi != null) + { + viewModel.SushiName = sushi.SushiName; + } + return viewModel; + } + } +} diff --git a/SushiBarFileImplement/Implements/SushiStorage.cs b/SushiBarFileImplement/Implements/SushiStorage.cs new file mode 100644 index 0000000..956a984 --- /dev/null +++ b/SushiBarFileImplement/Implements/SushiStorage.cs @@ -0,0 +1,77 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarFileImplement.Models; + + +namespace SushiBarFileImplement.Implements +{ + public class SushiStorage : ISushiStorage + { + private readonly DataFileSingleton source; + public SushiStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Sushis.Select(x => x.GetViewModel).ToList(); + } + + public List GetFilteredList(SushiSearchModel model) + { + if (string.IsNullOrEmpty(model.SushiName)) + { + return new(); + } + return source.Sushis.Where(x => x.SushiName.Contains(model.SushiName)).Select(x => x.GetViewModel).ToList(); + } + + public SushiViewModel? GetElement(SushiSearchModel model) + { + if (string.IsNullOrEmpty(model.SushiName) && !model.Id.HasValue) + { + return null; + } + return source.Sushis.FirstOrDefault(x => (!string.IsNullOrEmpty(model.SushiName) && + x.SushiName == model.SushiName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public SushiViewModel? Insert(SushiBindingModel model) + { + model.Id = source.Sushis.Count > 0 ? source.Sushis.Max(x => x.Id) + 1 : 1; + var newSushi = Sushi.Create(model); + if (newSushi == null) + { + return null; + } + source.Sushis.Add(newSushi); + source.SaveSushis(); + return newSushi.GetViewModel; + } + public SushiViewModel? Update(SushiBindingModel model) + { + var sushi = source.Sushis.FirstOrDefault(x => x.Id == model.Id); + if (sushi == null) + { + return null; + } + sushi.Update(model); + source.SaveSushis(); + return sushi.GetViewModel; + } + public SushiViewModel? Delete(SushiBindingModel model) + { + var element = source.Sushis.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Sushis.Remove(element); + source.SaveSushis(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/SushiBarFileImplement/Models/Order.cs b/SushiBarFileImplement/Models/Order.cs index b3d6258..97b723b 100644 --- a/SushiBarFileImplement/Models/Order.cs +++ b/SushiBarFileImplement/Models/Order.cs @@ -11,11 +11,11 @@ namespace SushiBarFileImplement.Models public int Id { get; private set; } public int SushiId { get; private set; } public int Count { get; private set; } - public double Sum { get; set; } - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; set; } = DateTime.Now; - public DateTime? DateImplement { get; set; } - public static Order? Create(OrderBindingModel model) + 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) { @@ -28,7 +28,8 @@ namespace SushiBarFileImplement.Models Count = model.Count, Sum = model.Sum, Status = model.Status, - DateCreate = model.DateCreate + DateCreate = model.DateCreate, + DateImplement = model.DateImplement }; } public static Order? Create(XElement element) @@ -43,7 +44,7 @@ namespace SushiBarFileImplement.Models SushiId = Convert.ToInt32(element.Element("SushiId")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value), - Status = (OrderStatus)Convert.ToInt32(element.Element("Status")!.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) @@ -62,6 +63,7 @@ namespace SushiBarFileImplement.Models { Id = Id, SushiId = SushiId, + Count = Count, Sum = Sum, Status = Status, DateCreate = DateCreate, diff --git a/SushiBarFileImplement/Models/Sushi.cs b/SushiBarFileImplement/Models/Sushi.cs index f2aaae8..b5d914c 100644 --- a/SushiBarFileImplement/Models/Sushi.cs +++ b/SushiBarFileImplement/Models/Sushi.cs @@ -20,8 +20,10 @@ namespace SushiBarFileImplement.Models if (_sushiComponents == null) { var source = DataFileSingleton.GetInstance(); - _sushiComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) - as IComponentModel)!, y.Value)); + _sushiComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) + as IComponentModel)!, y.Value) + ); } return _sushiComponents; } diff --git a/SushiBarFileImplement/SushiBarFileImplement.csproj b/SushiBarFileImplement/SushiBarFileImplement.csproj index 1716a8e..04be97c 100644 --- a/SushiBarFileImplement/SushiBarFileImplement.csproj +++ b/SushiBarFileImplement/SushiBarFileImplement.csproj @@ -12,8 +12,4 @@ - - - - diff --git a/SushiBarListImplement/Order.cs b/SushiBarListImplement/Order.cs index a872d8f..ad2c3b1 100644 --- a/SushiBarListImplement/Order.cs +++ b/SushiBarListImplement/Order.cs @@ -42,11 +42,7 @@ namespace SushiBarListImplement.Models { return; } - SushiId = model.SushiId; - Count = model.Count; - Sum = model.Sum; Status = model.Status; - DateCreate = model.DateCreate; DateImplement = model.DateImplement; } From e22f988f85486017a2473256c79494c96bc68406 Mon Sep 17 00:00:00 2001 From: ekallin Date: Sun, 25 Feb 2024 09:43:27 +0400 Subject: [PATCH 7/8] =?UTF-8?q?=D0=B3=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=20=D0=B4=D0=BB=D1=8F=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B0=D1=87=D0=B8=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/SushiBar/Program.cs b/SushiBar/Program.cs index 0ace9a1..de0a8b2 100644 --- a/SushiBar/Program.cs +++ b/SushiBar/Program.cs @@ -12,6 +12,7 @@ namespace SushiBar { internal static class Program { + // 2 private static ServiceProvider? _serviceProvider; public static ServiceProvider? ServiceProvider => _serviceProvider; From 9e3fd5af65f829a279397bc8114b9427c6bcfd99 Mon Sep 17 00:00:00 2001 From: ekallin Date: Sun, 25 Feb 2024 09:47:07 +0400 Subject: [PATCH 8/8] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20?= =?UTF-8?q?=D0=B3=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SushiBar/Program.cs b/SushiBar/Program.cs index de0a8b2..08c7e37 100644 --- a/SushiBar/Program.cs +++ b/SushiBar/Program.cs @@ -12,7 +12,7 @@ namespace SushiBar { internal static class Program { - // 2 + // private static ServiceProvider? _serviceProvider; public static ServiceProvider? ServiceProvider => _serviceProvider;