последние правочки

ComputersShop/ComputerShopFileImplements/DataFileSingleton.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputersShopFileImplements.Models;
+using System.Xml.Linq;
+
+namespace ComputersShopFileImplements
+{
+    internal class DataFileSingleton
+    {
+        private static DataFileSingleton? instance;
+        public readonly string ComponentFileName = "Component.xml";
+        public readonly string OrderFileName = "Order.xml";
+        public readonly string ComputerFileName = "Computer.xml";
+        public List<Component> Components { get; private set; }
+        public List<Order> Orders { get; private set; }
+        public List<Computer> 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<T>? LoadData<T>(string filename, string xmlNodeName, 
+            Func<XElement, T> selectFunction)
+        {
+            if (File.Exists(filename))
+            {
+                return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
+            }
+            return new List<T>();
+        }
+        private static void SaveData<T>(List<T> data, string filename,
+            string xmlNodeName, Func<T, XElement> selectFunction)
+        {
+            if (data != null)
+            {
+                new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
+            }
+        }
+    }
+}

ComputersShop/ComputerShopFileImplements/Implements/ComponentStorage.cs

@@ -0,0 +1,82 @@
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.SearchModels;
+using ComputersShopContracts.StoragesContracts;
+using ComputersShopContracts.ViewModels;
+using ComputersShopFileImplements.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputersShopFileImplements.Implements
+{
+    public class ComponentStorage: IComponentStorage
+    {
+        private readonly DataFileSingleton source;
+        public ComponentStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<ComponentViewModel> GetFullList()
+        {
+            return source.Components.Select(x => x.GetViewModel).ToList();
+        }
+        public List<ComponentViewModel> GetFiltredList(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;
+        }
+    }
+}

ComputersShop/ComputerShopFileImplements/Implements/ComputerStorage.cs

@@ -0,0 +1,82 @@
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.SearchModels;
+using ComputersShopContracts.StoragesContracts;
+using ComputersShopFileImplements.Models;
+using ComputersShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputersShopFileImplements.Implements
+{
+    public class ComputerStorage : IComputerStorage
+    {
+        private readonly DataFileSingleton source;
+        public ComputerStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<ComputerViewModel> GetFullList()
+        {
+            return source.Computers.Select(x => x.GetViewModel).ToList();
+        }
+        public List<ComputerViewModel> GetFiltredList(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 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 ComputerViewModel? Insert(ComputerBindingModel model)
+        {
+            model.Id = source.Computers.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1;
+            var newComputer = Computer.Create(model);
+            if (newComputer == null)
+            {
+                return null;
+            }
+            source.Computers.Add(newComputer);
+            source.SaveComputers();
+            return newComputer.GetViewModel;
+        }
+        public ComputerViewModel? Update(ComputerBindingModel model)
+        {
+            var computer = source.Computers.FirstOrDefault(x => x.Id == model.Id);
+            if (computer == null)
+            {
+                return null;
+            }
+            computer.Update(model);
+            source.SaveComputers();
+            return computer.GetViewModel;
+        }
+        public ComputerViewModel? Delete(ComputerBindingModel model)
+        {
+            var element = source.Computers.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                source.Computers.Remove(element);
+                source.SaveComputers();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs

@@ -0,0 +1,83 @@
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.SearchModels;
+using ComputersShopContracts.StoragesContracts;
+using ComputersShopContracts.ViewModels;
+using ComputersShopFileImplements.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputersShopFileImplements.Implements
+{
+    public class OrderStorage : IOrderStorage
+    {
+        private readonly DataFileSingleton source;
+        public OrderStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<OrderViewModel> GetFullList()
+        {
+            return source.Orders.Select(x => GetViewModel(x)).ToList();
+        }
+        public List<OrderViewModel> GetFiltredList(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? 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? 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? Delete(OrderBindingModel model)
+        {
+            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            source.Orders.Remove(order);
+            source.SaveOrders();
+            return GetViewModel(order);
+        }
+        private OrderViewModel GetViewModel(Order order)
+        {
+            var viewModel = order.GetViewModel;
+            var computer = source.Computers.FirstOrDefault(x => x.Id == order.ComputerId);
+            viewModel.ComputerName = computer?.ComputerName;
+            return viewModel;
+        }
+    }
+}

ComputersShop/ComputerShopFileImplements/Models/Component.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.ViewModels;
+using ComputersShopDataModels.Models;
+using System.Xml.Linq;
+
+namespace ComputersShopFileImplements.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()));
+    }
+}

ComputersShop/ComputerShopFileImplements/Models/Computer.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.ViewModels;
+using ComputersShopDataModels.Models;
+using System.Xml.Linq;
+
+namespace ComputersShopFileImplements.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<int, int> Components { get; private set; } = new();
+        private Dictionary<int, (IComponentModel, int)>? _computerComponents = null;
+        public Dictionary<int, (IComponentModel, int)> 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()));
+    }
+}

ComputersShop/ComputerShopFileImplements/Models/Order.cs

@@ -0,0 +1,95 @@
+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 ComputersShopFileImplements.Models
+{
+    public class Order: IOrderModel
+    {
+        public int Id { get; private set; }
+        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 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 id = Convert.ToInt32(element.Attribute("Id")!.Value);
+            var computerId = Convert.ToInt32(element.Element("ComputerId")!.Value);
+            var sum = Convert.ToDouble(element.Element("Sum")!.Value);
+            var count = Convert.ToInt32(element.Element("Count")!.Value);
+            var status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value);
+            var dateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value);
+            var dateImplement = DateTime.Now;
+            
+            return new Order()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ComputerId = Convert.ToInt32(element.Element("ComputerId")!.Value),
+                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+                Count = Convert.ToInt32(element.Element("Count")!.Value),
+                Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
+                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+                DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null: Convert.ToDateTime(element.Element("DateImplement")!.Value)
+            };
+        }
+        public void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Status = model.Status;
+            DateImplement = model.DateImplement;
+        }
+        public OrderViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ComputerId = ComputerId,
+            Sum = Sum,
+            Count = Count,
+            Status = Status,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+        };
+        public XElement GetXElement => new(
+            "Order",
+            new XAttribute("Id", Id),
+            new XElement("ComputerId", ComputerId.ToString()),
+            new XElement("Count", Count.ToString()),
+            new XElement("Sum", Sum.ToString()),
+            new XElement("Status", Status.ToString()),
+            new XElement("DateCreate", DateCreate.ToString()),
+            new XElement("DateImplement", DateImplement.ToString())
+            );
+    }
+}

ComputersShop/ComputersShop.sln

