From 4ac60f090d735abe559e55520db858c6c754579c Mon Sep 17 00:00:00 2001 From: bocchanskyy Date: Sun, 18 Feb 2024 13:58:39 +0400 Subject: [PATCH 1/5] seems like it works!! --- ComputersShop/ComputersShop.sln | 16 ++- .../ComputersShopFileImplement.csproj | 14 +++ .../DataFileSingleton.cs | 54 +++++++++ .../Implements/ComponentStorage.cs | 78 +++++++++++++ .../Implements/ComputerStorage.cs | 82 ++++++++++++++ .../Implements/OrderStorage.cs | 96 ++++++++++++++++ .../Models/Component.cs | 64 +++++++++++ .../Models/Computer.cs | 95 ++++++++++++++++ .../Models/Order.cs | 104 ++++++++++++++++++ .../ComputersShopView.csproj | 2 +- .../ComputersShopView/FormMain.Designer.cs | 16 +-- ComputersShop/ComputersShopView/Program.cs | 4 +- 12 files changed, 609 insertions(+), 16 deletions(-) create mode 100644 ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj create mode 100644 ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Component.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Computer.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Order.cs diff --git a/ComputersShop/ComputersShop.sln b/ComputersShop/ComputersShop.sln index 6be19c0..0571c77 100644 --- a/ComputersShop/ComputersShop.sln +++ b/ComputersShop/ComputersShop.sln @@ -3,15 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32825.248 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "СomputersShopDataModels", "СomputersShopDataModels\СomputersShopDataModels.csproj", "{325A0EEC-AE7D-49D4-9441-4B390F3D47AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "СomputersShopDataModels", "СomputersShopDataModels\СomputersShopDataModels.csproj", "{325A0EEC-AE7D-49D4-9441-4B390F3D47AC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopContracts", "ComputersShopContracts\ComputersShopContracts.csproj", "{36B9AA43-8BA7-49B0-845C-2CAE5715670C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopContracts", "ComputersShopContracts\ComputersShopContracts.csproj", "{36B9AA43-8BA7-49B0-845C-2CAE5715670C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopBusinessLogic", "ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj", "{CDFC655D-B1F8-4D87-9400-A0847FCAEAC6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopBusinessLogic", "ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj", "{CDFC655D-B1F8-4D87-9400-A0847FCAEAC6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopListImplement", "ComputersShopListImplement\ComputersShopListImplement.csproj", "{35DC2893-12C1-417B-9B92-5A18997B47A6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopListImplement", "ComputersShopListImplement\ComputersShopListImplement.csproj", "{35DC2893-12C1-417B-9B92-5A18997B47A6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopView", "ComputersShopView\ComputersShopView.csproj", "{B0416A4B-CD04-4991-BC00-7FCFC9DEEF73}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopView", "ComputersShopView\ComputersShopView.csproj", "{B0416A4B-CD04-4991-BC00-7FCFC9DEEF73}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopFileImplement", "ComputersShopFileImplement\ComputersShopFileImplement.csproj", "{58BB53D3-F224-451F-B9BD-D1D67ACE7F23}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {B0416A4B-CD04-4991-BC00-7FCFC9DEEF73}.Debug|Any CPU.Build.0 = Debug|Any CPU {B0416A4B-CD04-4991-BC00-7FCFC9DEEF73}.Release|Any CPU.ActiveCfg = Release|Any CPU {B0416A4B-CD04-4991-BC00-7FCFC9DEEF73}.Release|Any CPU.Build.0 = Release|Any CPU + {58BB53D3-F224-451F-B9BD-D1D67ACE7F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58BB53D3-F224-451F-B9BD-D1D67ACE7F23}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58BB53D3-F224-451F-B9BD-D1D67ACE7F23}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58BB53D3-F224-451F-B9BD-D1D67ACE7F23}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj b/ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj new file mode 100644 index 0000000..67fa075 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs b/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..e2facb0 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs @@ -0,0 +1,54 @@ +using ComputersShopFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ComputersShopFileImplement +{ + public class DataFileSingleton + { + private static DataFileSingleton? instance; + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string ComputerFileName = "Computer.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Computers { get; private set; } + public static DataFileSingleton GetInstance() + { + if (instance == null) + { + instance = new DataFileSingleton(); + } + return instance; + } + public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); + public void SaveComputers() => SaveData(Computers, ComputerFileName, "Computers", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Computers = LoadData(ComputerFileName, "Computer", x => Computer.Create(x)!)!; + Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + } + private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) + { + if (File.Exists(filename)) + { + return + XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); + } + return new List(); + } + private static void SaveData(List data, string filename, string xmlNodeName, Func selectFunction) + { + if (data != null) + { + new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename); + } + } + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..8145f62 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,78 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataFileSingleton source; + public ComponentStorage() + { + source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return source.Components.Select(x => x.GetViewModel).ToList(); + } + public List GetFilteredList(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName)) + { + return new(); + } + return source.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList(); + } + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } + return source.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || + (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + public ComponentViewModel? Insert(ComponentBindingModel model) + { + model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1; + var newComponent = Component.Create(model); + if (newComponent == null) + { + return null; + } + source.Components.Add(newComponent); + source.SaveComponents(); + return newComponent.GetViewModel; + } + public ComponentViewModel? Update(ComponentBindingModel model) + { + var component = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (component == null) + { + return null; + } + component.Update(model); + source.SaveComponents(); + return component.GetViewModel; + } + public ComponentViewModel? Delete(ComponentBindingModel model) + { + var element = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Components.Remove(element); + source.SaveComponents(); + return element.GetViewModel; + } + return null; + } + + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs new file mode 100644 index 0000000..6a70923 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs @@ -0,0 +1,82 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplement.Implements +{ + public class ComputerStorage : IComputerStorage + { + private readonly DataFileSingleton source; + + public ComputerStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public ComputerViewModel? GetElement(ComputerSearchModel model) + { + if (string.IsNullOrEmpty(model.ComputerName) && !model.Id.HasValue) + { + return null; + } + return source.Computers.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComputerName) && x.ComputerName == model.ComputerName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(ComputerSearchModel model) + { + if (string.IsNullOrEmpty(model.ComputerName)) + { + return new(); + } + return source.Computers.Where(x => x.ComputerName.Contains(model.ComputerName)).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Computers.Select(x => x.GetViewModel).ToList(); + } + + public ComputerViewModel? Insert(ComputerBindingModel model) + { + model.Id = source.Computers.Count > 0 ? source.Computers.Max(x => x.Id) + 1 : 1; + var newDoc = Computer.Create(model); + if (newDoc == null) + { + return null; + } + source.Computers.Add(newDoc); + source.SaveComputers(); + return newDoc.GetViewModel; + } + + public ComputerViewModel? Update(ComputerBindingModel model) + { + var document = source.Computers.FirstOrDefault(x => x.Id == model.Id); + if (document == null) + { + return null; + } + document.Update(model); + source.SaveComputers(); + return document.GetViewModel; + } + public ComputerViewModel? Delete(ComputerBindingModel model) + { + var document = source.Computers.FirstOrDefault(x => x.Id == model.Id); + if (document == null) + { + return null; + } + document.Update(model); + source.SaveComputers(); + return document.GetViewModel; + } + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..8192b8b --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,96 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + return GetViewModel(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)); + } + + 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 List GetFullList() + { + return source.Orders.Select(x => GetViewModel(x)).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 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 order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order == null) + { + return null; + } + order.Update(model); + source.SaveOrders(); + return GetViewModel(order); + } + + private OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; + foreach (var comp in source.Computers) + { + if (comp.Id == order.ComputerId) + { + viewModel.ComputerName = comp.ComputerName; + break; + } + } + return viewModel; + } + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Models/Component.cs b/ComputersShop/ComputersShopFileImplement/Models/Component.cs new file mode 100644 index 0000000..6b6d8a0 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Models/Component.cs @@ -0,0 +1,64 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ComputersShopFileImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + public string ComponentName { get; private set; } = string.Empty; + public double Cost { get; set; } + public static Component? Create(ComponentBindingModel model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + public static Component? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Component() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComponentName = element.Element("ComponentName")!.Value, + Cost = Convert.ToDouble(element.Element("Cost")!.Value) + }; + } + public void Update(ComponentBindingModel model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + public XElement GetXElement => new("Component", + new XAttribute("Id", Id), + new XElement("ComponentName", ComponentName), + new XElement("Cost", Cost.ToString())); + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Models/Computer.cs b/ComputersShop/ComputersShopFileImplement/Models/Computer.cs new file mode 100644 index 0000000..0f407ff --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Models/Computer.cs @@ -0,0 +1,95 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ComputersShopFileImplement.Models +{ + public class Computer : IComputerModel + { + public int Id { get; private set; } + public string ComputerName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + private Dictionary? _ComputerComponents = null; + public Dictionary ComputerComponents + { + get + { + if (_ComputerComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _ComputerComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, + y.Value)); + } + return _ComputerComponents; + } + } + public static Computer? Create(ComputerBindingModel model) + { + if (model == null) + { + return null; + } + return new Computer() + { + Id = model.Id, + ComputerName = model.ComputerName, + Price = model.Price, + Components = model.ComputerComponents.ToDictionary(x => x.Key, x + => x.Value.Item2) + }; + } + public static Computer? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Computer() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComputerName = element.Element("ComputerName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = + element.Element("ComputerComponents")!.Elements("ComputerComponent") + .ToDictionary(x => + Convert.ToInt32(x.Element("Key")?.Value), x => + Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(ComputerBindingModel model) + { + if (model == null) + { + return; + } + ComputerName = model.ComputerName; + Price = model.Price; + Components = model.ComputerComponents.ToDictionary(x => x.Key, x => + x.Value.Item2); + _ComputerComponents = null; + } + public ComputerViewModel GetViewModel => new() + { + Id = Id, + ComputerName = ComputerName, + Price = Price, + ComputerComponents = ComputerComponents + }; + public XElement GetXElement => new("Computer", + new XAttribute("Id", Id), + new XElement("ComputerName", ComputerName), + new XElement("Price", Price.ToString()), + new XElement("ComputerComponents", Components.Select(x => new XElement("ComputerComponent", new XElement("Key", x.Key), new XElement("Value", x.Value))) + + .ToArray())); + + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Models/Order.cs b/ComputersShop/ComputersShopFileImplement/Models/Order.cs new file mode 100644 index 0000000..ba4ebd2 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Models/Order.cs @@ -0,0 +1,104 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Enums; +using ComputersShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ComputersShopFileImplement.Models +{ + public class Order : IOrderModel + { + public int ComputerId { get; private set; } + + public int Count { get; private set; } + + public double Sum { get; private set; } + + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + + public DateTime DateCreate { get; private set; } = DateTime.Now; + + public DateTime? DateImplement { get; private set; } + + public int Id { get; private set; } + + public static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + ComputerId = model.ComputerId, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement + }; + } + + public static Order? Create(XElement element) + { + if (element == null) + { + return null; + } + var order = new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComputerId = Convert.ToInt32(element.Element("ComputerId")!.Value), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null), + }; + DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl); + + order.DateImplement = dateImpl; + + if (!Enum.TryParse(element.Element("Status")!.Value, out OrderStatus status)) + { + return null; + } + order.Status = status; + return order; + } + + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + DateImplement = model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + ComputerId = ComputerId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("ComputerId", ComputerId), + new XElement("Count", Count.ToString()), + new XElement("Sum", Sum.ToString()), + new XElement("Status", Status.ToString()), + new XElement("DateCreate", DateCreate.ToString()), + new XElement("DateImplement", DateImplement.ToString())); + } +} diff --git a/ComputersShop/ComputersShopView/ComputersShopView.csproj b/ComputersShop/ComputersShopView/ComputersShopView.csproj index 065124a..65d6ccb 100644 --- a/ComputersShop/ComputersShopView/ComputersShopView.csproj +++ b/ComputersShop/ComputersShopView/ComputersShopView.csproj @@ -19,7 +19,7 @@ - + \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormMain.Designer.cs b/ComputersShop/ComputersShopView/FormMain.Designer.cs index 30ff138..b31d5d0 100644 --- a/ComputersShop/ComputersShopView/FormMain.Designer.cs +++ b/ComputersShop/ComputersShopView/FormMain.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.menuStrip = new System.Windows.Forms.MenuStrip(); - this.справочникToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dictionaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.computerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.componentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataGridView = new System.Windows.Forms.DataGridView(); @@ -45,21 +45,21 @@ // menuStrip // this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.справочникToolStripMenuItem}); + this.dictionaryToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; this.menuStrip.Size = new System.Drawing.Size(1047, 24); this.menuStrip.TabIndex = 0; this.menuStrip.Text = "menuStrip1"; // - // справочникToolStripMenuItem + // dictionaryToolStripMenuItem // - this.справочникToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.dictionaryToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.computerToolStripMenuItem, this.componentsToolStripMenuItem}); - this.справочникToolStripMenuItem.Name = "справочникToolStripMenuItem"; - this.справочникToolStripMenuItem.Size = new System.Drawing.Size(94, 20); - this.справочникToolStripMenuItem.Text = "Cправочники"; + this.dictionaryToolStripMenuItem.Name = "dictionaryToolStripMenuItem"; + this.dictionaryToolStripMenuItem.Size = new System.Drawing.Size(94, 20); + this.dictionaryToolStripMenuItem.Text = "Cправочники"; // // computerToolStripMenuItem // @@ -161,7 +161,7 @@ #endregion private MenuStrip menuStrip; - private ToolStripMenuItem справочникToolStripMenuItem; + private ToolStripMenuItem dictionaryToolStripMenuItem; private DataGridView dataGridView; private Button buttonCreateOrder; private Button buttonTakeOrderInWork; diff --git a/ComputersShop/ComputersShopView/Program.cs b/ComputersShop/ComputersShopView/Program.cs index a93980f..e5c4c74 100644 --- a/ComputersShop/ComputersShopView/Program.cs +++ b/ComputersShop/ComputersShopView/Program.cs @@ -1,11 +1,11 @@ using ComputersShopBusinessLogic.BusinessLogics; using ComputersShopContracts.BusinessLogicContracts; using ComputersShopContracts.StoragesContracts; -using ComputersShopListImplement.Implements; +using ComputersShopFileImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; -using OrdersShopListImplement.Implements; + namespace ComputersShopView { -- 2.25.1 From 3aef07951275a3d971c15142654bfdd4538e06c7 Mon Sep 17 00:00:00 2001 From: bocchanskyy Date: Mon, 4 Mar 2024 20:39:08 +0400 Subject: [PATCH 2/5] GetViewModel with LINQ --- .../ComputersShopFileImplement/Implements/OrderStorage.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs index 8192b8b..79ba0d0 100644 --- a/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs +++ b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs @@ -82,14 +82,11 @@ namespace ComputersShopFileImplement.Implements private OrderViewModel GetViewModel(Order order) { var viewModel = order.GetViewModel; - foreach (var comp in source.Computers) - { - if (comp.Id == order.ComputerId) + var comp = source.Computers.FirstOrDefault(comp => comp.Id == order.ComputerId); + if (comp != null) { viewModel.ComputerName = comp.ComputerName; - break; } - } return viewModel; } } -- 2.25.1 From 586e573fc0cc44214121e5340268264a4a9c5428 Mon Sep 17 00:00:00 2001 From: bocchanskyy Date: Mon, 18 Mar 2024 20:59:24 +0400 Subject: [PATCH 3/5] I guess I'm done with it --- .../BusinessLogics/OrderLogic.cs | 23 +- .../BusinessLogics/ShopLogic.cs | 68 +++- .../BindingModels/ShopBindingModel.cs | 3 +- .../BusinessLogicContracts/IShopLogic.cs | 2 + .../StorageContracts/IShopStorage.cs | 4 +- .../ViewModels/ShopViewModel.cs | 4 +- .../DataFileSingleton.cs | 4 + .../Implements/ShopStorage.cs | 132 +++++++ .../ComputersShopFileImplement/Models/Shop.cs | 108 ++++++ .../ComputersShopView/FormMain.Designer.cs | 146 ++++---- ComputersShop/ComputersShopView/FormMain.cs | 319 +++++++++-------- .../FormSellComputers.Designer.cs | 124 +++++++ .../ComputersShopView/FormSellComputers.cs | 86 +++++ .../ComputersShopView/FormSellComputers.resx | 60 ++++ .../ComputersShopView/FormShop.Designer.cs | 329 +++++++++--------- ComputersShop/ComputersShopView/FormShop.cs | 4 +- ComputersShop/ComputersShopView/FormShop.resx | 3 + ComputersShop/ComputersShopView/Program.cs | 1 + .../Models/IShopModel.cs | 3 +- 19 files changed, 1033 insertions(+), 390 deletions(-) create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/ShopStorage.cs create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Shop.cs create mode 100644 ComputersShop/ComputersShopView/FormSellComputers.Designer.cs create mode 100644 ComputersShop/ComputersShopView/FormSellComputers.cs create mode 100644 ComputersShop/ComputersShopView/FormSellComputers.resx diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs index 9789315..ff9403e 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -17,10 +17,14 @@ namespace ComputersShopBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + private readonly IShopLogic _shopLogic; + private readonly IComputerStorage _computerStorage; + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopLogic shopLogic, IComputerStorage computerStorage) { _logger = logger; _orderStorage = orderStorage; + _shopLogic = shopLogic; + _computerStorage = computerStorage; } public bool CreateOrder(OrderBindingModel model) { @@ -52,7 +56,20 @@ namespace ComputersShopBusinessLogic.BusinessLogics return false; } model.Status = newStatus; - if (model.Status == OrderStatus.Готов) model.DateImplement = DateTime.Now; + if (model.Status == OrderStatus.Готов) + { + + model.DateImplement = DateTime.Now; + var computer = _computerStorage.GetElement(new() { Id = viewModel.ComputerId }); + if (computer == null) + { + throw new ArgumentNullException(nameof(computer)); + } + if (!_shopLogic.AddComputers(computer, viewModel.Count)) + { + throw new Exception($"AddComputers operation failed - нет места"); + } + } else { model.DateImplement = viewModel.DateImplement; @@ -61,7 +78,7 @@ namespace ComputersShopBusinessLogic.BusinessLogics if (_orderStorage.Update(model) == null) { model.Status--; - _logger.LogWarning("Update operation failed"); + _logger.LogWarning("Change status operation failed"); return false; } return true; diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs index 2d963b1..42f57b9 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; +using System.Reflection; using System.Text; using System.Threading.Tasks; @@ -31,6 +32,7 @@ namespace ComputersShopBusinessLogic.BusinessLogics if (quantity <= 0) { + return false; throw new ArgumentException("Количество добавляемого изделия должно быть больше 0", nameof(quantity)); } @@ -43,7 +45,10 @@ namespace ComputersShopBusinessLogic.BusinessLogics return false; } - _logger.LogInformation("AddComputerInShop find. Id:{Id}", element.Id); + if (element.Capacity - element.Computers.Select(x => x.Value.Item2).Sum() < quantity) + { + throw new ArgumentNullException("В магазине не хватает места", nameof(quantity)); + } if (element.Computers.TryGetValue(computer.Id, out var pair)) { @@ -62,11 +67,63 @@ namespace ComputersShopBusinessLogic.BusinessLogics ShopAddress = element.ShopAddress, ShopName = element.ShopName, DateOpening = element.DateOpening, - Computers = element.Computers + Computers = element.Computers, + Capacity = element.Capacity, }); return true; } + public bool AddComputers(IComputerModel computer, int quantity) + { + if (computer == null) + { + throw new ArgumentNullException(nameof(computer)); + } + if (quantity <= 0) + { + throw new ArgumentException("Количество документов должно быть больше 0", nameof(quantity)); + } + _logger.LogInformation("AddComputers. ShopName:{ShopName}. Id:{Id}", computer.ComputerName, computer.Id); + var allFreeQuantity = _shopStorage.GetFullList().Select(x => x.Capacity - x.Computers.Select(x => x.Value.Item2).Sum()).Sum(); + if (allFreeQuantity < quantity) + { + _logger.LogWarning("AddComputers operation failed."); + return false; + } + foreach (var shop in _shopStorage.GetFullList()) + { + int freeQuantity = shop.Capacity - shop.Computers.Select(x => x.Value.Item2).Sum(); + if (freeQuantity <= 0) + { + continue; + } + if (freeQuantity < quantity) + { + if (!AddComputer(new() { Id = shop.Id }, computer, freeQuantity)) + { + _logger.LogWarning("AddComputers operation failed."); + return false; + } + quantity -= freeQuantity; + } + else + { + if (!AddComputer(new() { Id = shop.Id }, computer, quantity)) + { + _logger.LogWarning("AddComputers operation failed."); + return false; + } + quantity = 0; + } + if (quantity == 0) + { + return true; + } + } + _logger.LogWarning("AddComputers operation failed."); + return false; + } + public bool Create(ShopBindingModel model) { CheckModel(model); @@ -131,6 +188,11 @@ namespace ComputersShopBusinessLogic.BusinessLogics return list; } + public bool SellComputers(IComputerModel computer, int quantity) + { + return _shopStorage.SellComputers(computer, quantity); + } + public bool Update(ShopBindingModel model) { CheckModel(model, false); @@ -177,4 +239,4 @@ namespace ComputersShopBusinessLogic.BusinessLogics } } } -} \ No newline at end of file +} diff --git a/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs b/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs index 59d6ff3..4a73f59 100644 --- a/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs +++ b/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs @@ -14,5 +14,6 @@ namespace ComputersShopContracts.BindingModels public string ShopAddress { get; set; } = string.Empty; public DateTime DateOpening { get; set; } = DateTime.Now; public Dictionary Computers { get; set; } = new(); + public int Capacity { get; set; } } -} \ No newline at end of file +} diff --git a/ComputersShop/ComputersShopContracts/BusinessLogicContracts/IShopLogic.cs b/ComputersShop/ComputersShopContracts/BusinessLogicContracts/IShopLogic.cs index a1f8951..b6277fe 100644 --- a/ComputersShop/ComputersShopContracts/BusinessLogicContracts/IShopLogic.cs +++ b/ComputersShop/ComputersShopContracts/BusinessLogicContracts/IShopLogic.cs @@ -18,5 +18,7 @@ namespace ComputersShopContracts.BusinessLogicContracts bool Update(ShopBindingModel model); bool Delete(ShopBindingModel model); bool AddComputer(ShopSearchModel model, IComputerModel computer, int quantity); + bool AddComputers(IComputerModel computer, int quantity); + bool SellComputers(IComputerModel computer, int quantity); } } \ No newline at end of file diff --git a/ComputersShop/ComputersShopContracts/StorageContracts/IShopStorage.cs b/ComputersShop/ComputersShopContracts/StorageContracts/IShopStorage.cs index 74abeaf..5d28ba7 100644 --- a/ComputersShop/ComputersShopContracts/StorageContracts/IShopStorage.cs +++ b/ComputersShop/ComputersShopContracts/StorageContracts/IShopStorage.cs @@ -1,6 +1,7 @@ using ComputersShopContracts.BindingModels; using ComputersShopContracts.SearchModels; using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; @@ -17,5 +18,6 @@ namespace ComputersShopContracts.StoragesContracts ShopViewModel? Insert(ShopBindingModel model); ShopViewModel? Update(ShopBindingModel model); ShopViewModel? Delete(ShopBindingModel model); + bool SellComputers(IComputerModel model, int quantity); } -} \ No newline at end of file +} diff --git a/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs b/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs index 62d4e1a..cf69095 100644 --- a/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs +++ b/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs @@ -19,5 +19,7 @@ namespace ComputersShopContracts.ViewModels public string ShopAddress { get; set; } = string.Empty; [DisplayName("Дата открытия")] public DateTime DateOpening { get; set; } = DateTime.Now; + [DisplayName("Вместимость магазина")] + public int Capacity { get; set; } } -} \ No newline at end of file +} diff --git a/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs b/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs index e2facb0..6362aa1 100644 --- a/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs +++ b/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs @@ -14,9 +14,11 @@ namespace ComputersShopFileImplement private readonly string ComponentFileName = "Component.xml"; private readonly string OrderFileName = "Order.xml"; private readonly string ComputerFileName = "Computer.xml"; + private readonly string ShopFileName = "Shop.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Computers { get; private set; } + public List Shops { get; private set; } public static DataFileSingleton GetInstance() { if (instance == null) @@ -28,11 +30,13 @@ namespace ComputersShopFileImplement public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); public void SaveComputers() => SaveData(Computers, ComputerFileName, "Computers", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement); private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Computers = LoadData(ComputerFileName, "Computer", x => Computer.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { diff --git a/ComputersShop/ComputersShopFileImplement/Implements/ShopStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..2251118 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Implements/ShopStorage.cs @@ -0,0 +1,132 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Models; +using ComputersShopFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplement.Implements +{ + public class ShopStorage : IShopStorage + { + private readonly DataFileSingleton source; + + public ShopStorage() + { + source = DataFileSingleton.GetInstance(); + } + public ShopViewModel? Delete(ShopBindingModel model) + { + var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (shop != null) + { + source.Shops.Remove(shop); + source.SaveShops(); + return shop.GetViewModel; + } + return null; + } + + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + return source.Shops + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName)) + { + return new(); + } + return source.Shops + .Where(x => x.ShopName.Contains(model.ShopName)) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + return source.Shops.Select(x => x.GetViewModel).ToList(); + } + + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1; + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + source.Shops.Add(newShop); + source.SaveShops(); + return newShop.GetViewModel; + } + + public bool SellComputers(IComputerModel model, int quantity) + { + int hasCount = 0; + + source.Shops.ForEach(x => + { + if (x.Computers.TryGetValue(model.Id, out var pair)) + { + hasCount += pair.Item2; + } + }); + + if (hasCount < quantity) return false; + + source.Shops.ForEach(x => + { + if (x.Computers.TryGetValue(model.Id, out var pair)) + { + if (quantity >= pair.Item2) + { + quantity -= pair.Item2; + x.Computers[model.Id] = (model, 0); + } + else + { + x.Computers[model.Id] = (model, pair.Item2 - quantity); + quantity = 0; + } + + x.Update(new ShopBindingModel + { + Id = x.Id, + ShopAddress = x.ShopAddress, + Capacity = x.Capacity, + DateOpening = x.DateOpening, + ShopName = x.ShopName, + Computers = x.Computers + }); + } + }); + + source.SaveShops(); + return true; + } + + public ShopViewModel? Update(ShopBindingModel model) + { + var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (shop == null) + { + return null; + } + shop.Update(model); + source.SaveShops(); + return shop.GetViewModel; + } + } +} diff --git a/ComputersShop/ComputersShopFileImplement/Models/Shop.cs b/ComputersShop/ComputersShopFileImplement/Models/Shop.cs new file mode 100644 index 0000000..e2eb630 --- /dev/null +++ b/ComputersShop/ComputersShopFileImplement/Models/Shop.cs @@ -0,0 +1,108 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ComputersShopFileImplement.Models +{ + public class Shop : IShopModel + { + public int Id { get; private set; } + public string ShopName { get; private set; } = string.Empty; + public string ShopAddress { get; private set; } = string.Empty; + public DateTime DateOpening { get; private set; } + public int Capacity { get; private set; } + public Dictionary ComputersCount = new(); + public Dictionary? _computers = null; + public Dictionary Computers + { + get + { + if (_computers == null) + { + var source = DataFileSingleton.GetInstance(); + _computers = ComputersCount.ToDictionary( + x => x.Key, + y => ((source.Computers.FirstOrDefault(z => z.Id == y.Key) as IComputerModel)!, + y.Value) + ); + } + return _computers; + } + } + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + ShopAddress = model.ShopAddress, + DateOpening = model.DateOpening, + Capacity = model.Capacity, + ComputersCount = model.Computers.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + public static Shop? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Shop() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ShopName = element.Element("ShopName")!.Value, + ShopAddress = element.Element("ShopAddress")!.Value, + DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value), + Capacity = Convert.ToInt32(element.Element("Capacity")!.Value), + ComputersCount = element.Element("Computers")!.Elements("Computer") + .ToDictionary( + x => Convert.ToInt32(x.Element("Key")?.Value), + x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + ShopAddress = model.ShopAddress; + DateOpening = model.DateOpening; + Capacity = model.Capacity; + ComputersCount = model.Computers.ToDictionary(x => x.Key, x => x.Value.Item2); + _computers = null; + + } + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + ShopAddress = ShopAddress, + DateOpening = DateOpening, + Capacity = Capacity, + Computers = Computers + }; + public XElement GetXElement => new("Shop", + new XAttribute("Id", Id), + new XElement("ShopName", ShopName), + new XElement("ShopAddress", ShopAddress), + new XElement("DateOpening", DateOpening.ToString()), + new XElement("Capacity", Capacity.ToString()), + new XElement("Computers", ComputersCount.Select(x => + new XElement("Computer", + new XElement("Key", x.Key), + new XElement("Value", x.Value))) + .ToArray())); + } +} diff --git a/ComputersShop/ComputersShopView/FormMain.Designer.cs b/ComputersShop/ComputersShopView/FormMain.Designer.cs index 0becd1a..5ee2b99 100644 --- a/ComputersShop/ComputersShopView/FormMain.Designer.cs +++ b/ComputersShop/ComputersShopView/FormMain.Designer.cs @@ -1,39 +1,40 @@ namespace ComputersShopView { - partial class FormMain - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class FormMain + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.menuStrip = new System.Windows.Forms.MenuStrip(); - this.directoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.справочникToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.computerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.componentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.shopsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.replenishmentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.пополнениеМагазинаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.продатьКомпьютеромToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataGridView = new System.Windows.Forms.DataGridView(); this.buttonCreateOrder = new System.Windows.Forms.Button(); this.buttonTakeOrderInWork = new System.Windows.Forms.Button(); @@ -47,51 +48,59 @@ // menuStrip // this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.directoryToolStripMenuItem, - this.replenishmentToolStripMenuItem}); + this.справочникToolStripMenuItem, + this.пополнениеМагазинаToolStripMenuItem, + this.продатьКомпьютеромToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; this.menuStrip.Size = new System.Drawing.Size(1047, 24); this.menuStrip.TabIndex = 0; this.menuStrip.Text = "menuStrip1"; // - // directoryToolStripMenuItem + // справочникToolStripMenuItem // - this.directoryToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.справочникToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.computerToolStripMenuItem, this.componentsToolStripMenuItem, - this.shopsToolStripMenuItem}); - this.directoryToolStripMenuItem.Name = "directoryToolStripMenuItem"; - this.directoryToolStripMenuItem.Size = new System.Drawing.Size(94, 20); - this.directoryToolStripMenuItem.Text = "Cправочники"; + this.магазиныToolStripMenuItem}); + this.справочникToolStripMenuItem.Name = "справочникToolStripMenuItem"; + this.справочникToolStripMenuItem.Size = new System.Drawing.Size(94, 20); + this.справочникToolStripMenuItem.Text = "Справочники"; // // computerToolStripMenuItem // this.computerToolStripMenuItem.Name = "computerToolStripMenuItem"; this.computerToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.computerToolStripMenuItem.Text = "Компьютеры"; - this.computerToolStripMenuItem.Click += new System.EventHandler(this.ComputersToolStripMenuItem_Click); + this.computerToolStripMenuItem.Click += ComputersToolStripMenuItem_Click; // // componentsToolStripMenuItem // this.componentsToolStripMenuItem.Name = "componentsToolStripMenuItem"; this.componentsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.componentsToolStripMenuItem.Text = "Компоненты"; - this.componentsToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click); + this.componentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; // - // shopsToolStripMenuItem + // магазиныToolStripMenuItem // - this.shopsToolStripMenuItem.Name = "shopsToolStripMenuItem"; - this.shopsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.shopsToolStripMenuItem.Text = "Магазины"; - this.shopsToolStripMenuItem.Click += new System.EventHandler(this.ShopToolStripMenuItem_Click); + this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.магазиныToolStripMenuItem.Text = "Магазины"; + this.магазиныToolStripMenuItem.Click += ShopToolStripMenuItem_Click; // - // replenishmentToolStripMenuItem + // пополнениеМагазинаToolStripMenuItem // - this.replenishmentToolStripMenuItem.Name = "replenishmentToolStripMenuItem"; - this.replenishmentToolStripMenuItem.Size = new System.Drawing.Size(143, 20); - this.replenishmentToolStripMenuItem.Text = "Пополнение магазина"; - this.replenishmentToolStripMenuItem.Click += new System.EventHandler(this.ShopReplenishmentToolStripMenuItem_Click); + this.пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem"; + this.пополнениеМагазинаToolStripMenuItem.Size = new System.Drawing.Size(143, 20); + this.пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина"; + this.пополнениеМагазинаToolStripMenuItem.Click += shopReplenishmentToolStripMenuItem_Click; + // + // продатьКомпьютеромToolStripMenuItem + // + this.продатьКомпьютеромToolStripMenuItem.Name = "продатьКомпьютеромToolStripMenuItem"; + this.продатьКомпьютеромToolStripMenuItem.Size = new System.Drawing.Size(131, 20); + this.продатьКомпьютеромToolStripMenuItem.Text = "Продать компьютер"; + this.продатьКомпьютеромToolStripMenuItem.Click += ButtonSellComputer_Click; // // dataGridView // @@ -110,7 +119,7 @@ this.buttonCreateOrder.TabIndex = 2; this.buttonCreateOrder.Text = "Создать заказ"; this.buttonCreateOrder.UseVisualStyleBackColor = true; - this.buttonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click); + this.buttonCreateOrder.Click += ButtonCreateOrder_Click; // // buttonTakeOrderInWork // @@ -120,7 +129,7 @@ this.buttonTakeOrderInWork.TabIndex = 3; this.buttonTakeOrderInWork.Text = "Отдать на выполнение"; this.buttonTakeOrderInWork.UseVisualStyleBackColor = true; - this.buttonTakeOrderInWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click); + this.buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; // // buttonOrderReady // @@ -130,7 +139,7 @@ this.buttonOrderReady.TabIndex = 4; this.buttonOrderReady.Text = "Заказ готов"; this.buttonOrderReady.UseVisualStyleBackColor = true; - this.buttonOrderReady.Click += new System.EventHandler(this.ButtonOrderReady_Click); + this.buttonOrderReady.Click += ButtonOrderReady_Click; // // buttonIssuedOrder // @@ -140,7 +149,7 @@ this.buttonIssuedOrder.TabIndex = 5; this.buttonIssuedOrder.Text = "Заказ выдан"; this.buttonIssuedOrder.UseVisualStyleBackColor = true; - this.buttonIssuedOrder.Click += new System.EventHandler(this.ButtonIssuedOrder_Click); + this.buttonIssuedOrder.Click += ButtonIssuedOrder_Click; // // buttonRef // @@ -150,7 +159,7 @@ this.buttonRef.TabIndex = 6; this.buttonRef.Text = "Обновить список"; this.buttonRef.UseVisualStyleBackColor = true; - this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); + this.buttonRef.Click += ButtonRef_Click; // // FormMain // @@ -167,28 +176,29 @@ this.MainMenuStrip = this.menuStrip; this.Name = "FormMain"; this.Text = "Магазин электроники"; - this.Load += new System.EventHandler(this.FormMain_Load); + Load += FormMain_Load; this.menuStrip.ResumeLayout(false); this.menuStrip.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion - private MenuStrip menuStrip; - private ToolStripMenuItem dictionaryToolStripMenuItem; - private DataGridView dataGridView; - private Button buttonCreateOrder; - private Button buttonTakeOrderInWork; - private Button buttonOrderReady; - private Button buttonIssuedOrder; - private Button buttonRef; - private ToolStripMenuItem computerToolStripMenuItem; - private ToolStripMenuItem componentsToolStripMenuItem; - private ToolStripMenuItem replenishmentToolStripMenuItem; - private ToolStripMenuItem shopsToolStripMenuItem; + private MenuStrip menuStrip; + private ToolStripMenuItem справочникToolStripMenuItem; + private DataGridView dataGridView; + private Button buttonCreateOrder; + private Button buttonTakeOrderInWork; + private Button buttonOrderReady; + private Button buttonIssuedOrder; + private Button buttonRef; + private ToolStripMenuItem computerToolStripMenuItem; + private ToolStripMenuItem componentsToolStripMenuItem; + private ToolStripMenuItem магазиныToolStripMenuItem; + private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; + private ToolStripMenuItem продатьКомпьютеромToolStripMenuItem; } } \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormMain.cs b/ComputersShop/ComputersShopView/FormMain.cs index 2d588c3..5c9d5ed 100644 --- a/ComputersShop/ComputersShopView/FormMain.cs +++ b/ComputersShop/ComputersShopView/FormMain.cs @@ -14,176 +14,189 @@ using System.Windows.Forms; namespace ComputersShopView { - public partial class FormMain : Form - { - private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; + public partial class FormMain : Form + { + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic) - { - InitializeComponent(); - _logger = logger; - _orderLogic = orderLogic; - } + public FormMain(ILogger logger, IOrderLogic orderLogic) + { + InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + } - private void FormMain_Load(object sender, EventArgs e) - { - LoadData(); - } - private void LoadData() - { - _logger.LogInformation("Загрузка заказов"); - try - { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["ComputerId"].Visible = false; - } - _logger.LogInformation("Загрузка заказов"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки заказов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) - { - form.ShowDialog(); - } - } - private void ComputersToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormComputers)); - if (service is FormComputers form) - { - form.ShowDialog(); - } - } + private void FormMain_Load(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData() + { + _logger.LogInformation("Загрузка заказов"); + try + { + var list = _orderLogic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["ComputerId"].Visible = false; + } + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + if (service is FormComponents form) + { + form.ShowDialog(); + } + } + private void ComputersToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComputers)); + if (service is FormComputers form) + { + form.ShowDialog(); + } + } private void ShopToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormShops)); + if (service is FormShops form) { form.ShowDialog(); } } private void ButtonCreateOrder_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - if (service is FormCreateOrder form) - { - form.ShowDialog(); - LoadData(); - } - } - private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); - try - { - var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel - { - Id = id, - ComputerId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ComputerId"].Value), - Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), - Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), - Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), - DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()) - }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка передачи заказа в работу"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - private void ButtonOrderReady_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); - try - { - var operationResult = _orderLogic.FinishOrder(new OrderBindingModel - { - Id = id, - ComputerId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ComputerId"].Value), - Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), - Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), - Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), - DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()) - }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка отметки о готовности заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - private void ButtonIssuedOrder_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); - try - { - var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel - { - Id = id, - ComputerId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ComputerId"].Value), - Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), - Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), - Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), - DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()) - }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - _logger.LogInformation("Заказ №{id} выдан", id); - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - private void ButtonRef_Click(object sender, EventArgs e) - { - LoadData(); - } - private void ShopReplenishmentToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + if (service is FormCreateOrder form) + { + form.ShowDialog(); + LoadData(); + } + } + private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); + try + { + var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel + { + Id = id, + ComputerId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ComputerId"].Value), + Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), + Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), + Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), + DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()) + }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка передачи заказа в работу"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void ButtonOrderReady_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); + try + { + var operationResult = _orderLogic.FinishOrder(new OrderBindingModel + { + Id = id, + ComputerId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ComputerId"].Value), + Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), + Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), + Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), + DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()) + }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о готовности заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void ButtonIssuedOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); + try + { + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = id, + ComputerId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ComputerId"].Value), + Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), + Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), + Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), + DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()) + }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _logger.LogInformation("Заказ №{id} выдан", id); + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + + private void shopReplenishmentToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormShopReplenishment)); + if (service is FormShopReplenishment form) { form.ShowDialog(); } } + + private void ButtonSellComputer_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormSellComputers)); + if (service is FormSellComputers form) + { + form.ShowDialog(); + LoadData(); + } + } } } diff --git a/ComputersShop/ComputersShopView/FormSellComputers.Designer.cs b/ComputersShop/ComputersShopView/FormSellComputers.Designer.cs new file mode 100644 index 0000000..9e933c7 --- /dev/null +++ b/ComputersShop/ComputersShopView/FormSellComputers.Designer.cs @@ -0,0 +1,124 @@ +namespace ComputersShopView +{ + partial class FormSellComputers + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + ButtonCancel = new Button(); + comboBoxDocuments = new ComboBox(); + numericUpDownCount = new NumericUpDown(); + labelDocument = new Label(); + labelCount = new Label(); + ButtonSave = new Button(); + ((System.ComponentModel.ISupportInitialize)numericUpDownCount).BeginInit(); + SuspendLayout(); + // + // ButtonCancel + // + ButtonCancel.Location = new Point(233, 60); + ButtonCancel.Margin = new Padding(3, 2, 3, 2); + ButtonCancel.Name = "ButtonCancel"; + ButtonCancel.Size = new Size(82, 22); + ButtonCancel.TabIndex = 1; + ButtonCancel.Text = "Отмена"; + ButtonCancel.UseVisualStyleBackColor = true; + ButtonCancel.Click += ButtonCancel_Click; + // + // comboBoxDocuments + // + comboBoxDocuments.FormattingEnabled = true; + comboBoxDocuments.Location = new Point(89, 6); + comboBoxDocuments.Margin = new Padding(3, 2, 3, 2); + comboBoxDocuments.Name = "comboBoxDocuments"; + comboBoxDocuments.Size = new Size(226, 23); + comboBoxDocuments.TabIndex = 2; + // + // numericUpDownCount + // + numericUpDownCount.Location = new Point(90, 33); + numericUpDownCount.Margin = new Padding(3, 2, 3, 2); + numericUpDownCount.Name = "numericUpDownCount"; + numericUpDownCount.Size = new Size(225, 23); + numericUpDownCount.TabIndex = 3; + // + // labelDocument + // + labelDocument.AutoSize = true; + labelDocument.Location = new Point(12, 9); + labelDocument.Name = "labelDocument"; + labelDocument.Size = new Size(71, 15); + labelDocument.TabIndex = 4; + labelDocument.Text = "Компьютер"; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(11, 35); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(72, 15); + labelCount.TabIndex = 5; + labelCount.Text = "Количество"; + // + // ButtonSave + // + ButtonSave.Location = new Point(145, 60); + ButtonSave.Margin = new Padding(3, 2, 3, 2); + ButtonSave.Name = "ButtonSave"; + ButtonSave.Size = new Size(82, 22); + ButtonSave.TabIndex = 6; + ButtonSave.Text = "Сохранить"; + ButtonSave.UseVisualStyleBackColor = true; + ButtonSave.Click += ButtonSave_Click; + // + // FormSellComputers + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(326, 93); + Controls.Add(ButtonSave); + Controls.Add(labelCount); + Controls.Add(labelDocument); + Controls.Add(numericUpDownCount); + Controls.Add(comboBoxDocuments); + Controls.Add(ButtonCancel); + Margin = new Padding(3, 2, 3, 2); + Name = "FormSellComputers"; + Text = "Продажа компьютеров"; + ((System.ComponentModel.ISupportInitialize)numericUpDownCount).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + private Button ButtonCancel; + private ComboBox comboBoxDocuments; + private NumericUpDown numericUpDownCount; + private Label labelDocument; + private Label labelCount; + private Button ButtonSave; + } +} \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormSellComputers.cs b/ComputersShop/ComputersShopView/FormSellComputers.cs new file mode 100644 index 0000000..e301cec --- /dev/null +++ b/ComputersShop/ComputersShopView/FormSellComputers.cs @@ -0,0 +1,86 @@ +using ComputersShopContracts.BusinessLogicContracts; +using ComputersShopContracts.ViewModels; +using Microsoft.Extensions.Logging; +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; + +namespace ComputersShopView +{ + public partial class FormSellComputers : Form + { + private readonly ILogger _logger; + private readonly IShopLogic _shopLogic; + private readonly IComputerLogic _computerLogic; + private readonly List? _listComputer; + public FormSellComputers(ILogger logger, IShopLogic shopLogic, IComputerLogic computerLogic) + { + InitializeComponent(); + _logger = logger; + _shopLogic = shopLogic; + _computerLogic = computerLogic; + _listComputer = computerLogic.ReadList(null); + if (_listComputer != null) + { + comboBoxDocuments.DisplayMember = "ComputerName"; + comboBoxDocuments.ValueMember = "Id"; + comboBoxDocuments.DataSource = _listComputer; + comboBoxDocuments.SelectedItem = null; + } + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (comboBoxDocuments.SelectedValue == null) + { + MessageBox.Show("Выберите компьютер", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(numericUpDownCount.Text)) + { + MessageBox.Show("Заполните количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Продажа поездок"); + try + { + var comp = _computerLogic.ReadElement(new() + { + Id = (int)comboBoxDocuments.SelectedValue + }); + if (comp == null) + { + throw new Exception("Компьютер не найден. Дополнительная информация в логах."); + } + var operationResult = _shopLogic.SellComputers( + computer: comp, + quantity: (int)numericUpDownCount.Value + ); + if (!operationResult) + { + throw new Exception("Ошибка при продаже компьютера. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения компьютера"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/ComputersShop/ComputersShopView/FormSellComputers.resx b/ComputersShop/ComputersShopView/FormSellComputers.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/ComputersShop/ComputersShopView/FormSellComputers.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormShop.Designer.cs b/ComputersShop/ComputersShopView/FormShop.Designer.cs index 3ae9494..94397db 100644 --- a/ComputersShop/ComputersShopView/FormShop.Designer.cs +++ b/ComputersShop/ComputersShopView/FormShop.Designer.cs @@ -28,182 +28,195 @@ /// private void InitializeComponent() { - this.dateTimePicker = new System.Windows.Forms.DateTimePicker(); - this.textBoxName = new System.Windows.Forms.TextBox(); - this.textBoxAddress = new System.Windows.Forms.TextBox(); - this.labelTime = new System.Windows.Forms.Label(); - this.labelAddress = new System.Windows.Forms.Label(); - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnManufactureName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.labelShop = new System.Windows.Forms.Label(); - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.SuspendLayout(); - // - // dateTimePicker - // - this.dateTimePicker.Location = new System.Drawing.Point(384, 27); - this.dateTimePicker.Name = "dateTimePicker"; - this.dateTimePicker.Size = new System.Drawing.Size(207, 23); - this.dateTimePicker.TabIndex = 26; - // - // textBoxName - // - this.textBoxName.Location = new System.Drawing.Point(10, 27); - this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(141, 23); - this.textBoxName.TabIndex = 25; - // - // textBoxAddress - // - this.textBoxAddress.Location = new System.Drawing.Point(158, 27); - this.textBoxAddress.Name = "textBoxAddress"; - this.textBoxAddress.Size = new System.Drawing.Size(221, 23); - this.textBoxAddress.TabIndex = 24; - // - // labelTime - // - this.labelTime.AutoSize = true; - this.labelTime.Location = new System.Drawing.Point(384, 9); - this.labelTime.Name = "labelTime"; - this.labelTime.Size = new System.Drawing.Size(87, 15); - this.labelTime.TabIndex = 23; - this.labelTime.Text = "Дата открытия"; - // - // labelAddress - // - this.labelAddress.AutoSize = true; - this.labelAddress.Location = new System.Drawing.Point(158, 9); - this.labelAddress.Name = "labelAddress"; - this.labelAddress.Size = new System.Drawing.Size(40, 15); - this.labelAddress.TabIndex = 22; - this.labelAddress.Text = "Адрес"; - // - // dataGridView - // - this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.ColumnID, - this.ColumnManufactureName, - this.Price, - this.ColumnCount}); - this.dataGridView.Location = new System.Drawing.Point(10, 56); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowHeadersWidth = 62; - this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(581, 327); - this.dataGridView.TabIndex = 21; - // - // ColumnID - // - this.ColumnID.HeaderText = "ID"; - this.ColumnID.MinimumWidth = 8; - this.ColumnID.Name = "ColumnID"; - this.ColumnID.Visible = false; - this.ColumnID.Width = 150; - // - // ColumnManufactureName - // - this.ColumnManufactureName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.ColumnManufactureName.HeaderText = "Название компьютера"; - this.ColumnManufactureName.MinimumWidth = 8; - this.ColumnManufactureName.Name = "ColumnManufactureName"; - // - // Price - // - this.Price.HeaderText = "Цена"; - this.Price.MinimumWidth = 6; - this.Price.Name = "Price"; - this.Price.Width = 125; - // - // ColumnCount - // - this.ColumnCount.HeaderText = "Количество"; - this.ColumnCount.MinimumWidth = 8; - this.ColumnCount.Name = "ColumnCount"; - this.ColumnCount.Width = 150; + labelShop = new Label(); + labelAddress = new Label(); + labelDate = new Label(); + textBoxName = new TextBox(); + textBoxAddress = new TextBox(); + dateTimePicker = new DateTimePicker(); + dataGridView = new DataGridView(); + ButtonSave = new Button(); + ButtonCancel = new Button(); + numericUpDownCapacity = new NumericUpDown(); + labelCapacity = new Label(); + ID = new DataGridViewTextBoxColumn(); + DocumentName = new DataGridViewTextBoxColumn(); + Price = new DataGridViewTextBoxColumn(); + Count = new DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownCapacity).BeginInit(); + SuspendLayout(); // // labelShop // - this.labelShop.AutoSize = true; - this.labelShop.Location = new System.Drawing.Point(10, 9); - this.labelShop.Name = "labelShop"; - this.labelShop.Size = new System.Drawing.Size(54, 15); - this.labelShop.TabIndex = 20; - this.labelShop.Text = "Магазин"; + labelShop.AutoSize = true; + labelShop.Location = new Point(10, 16); + labelShop.Name = "labelShop"; + labelShop.Size = new Size(54, 15); + labelShop.TabIndex = 0; + labelShop.Text = "Магазин"; // - // buttonSave + // labelAddress // - this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonSave.Location = new System.Drawing.Point(363, 392); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(120, 22); - this.buttonSave.TabIndex = 28; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += ButtonSave_Click; + labelAddress.AutoSize = true; + labelAddress.Location = new Point(156, 16); + labelAddress.Name = "labelAddress"; + labelAddress.Size = new Size(40, 15); + labelAddress.TabIndex = 1; + labelAddress.Text = "Адрес"; // - // buttonCancel + // labelDate // - this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonCancel.Location = new System.Drawing.Point(488, 392); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(103, 22); - this.buttonCancel.TabIndex = 27; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += ButtonCancel_Click; + labelDate.AutoSize = true; + labelDate.Location = new Point(375, 16); + labelDate.Name = "labelDate"; + labelDate.Size = new Size(87, 15); + labelDate.TabIndex = 2; + labelDate.Text = "Дата открытия"; + // + // textBoxName + // + textBoxName.Location = new Point(10, 33); + textBoxName.Margin = new Padding(3, 2, 3, 2); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(140, 23); + textBoxName.TabIndex = 3; + // + // textBoxAddress + // + textBoxAddress.Location = new Point(156, 33); + textBoxAddress.Margin = new Padding(3, 2, 3, 2); + textBoxAddress.Name = "textBoxAddress"; + textBoxAddress.Size = new Size(216, 23); + textBoxAddress.TabIndex = 4; + // + // dateTimePicker + // + dateTimePicker.Location = new Point(375, 33); + dateTimePicker.Margin = new Padding(3, 2, 3, 2); + dateTimePicker.Name = "dateTimePicker"; + dateTimePicker.Size = new Size(123, 23); + dateTimePicker.TabIndex = 5; + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ID, DocumentName, Price, Count }); + dataGridView.Location = new Point(10, 58); + dataGridView.Margin = new Padding(3, 2, 3, 2); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(623, 248); + dataGridView.TabIndex = 6; + // + // ButtonSave + // + ButtonSave.Location = new Point(429, 310); + ButtonSave.Margin = new Padding(3, 2, 3, 2); + ButtonSave.Name = "ButtonSave"; + ButtonSave.Size = new Size(97, 22); + ButtonSave.TabIndex = 7; + ButtonSave.Text = "Сохранить"; + ButtonSave.UseVisualStyleBackColor = true; + ButtonSave.Click += ButtonSave_Click; + // + // ButtonCancel + // + ButtonCancel.Location = new Point(551, 310); + ButtonCancel.Margin = new Padding(3, 2, 3, 2); + ButtonCancel.Name = "ButtonCancel"; + ButtonCancel.Size = new Size(82, 22); + ButtonCancel.TabIndex = 8; + ButtonCancel.Text = "Отмена"; + ButtonCancel.UseVisualStyleBackColor = true; + ButtonCancel.Click += ButtonCancel_Click; + // + // numericUpDownCapacity + // + numericUpDownCapacity.Location = new Point(513, 33); + numericUpDownCapacity.Name = "numericUpDownCapacity"; + numericUpDownCapacity.Size = new Size(120, 23); + numericUpDownCapacity.TabIndex = 9; + // + // labelCapacity + // + labelCapacity.AutoSize = true; + labelCapacity.Location = new Point(513, 16); + labelCapacity.Name = "labelCapacity"; + labelCapacity.Size = new Size(80, 15); + labelCapacity.TabIndex = 10; + labelCapacity.Text = "Вместимость"; + // + // ID + // + ID.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + ID.HeaderText = "ID"; + ID.MinimumWidth = 6; + ID.Name = "ID"; + ID.Visible = false; + // + // DocumentName + // + DocumentName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + DocumentName.HeaderText = "Название компьютера"; + DocumentName.MinimumWidth = 6; + DocumentName.Name = "DocumentName"; + // + // Price + // + Price.HeaderText = "Стоимость"; + Price.Name = "Price"; + // + // Count + // + Count.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + Count.HeaderText = "Количество"; + Count.MinimumWidth = 6; + Count.Name = "Count"; // // FormShop // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(616, 425); - this.Controls.Add(this.buttonSave); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.dateTimePicker); - this.Controls.Add(this.textBoxName); - this.Controls.Add(this.textBoxAddress); - this.Controls.Add(this.labelTime); - this.Controls.Add(this.labelAddress); - this.Controls.Add(this.dataGridView); - this.Controls.Add(this.labelShop); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.Name = "FormShop"; - this.Text = "Магазин"; + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(648, 338); + Controls.Add(labelCapacity); + Controls.Add(numericUpDownCapacity); + Controls.Add(ButtonCancel); + Controls.Add(ButtonSave); + Controls.Add(dataGridView); + Controls.Add(dateTimePicker); + Controls.Add(textBoxAddress); + Controls.Add(textBoxName); + Controls.Add(labelDate); + Controls.Add(labelAddress); + Controls.Add(labelShop); + Margin = new Padding(3, 2, 3, 2); + Name = "FormShop"; + Text = "Магазин"; Load += FormShop_Load; - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - private void ButtonCancel_Click1(object sender, EventArgs e) - { - throw new NotImplementedException(); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownCapacity).EndInit(); + ResumeLayout(false); + PerformLayout(); } #endregion - private DateTimePicker dateTimePicker; + private Label labelShop; + private Label labelAddress; + private Label labelDate; private TextBox textBoxName; private TextBox textBoxAddress; - private Label labelTime; - private Label labelAddress; + private DateTimePicker dateTimePicker; private DataGridView dataGridView; - private Label labelShop; - private Button buttonSave; - private Button buttonCancel; - private DataGridViewTextBoxColumn ColumnID; - private DataGridViewTextBoxColumn ColumnManufactureName; + private Button ButtonSave; + private Button ButtonCancel; + private NumericUpDown numericUpDownCapacity; + private Label labelCapacity; + private DataGridViewTextBoxColumn ID; + private DataGridViewTextBoxColumn DocumentName; private DataGridViewTextBoxColumn Price; - private DataGridViewTextBoxColumn ColumnCount; + private DataGridViewTextBoxColumn Count; } } \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormShop.cs b/ComputersShop/ComputersShopView/FormShop.cs index 305f2ac..91ff44f 100644 --- a/ComputersShop/ComputersShopView/FormShop.cs +++ b/ComputersShop/ComputersShopView/FormShop.cs @@ -46,6 +46,7 @@ namespace ComputersShopView textBoxName.Text = view.ShopName; textBoxAddress.Text = view.ShopAddress.ToString(); dateTimePicker.Text = view.DateOpening.ToString(); + numericUpDownCapacity.Value = view.Capacity; _shopComputers = view.Computers ?? new Dictionary(); LoadData(); } @@ -88,7 +89,7 @@ namespace ComputersShopView } if (string.IsNullOrEmpty(textBoxAddress.Text)) { - MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } _logger.LogInformation("Сохранение магазина"); @@ -100,6 +101,7 @@ namespace ComputersShopView ShopName = textBoxName.Text, ShopAddress = textBoxAddress.Text, DateOpening = dateTimePicker.Value.Date, + Capacity = (int)numericUpDownCapacity.Value, Computers = _shopComputers }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); diff --git a/ComputersShop/ComputersShopView/FormShop.resx b/ComputersShop/ComputersShopView/FormShop.resx index f298a7b..7920df3 100644 --- a/ComputersShop/ComputersShopView/FormShop.resx +++ b/ComputersShop/ComputersShopView/FormShop.resx @@ -57,4 +57,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/Program.cs b/ComputersShop/ComputersShopView/Program.cs index 042fc94..17b74b9 100644 --- a/ComputersShop/ComputersShopView/Program.cs +++ b/ComputersShop/ComputersShopView/Program.cs @@ -55,6 +55,7 @@ namespace ComputersShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/ComputersShop/СomputersShopDataModels/Models/IShopModel.cs b/ComputersShop/СomputersShopDataModels/Models/IShopModel.cs index 2ce1e52..0db9cbf 100644 --- a/ComputersShop/СomputersShopDataModels/Models/IShopModel.cs +++ b/ComputersShop/СomputersShopDataModels/Models/IShopModel.cs @@ -11,6 +11,7 @@ namespace ComputersShopDataModels.Models public string ShopName { get; } public string ShopAddress { get; } DateTime DateOpening { get; } + public int Capacity { get; } Dictionary Computers { get; } } -} \ No newline at end of file +} -- 2.25.1 From bb0bb04fc01a138638400b8404be2e1fe23df7a5 Mon Sep 17 00:00:00 2001 From: bocchanskyy Date: Tue, 16 Apr 2024 22:07:09 +0400 Subject: [PATCH 4/5] forgot to add smth... --- .../ComputersShopListImplement/Implements/ShopStorage.cs | 6 ++++++ ComputersShop/ComputersShopListImplement/Models/Shop.cs | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs b/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs index 83e4af7..1f70cd3 100644 --- a/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs +++ b/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs @@ -2,6 +2,7 @@ using ComputersShopContracts.SearchModels; using ComputersShopContracts.StoragesContracts; using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Models; using ComputersShopListImplement.Models; using System; using System.Collections.Generic; @@ -107,6 +108,11 @@ namespace ComputersShopListImplement.Implements return newShop.GetViewModel; } + public bool SellComputers(IComputerModel model, int quantity) + { + throw new NotImplementedException(); + } + public ShopViewModel? Update(ShopBindingModel model) { foreach (var Shop in _source.Shops) diff --git a/ComputersShop/ComputersShopListImplement/Models/Shop.cs b/ComputersShop/ComputersShopListImplement/Models/Shop.cs index 7631bda..5c401e4 100644 --- a/ComputersShop/ComputersShopListImplement/Models/Shop.cs +++ b/ComputersShop/ComputersShopListImplement/Models/Shop.cs @@ -55,5 +55,7 @@ namespace ComputersShopListImplement.Models DateOpening = DateOpening, Computers = Computers }; + + public int Capacity => throw new NotImplementedException(); } } \ No newline at end of file -- 2.25.1 From e72da0eece94a934090378b667001de6ac94aa60 Mon Sep 17 00:00:00 2001 From: bocchanskyy Date: Tue, 14 May 2024 06:26:27 +0400 Subject: [PATCH 5/5] =?UTF-8?q?=D0=9D=D1=83=D0=B6=D0=B5=D0=BD=20=D0=B1?= =?UTF-8?q?=D1=8B=D0=BB=20Linq=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ShopLogic.cs | 4 ++-- .../Implements/ShopStorage.cs | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs index 42f57b9..0c019ff 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs @@ -33,7 +33,7 @@ namespace ComputersShopBusinessLogic.BusinessLogics if (quantity <= 0) { return false; - throw new ArgumentException("Количество добавляемого изделия должно быть больше 0", nameof(quantity)); + throw new ArgumentException("Количество добавляемого компьютера должно быть больше 0", nameof(quantity)); } _logger.LogInformation("AddComputerInShop. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id); @@ -81,7 +81,7 @@ namespace ComputersShopBusinessLogic.BusinessLogics } if (quantity <= 0) { - throw new ArgumentException("Количество документов должно быть больше 0", nameof(quantity)); + throw new ArgumentException("Количество компьютеров должно быть больше 0", nameof(quantity)); } _logger.LogInformation("AddComputers. ShopName:{ShopName}. Id:{Id}", computer.ComputerName, computer.Id); var allFreeQuantity = _shopStorage.GetFullList().Select(x => x.Capacity - x.Computers.Select(x => x.Value.Item2).Sum()).Sum(); diff --git a/ComputersShop/ComputersShopFileImplement/Implements/ShopStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/ShopStorage.cs index 2251118..8825bad 100644 --- a/ComputersShop/ComputersShopFileImplement/Implements/ShopStorage.cs +++ b/ComputersShop/ComputersShopFileImplement/Implements/ShopStorage.cs @@ -74,17 +74,13 @@ namespace ComputersShopFileImplement.Implements public bool SellComputers(IComputerModel model, int quantity) { - int hasCount = 0; + int hasCount = source.Shops + .SelectMany(x => x.Computers) + .Where(pair => pair.Key == model.Id) + .Sum(pair => pair.Value.Item2); - source.Shops.ForEach(x => - { - if (x.Computers.TryGetValue(model.Id, out var pair)) - { - hasCount += pair.Item2; - } - }); - - if (hasCount < quantity) return false; + if (hasCount < quantity) + return false; source.Shops.ForEach(x => { -- 2.25.1