@@ -7,11 +7,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShop", "ComputersS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopDataModels", "ComputersShopDataModels\ComputersShopDataModels.csproj", "{34C63637-6E52-4576-99D5-DA7524F73EA0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopContracts", "ComputersShopContracts\ComputersShopContracts.csproj", "{1761A1DB-696C-4C00-B05F-FD00E768594B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopContracts", "ComputersShopContracts\ComputersShopContracts.csproj", "{1761A1DB-696C-4C00-B05F-FD00E768594B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopBusinessLogic", "ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj", "{93D47C23-DA56-4179-8918-9D70A1012048}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopBusinessLogic", "ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj", "{93D47C23-DA56-4179-8918-9D70A1012048}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopListImplement", "ComputersShopListImplement\ComputersShopListImplement.csproj", "{8AF31165-C031-42B2-88D4-A1A89EFCDC59}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopListImplements", "ComputersShopListImplement\ComputersShopListImplements.csproj", "{8AF31165-C031-42B2-88D4-A1A89EFCDC59}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopFileImplements", "ComputerShopFileImplements\ComputersShopFileImplements.csproj", "{47B30693-D73D-49A1-B41A-740454667ABF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
 		{8AF31165-C031-42B2-88D4-A1A89EFCDC59}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8AF31165-C031-42B2-88D4-A1A89EFCDC59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AF31165-C031-42B2-88D4-A1A89EFCDC59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47B30693-D73D-49A1-B41A-740454667ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47B30693-D73D-49A1-B41A-740454667ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47B30693-D73D-49A1-B41A-740454667ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47B30693-D73D-49A1-B41A-740454667ABF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ComputersShop/ComputersShop/ComputersShop.csproj

@@ -15,9 +15,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\ComputerShopFileImplements\ComputersShopFileImplements.csproj" />
     <ProjectReference Include="..\ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj" />
     <ProjectReference Include="..\ComputersShopContracts\ComputersShopContracts.csproj" />
-    <ProjectReference Include="..\ComputersShopListImplement\ComputersShopListImplement.csproj" />
+    <ProjectReference Include="..\ComputersShopListImplement\ComputersShopListImplements.csproj" />
   </ItemGroup>
 
   <ItemGroup>

ComputersShop/ComputersShop/FormMain.Designer.cs

@@ -1,198 +1,177 @@
 namespace ComputersShop
 {
-	partial class FormMain
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
+    partial class FormMain
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
 
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        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
 
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			menuStrip = new MenuStrip();
-			справочникиToolStripMenuItem = new ToolStripMenuItem();
-			компонентыToolStripMenuItem = new ToolStripMenuItem();
-			комьютерыToolStripMenuItem = new ToolStripMenuItem();
-			магазиныToolStripMenuItem = new ToolStripMenuItem();
-			dataGridView = new DataGridView();
-			buttonCreateOrder = new Button();
-			buttonTakeOrderInWork = new Button();
-			buttonOrderReady = new Button();
-			buttonIssuedOrder = new Button();
-			buttonUpdate = new Button();
-			buttonSupplyShop = new Button();
-			menuStrip.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
-			// 
-			// menuStrip
-			// 
-			menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem });
-			menuStrip.Location = new Point(0, 0);
-			menuStrip.Name = "menuStrip";
-			menuStrip.Size = new Size(984, 24);
-			menuStrip.TabIndex = 0;
-			menuStrip.Text = "menuStrip1";
-			// 
-			// справочникиToolStripMenuItem
-			// 
-			справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, комьютерыToolStripMenuItem, магазиныToolStripMenuItem });
-			справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
-			справочникиToolStripMenuItem.Size = new Size(94, 20);
-			справочникиToolStripMenuItem.Text = "Справочники";
-			// 
-			// компонентыToolStripMenuItem
-			// 
-			компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-			компонентыToolStripMenuItem.Size = new Size(180, 22);
-			компонентыToolStripMenuItem.Text = "Компоненты";
-			компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
-			// 
-			// комьютерыToolStripMenuItem
-			// 
-			комьютерыToolStripMenuItem.Name = "комьютерыToolStripMenuItem";
-			комьютерыToolStripMenuItem.Size = new Size(180, 22);
-			комьютерыToolStripMenuItem.Text = "Комьютеры";
-			комьютерыToolStripMenuItem.Click += КомпьютерыToolStripMenuItem_Click;
-			// 
-			// магазиныToolStripMenuItem
-			// 
-			магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-			магазиныToolStripMenuItem.Size = new Size(180, 22);
-			магазиныToolStripMenuItem.Text = "Магазины";
-			магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click;
-			// 
-			// dataGridView
-			// 
-			dataGridView.AllowUserToAddRows = false;
-			dataGridView.AllowUserToDeleteRows = false;
-			dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Location = new Point(0, 27);
-			dataGridView.MultiSelect = false;
-			dataGridView.Name = "dataGridView";
-			dataGridView.ReadOnly = true;
-			dataGridView.RowHeadersVisible = false;
-			dataGridView.RowTemplate.Height = 25;
-			dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-			dataGridView.Size = new Size(780, 425);
-			dataGridView.TabIndex = 1;
-			// 
-			// buttonCreateOrder
-			// 
-			buttonCreateOrder.Location = new Point(792, 27);
-			buttonCreateOrder.Name = "buttonCreateOrder";
-			buttonCreateOrder.Size = new Size(180, 35);
-			buttonCreateOrder.TabIndex = 2;
-			buttonCreateOrder.Text = "Создать заказ";
-			buttonCreateOrder.UseVisualStyleBackColor = true;
-			buttonCreateOrder.Click += ButtonCreateOrder_Click;
-			// 
-			// buttonTakeOrderInWork
-			// 
-			buttonTakeOrderInWork.Location = new Point(792, 87);
-			buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-			buttonTakeOrderInWork.Size = new Size(180, 35);
-			buttonTakeOrderInWork.TabIndex = 3;
-			buttonTakeOrderInWork.Text = "Отправить на выполнение";
-			buttonTakeOrderInWork.UseVisualStyleBackColor = true;
-			buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
-			// 
-			// buttonOrderReady
-			// 
-			buttonOrderReady.Location = new Point(792, 147);
-			buttonOrderReady.Name = "buttonOrderReady";
-			buttonOrderReady.Size = new Size(180, 35);
-			buttonOrderReady.TabIndex = 4;
-			buttonOrderReady.Text = "Заказ готов";
-			buttonOrderReady.UseVisualStyleBackColor = true;
-			buttonOrderReady.Click += ButtonOrderReady_Click;
-			// 
-			// buttonIssuedOrder
-			// 
-			buttonIssuedOrder.Location = new Point(792, 207);
-			buttonIssuedOrder.Name = "buttonIssuedOrder";
-			buttonIssuedOrder.Size = new Size(180, 35);
-			buttonIssuedOrder.TabIndex = 5;
-			buttonIssuedOrder.Text = "Заказ выдан";
-			buttonIssuedOrder.UseVisualStyleBackColor = true;
-			buttonIssuedOrder.Click += ButtonIssuedOrder_Click;
-			// 
-			// buttonUpdate
-			// 
-			buttonUpdate.Location = new Point(792, 267);
-			buttonUpdate.Name = "buttonUpdate";
-			buttonUpdate.Size = new Size(180, 35);
-			buttonUpdate.TabIndex = 6;
-			buttonUpdate.Text = "Обновить список";
-			buttonUpdate.UseVisualStyleBackColor = true;
-			buttonUpdate.Click += ButtonUpd_Click;
-			// 
-			// buttonSupplyShop
-			// 
-			buttonSupplyShop.Location = new Point(792, 327);
-			buttonSupplyShop.Name = "buttonSupplyShop";
-			buttonSupplyShop.Size = new Size(180, 35);
-			buttonSupplyShop.TabIndex = 7;
-			buttonSupplyShop.Text = "Пополнение магазина";
-			buttonSupplyShop.UseVisualStyleBackColor = true;
-			buttonSupplyShop.Click += buttonSupplyShop_Click;
-			// 
-			// FormMain
-			// 
-			AutoScaleDimensions = new SizeF(7F, 15F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(984, 450);
-			Controls.Add(buttonSupplyShop);
-			Controls.Add(buttonUpdate);
-			Controls.Add(buttonIssuedOrder);
-			Controls.Add(buttonOrderReady);
-			Controls.Add(buttonTakeOrderInWork);
-			Controls.Add(buttonCreateOrder);
-			Controls.Add(dataGridView);
-			Controls.Add(menuStrip);
-			MainMenuStrip = menuStrip;
-			Name = "FormMain";
-			Text = "Компьютерный магазин";
-			menuStrip.ResumeLayout(false);
-			menuStrip.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-			PerformLayout();
-		}
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            menuStrip = new MenuStrip();
+            справочникиToolStripMenuItem = new ToolStripMenuItem();
+            компонентыToolStripMenuItem = new ToolStripMenuItem();
+            комьютерыToolStripMenuItem = new ToolStripMenuItem();
+            dataGridView = new DataGridView();
+            buttonCreateOrder = new Button();
+            buttonTakeOrderInWork = new Button();
+            buttonOrderReady = new Button();
+            buttonIssuedOrder = new Button();
+            buttonUpdate = new Button();
+            menuStrip.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // menuStrip
+            // 
+            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(984, 24);
+            menuStrip.TabIndex = 0;
+            menuStrip.Text = "menuStrip1";
+            // 
+            // справочникиToolStripMenuItem
+            // 
+            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, комьютерыToolStripMenuItem });
+            справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+            справочникиToolStripMenuItem.Size = new Size(94, 20);
+            справочникиToolStripMenuItem.Text = "Справочники";
+            // 
+            // компонентыToolStripMenuItem
+            // 
+            компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+            компонентыToolStripMenuItem.Size = new Size(145, 22);
+            компонентыToolStripMenuItem.Text = "Компоненты";
+            компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
+            // 
+            // комьютерыToolStripMenuItem
+            // 
+            комьютерыToolStripMenuItem.Name = "комьютерыToolStripMenuItem";
+            комьютерыToolStripMenuItem.Size = new Size(145, 22);
+            комьютерыToolStripMenuItem.Text = "Комьютеры";
+            комьютерыToolStripMenuItem.Click += КомпьютерыToolStripMenuItem_Click;
+            // 
+            // dataGridView
+            // 
+            dataGridView.AllowUserToAddRows = false;
+            dataGridView.AllowUserToDeleteRows = false;
+            dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Location = new Point(0, 27);
+            dataGridView.MultiSelect = false;
+            dataGridView.Name = "dataGridView";
+            dataGridView.ReadOnly = true;
+            dataGridView.RowHeadersVisible = false;
+            dataGridView.RowTemplate.Height = 25;
+            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+            dataGridView.Size = new Size(780, 425);
+            dataGridView.TabIndex = 1;
+            // 
+            // buttonCreateOrder
+            // 
+            buttonCreateOrder.Location = new Point(792, 27);
+            buttonCreateOrder.Name = "buttonCreateOrder";
+            buttonCreateOrder.Size = new Size(180, 35);
+            buttonCreateOrder.TabIndex = 2;
+            buttonCreateOrder.Text = "Создать заказ";
+            buttonCreateOrder.UseVisualStyleBackColor = true;
+            buttonCreateOrder.Click += ButtonCreateOrder_Click;
+            // 
+            // buttonTakeOrderInWork
+            // 
+            buttonTakeOrderInWork.Location = new Point(792, 87);
+            buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
+            buttonTakeOrderInWork.Size = new Size(180, 35);
+            buttonTakeOrderInWork.TabIndex = 3;
+            buttonTakeOrderInWork.Text = "Отправить на выполнение";
+            buttonTakeOrderInWork.UseVisualStyleBackColor = true;
+            buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
+            // 
+            // buttonOrderReady
+            // 
+            buttonOrderReady.Location = new Point(792, 147);
+            buttonOrderReady.Name = "buttonOrderReady";
+            buttonOrderReady.Size = new Size(180, 35);
+            buttonOrderReady.TabIndex = 4;
+            buttonOrderReady.Text = "Заказ готов";
+            buttonOrderReady.UseVisualStyleBackColor = true;
+            buttonOrderReady.Click += ButtonOrderReady_Click;
+            // 
+            // buttonIssuedOrder
+            // 
+            buttonIssuedOrder.Location = new Point(792, 207);
+            buttonIssuedOrder.Name = "buttonIssuedOrder";
+            buttonIssuedOrder.Size = new Size(180, 35);
+            buttonIssuedOrder.TabIndex = 5;
+            buttonIssuedOrder.Text = "Заказ выдан";
+            buttonIssuedOrder.UseVisualStyleBackColor = true;
+            buttonIssuedOrder.Click += ButtonIssuedOrder_Click;
+            // 
+            // buttonUpdate
+            // 
+            buttonUpdate.Location = new Point(792, 267);
+            buttonUpdate.Name = "buttonUpdate";
+            buttonUpdate.Size = new Size(180, 35);
+            buttonUpdate.TabIndex = 6;
+            buttonUpdate.Text = "Обновить список";
+            buttonUpdate.UseVisualStyleBackColor = true;
+            buttonUpdate.Click += ButtonUpd_Click;
+            // 
+            // FormMain
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(984, 450);
+            Controls.Add(buttonUpdate);
+            Controls.Add(buttonIssuedOrder);
+            Controls.Add(buttonOrderReady);
+            Controls.Add(buttonTakeOrderInWork);
+            Controls.Add(buttonCreateOrder);
+            Controls.Add(dataGridView);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
+            Name = "FormMain";
+            Text = "Компьютерный магазин";
+            Load += FormMain_Load;
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
+        }
 
-		#endregion
+        #endregion
 
-		private MenuStrip menuStrip;
-		private ToolStripMenuItem справочникиToolStripMenuItem;
-		private ToolStripMenuItem компонентыToolStripMenuItem;
-		private ToolStripMenuItem комьютерыToolStripMenuItem;
-		private DataGridView dataGridView;
-		private Button buttonCreateOrder;
-		private Button buttonTakeOrderInWork;
-		private Button buttonOrderReady;
-		private Button buttonIssuedOrder;
-		private Button buttonUpdate;
-		private ToolStripMenuItem магазиныToolStripMenuItem;
-		private Button buttonSupplyShop;
-	}
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem справочникиToolStripMenuItem;
+        private ToolStripMenuItem компонентыToolStripMenuItem;
+        private ToolStripMenuItem комьютерыToolStripMenuItem;
+        private DataGridView dataGridView;
+        private Button buttonCreateOrder;
+        private Button buttonTakeOrderInWork;
+        private Button buttonOrderReady;
+        private Button buttonIssuedOrder;
+        private Button buttonUpdate;
+    }
 }

ComputersShop/ComputersShop/FormMain.cs

@@ -13,162 +13,145 @@ using System.Windows.Forms;
 
 namespace ComputersShop
 {
-	public partial class FormMain : Form
-	{
-		private readonly ILogger _logger;
+    public partial class FormMain : Form
+    {
+        private readonly ILogger _logger;
 
-		private readonly IOrderLogic _orderLogic;
+        private readonly IOrderLogic _orderLogic;
 
-		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_orderLogic = orderLogic;
-		}
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _orderLogic = orderLogic;
+        }
 
-		private void FormMain_Load(object sender, EventArgs e)
-		{
-			LoadData();
-		}
+        private void FormMain_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
 
-		private void LoadData()
-		{
-			try
-			{
-				var list = _orderLogic.ReadList(null);
-				if (list != null)
-				{
-					dataGridView.DataSource = list;
-					dataGridView.Columns["ComputerId"].Visible = false;
-					dataGridView.Columns["ComputerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-				}
-				_logger.LogInformation("Orders loading");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Orders loading error");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
+        private void LoadData()
+        {
+            try
+            {
+                var list = _orderLogic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["ComputerId"].Visible = false;
+                    dataGridView.Columns["ComputerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Orders loading");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Orders loading error");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
 
-		private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
-			if (service is FormComponents form)
-			{
-				form.ShowDialog();
-			}
-		}
+        private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+            if (service is FormComponents form)
+            {
+                form.ShowDialog();
+            }
+        }
 
-		private void КомпьютерыToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormComputers));
-			if (service is FormComputers form)
-			{
-				form.ShowDialog();
-			}
-		}
-		private void МагазиныToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-			if (service is FormShops form)
-			{
-				form.ShowDialog();
-			}
-		}
+        private void КомпьютерыToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormComputers));
+            if (service is FormComputers 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 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("Order №{id}. Status changes to 'В работе'", id);
-				try
-				{
-					var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id });
-					if (!operationResult)
-					{
-						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-					}
-					LoadData();
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Error taking an order to work");
-					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-			}
-		}
+        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("Order №{id}. Status changes to 'В работе'", id);
+                try
+                {
+                    var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id });
+                    if (!operationResult)
+                    {
+                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+                    }
+                    LoadData();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Error taking an order to work");
+                    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("Order №{id}.  Status changes to 'Готов'", id);
-				try
-				{
-					var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id });
-					if (!operationResult)
-					{
-						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-					}
-					LoadData();
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Order readiness marking error");
-					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("Order №{id}.  Status changes to 'Готов'", id);
+                try
+                {
+                    var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id });
+                    if (!operationResult)
+                    {
+                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+                    }
+                    LoadData();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Order readiness marking error");
+                    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("Order №{id}. Status changes to 'Выдан'", id);
-				try
-				{
-					var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id });
-					if (!operationResult)
-					{
-						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-					}
-					_logger.LogInformation("Order №{id} issued", id);
-					LoadData();
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Order issue marking error");
-					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("Order №{id}. Status changes to 'Выдан'", id);
+                try
+                {
+                    var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id });
+                    if (!operationResult)
+                    {
+                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+                    }
+                    _logger.LogInformation("Order №{id} issued", id);
+                    LoadData();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Order issue marking error");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
 
-		private void ButtonUpd_Click(object sender, EventArgs e)
-		{
-			LoadData();
-		}
-
-		private void buttonSupplyShop_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply));
-			if (service is FormShopSupply form)
-			{
-				form.ShowDialog();
-			}
-		}
-	}
+        private void ButtonUpd_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+    }
 }

ComputersShop/ComputersShop/FormShop.Designer.cs

@@ -1,188 +0,0 @@
-namespace ComputersShop
-{
-	partial class FormShop
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			textBoxName = new TextBox();
-			labelAddress = new Label();
-			labelName = new Label();
-			DateTimePickerDateOpen = new DateTimePicker();
-			labelDateOpen = new Label();
-			dataGridView = new DataGridView();
-			ColumnId = new DataGridViewTextBoxColumn();
-			ColumnComputer = new DataGridViewTextBoxColumn();
-			ColumnCount = new DataGridViewTextBoxColumn();
-			buttonCancel = new Button();
-			buttonSave = new Button();
-			textBoxAddress = new TextBox();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
-			// 
-			// textBoxName
-			// 
-			textBoxName.Location = new Point(105, 6);
-			textBoxName.Name = "textBoxName";
-			textBoxName.Size = new Size(235, 23);
-			textBoxName.TabIndex = 11;
-			// 
-			// labelAddress
-			// 
-			labelAddress.AutoSize = true;
-			labelAddress.Location = new Point(12, 42);
-			labelAddress.Name = "labelAddress";
-			labelAddress.Size = new Size(43, 15);
-			labelAddress.TabIndex = 9;
-			labelAddress.Text = "Адрес:";
-			// 
-			// labelName
-			// 
-			labelName.AutoSize = true;
-			labelName.Location = new Point(12, 9);
-			labelName.Name = "labelName";
-			labelName.Size = new Size(62, 15);
-			labelName.TabIndex = 8;
-			labelName.Text = "Название:";
-			// 
-			// DateTimePickerDateOpen
-			// 
-			DateTimePickerDateOpen.Location = new Point(105, 72);
-			DateTimePickerDateOpen.Name = "DateTimePickerDateOpen";
-			DateTimePickerDateOpen.Size = new Size(235, 23);
-			DateTimePickerDateOpen.TabIndex = 15;
-			// 
-			// labelDateOpen
-			// 
-			labelDateOpen.AutoSize = true;
-			labelDateOpen.Location = new Point(12, 75);
-			labelDateOpen.Name = "labelDateOpen";
-			labelDateOpen.Size = new Size(87, 15);
-			labelDateOpen.TabIndex = 16;
-			labelDateOpen.Text = "Дата открытия";
-			// 
-			// dataGridView
-			// 
-			dataGridView.AllowUserToAddRows = false;
-			dataGridView.AllowUserToDeleteRows = false;
-			dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnComputer, ColumnCount });
-			dataGridView.Location = new Point(12, 110);
-			dataGridView.MultiSelect = false;
-			dataGridView.Name = "dataGridView";
-			dataGridView.ReadOnly = true;
-			dataGridView.RowHeadersVisible = false;
-			dataGridView.RowTemplate.Height = 25;
-			dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-			dataGridView.Size = new Size(535, 250);
-			dataGridView.TabIndex = 17;
-			// 
-			// ColumnId
-			// 
-			ColumnId.HeaderText = "Id";
-			ColumnId.Name = "ColumnId";
-			ColumnId.ReadOnly = true;
-			ColumnId.Visible = false;
-			// 
-			// ColumnComputer
-			// 
-			ColumnComputer.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-			ColumnComputer.HeaderText = "Компьютер";
-			ColumnComputer.Name = "ColumnComputer";
-			ColumnComputer.ReadOnly = true;
-			// 
-			// ColumnCount
-			// 
-			ColumnCount.HeaderText = "Количество";
-			ColumnCount.Name = "ColumnCount";
-			ColumnCount.ReadOnly = true;
-			// 
-			// buttonCancel
-			// 
-			buttonCancel.Location = new Point(447, 369);
-			buttonCancel.Name = "buttonCancel";
-			buttonCancel.Size = new Size(100, 30);
-			buttonCancel.TabIndex = 19;
-			buttonCancel.Text = "Отменить";
-			buttonCancel.UseVisualStyleBackColor = true;
-			buttonCancel.Click += buttonCancel_Click;
-			// 
-			// buttonSave
-			// 
-			buttonSave.Location = new Point(337, 369);
-			buttonSave.Name = "buttonSave";
-			buttonSave.Size = new Size(100, 30);
-			buttonSave.TabIndex = 18;
-			buttonSave.Text = "Сохранить";
-			buttonSave.UseVisualStyleBackColor = true;
-			buttonSave.Click += buttonSave_Click;
-			// 
-			// textBoxAddress
-			// 
-			textBoxAddress.Location = new Point(105, 39);
-			textBoxAddress.Name = "textBoxAddress";
-			textBoxAddress.Size = new Size(235, 23);
-			textBoxAddress.TabIndex = 20;
-			// 
-			// FormShop
-			// 
-			AutoScaleDimensions = new SizeF(7F, 15F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(559, 411);
-			Controls.Add(textBoxAddress);
-			Controls.Add(buttonCancel);
-			Controls.Add(buttonSave);
-			Controls.Add(dataGridView);
-			Controls.Add(labelDateOpen);
-			Controls.Add(DateTimePickerDateOpen);
-			Controls.Add(textBoxName);
-			Controls.Add(labelAddress);
-			Controls.Add(labelName);
-			Name = "FormShop";
-			Text = "Магазин";
-			Load += FormShop_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-			PerformLayout();
-		}
-
-		#endregion
-
-		private TextBox textBoxName;
-		private Label labelAddress;
-		private Label labelName;
-		private DateTimePicker DateTimePickerDateOpen;
-		private Label labelDateOpen;
-		private DataGridView dataGridView;
-		private DataGridViewTextBoxColumn ColumnId;
-		private DataGridViewTextBoxColumn ColumnComputer;
-		private DataGridViewTextBoxColumn ColumnCount;
-		private Button buttonCancel;
-		private Button buttonSave;
-		private TextBox textBoxAddress;
-	}
-}

ComputersShop/ComputersShop/FormShop.cs

@@ -1,134 +0,0 @@
-using ComputersShopContracts.BindingModels;
-using ComputersShopContracts.BusinessLogicsContracts;
-using ComputersShopContracts.SearchModels;
-using ComputersShopDataModels.Models;
-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 ComputersShop
-{
-	public partial class FormShop : Form
-	{
-		private readonly IShopLogic _logic;
-		private readonly ILogger _logger;
-		private Dictionary<int, (IComputerModel, int)> _shopComputers;
-		private int? _id;
-		public int Id { set { _id = value; } }
-
-		public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-			_shopComputers = new();
-		}
-
-		private void FormShop_Load(object sender, EventArgs e)
-		{
-			if (_id.HasValue)
-			{
-				_logger.LogInformation("Loading shop");
-
-				try
-				{
-					var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
-
-					if (shop != null)
-					{
-						textBoxName.Text = shop.ShopName;
-						textBoxAddress.Text = shop.Address;
-						DateTimePickerDateOpen.Value = shop.DateOpen;
-						_shopComputers = shop.ShopComputers ?? new Dictionary<int, (IComputerModel, int)>();
-						LoadData();
-					}
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Error during loading shop");
-					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-			}
-		}
-
-		private void LoadData()
-		{
-			_logger.LogInformation("Loading shop's bouquets");
-
-			try
-			{
-				if (_shopComputers != null)
-				{
-					dataGridView.Rows.Clear();
-					foreach (var computer in _shopComputers)
-					{
-						dataGridView.Rows.Add(new object[] { computer.Key, computer.Value.Item1.ComputerName, computer.Value.Item2 });
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Error during loading shop's computers");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void buttonSave_Click(object sender, EventArgs e)
-		{
-			if (string.IsNullOrEmpty(textBoxName.Text))
-			{
-				MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-
-			if (string.IsNullOrEmpty(textBoxAddress.Text))
-			{
-				MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-
-			_logger.LogInformation("Saving shop");
-
-			try
-			{
-				var model = new ShopBindingModel
-				{
-					Id = _id ?? 0,
-					ShopName = textBoxName.Text,
-					Address = textBoxAddress.Text,
-					DateOpen = DateTimePickerDateOpen.Value,
-					ShopComputers = _shopComputers
-				};
-
-				var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-
-				if (!operationResult)
-				{
-					throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-				}
-
-				MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-				DialogResult = DialogResult.OK;
-				Close();
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Error during saving shop");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void buttonCancel_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-	}
-}

ComputersShop/ComputersShop/FormShop.resx

@@ -1,69 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ColumnId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnComputer.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

ComputersShop/ComputersShop/FormShopSupply.Designer.cs

@@ -1,147 +0,0 @@
-namespace ComputersShop
-{
-	partial class FormShopSupply
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			buttonCancel = new Button();
-			buttonSave = new Button();
-			textBoxCount = new TextBox();
-			labelCount = new Label();
-			labelShop = new Label();
-			comboBoxShop = new ComboBox();
-			comboBoxComputer = new ComboBox();
-			labelComputer = new Label();
-			SuspendLayout();
-			// 
-			// buttonCancel
-			// 
-			buttonCancel.Location = new Point(270, 100);
-			buttonCancel.Name = "buttonCancel";
-			buttonCancel.Size = new Size(100, 30);
-			buttonCancel.TabIndex = 11;
-			buttonCancel.Text = "Отменить";
-			buttonCancel.UseVisualStyleBackColor = true;
-			buttonCancel.Click += buttonCancel_Click;
-			// 
-			// buttonSave
-			// 
-			buttonSave.Location = new Point(160, 100);
-			buttonSave.Name = "buttonSave";
-			buttonSave.Size = new Size(100, 30);
-			buttonSave.TabIndex = 10;
-			buttonSave.Text = "Сохранить";
-			buttonSave.UseVisualStyleBackColor = true;
-			buttonSave.Click += buttonSave_Click;
-			// 
-			// textBoxCount
-			// 
-			textBoxCount.Location = new Point(90, 64);
-			textBoxCount.Name = "textBoxCount";
-			textBoxCount.Size = new Size(282, 23);
-			textBoxCount.TabIndex = 9;
-			// 
-			// labelCount
-			// 
-			labelCount.AutoSize = true;
-			labelCount.Location = new Point(12, 67);
-			labelCount.Name = "labelCount";
-			labelCount.Size = new Size(75, 15);
-			labelCount.TabIndex = 7;
-			labelCount.Text = "Количество:";
-			// 
-			// labelShop
-			// 
-			labelShop.AutoSize = true;
-			labelShop.Location = new Point(12, 9);
-			labelShop.Name = "labelShop";
-			labelShop.Size = new Size(57, 15);
-			labelShop.TabIndex = 12;
-			labelShop.Text = "Магазин:";
-			// 
-			// comboBoxShop
-			// 
-			comboBoxShop.FormattingEnabled = true;
-			comboBoxShop.Location = new Point(90, 6);
-			comboBoxShop.Margin = new Padding(3, 2, 3, 2);
-			comboBoxShop.Name = "comboBoxShop";
-			comboBoxShop.Size = new Size(280, 23);
-			comboBoxShop.TabIndex = 13;
-			// 
-			// comboBoxComputer
-			// 
-			comboBoxComputer.FormattingEnabled = true;
-			comboBoxComputer.Location = new Point(90, 36);
-			comboBoxComputer.Margin = new Padding(3, 2, 3, 2);
-			comboBoxComputer.Name = "comboBoxComputer";
-			comboBoxComputer.Size = new Size(280, 23);
-			comboBoxComputer.TabIndex = 14;
-			// 
-			// labelComputer
-			// 
-			labelComputer.AutoSize = true;
-			labelComputer.Location = new Point(12, 39);
-			labelComputer.Name = "labelComputer";
-			labelComputer.Size = new Size(74, 15);
-			labelComputer.TabIndex = 15;
-			labelComputer.Text = "Компьютер:";
-			// 
-			// FormShopSupply
-			// 
-			AutoScaleDimensions = new SizeF(7F, 15F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(384, 139);
-			Controls.Add(labelComputer);
-			Controls.Add(comboBoxComputer);
-			Controls.Add(comboBoxShop);
-			Controls.Add(labelShop);
-			Controls.Add(buttonCancel);
-			Controls.Add(buttonSave);
-			Controls.Add(textBoxCount);
-			Controls.Add(labelCount);
-			Name = "FormShopSupply";
-			Text = "FormShopSupply";
-			Load += FormShopSupply_Load;
-			ResumeLayout(false);
-			PerformLayout();
-		}
-
-		#endregion
-
-		private Button buttonCancel;
-		private Button buttonSave;
-		private TextBox textBoxCount;
-		private TextBox textBoxName;
-		private Label labelCount;
-		private Label labelName;
-		private TextBox textBox1;
-		private Label labelShop;
-		private ComboBox comboBoxShop;
-		private ComboBox comboBoxComputer;
-		private Label labelComputer;
-	}
-}

ComputersShop/ComputersShop/FormShopSupply.cs

@@ -1,127 +0,0 @@
-using ComputersShopContracts.BindingModels;
-using ComputersShopContracts.BuisnessLogicsContracts;
-using ComputersShopContracts.BusinessLogicsContracts;
-using ComputersShopContracts.SearchModels;
-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 ComputersShop
-{
-	public partial class FormShopSupply : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IComputerLogic _logicComputer;
-		private readonly IShopLogic _logicShop;
-
-		public FormShopSupply(ILogger<FormShopSupply> logger, IComputerLogic logicBouquet, IShopLogic logicShop)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logicComputer = logicBouquet;
-			_logicShop = logicShop;
-		}
-
-		private void FormShopSupply_Load(object sender, EventArgs e)
-		{
-			_logger.LogInformation("Loading computers for supplying");
-
-			try
-			{
-				var list = _logicComputer.ReadList(null);
-				if (list != null)
-				{
-					comboBoxComputer.DisplayMember = "ComputerName";
-					comboBoxComputer.ValueMember = "Id";
-					comboBoxComputer.DataSource = list;
-					comboBoxComputer.SelectedItem = null;
-				}
-
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Error during loading bouquets for supplying");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-
-			_logger.LogInformation("Loading shops for supplying");
-
-			try
-			{
-				var list = _logicShop.ReadList(null);
-				if (list != null)
-				{
-					comboBoxShop.DisplayMember = "ShopName";
-					comboBoxShop.ValueMember = "Id";
-					comboBoxShop.DataSource = list;
-					comboBoxShop.SelectedItem = null;
-				}
-
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Error during loading shops for supplying");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void buttonSave_Click(object sender, EventArgs e)
-		{
-			if (string.IsNullOrEmpty(textBoxCount.Text))
-			{
-				MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-
-			if (comboBoxComputer.SelectedValue == null)
-			{
-				MessageBox.Show("Выберите букет", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-
-			if (comboBoxShop.SelectedValue == null)
-			{
-				MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-
-			_logger.LogInformation("Creation of supply");
-
-			try
-			{
-				var operationResult = _logicShop.SupplyComputers(
-					new ShopSearchModel { Id = Convert.ToInt32(comboBoxShop.SelectedValue), Name = comboBoxShop.Text },
-					new ComputerBindingModel { Id = Convert.ToInt32(comboBoxComputer.SelectedValue), ComputerName = comboBoxComputer.Text },
-					Convert.ToInt32(textBoxCount.Text)
-				);
-
-				if (!operationResult)
-				{
-					throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах.");
-				}
-
-				MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-				DialogResult = DialogResult.OK;
-				Close();
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Error during creation of supply");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void buttonCancel_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-	}
-}

ComputersShop/ComputersShop/FormShopSupply.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ComputersShop/ComputersShop/FormShops.Designer.cs

@@ -1,149 +0,0 @@
-namespace ComputersShop
-{
-	partial class FormShops
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			DataGridViewCellStyle dataGridViewCellStyle1 = new DataGridViewCellStyle();
-			DataGridViewCellStyle dataGridViewCellStyle2 = new DataGridViewCellStyle();
-			DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle();
-			buttonReload = new Button();
-			buttonDelete = new Button();
-			buttonUpdate = new Button();
-			buttonAdd = new Button();
-			dataGridView = new DataGridView();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
-			// 
-			// buttonReload
-			// 
-			buttonReload.Location = new Point(332, 123);
-			buttonReload.Name = "buttonReload";
-			buttonReload.Size = new Size(140, 30);
-			buttonReload.TabIndex = 13;
-			buttonReload.Text = "Обновить";
-			buttonReload.UseVisualStyleBackColor = true;
-			buttonReload.Click += buttonUpdate_Click;
-			// 
-			// buttonDelete
-			// 
-			buttonDelete.Location = new Point(332, 87);
-			buttonDelete.Name = "buttonDelete";
-			buttonDelete.Size = new Size(140, 30);
-			buttonDelete.TabIndex = 12;
-			buttonDelete.Text = "Удалить";
-			buttonDelete.UseVisualStyleBackColor = true;
-			buttonDelete.Click += buttonDelete_Click;
-			// 
-			// buttonUpdate
-			// 
-			buttonUpdate.Location = new Point(332, 51);
-			buttonUpdate.Name = "buttonUpdate";
-			buttonUpdate.Size = new Size(140, 30);
-			buttonUpdate.TabIndex = 11;
-			buttonUpdate.Text = "Изменить";
-			buttonUpdate.UseVisualStyleBackColor = true;
-			buttonUpdate.Click += buttonEdit_Click;
-			// 
-			// buttonAdd
-			// 
-			buttonAdd.Location = new Point(332, 15);
-			buttonAdd.Name = "buttonAdd";
-			buttonAdd.Size = new Size(140, 30);
-			buttonAdd.TabIndex = 10;
-			buttonAdd.Text = "Добавить";
-			buttonAdd.UseVisualStyleBackColor = true;
-			buttonAdd.Click += buttonAdd_Click;
-			// 
-			// dataGridView
-			// 
-			dataGridView.AllowUserToAddRows = false;
-			dataGridView.AllowUserToDeleteRows = false;
-			dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
-			dataGridViewCellStyle1.Alignment = DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle1.BackColor = SystemColors.Control;
-			dataGridViewCellStyle1.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
-			dataGridViewCellStyle1.ForeColor = SystemColors.WindowText;
-			dataGridViewCellStyle1.SelectionBackColor = SystemColors.Highlight;
-			dataGridViewCellStyle1.SelectionForeColor = SystemColors.HighlightText;
-			dataGridViewCellStyle1.WrapMode = DataGridViewTriState.True;
-			dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridViewCellStyle2.Alignment = DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle2.BackColor = SystemColors.Window;
-			dataGridViewCellStyle2.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
-			dataGridViewCellStyle2.ForeColor = SystemColors.ControlText;
-			dataGridViewCellStyle2.SelectionBackColor = SystemColors.Highlight;
-			dataGridViewCellStyle2.SelectionForeColor = SystemColors.HighlightText;
-			dataGridViewCellStyle2.WrapMode = DataGridViewTriState.False;
-			dataGridView.DefaultCellStyle = dataGridViewCellStyle2;
-			dataGridView.Dock = DockStyle.Left;
-			dataGridView.Location = new Point(0, 0);
-			dataGridView.MultiSelect = false;
-			dataGridView.Name = "dataGridView";
-			dataGridView.ReadOnly = true;
-			dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle3.BackColor = SystemColors.Control;
-			dataGridViewCellStyle3.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
-			dataGridViewCellStyle3.ForeColor = SystemColors.WindowText;
-			dataGridViewCellStyle3.SelectionBackColor = SystemColors.Highlight;
-			dataGridViewCellStyle3.SelectionForeColor = SystemColors.HighlightText;
-			dataGridViewCellStyle3.WrapMode = DataGridViewTriState.True;
-			dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
-			dataGridView.RowHeadersVisible = false;
-			dataGridView.RowTemplate.Height = 25;
-			dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-			dataGridView.Size = new Size(300, 361);
-			dataGridView.TabIndex = 9;
-			// 
-			// FormShops
-			// 
-			AutoScaleDimensions = new SizeF(7F, 15F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(484, 361);
-			Controls.Add(buttonReload);
-			Controls.Add(buttonDelete);
-			Controls.Add(buttonUpdate);
-			Controls.Add(buttonAdd);
-			Controls.Add(dataGridView);
-			Name = "FormShops";
-			Text = "Магазины";
-			Load += FormShops_Load;
-			Click += FormShops_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-		}
-
-		#endregion
-
-		private Button buttonReload;
-		private Button buttonDelete;
-		private Button buttonUpdate;
-		private Button buttonAdd;
-		private DataGridView dataGridView;
-	}
-}

ComputersShop/ComputersShop/FormShops.cs

@@ -1,122 +0,0 @@
-using ComputersShopContracts.BindingModels;
-using ComputersShopContracts.BusinessLogicsContracts;
-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 ComputersShop
-{
-	public partial class FormShops : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IShopLogic _logic;
-
-		public FormShops(ILogger<FormShops> logger, IShopLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-		}
-
-		private void FormShops_Load(object sender, EventArgs e)
-		{
-			LoadData();
-		}
-
-		private void LoadData()
-		{
-			try
-			{
-				var list = _logic.ReadList(null);
-
-				if (list != null)
-				{
-					dataGridView.DataSource = list;
-					dataGridView.Columns["Id"].Visible = false;
-					dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-					dataGridView.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-					dataGridView.Columns["DateOpen"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-					dataGridView.Columns["ShopComputers"].Visible = false;
-				}
-
-				_logger.LogInformation("Loading shops");
-
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Error during loading shops");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void buttonUpdate_Click(object sender, EventArgs e)
-		{
-			LoadData();
-		}
-
-		private void buttonAdd_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-
-			if (service is FormShop form)
-			{
-				if (form.ShowDialog() == DialogResult.OK)
-				{
-					LoadData();
-				}
-			}
-		}
-
-		private void buttonEdit_Click(object sender, EventArgs e)
-		{
-			if (dataGridView.SelectedRows.Count == 1)
-			{
-				var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-
-				if (service is FormShop form)
-				{
-					form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-
-					if (form.ShowDialog() == DialogResult.OK)
-					{
-						LoadData();
-					}
-				}
-			}
-		}
-
-		private void buttonDelete_Click(object sender, EventArgs e)
-		{
-			if (dataGridView.SelectedRows.Count == 1)
-			{
-				if (MessageBox.Show("Удалить магазин?", "Подтверждение", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-				{
-					int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-					_logger.LogInformation("Deleting shop");
-
-					try
-					{
-						if (!_logic.Delete(new ShopBindingModel { Id = id }))
-						{
-							throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-						}
-
-						LoadData();
-					}
-					catch (Exception ex)
-					{
-						_logger.LogError(ex, "Error during deleting shop");
-						MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-					}
-				}
-			}
-		}
-	}
-}

ComputersShop/ComputersShop/FormShops.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ComputersShop/ComputersShop/Program.cs

@@ -1,8 +1,7 @@
 using ComputersShopBusinessLogic.BusinessLogics;
 using ComputersShopContracts.BuisnessLogicsContracts;
-using ComputersShopContracts.BusinessLogicsContracts;
 using ComputersShopContracts.StoragesContracts;
-using ComputersShopListImplement.Implements;
+using ComputersShopFileImplements.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
@@ -38,23 +37,18 @@ namespace ComputersShop
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IComputerStorage, ComputerStorage>();
-			services.AddTransient<IShopStorage, ShopStorage>();
 
-			services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IComputerLogic, ComputerLogic>();
-			services.AddTransient<IShopLogic, ShopLogic>();
 
-			services.AddTransient<FormMain>();
+            services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
             services.AddTransient<FormCreateOrder>();
             services.AddTransient<FormComputer>();
             services.AddTransient<FormComputerComponent>();
             services.AddTransient<FormComputers>();
-			services.AddTransient<FormShop>();
-			services.AddTransient<FormShops>();
-			services.AddTransient<FormShopSupply>();
-		}
+        }
     }
 }

ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,161 +0,0 @@
-using ComputersShopContracts.BindingModels;
-using ComputersShopContracts.BusinessLogicsContracts;
-using ComputersShopContracts.SearchModels;
-using ComputersShopContracts.StoragesContracts;
-using ComputersShopContracts.ViewModels;
-using ComputersShopDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputersShopBusinessLogic.BusinessLogics
-{
-	public class ShopLogic: IShopLogic
-	{
-		private readonly ILogger _logger;
-		private readonly IShopStorage _shopStorage;
-
-		public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
-		{
-			_logger = logger;
-			_shopStorage = shopStorage;
-		}
-
-		public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-		{
-			_logger.LogInformation("ReadList. Id:{Id} Name:{Name}", model?.Id, model?.Name);
-			var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFiltredList(model);
-			if (list == null)
-			{
-				_logger.LogWarning("ReadList return null list");
-				return null;
-			}
-			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
-			return list;
-		}
-
-		public ShopViewModel? ReadElement(ShopSearchModel model)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-			_logger.LogInformation("ReadElement. ShopName:{ShopName}. Id:{Id}", model.Name, model.Id);
-			var element = _shopStorage.GetElement(model);
-			if (element == null)
-			{
-				_logger.LogWarning("ReadElement element not found");
-				return null;
-			}
-			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-			return element;
-		}
-		public bool Create(ShopBindingModel model)
-		{
-			CheckModel(model);
-			if (_shopStorage.Insert(model) == null)
-			{
-				_logger.LogWarning("Insert operation failed");
-				return false;
-			}
-			return true;
-		}
-		public bool Update(ShopBindingModel model)
-		{
-			CheckModel(model);
-			if (_shopStorage.Update(model) == null)
-			{
-				_logger.LogWarning("Update operation failed");
-				return false;
-			}
-			return true;
-		}
-		public bool Delete(ShopBindingModel model)
-		{
-			CheckModel(model, false);
-			_logger.LogInformation("Delete. Id:{Id}", model.Id);
-			if (_shopStorage.Delete(model) == null)
-			{
-				_logger.LogWarning("Delete operation failed");
-				return false;
-			}
-			return true;
-		}
-		private void CheckModel(ShopBindingModel model, bool withParams = true)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-			if (!withParams)
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(model.ShopName))
-			{
-				throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName));
-			}
-			if (string.IsNullOrEmpty(model.Address))
-			{
-				throw new ArgumentNullException("Нет адреса магазина", nameof(model.Address));
-			}
-
-			_logger.LogInformation("Computer. ComputerName:{ComputerName}. Cost:{Cost}. Id:{Id}", model.ShopName, model.Address, model.Id);
-
-			var element = _shopStorage.GetElement(new ShopSearchModel
-			{
-				Name = model.ShopName
-			});
-			if (element != null && element.Id != model.Id)
-			{
-				throw new InvalidOperationException("Магазин с таким названием уже есть");
-			}
-		}
-
-		public bool SupplyComputers(ShopSearchModel model, IComputerModel computer, int count)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-			if (computer == null)
-			{
-				throw new ArgumentNullException(nameof(computer));
-			}
-			if (count <= 0)
-			{
-				throw new ArgumentNullException("Количесво товара должно быть больше 0");
-			}
-
-			ShopViewModel? currentShop = _shopStorage.GetElement(model);
-			if (currentShop == null)
-			{
-				throw new ArgumentNullException(nameof(currentShop));
-			}
-			_logger.LogInformation("Make Supply. Id: {Id}. ShopName: {Name}", model.Id, model.Name);
-
-			if (currentShop.ShopComputers.TryGetValue(computer.Id, out var pair))
-			{
-				currentShop.ShopComputers[computer.Id] = (pair.Item1, pair.Item2 + count);
-				_logger.LogInformation("Add computers. ComputerName: {Name}. Count: {Name}", pair.Item1, pair.Item2 + count);
-			}
-			else
-			{
-				currentShop.ShopComputers.Add(computer.Id, (computer, count));
-				_logger.LogInformation("Add new computers. ComputerName: {Name}. Count: {Name}", pair.Item1, count);
-			}
-
-			return Update(new()
-			{
-				Id = currentShop.Id,
-				ShopName = currentShop.ShopName,
-				DateOpen = currentShop.DateOpen,
-				Address = currentShop.Address,
-				ShopComputers = currentShop.ShopComputers,
-			});
-		}
-	}
-}

ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs

@@ -1,19 +0,0 @@
-using ComputersShopDataModels.Enums;
-using ComputersShopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputersShopContracts.BindingModels
-{
-	public class ShopBindingModel: IShopModel
-	{
-		public int Id { get; set; }
-		public string ShopName { get; set; }
-		public string Address { get; set; }
-		public DateTime DateOpen { get; set; } = DateTime.Now;
-		public Dictionary<int, (IComputerModel, int)> ShopComputers{ get; set; } = new();
-	}
-}

ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,22 +0,0 @@
-using ComputersShopContracts.BindingModels;
-using ComputersShopContracts.SearchModels;
-using ComputersShopContracts.ViewModels;
-using ComputersShopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputersShopContracts.BusinessLogicsContracts
-{
-	public interface IShopLogic
-	{
-		ShopViewModel? ReadElement(ShopSearchModel model);
-		List<ShopViewModel>? ReadList(ShopSearchModel? model);
-		bool Create(ShopBindingModel model);
-		bool Update(ShopBindingModel model);
-		bool Delete(ShopBindingModel model);
-		bool SupplyComputers(ShopSearchModel model, IComputerModel computer, int count);
-	}
-}

ComputersShop/ComputersShopContracts/SearchModels/ShopSearchModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputersShopContracts.SearchModels
-{
-	public class ShopSearchModel
-	{
-		public int? Id { get; set; }
-		public string? Name { get; set; }
-	}
-}

ComputersShop/ComputersShopContracts/StoragesContracts/IShopStorage.cs

@@ -1,21 +0,0 @@
-using ComputersShopContracts.BindingModels;
-using ComputersShopContracts.SearchModels;
-using ComputersShopContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputersShopContracts.StoragesContracts
-{
-	public interface IShopStorage
-	{
-		List<ShopViewModel> GetFullList();
-		List<ShopViewModel> GetFiltredList(ShopSearchModel model);
-		ShopViewModel? GetElement(ShopSearchModel model);
-		ShopViewModel? Insert(ShopBindingModel model);
-		ShopViewModel? Update(ShopBindingModel model);
-		ShopViewModel? Delete(ShopBindingModel model);
-	}
-}

ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs

@@ -1,25 +0,0 @@
-using ComputersShopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputersShopContracts.ViewModels
-{
-	public class ShopViewModel: IShopModel
-	{
-		public int Id { get; set; }
-
-		[DisplayName("Название магазина")]
-		public string ShopName { get; set; } = string.Empty;
-
-		[DisplayName("Адресс")]
-		public string Address { get; set; } = string.Empty;
-		[DisplayName("Дата открытия")]
-		public DateTime DateOpen { get; set; } = DateTime.Now;
-
-		public Dictionary<int, (IComputerModel, int)> ShopComputers { get; set; } = new();
-	}
-}

ComputersShop/ComputersShopDataModels/Models/IShopModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputersShopDataModels.Models
-{
-	public interface IShopModel: IId
-	{
-		string ShopName { get; }
-		string Address { get; }
-		DateTime DateOpen { get; }
-	}
-}

ComputersShop/ComputersShopListImplement/ComputersShopListImplements.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ComputersShopContracts\ComputersShopContracts.csproj" />
+    <ProjectReference Include="..\ComputersShopDataModels\ComputersShopDataModels.csproj" />
+  </ItemGroup>
+
+</Project>

ComputersShop/ComputersShopListImplement/DataListSingleton.cs

@@ -13,13 +13,11 @@ namespace ComputersShopListImplement
         public  List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Computer> Computers { get; set; }
-		public List<Shop> Shops { get; set; }
-		private DataListSingleton()
+        private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Computers = new List<Computer>();
-            Shops = new List<Shop>();
         }
         public static DataListSingleton GetInstance()
         {

ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs

@@ -1,106 +0,0 @@
-using ComputersShopContracts.BindingModels;
-using ComputersShopContracts.SearchModels;
-using ComputersShopContracts.StoragesContracts;
-using ComputersShopContracts.ViewModels;
-using ComputersShopListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputersShopListImplement.Implements
-{
-	public class ShopStorage: IShopStorage
-	{
-		private readonly DataListSingleton _source;
-		public ShopStorage()
-		{
-			_source = DataListSingleton.GetInstance();
-		}
-		public List<ShopViewModel> GetFullList()
-		{
-			var result = new List<ShopViewModel>();
-			foreach (var shop in _source.Shops)
-			{
-				result.Add(shop.GetViewModel);
-			}
-			return result;
-		}
-		public List<ShopViewModel> GetFiltredList(ShopSearchModel model)
-		{
-			var result = new List<ShopViewModel>();
-			if (string.IsNullOrEmpty(model.Name))
-			{
-				return result;
-			}
-			foreach (var shop in _source.Shops)
-			{
-				if (shop.ShopName.Contains(model.Name))
-				{
-					result.Add(shop.GetViewModel);
-				}
-			}
-			return result;
-		}
-		public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Name) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(model.Name)
-                    && shop.ShopName == model.Name) || (model.Id.HasValue && shop.Id == model.Id))
-                {
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-		public ShopViewModel? Insert(ShopBindingModel model)
-		{
-			model.Id = 1;
-			foreach (var shop in _source.Shops)
-			{
-				if (model.Id <= shop.Id)
-				{
-					model.Id = shop.Id + 1;
-				}
-			}
-			var newShop = Shop.Create(model);
-			if (newShop == null)
-			{
-				return null;
-			}
-			_source.Shops.Add(newShop);
-			return newShop.GetViewModel;
-		}
-		public ShopViewModel? Update(ShopBindingModel model)
-		{
-			foreach (var shop in _source.Shops)
-			{
-				if (shop.Id == model.Id)
-				{
-					shop.Update(model);
-					return shop.GetViewModel;
-				}
-			}
-			return null;
-		}
-		public ShopViewModel? Delete(ShopBindingModel model)
-		{
-			for (int i = 0; i < _source.Shops.Count; ++i)
-			{
-				if (_source.Shops[i].Id == model.Id)
-				{
-					var element = _source.Shops[i];
-					_source.Shops.RemoveAt(i);
-					return element.GetViewModel;
-				}
-			}
-			return null;
-		}
-	}
-}

ComputersShop/ComputersShopListImplement/Models/Shop.cs

@@ -1,56 +0,0 @@
-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;
-
-namespace ComputersShopListImplement.Models
-{
-	public class Shop: IShopModel
-	{
-		public int Id { get; private set; }
-        public string ShopName { get; private set; }
-        public string Address { get; private set; }
-        public DateTime DateOpen { get; private set; }
-        public Dictionary<int, (IComputerModel, int)> ShopComputers { get; private set; } = new();
-
-		public static Shop? Create(ShopBindingModel model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new Shop()
-			{
-				Id = model.Id,
-				ShopName = model.ShopName,
-				Address = model.Address,
-				DateOpen = model.DateOpen,
-				ShopComputers = new()
-			};
-		} 
-		public void Update(ShopBindingModel model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			ShopName = model.ShopName;
-			Address = model.Address;
-			DateOpen = model.DateOpen;
-			ShopComputers = model.ShopComputers;
-		}
-
-		public ShopViewModel GetViewModel => new()
-		{
-			Id = Id,
-			ShopName = ShopName,
-			Address = Address,
-			DateOpen = DateOpen,
-			ShopComputers = ShopComputers
-		};
-	}
-}