FishFactory/FishFactory.sln

@@ -3,15 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34031.279
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryListImplement", "FishFactoryListImplement\FishFactoryListImplement.csproj", "{905C1D79-DDB9-4D7A-91B6-DBB8CE1758CB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryBusinessLogic", "FishFactoryBusinessLogic\FishFactoryBusinessLogic.csproj", "{26D7F5A0-91FF-4076-84FE-8351FA7D1622}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryContracts", "FishFactoryContracts\FishFactoryContracts.csproj", "{63E1CA2D-8794-434D-9C89-3B159C12FAC2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryDataModels", "FishFactoryDataModels\FishFactoryDataModels.csproj", "{A1205FD1-95CF-4B1F-9F83-4969059ED5A9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFacoryView", "FishFactoryView\FishFacoryView.csproj", "{C7F45F63-C57C-4226-84F6-0A66D81C4540}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactory", "FishFactory\FishFactory.csproj", "{7D6246E7-96CD-455F-81EE-81A04D8845A3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,26 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{905C1D79-DDB9-4D7A-91B6-DBB8CE1758CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{905C1D79-DDB9-4D7A-91B6-DBB8CE1758CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{905C1D79-DDB9-4D7A-91B6-DBB8CE1758CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{905C1D79-DDB9-4D7A-91B6-DBB8CE1758CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26D7F5A0-91FF-4076-84FE-8351FA7D1622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26D7F5A0-91FF-4076-84FE-8351FA7D1622}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26D7F5A0-91FF-4076-84FE-8351FA7D1622}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26D7F5A0-91FF-4076-84FE-8351FA7D1622}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63E1CA2D-8794-434D-9C89-3B159C12FAC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63E1CA2D-8794-434D-9C89-3B159C12FAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63E1CA2D-8794-434D-9C89-3B159C12FAC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63E1CA2D-8794-434D-9C89-3B159C12FAC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1205FD1-95CF-4B1F-9F83-4969059ED5A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1205FD1-95CF-4B1F-9F83-4969059ED5A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1205FD1-95CF-4B1F-9F83-4969059ED5A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1205FD1-95CF-4B1F-9F83-4969059ED5A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7F45F63-C57C-4226-84F6-0A66D81C4540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7F45F63-C57C-4226-84F6-0A66D81C4540}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7F45F63-C57C-4226-84F6-0A66D81C4540}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7F45F63-C57C-4226-84F6-0A66D81C4540}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D6246E7-96CD-455F-81EE-81A04D8845A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D6246E7-96CD-455F-81EE-81A04D8845A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D6246E7-96CD-455F-81EE-81A04D8845A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D6246E7-96CD-455F-81EE-81A04D8845A3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

FishFactory/FishFactory/FishFactory.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+</Project>

FishFactory/FishFactory/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace FishFactory
+{
+    partial class Form1
+    {
+        /// <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()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "Form1";
+        }
+
+        #endregion
+    }
+}

FishFactory/FishFactory/Form1.cs

@@ -0,0 +1,10 @@
+namespace FishFactory
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+    }
+}

FishFactory/FishFactory/Program.cs

@@ -0,0 +1,17 @@
+namespace FishFactory
+{
+    internal static class Program
+    {
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            // To customize application configuration such as set high DPI settings or default font,
+            // see https://aka.ms/applicationconfiguration.
+            ApplicationConfiguration.Initialize();
+            Application.Run(new Form1());
+        }
+    }
+}

FishFactory/FishFactoryBusinessLogic/BusinessLogics/CannedLogic.cs

@@ -1,112 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryBusinessLogic.BusinessLogics
-{
-    public class CannedLogic : ICannedLogic
-    {
-        private readonly ILogger _logger;
-        private readonly ICannedStorage _cannedStorage;
-        public CannedLogic(ILogger<CannedLogic> logger, ICannedStorage CannedStorage)
-        {
-            _logger = logger;
-            _cannedStorage = CannedStorage;
-        }
-        public List<CannedViewModel>? ReadList(CannedSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. CannedName:{CannedName}.Id:{ Id}", model?.CannedName, model?.Id);
-            var list = model == null ? _cannedStorage.GetFullList() : _cannedStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-        public CannedViewModel? ReadElement(CannedSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement.CannedName:{CannedName}.Id:{ Id}", model.CannedName, model.Id);
-            var element = _cannedStorage.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(CannedBindingModel model)
-        {
-            CheckModel(model);
-            if (_cannedStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Update(CannedBindingModel model)
-        {
-            CheckModel(model);
-            if (_cannedStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Delete(CannedBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_cannedStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-        private void CheckModel(CannedBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.CannedName))
-            {
-                throw new ArgumentNullException("Нет названия изделия", nameof(model.CannedName));
-            }
-            if (model.Price <= 0)
-            {
-                throw new ArgumentNullException("Цена изделия должна быть больше 0", nameof(model.Price));
-            }
-            _logger.LogInformation("Canned. CannedName:{CannedName}.Price:{Price}.Id: { Id}", model.CannedName, model.Price, model.Id);
-            var element = _cannedStorage.GetElement(new CannedSearchModel
-            {
-                CannedName = model.CannedName
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Изделие с таким названием уже есть");
-            }
-        }
-    }
-}

FishFactory/FishFactoryBusinessLogic/BusinessLogics/ComponentLogic.cs

@@ -1,111 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-namespace FishFactoryBusinessLogic.BusinessLogics
-{
-    public class ComponentLogic : IComponentLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IComponentStorage _componentStorage;
-        public ComponentLogic(ILogger<ComponentLogic> logger, IComponentStorage
-       componentStorage)
-        {
-            _logger = logger;
-            _componentStorage = componentStorage;
-        }
-        public List<ComponentViewModel>? ReadList(ComponentSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ComponentName:{ComponentName}.Id:{ Id}", model?.ComponentName, model?.Id);
-        var list = model == null ? _componentStorage.GetFullList() :
-_componentStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-        public ComponentViewModel? ReadElement(ComponentSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ComponentName:{ComponentName}.Id:{ Id}", model.ComponentName, model.Id);
-        var element = _componentStorage.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(ComponentBindingModel model)
-        {
-            CheckModel(model);
-            if (_componentStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Update(ComponentBindingModel model)
-        {
-            CheckModel(model);
-            if (_componentStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Delete(ComponentBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_componentStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-        private void CheckModel(ComponentBindingModel model, bool withParams =
-       true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.ComponentName))
-            {
-                throw new ArgumentNullException("Нет названия компонента",
-               nameof(model.ComponentName));
-            }
-            if (model.Cost <= 0)
-            {
-                throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost));
-            }
-            _logger.LogInformation("Component. ComponentName:{ComponentName}.Cost:{ Cost}. Id: { Id}",
-                model.ComponentName, model.Cost, model.Id);
-        var element = _componentStorage.GetElement(new ComponentSearchModel
- {
-     ComponentName = model.ComponentName
- });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Компонент с таким названием уже есть");
-            }
-        }
-    }
-}

FishFactory/FishFactoryBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -1,123 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryBusinessLogic.BusinessLogics
-{
-    public class OrderLogic : IOrderLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IOrderStorage _orderStorage;
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
-        {
-            _logger = logger;
-            _orderStorage = orderStorage;
-        }
-        public List<OrderViewModel>? ReadList(OrderSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. Id: {Id}", model?.Id);
-            var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count: {Count}", list.Count);
-            return list;
-        }
-        public bool CreateOrder(OrderBindingModel model)
-        {
-            CheckModel(model);
-            if (model.Status != OrderStatus.Неизвестен)
-            {
-                _logger.LogWarning("Invalid order status");
-                return false;
-            }
-            model.Status = OrderStatus.Принят;
-            if (_orderStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool TakeOrderInWork(OrderBindingModel model)
-        {
-            CheckModel(model, false);
-            if (_orderStorage.GetElement(new OrderSearchModel { Id = model.Id })?.Status != OrderStatus.Принят)
-            {
-                _logger.LogWarning("Invalid order status");
-                return false;
-            }
-            model.Status = OrderStatus.Выполняется;
-            if (_orderStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-            }
-            return true;
-        }
-        public bool FinishOrder(OrderBindingModel model)
-        {
-            CheckModel(model, false);
-            if (_orderStorage.GetElement(new OrderSearchModel { Id = model.Id })?.Status != OrderStatus.Выполняется)
-            {
-                _logger.LogWarning("Invalid order status");
-                return false;
-            }
-            model.Status = OrderStatus.Готов;
-            model.DateImplement = DateTime.Now;
-            if (_orderStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-            }
-            return true;
-        }
-        public bool DeliveryOrder(OrderBindingModel model)
-        {
-            CheckModel(model, false);
-            var order = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
-            if (order?.Status != OrderStatus.Готов)
-            {
-                _logger.LogWarning("Invalid order status");
-                return false;
-            }
-            model.Status = OrderStatus.Выдан;
-            model.DateImplement = order.DateImplement;
-            if (_orderStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-            }
-            return true;
-        }
-        private void CheckModel(OrderBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (model.Sum <= 0)
-            {
-                throw new ArgumentNullException("Стоимость должна быть больше 0", nameof(model.Sum));
-            }
-            _logger.LogInformation("Order. Id: {Id}. Sum: {Sum}. ReinforcedId: {ReinforcedId}", model.Id, model.Sum, model.CannedId);
-            var element = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
-            if (element != null && element.Id == model.Id)
-            {
-                throw new InvalidOperationException("Заказ с таким номером уже есть");
-            }
-        }
-    }
-}

FishFactory/FishFactoryBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,160 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BisinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryBusinessLogic.BusinessLogics
-{
-	public class ShopLogic : IShopLogic
-	{
-		private readonly ILogger _logger;
-		private readonly IShopStorage _shopStorage;
-		private readonly ICannedStorage _cannedStorage;
-
-		public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, ICannedStorage cannedStorage)
-		{
-			_logger = logger;
-			_shopStorage = shopStorage;
-			_cannedStorage = cannedStorage;
-		}
-
-		public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-		{
-			_logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id);
-			var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(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.ShopName, 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;
-		}
-
-		public bool MakeSupply(SupplyBindingModel model)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-			if (model.Count <= 0)
-			{
-				throw new ArgumentException("Количество изделий должно быть больше 0");
-			}
-			var shop = _shopStorage.GetElement(new ShopSearchModel
-			{
-				Id = model.ShopId
-			});
-			if (shop == null)
-			{
-				throw new ArgumentException("Магазина не существует");
-			}
-			if (shop.ShopCanneds.ContainsKey(model.CannedID))
-			{
-				var oldValue = shop.ShopCanneds[model.CannedID];
-				oldValue.Item2 += model.Count;
-				shop.ShopCanneds[model.CannedID] = oldValue;
-			}
-			else
-			{
-				var canned = _cannedStorage.GetElement(new CannedSearchModel
-				{
-					Id = model.CannedID
-				});
-				if (canned == null)
-				{
-					throw new ArgumentException($"Поставка: Товар с id:{model.CannedID} не найденн");
-				}
-				shop.ShopCanneds.Add(model.CannedID, (canned, model.Count));
-			}
-			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.Adress))
-			{
-				throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Adress));
-			}
-			if (string.IsNullOrEmpty(model.ShopName))
-			{
-				throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName));
-			}
-			_logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
-			var element = _shopStorage.GetElement(new ShopSearchModel
-			{
-				ShopName = model.ShopName
-			});
-			if (element != null && element.Id != model.Id)
-			{
-				throw new InvalidOperationException("Магазин с таким названием уже есть");
-			}
-		}
-	}
-}

FishFactory/FishFactoryBusinessLogic/FishFactoryBusinessLogic.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
-  </ItemGroup>
-
-</Project>

FishFactory/FishFactoryContracts/BindingModels/CannedBindingModel.cs

@@ -1,17 +0,0 @@
-using FishFactoryDataModels.Models;
-
-namespace FishFactoryContracts.BindingModels
-{
-    public class CannedBindingModel : ICannedModel
-    {
-        public int Id { get; set; }
-        public string CannedName { get; set; } = string.Empty;
-        public double Price { get; set; }
-        public Dictionary<int, (IComponentModel, int)> CannedComponents
-        {
-            get;
-            set;
-        } = new();
-    }
-}
-

FishFactory/FishFactoryContracts/BindingModels/ComponentBindingModel.cs

@@ -1,12 +0,0 @@
-
-using FishFactoryDataModels.Models;
-
-namespace FishFactoryContracts.BindingModels
-{
-    public class ComponentBindingModel : IComponentModel
-    {
-        public int Id { get; set; }
-        public string ComponentName { get; set; } = string.Empty;
-        public double Cost { get; set; }
-    }
-}

FishFactory/FishFactoryContracts/BindingModels/OrderBindingModel.cs

@@ -1,17 +0,0 @@
-using FishFactoryDataModels.Enums;
-using FishFactoryDataModels.Models;
-
-namespace FishFactoryContracts.BindingModels
-{
-    public class OrderBindingModel : IOrderModel
-    {
-        public int Id { get; set; }
-        public int CannedId { get; set; }
-        public string CannedName { get; set; } = string.Empty;
-        public int Count { get; set; }
-        public double Sum { get; set; }
-        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        public DateTime DateCreate { get; set; } = DateTime.Now;
-        public DateTime? DateImplement { get; set; }
-    }
-}

FishFactory/FishFactoryContracts/BindingModels/ShopBindingModel.cs

@@ -1,18 +0,0 @@
-using FishFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryContracts.BindingModels
-{
-	public class ShopBindingModel : IShopModel
-	{
-		public int Id { get; set; }
-		public string ShopName { get; set; } = string.Empty;
-		public string Adress { get; set; } = string.Empty;
-		public DateTime OpeningDate { get; set; } = DateTime.Now;
-		public Dictionary<int, (ICannedModel, int)> ShopCanneds { get; set; } = new();
-	}
-}

FishFactory/FishFactoryContracts/BindingModels/SupplyBindingModel.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FishFactoryDataModels.Models;
-
-
-namespace FishFactoryContracts.BindingModels
-{
-	public class SupplyBindingModel : ISupplyModel
-	{
-		public int ShopId { get; set; }
-		public int CannedID { get; set; }
-		public int Count { get; set; }
-	}
-}

FishFactory/FishFactoryContracts/BisinessLogicsContracts/ICannedLogic.cs

@@ -1,16 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.BusinessLogicsContracts
-{
-    public interface ICannedLogic
-    {
-        List<CannedViewModel>? ReadList(CannedSearchModel? model);
-        CannedViewModel? ReadElement(CannedSearchModel model);
-        bool Create(CannedBindingModel model);
-        bool Update(CannedBindingModel model);
-        bool Delete(CannedBindingModel model);
-    }
-}
-

FishFactory/FishFactoryContracts/BisinessLogicsContracts/IComponentLogic.cs

@@ -1,16 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.BusinessLogicsContracts
-{
-    public interface IComponentLogic
-    {
-        List<ComponentViewModel>? ReadList(ComponentSearchModel? model);
-        ComponentViewModel? ReadElement(ComponentSearchModel model);
-        bool Create(ComponentBindingModel model);
-        bool Update(ComponentBindingModel model);
-        bool Delete(ComponentBindingModel model);
-    }
-}
-

FishFactory/FishFactoryContracts/BisinessLogicsContracts/IOrderLogic.cs

@@ -1,16 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.BusinessLogicsContracts
-{
-    public interface IOrderLogic
-    {
-        List<OrderViewModel>? ReadList(OrderSearchModel? model);
-        bool CreateOrder(OrderBindingModel model);
-        bool TakeOrderInWork(OrderBindingModel model);
-        bool FinishOrder(OrderBindingModel model);
-        bool DeliveryOrder(OrderBindingModel model);
-    }
-}
-

FishFactory/FishFactoryContracts/BisinessLogicsContracts/IShopLogic.cs

@@ -1,21 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryContracts.BisinessLogicsContracts
-{
-	public interface IShopLogic
-	{
-		List<ShopViewModel>? ReadList(ShopSearchModel? model);
-		ShopViewModel? ReadElement(ShopSearchModel model);
-		bool Create(ShopBindingModel model);
-		bool Update(ShopBindingModel model);
-		bool Delete(ShopBindingModel model);
-		bool MakeSupply(SupplyBindingModel model);
-	}
-}

FishFactory/FishFactoryContracts/FishFactoryContracts.csproj

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

FishFactory/FishFactoryContracts/SearchModels/CannedSearchModel.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryContracts.SearchModels
-{
-    public class CannedSearchModel
-    {
-        public int? Id { get; set; }
-        public string? CannedName { get; set; }
-    }
-}
-

FishFactory/FishFactoryContracts/SearchModels/ComponentSearchModel.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryContracts.SearchModels
-{
-    public class ComponentSearchModel
-    {
-        public int? Id { get; set; }
-        public string? ComponentName { get; set; }
-    }
-}
-

FishFactory/FishFactoryContracts/SearchModels/OrderSearchModel.cs

@@ -1,7 +0,0 @@
-namespace FishFactoryContracts.SearchModels
-{
-    public class OrderSearchModel
-    {
-        public int? Id { get; set; }
-    }
-}

FishFactory/FishFactoryContracts/SearchModels/ShopSearchModel.cs

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

FishFactory/FishFactoryContracts/StoragesContracts/ICannedStorage.cs

@@ -1,16 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.StoragesContracts
-{
-    public interface ICannedStorage
-    {
-        List<CannedViewModel> GetFullList();
-        List<CannedViewModel> GetFilteredList(CannedSearchModel model);
-        CannedViewModel? GetElement(CannedSearchModel model);
-        CannedViewModel? Insert(CannedBindingModel model);
-        CannedViewModel? Update(CannedBindingModel model);
-        CannedViewModel? Delete(CannedBindingModel model);
-    }
-}

FishFactory/FishFactoryContracts/StoragesContracts/IComponentStorage.cs

@@ -1,17 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.StoragesContracts
-{
-    public interface IComponentStorage
-    {
-        List<ComponentViewModel> GetFullList();
-        List<ComponentViewModel> GetFilteredList(ComponentSearchModel model);
-        ComponentViewModel? GetElement(ComponentSearchModel model);
-        ComponentViewModel? Insert(ComponentBindingModel model);
-        ComponentViewModel? Update(ComponentBindingModel model);
-        ComponentViewModel? Delete(ComponentBindingModel model);
-    }
-}
-

FishFactory/FishFactoryContracts/StoragesContracts/IOrderStorage.cs

@@ -1,17 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.StoragesContracts
-{
-    public interface IOrderStorage
-    {
-        List<OrderViewModel> GetFullList();
-        List<OrderViewModel> GetFilteredList(OrderSearchModel model);
-        OrderViewModel? GetElement(OrderSearchModel model);
-        OrderViewModel? Insert(OrderBindingModel model);
-        OrderViewModel? Update(OrderBindingModel model);
-        OrderViewModel? Delete(OrderBindingModel model);
-    }
-}
-

FishFactory/FishFactoryContracts/StoragesContracts/IShopStorage.cs

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

FishFactory/FishFactoryContracts/ViewModels/CannedViewModel.cs

@@ -1,19 +0,0 @@
-using FishFactoryDataModels.Models;
-using System.ComponentModel;
-namespace FishFactoryContracts.ViewModels
-{
-    public class CannedViewModel : ICannedModel
-    {
-        public int Id { get; set; }
-        [DisplayName("Название изделия")]
-        public string CannedName { get; set; } = string.Empty;
-        [DisplayName("Цена")]
-        public double Price { get; set; }
-        public Dictionary<int, (IComponentModel, int)> CannedComponents
-        {
-            get;
-            set;
-        } = new();
-    }
-}
-

FishFactory/FishFactoryContracts/ViewModels/ComponentViewModel.cs

@@ -1,14 +0,0 @@
-using FishFactoryDataModels.Models;
-using System.ComponentModel;
-namespace FishFactoryContracts.ViewModels
-{
-    public class ComponentViewModel : IComponentModel
-    {
-        public int Id { get; set; }
-        [DisplayName("Название компонента")]
-        public string ComponentName { get; set; } = string.Empty;
-        [DisplayName("Цена")]
-        public double Cost { get; set; }
-    }
-}
-

FishFactory/FishFactoryContracts/ViewModels/OrderViewModel.cs

@@ -1,25 +0,0 @@
-using FishFactoryDataModels.Enums;
-using FishFactoryDataModels.Models;
-using System.ComponentModel;
-namespace FishFactoryContracts.ViewModels
-{
-    public class OrderViewModel : IOrderModel
-    {
-        [DisplayName("Номер")]
-        public int Id { get; set; }
-        public int CannedId { get; set; }
-        [DisplayName("Изделие")]
-        public string CannedName { get; set; } = string.Empty;
-        [DisplayName("Количество")]
-        public int Count { get; set; }
-        [DisplayName("Сумма")]
-        public double Sum { get; set; }
-        [DisplayName("Статус")]
-        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        [DisplayName("Дата создания")]
-        public DateTime DateCreate { get; set; } = DateTime.Now;
-        [DisplayName("Дата выполнения")]
-        public DateTime? DateImplement { get; set; }
-    }
-}
-

FishFactory/FishFactoryContracts/ViewModels/ShopViewModel.cs

@@ -1,22 +0,0 @@
-using FishFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryContracts.ViewModels
-{
-	public class ShopViewModel : IShopModel
-	{
-		public int Id { get; set; }
-		[DisplayName("Название")]
-		public string ShopName { get; set; } = string.Empty;
-		[DisplayName("Адрес")]
-		public string Adress { get; set; } = string.Empty;
-		[DisplayName("Дата открытия")]
-		public DateTime OpeningDate { get; set; }
-		public Dictionary<int, (ICannedModel, int)> ShopCanneds { get; set; } = new();
-	}
-}

FishFactory/FishFactoryDataModels/Enums/OrderStatus.cs

@@ -1,11 +0,0 @@
-namespace FishFactoryDataModels.Enums
-{
-    public enum OrderStatus
-    {
-        Неизвестен = -1,
-        Принят = 0,
-        Выполняется = 1,
-        Готов = 2,
-        Выдан = 3
-    }
-}

FishFactory/FishFactoryDataModels/FishFactoryDataModels.csproj

@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>

FishFactory/FishFactoryDataModels/IId.cs

@@ -1,8 +0,0 @@
-namespace FishFactoryDataModels
-{
-    public interface IId
-    {
-        int Id { get; }
-    }
-}
-

FishFactory/FishFactoryDataModels/Models/ICannedModel.cs

@@ -1,10 +0,0 @@
-namespace FishFactoryDataModels.Models
-{
-    public interface ICannedModel : IId
-    {
-        string CannedName { get; }
-        double Price { get; }
-        Dictionary<int, (IComponentModel, int)> CannedComponents { get; }
-    }
-}
-

FishFactory/FishFactoryDataModels/Models/IComponentModel.cs

@@ -1,8 +0,0 @@
-namespace FishFactoryDataModels.Models
-{
-    public interface IComponentModel : IId
-    {
-        string ComponentName { get; }
-        double Cost { get; }
-    }
-}

FishFactory/FishFactoryDataModels/Models/IOrderModel.cs

@@ -1,14 +0,0 @@
-using FishFactoryDataModels.Enums;
-
-namespace FishFactoryDataModels.Models
-{
-    public interface IOrderModel : IId
-    {
-        int CannedId { get; }
-        int Count { get; }
-        double Sum { get; }
-        OrderStatus Status { get; }
-        DateTime DateCreate { get; }
-        DateTime? DateImplement { get; }
-    }
-}

FishFactory/FishFactoryDataModels/Models/IShopModel.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryDataModels.Models
-{
-	public interface IShopModel : IId
-	{
-		string ShopName { get; }
-		string Adress { get; }
-		DateTime OpeningDate { get; }
-		Dictionary<int, (ICannedModel, int)> ShopCanneds { get; }
-	}
-}

FishFactory/FishFactoryDataModels/Models/ISupplyModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryDataModels.Models
-{
-	public interface ISupplyModel
-	{
-		int ShopId { get; }
-		int CannedID { get; }
-		int Count { get; }
-	}
-}

FishFactory/FishFactoryListImplement/DataListSingleton.cs

@@ -1,34 +0,0 @@
-using FishFactoryListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryListImplement
-{
-    public class DataListSingleton
-    {
-        private static DataListSingleton? _instance;
-        public List<Component> Components { get; set; }
-        public List<Order> Orders { get; set; }
-        public List<Canned> Canneds { get; set; }
-		public List<Shop> Shops { get; set; }
-		private DataListSingleton()
-        {
-            Components = new List<Component>();
-            Orders = new List<Order>();
-            Canneds = new List<Canned>();
-			Shops = new List<Shop>();
-		}
-        public static DataListSingleton GetInstance()
-        {
-            if (_instance == null)
-            {
-                _instance = new DataListSingleton();
-            }
-            return _instance;
-        }
-
-    }
-}

FishFactory/FishFactoryListImplement/FishFactoryListImplement.csproj

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

FishFactory/FishFactoryListImplement/Implements/CannedStorage.cs

@@ -1,106 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryListImplement.Implements
-{
-    public class CannedStorage : ICannedStorage
-    {
-        private readonly DataListSingleton _source;
-        public CannedStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public List<CannedViewModel> GetFullList()
-        {
-            var result = new List<CannedViewModel>();
-            foreach (var canned in _source.Canneds)
-            {
-                result.Add(canned.GetViewModel);
-            }
-            return result;
-        }
-        public List<CannedViewModel> GetFilteredList(CannedSearchModel model)
-        {
-            var result = new List<CannedViewModel>();
-            if (string.IsNullOrEmpty(model.CannedName))
-            {
-                return result;
-            }
-            foreach (var canned in _source.Canneds)
-            {
-                if (canned.CannedName.Contains(model.CannedName))
-                {
-                    result.Add(canned.GetViewModel);
-                }
-            }
-            return result;
-        }
-        public CannedViewModel? GetElement(CannedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.CannedName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var canned in _source.Canneds)
-            {
-                if ((!string.IsNullOrEmpty(model.CannedName) && canned.CannedName == model.CannedName) ||
-                    (model.Id.HasValue && canned.Id == model.Id))
-                {
-                    return canned.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public CannedViewModel? Insert(CannedBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var canned in _source.Canneds)
-            {
-                if (model.Id <= canned.Id)
-                {
-                    model.Id = canned.Id + 1;
-                }
-            }
-            var newCanned = Canned.Create(model);
-            if (newCanned == null)
-            {
-                return null;
-            }
-            _source.Canneds.Add(newCanned);
-            return newCanned.GetViewModel;
-        }
-        public CannedViewModel? Update(CannedBindingModel model)
-        {
-            foreach (var canned in _source.Canneds)
-            {
-                if (canned.Id == model.Id)
-                {
-                    canned.Update(model);
-                    return canned.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public CannedViewModel? Delete(CannedBindingModel model)
-        {
-            for (int i = 0; i < _source.Canneds.Count; ++i)
-            {
-                if (_source.Canneds[i].Id == model.Id)
-                {
-                    var element = _source.Canneds[i];
-                    _source.Canneds.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
-}

FishFactory/FishFactoryListImplement/Implements/ComponentStorage.cs

@@ -1,106 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryListImplement.Implements
-{
-    public class ComponentStorage : IComponentStorage
-    {
-        private readonly DataListSingleton _source;
-        public ComponentStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public List<ComponentViewModel> GetFullList()
-        {
-            var result = new List<ComponentViewModel>();
-            foreach (var component in _source.Components)
-            {
-                result.Add(component.GetViewModel);
-            }
-            return result;
-        }
-        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
-        {
-            var result = new List<ComponentViewModel>();
-            if (string.IsNullOrEmpty(model.ComponentName))
-            {
-                return result;
-            }
-            foreach (var component in _source.Components)
-            {
-                if (component.ComponentName.Contains(model.ComponentName))
-                {
-                    result.Add(component.GetViewModel);
-                }
-            }
-            return result;
-        }
-        public ComponentViewModel? GetElement(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var component in _source.Components)
-            {
-                if ((!string.IsNullOrEmpty(model.ComponentName) && component.ComponentName == model.ComponentName) ||
-                    (model.Id.HasValue && component.Id == model.Id))
-                {
-                    return component.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ComponentViewModel? Insert(ComponentBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var component in _source.Components)
-            {
-                if (model.Id <= component.Id)
-                {
-                    model.Id = component.Id + 1;
-                }
-            }
-            var newComponent = Component.Create(model);
-            if (newComponent == null)
-            {
-                return null;
-            }
-            _source.Components.Add(newComponent);
-            return newComponent.GetViewModel;
-        }
-        public ComponentViewModel? Update(ComponentBindingModel model)
-        {
-            foreach (var component in _source.Components)
-            {
-                if (component.Id == model.Id)
-                {
-                    component.Update(model);
-                    return component.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ComponentViewModel? Delete(ComponentBindingModel model)
-        {
-            for (int i = 0; i < _source.Components.Count; ++i)
-            {
-                if (_source.Components[i].Id == model.Id)
-                {
-                    var element = _source.Components[i];
-                    _source.Components.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
-}

FishFactory/FishFactoryListImplement/Implements/OrderStorage.cs

@@ -1,105 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryListImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        private readonly DataListSingleton _source;
-        public OrderStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public List<OrderViewModel> GetFullList()
-        {
-            var result = new List<OrderViewModel>();
-            foreach (var order in _source.Orders)
-            {
-                result.Add(order.GetViewModel);
-            }
-            return result;
-        }
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            var result = new List<OrderViewModel>();
-            if (!model.Id.HasValue)
-            {
-                return result;
-            }
-            foreach (var order in _source.Orders)
-            {
-                if (model.Id.HasValue && order.Id == model.Id)
-                {
-                    result.Add(order.GetViewModel);
-                }
-            }
-            return result;
-        }
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var order in _source.Orders)
-            {
-                if (model.Id.HasValue && order.Id == model.Id)
-                {
-                    return order.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public OrderViewModel? Insert(OrderBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var order in _source.Orders)
-            {
-                if (model.Id <= order.Id)
-                {
-                    model.Id = order.Id + 1;
-                }
-            }
-            var newOrder = Order.Create(model);
-            if (newOrder == null)
-            {
-                return null;
-            }
-            _source.Orders.Add(newOrder);
-            return newOrder.GetViewModel;
-        }
-        public OrderViewModel? Update(OrderBindingModel model)
-        {
-            foreach (var order in _source.Orders)
-            {
-                if (order.Id == model.Id)
-                {
-                    order.Update(model);
-                    return order.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            for (int i = 0; i < _source.Orders.Count; ++i)
-            {
-                if (_source.Orders[i].Id == model.Id)
-                {
-                    var element = _source.Orders[i];
-                    _source.Orders.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
-}

FishFactory/FishFactoryListImplement/Implements/ShopStorage.cs

@@ -1,113 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryListImplement.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> GetFilteredList(ShopSearchModel model)
-		{
-			var result = new List<ShopViewModel>();
-			if (string.IsNullOrEmpty(model.ShopName))
-			{
-				return result;
-			}
-			foreach (var shop in _source.Shops)
-			{
-				if (shop.ShopName.Contains(model.ShopName))
-				{
-					result.Add(shop.GetViewModel);
-				}
-			}
-			return result;
-		}
-
-		public ShopViewModel? GetElement(ShopSearchModel model)
-		{
-			if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-			{
-				return null;
-			}
-			foreach (var shop in _source.Shops)
-			{
-				if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) ||
-					(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;
-		}
-	}
-}

FishFactory/FishFactoryListImplement/Models/Canned.cs

@@ -1,50 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryListImplement.Models
-{
-    public class Canned : ICannedModel
-    {
-        public int Id { get; private set; }
-        public string CannedName { get; private set; } = string.Empty;
-        public double Price { get; private set; }
-        public Dictionary<int, (IComponentModel, int)> CannedComponents { get; private set; } = new Dictionary<int, (IComponentModel, int)>();
-        public static Canned? Create(CannedBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Canned()
-            {
-                Id = model.Id,
-                CannedName = model.CannedName,
-                Price = model.Price,
-                CannedComponents = model.CannedComponents
-            };
-        }
-        public void Update(CannedBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            CannedName = model.CannedName;
-            Price = model.Price;
-            CannedComponents = model.CannedComponents;
-        }
-        public CannedViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CannedName = CannedName,
-            Price = Price,
-            CannedComponents = CannedComponents
-        };
-    }
-}

FishFactory/FishFactoryListImplement/Models/Component.cs

@@ -1,46 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryListImplement.Models
-{
-    public class Component : IComponentModel
-    {
-        public int Id { get; private set; }
-        public string ComponentName { get; private set; } = string.Empty;
-        public double Cost { get; private set; }
-        public static Component? Create(ComponentBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Component()
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-        public void Update(ComponentBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ComponentName = model.ComponentName;
-            Cost = model.Cost;
-        }
-        public ComponentViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ComponentName = ComponentName,
-            Cost = Cost
-        };
-    }
-}

FishFactory/FishFactoryListImplement/Models/Order.cs

@@ -1,62 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Enums;
-using FishFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryListImplement.Models
-{
-    public class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-        public int CannedId { get; private set; }
-        public string CannedName { get; private set; } = String.Empty;
-        public int Count { get; private set; }
-        public double Sum { get; private set; }
-        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-        public DateTime DateCreate { get; private set; } = DateTime.Now;
-        public DateTime? DateImplement { get; private set; }
-        public static Order? Create(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Order()
-            {
-                Id = model.Id,
-                CannedId = model.CannedId,
-                CannedName = model.CannedName,
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
-            };
-        }
-        public void Update(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Status = model.Status;
-            DateImplement = model.DateImplement;
-        }
-        public OrderViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CannedId = CannedId,
-            CannedName = CannedName,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-        };
-    }
-}

FishFactory/FishFactoryListImplement/Models/Shop.cs

@@ -1,55 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryListImplement.Models
-{
-	public class Shop : IShopModel
-	{
-		public int Id { get; private set; }
-		public string ShopName { get; private set; } = string.Empty;
-		public string Adress { get; private set; } = string.Empty;
-		public DateTime OpeningDate { get; private set; }
-		public Dictionary<int, (ICannedModel, int)> ShopCanneds { get; private set; } = new();
-
-		public static Shop? Create(ShopBindingModel? model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new Shop()
-			{
-				Id = model.Id,
-				ShopName = model.ShopName,
-				Adress = model.Adress,
-				OpeningDate = model.OpeningDate
-			};
-		}
-
-		public void Update(ShopBindingModel? model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			ShopName = model.ShopName;
-			Adress = model.Adress;
-			OpeningDate = model.OpeningDate;
-		}
-
-		public ShopViewModel GetViewModel => new()
-		{
-			Id = Id,
-			ShopName = ShopName,
-			Adress = Adress,
-			OpeningDate = OpeningDate,
-			ShopCanneds = ShopCanneds
-		};
-	}
-}

FishFactory/FishFactoryView/FishFacoryView.csproj

@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="nlog.config" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="nlog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FishFactoryBusinessLogic\FishFactoryBusinessLogic.csproj" />
-    <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
-    <ProjectReference Include="..\FishFactoryListImplement\FishFactoryListImplement.csproj" />
-  </ItemGroup>
-
-</Project>

FishFactory/FishFactoryView/FormCanned.Designer.cs

@@ -1,249 +0,0 @@
-namespace FishFactoryView
-{
-    partial class FormCanned
-    {
-        /// <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()
-        {
-            this.labelName = new System.Windows.Forms.Label();
-            this.textBoxName = new System.Windows.Forms.TextBox();
-            this.labelPrice = new System.Windows.Forms.Label();
-            this.textBoxPrice = new System.Windows.Forms.TextBox();
-            this.groupBoxComponents = new System.Windows.Forms.GroupBox();
-            this.buttonRef = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Component = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.groupBoxComponents.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // labelName
-            // 
-            this.labelName.AutoSize = true;
-            this.labelName.Location = new System.Drawing.Point(14, 11);
-            this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(65, 15);
-            this.labelName.TabIndex = 0;
-            this.labelName.Text = "Название: ";
-            // 
-            // textBoxName
-            // 
-            this.textBoxName.Location = new System.Drawing.Point(98, 9);
-            this.textBoxName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxName.Name = "textBoxName";
-            this.textBoxName.Size = new System.Drawing.Size(246, 23);
-            this.textBoxName.TabIndex = 1;
-            // 
-            // labelPrice
-            // 
-            this.labelPrice.AutoSize = true;
-            this.labelPrice.Location = new System.Drawing.Point(14, 38);
-            this.labelPrice.Name = "labelPrice";
-            this.labelPrice.Size = new System.Drawing.Size(73, 15);
-            this.labelPrice.TabIndex = 2;
-            this.labelPrice.Text = "Стоимость: ";
-            // 
-            // textBoxPrice
-            // 
-            this.textBoxPrice.Location = new System.Drawing.Point(98, 38);
-            this.textBoxPrice.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxPrice.Name = "textBoxPrice";
-            this.textBoxPrice.Size = new System.Drawing.Size(135, 23);
-            this.textBoxPrice.TabIndex = 3;
-            // 
-            // groupBoxComponents
-            // 
-            this.groupBoxComponents.Controls.Add(this.buttonRef);
-            this.groupBoxComponents.Controls.Add(this.buttonDel);
-            this.groupBoxComponents.Controls.Add(this.buttonUpd);
-            this.groupBoxComponents.Controls.Add(this.buttonAdd);
-            this.groupBoxComponents.Controls.Add(this.dataGridView);
-            this.groupBoxComponents.Location = new System.Drawing.Point(10, 63);
-            this.groupBoxComponents.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBoxComponents.Name = "groupBoxComponents";
-            this.groupBoxComponents.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBoxComponents.Size = new System.Drawing.Size(562, 239);
-            this.groupBoxComponents.TabIndex = 4;
-            this.groupBoxComponents.TabStop = false;
-            this.groupBoxComponents.Text = "Компоненты";
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(439, 158);
-            this.buttonRef.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(110, 26);
-            this.buttonRef.TabIndex = 4;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(439, 118);
-            this.buttonDel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(110, 26);
-            this.buttonDel.TabIndex = 3;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(439, 76);
-            this.buttonUpd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(110, 26);
-            this.buttonUpd.TabIndex = 2;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(439, 35);
-            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(110, 26);
-            this.buttonAdd.TabIndex = 1;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            this.dataGridView.BackgroundColor = System.Drawing.Color.White;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.id,
-            this.Component,
-            this.Count});
-            this.dataGridView.Location = new System.Drawing.Point(5, 20);
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(416, 215);
-            this.dataGridView.TabIndex = 0;
-            // 
-            // id
-            // 
-            this.id.HeaderText = "id";
-            this.id.MinimumWidth = 6;
-            this.id.Name = "id";
-            this.id.ReadOnly = true;
-            this.id.Visible = false;
-            // 
-            // Component
-            // 
-            this.Component.HeaderText = "Компонент";
-            this.Component.MinimumWidth = 6;
-            this.Component.Name = "Component";
-            this.Component.ReadOnly = true;
-            // 
-            // Count
-            // 
-            this.Count.HeaderText = "Количество";
-            this.Count.MinimumWidth = 6;
-            this.Count.Name = "Count";
-            this.Count.ReadOnly = true;
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(361, 313);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(110, 26);
-            this.buttonCancel.TabIndex = 5;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(245, 313);
-            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(110, 26);
-            this.buttonSave.TabIndex = 6;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // FormCanned
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(599, 347);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.groupBoxComponents);
-            this.Controls.Add(this.textBoxPrice);
-            this.Controls.Add(this.labelPrice);
-            this.Controls.Add(this.textBoxName);
-            this.Controls.Add(this.labelName);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormCanned";
-            this.Text = "Изделие";
-            this.Load += new System.EventHandler(this.FormCanned_Load);
-            this.groupBoxComponents.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelName;
-        private TextBox textBoxName;
-        private Label labelPrice;
-        private TextBox textBoxPrice;
-        private GroupBox groupBoxComponents;
-        private Button buttonRef;
-        private Button buttonDel;
-        private Button buttonUpd;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn Component;
-        private DataGridViewTextBoxColumn Count;
-        private Button buttonCancel;
-        private Button buttonSave;
-        private DataGridViewTextBoxColumn id;
-    }
-}

FishFactory/FishFactoryView/FormCanned.cs

@@ -1,213 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryDataModels.Models;
-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 FishFactoryView
-{
-    public partial class FormCanned : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ICannedLogic _logic;
-        private int? _id;
-        private Dictionary<int, (IComponentModel, int)> _CannedComponents;
-        public int Id { set { _id = value; } }
-        public FormCanned(ILogger<FormCanned> logger, ICannedLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            _CannedComponents = new Dictionary<int, (IComponentModel, int)>();
-        }
-        private void FormCanned_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Загрузка изделия");
-                try
-                {
-                    var view = _logic.ReadElement(new CannedSearchModel
-                    {
-                        Id = _id.Value
-                    });
-                    if (view != null)
-                    {
-                        textBoxName.Text = view.CannedName;
-                        textBoxPrice.Text = view.Price.ToString();
-                        _CannedComponents = view.CannedComponents ?? new
-                        Dictionary<int, (IComponentModel, int)>();
-                        LoadData();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка загрузки изделия");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                }
-            }
-        }
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка компонент изделия");
-            try
-            {
-                if (_CannedComponents != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var pc in _CannedComponents)
-                    {
-                        dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 });
-                    }
-                    textBoxPrice.Text = CalcPrice().ToString();
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки компонент изделия");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormCannedComponent));
-            if (service is FormCannedComponent form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    if (form.ComponentModel == null)
-                    {
-                        return;
-                    }
-                    _logger.LogInformation("Добавление нового компонента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
-                    if (_CannedComponents.ContainsKey(form.Id))
-                    {
-                        _CannedComponents[form.Id] = (form.ComponentModel,
-                        form.Count);
-                    }
-                    else
-                    {
-                        _CannedComponents.Add(form.Id, (form.ComponentModel,
-                        form.Count));
-                    }
-                    LoadData();
-                }
-            }
-        }
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormCannedComponent));
-                if (service is FormCannedComponent form)
-                {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
-                    form.Id = id;
-                    form.Count = _CannedComponents[id].Item2;
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        if (form.ComponentModel == null)
-                        {
-                            return;
-                        }
-                        _logger.LogInformation("Изменение компонента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
-                        _CannedComponents[form.Id] = (form.ComponentModel, form.Count);
-                        LoadData();
-                    }
-                }
-            }
-        }
-        private void ButtonDel_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    try
-                    {
-                        _logger.LogInformation("Удаление компонента:{ ComponentName}-{ Count}", dataGridView.SelectedRows[0].Cells[1].Value);
-                        _CannedComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value));
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message, "Ошибка",
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                    LoadData();
-                }
-            }
-        }
-        private void ButtonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxName.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxPrice.Text))
-            {
-                MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (_CannedComponents == null || _CannedComponents.Count == 0)
-            {
-                MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение изделия");
-            try
-            {
-                var model = new CannedBindingModel
-                {
-                    Id = _id ?? 0,
-                    CannedName = textBoxName.Text,
-                    Price = Convert.ToDouble(textBoxPrice.Text),
-                    CannedComponents = _CannedComponents
-                };
-                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, "Ошибка сохранения изделия");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-        private double CalcPrice()
-        {
-            double price = 0;
-            foreach (var elem in _CannedComponents)
-            {
-                price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2);
-            }
-            return Math.Round(price * 1.1, 2);
-        }
-    }
-}

FishFactory/FishFactoryView/FormCanned.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>

FishFactory/FishFactoryView/FormCannedComponent.Designer.cs

@@ -1,125 +0,0 @@
-namespace FishFactoryView
-{
-    partial class FormCannedComponent
-    {
-        /// <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()
-        {
-            this.labelComponent = new System.Windows.Forms.Label();
-            this.comboBoxComponent = new System.Windows.Forms.ComboBox();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // labelComponent
-            // 
-            this.labelComponent.AutoSize = true;
-            this.labelComponent.Location = new System.Drawing.Point(10, 7);
-            this.labelComponent.Name = "labelComponent";
-            this.labelComponent.Size = new System.Drawing.Size(72, 15);
-            this.labelComponent.TabIndex = 0;
-            this.labelComponent.Text = "Компонент:";
-            // 
-            // comboBoxComponent
-            // 
-            this.comboBoxComponent.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxComponent.FormattingEnabled = true;
-            this.comboBoxComponent.Location = new System.Drawing.Point(104, 7);
-            this.comboBoxComponent.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.comboBoxComponent.Name = "comboBoxComponent";
-            this.comboBoxComponent.Size = new System.Drawing.Size(235, 23);
-            this.comboBoxComponent.TabIndex = 1;
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(10, 38);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(75, 15);
-            this.labelCount.TabIndex = 2;
-            this.labelCount.Text = "Количество:";
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(104, 38);
-            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(235, 23);
-            this.textBoxCount.TabIndex = 3;
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(253, 70);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(86, 31);
-            this.buttonCancel.TabIndex = 4;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(168, 70);
-            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(79, 31);
-            this.buttonSave.TabIndex = 5;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // FormReinforcedComponent
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(373, 110);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.comboBoxComponent);
-            this.Controls.Add(this.labelComponent);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormReinforcedComponent";
-            this.Text = "Компонент изделия";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelComponent;
-        private ComboBox comboBoxComponent;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonCancel;
-        private Button buttonSave;
-    }
-}

FishFactory/FishFactoryView/FormCannedComponent.cs

@@ -1,83 +0,0 @@
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-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 FishFactoryView
-{
-    public partial class FormCannedComponent : Form
-    {
-        private readonly List<ComponentViewModel>? _list;
-        public int Id
-        {
-            get
-            {
-                return Convert.ToInt32(comboBoxComponent.SelectedValue);
-            }
-            set
-            {
-                comboBoxComponent.SelectedValue = value;
-            }
-        }
-        public IComponentModel? ComponentModel
-        {
-            get
-            {
-                if (_list == null)
-                {
-                    return null;
-                }
-                foreach (var elem in _list)
-                {
-                    if (elem.Id == Id)
-                    {
-                        return elem;
-                    }
-                }
-                return null;
-            }
-        }
-        public int Count { get { return Convert.ToInt32(textBoxCount.Text); } set { textBoxCount.Text = value.ToString(); } }
-        public FormCannedComponent(IComponentLogic logic)
-        {
-            InitializeComponent();
-
-            _list = logic.ReadList(null);
-            if (_list != null)
-            {
-                comboBoxComponent.DisplayMember = "ComponentName";
-                comboBoxComponent.ValueMember = "Id";
-                comboBoxComponent.DataSource = _list;
-                comboBoxComponent.SelectedItem = null;
-            }
-        }
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxComponent.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите компонент", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

FishFactory/FishFactoryView/FormCannedComponent.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>

FishFactory/FishFactoryView/FormCanneds.Designer.cs

@@ -1,138 +0,0 @@
-namespace FishFactoryView
-{
-    partial class FormCanneds
-    {
-        /// <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()
-        {
-            this.ToolsPanel = new System.Windows.Forms.Panel();
-            this.buttonRef = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ToolsPanel.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // ToolsPanel
-            // 
-            this.ToolsPanel.Controls.Add(this.dataGridView);
-            this.ToolsPanel.Controls.Add(this.buttonRef);
-            this.ToolsPanel.Controls.Add(this.buttonDel);
-            this.ToolsPanel.Controls.Add(this.buttonUpd);
-            this.ToolsPanel.Controls.Add(this.buttonAdd);
-            this.ToolsPanel.Location = new System.Drawing.Point(-1, -1);
-            this.ToolsPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.ToolsPanel.Name = "ToolsPanel";
-            this.ToolsPanel.Size = new System.Drawing.Size(717, 361);
-            this.ToolsPanel.TabIndex = 3;
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(534, 173);
-            this.buttonRef.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(110, 27);
-            this.buttonRef.TabIndex = 3;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(534, 125);
-            this.buttonDel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(110, 27);
-            this.buttonDel.TabIndex = 2;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(534, 76);
-            this.buttonUpd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(110, 27);
-            this.buttonUpd.TabIndex = 1;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(534, 31);
-            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(110, 27);
-            this.buttonAdd.TabIndex = 0;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.BackgroundColor = System.Drawing.Color.White;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(0, 0);
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(516, 359);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // FormCanneds
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(707, 359);
-            this.Controls.Add(this.ToolsPanel);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormCanneds";
-            this.Text = "Изделия";
-            this.Load += new System.EventHandler(this.FormCanneds_Load);
-            this.ToolsPanel.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Panel ToolsPanel;
-        private Button buttonRef;
-        private Button buttonDel;
-        private Button buttonUpd;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-    }
-}

FishFactory/FishFactoryView/FormCanneds.cs

@@ -1,109 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace FishFactoryView
-{
-    public partial class FormCanneds : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ICannedLogic _logic;
-        public FormCanneds(ILogger<FormCanneds> logger, ICannedLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-        private void FormCanneds_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["CannedComponents"].Visible = false;
-                    dataGridView.Columns["CannedName"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка изделий");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки изделий");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormCanned));
-            if (service is FormCanned form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormCanned));
-                if (service is FormCanned form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-        private void ButtonDel_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("Удаление изделия");
-                    try
-                    {
-                        if (!_logic.Delete(new CannedBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления изделия");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-        private void ButtonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

FishFactory/FishFactoryView/FormCanneds.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>

FishFactory/FishFactoryView/FormComponent.Designer.cs

@@ -1,124 +0,0 @@
-namespace FishFactoryView
-{
-    partial class FormComponent
-    {
-        /// <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()
-        {
-            this.labelName = new System.Windows.Forms.Label();
-            this.textBoxName = new System.Windows.Forms.TextBox();
-            this.textBoxCost = new System.Windows.Forms.TextBox();
-            this.labelCost = new System.Windows.Forms.Label();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // labelName
-            // 
-            this.labelName.AutoSize = true;
-            this.labelName.Location = new System.Drawing.Point(10, 7);
-            this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(62, 15);
-            this.labelName.TabIndex = 0;
-            this.labelName.Text = "Название:";
-            // 
-            // textBoxName
-            // 
-            this.textBoxName.Location = new System.Drawing.Point(86, 7);
-            this.textBoxName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxName.Name = "textBoxName";
-            this.textBoxName.Size = new System.Drawing.Size(275, 23);
-            this.textBoxName.TabIndex = 1;
-            // 
-            // textBoxCost
-            // 
-            this.textBoxCost.Location = new System.Drawing.Point(86, 32);
-            this.textBoxCost.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxCost.Name = "textBoxCost";
-            this.textBoxCost.Size = new System.Drawing.Size(122, 23);
-            this.textBoxCost.TabIndex = 3;
-            // 
-            // labelCost
-            // 
-            this.labelCost.AutoSize = true;
-            this.labelCost.Location = new System.Drawing.Point(10, 32);
-            this.labelCost.Name = "labelCost";
-            this.labelCost.Size = new System.Drawing.Size(38, 15);
-            this.labelCost.TabIndex = 2;
-            this.labelCost.Text = "Цена:";
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(143, 72);
-            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(96, 26);
-            this.buttonSave.TabIndex = 4;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(245, 72);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(97, 26);
-            this.buttonCancel.TabIndex = 5;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // FormComponent
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(373, 106);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.textBoxCost);
-            this.Controls.Add(this.labelCost);
-            this.Controls.Add(this.textBoxName);
-            this.Controls.Add(this.labelName);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormComponent";
-            this.Text = "Компонент";
-            this.Load += new System.EventHandler(this.FormComponent_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelName;
-        private TextBox textBoxName;
-        private TextBox textBoxCost;
-        private Label labelCost;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

FishFactory/FishFactoryView/FormComponent.cs

@@ -1,90 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-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 FishFactoryView
-{
-    public partial class FormComponent : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IComponentLogic _logic;
-        private int? _id;
-        public int Id { set { _id = value; } }
-        public FormComponent(ILogger<FormComponent> logger, IComponentLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-        private void FormComponent_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                try
-                {
-                    _logger.LogInformation("Получение компонента");
-                    var view = _logic.ReadElement(new ComponentSearchModel
-                    {
-                        Id = _id.Value
-                    });
-                    if (view != null)
-                    {
-                        textBoxName.Text = view.ComponentName;
-                        textBoxCost.Text = view.Cost.ToString();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка получения компонента");
-                    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;
-            }
-            _logger.LogInformation("Сохранение компонента");
-            try
-            {
-                var model = new ComponentBindingModel
-                {
-                    Id = _id ?? 0,
-                    ComponentName = textBoxName.Text,
-                    Cost = Convert.ToDouble(textBoxCost.Text)
-                };
-                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, "Ошибка сохранения компонента");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

FishFactory/FishFactoryView/FormComponent.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>

FishFactory/FishFactoryView/FormComponents.Designer.cs

@@ -1,138 +0,0 @@
-namespace FishFactoryView
-{
-    partial class FormComponents
-    {
-        /// <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()
-        {
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ToolsPanel = new System.Windows.Forms.Panel();
-            this.buttonRef = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.ToolsPanel.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.BackgroundColor = System.Drawing.Color.White;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(0, 2);
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(519, 360);
-            this.dataGridView.TabIndex = 0;
-            // 
-            // ToolsPanel
-            // 
-            this.ToolsPanel.Controls.Add(this.dataGridView);
-            this.ToolsPanel.Controls.Add(this.buttonRef);
-            this.ToolsPanel.Controls.Add(this.buttonDel);
-            this.ToolsPanel.Controls.Add(this.buttonUpd);
-            this.ToolsPanel.Controls.Add(this.buttonAdd);
-            this.ToolsPanel.Location = new System.Drawing.Point(-1, -1);
-            this.ToolsPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.ToolsPanel.Name = "ToolsPanel";
-            this.ToolsPanel.Size = new System.Drawing.Size(675, 364);
-            this.ToolsPanel.TabIndex = 1;
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(528, 155);
-            this.buttonRef.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(110, 27);
-            this.buttonRef.TabIndex = 3;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(528, 107);
-            this.buttonDel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(110, 27);
-            this.buttonDel.TabIndex = 2;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(528, 58);
-            this.buttonUpd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(110, 27);
-            this.buttonUpd.TabIndex = 1;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(528, 13);
-            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(110, 27);
-            this.buttonAdd.TabIndex = 0;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // FormComponents
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(673, 361);
-            this.Controls.Add(this.ToolsPanel);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormComponents";
-            this.Text = "Компоненты";
-            this.Load += new System.EventHandler(this.FormComponents_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ToolsPanel.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DataGridView dataGridView;
-        private Panel ToolsPanel;
-        private Button buttonRef;
-        private Button buttonDel;
-        private Button buttonUpd;
-        private Button buttonAdd;
-    }
-}

FishFactory/FishFactoryView/FormComponents.cs

@@ -1,113 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace FishFactoryView
-{
-    public partial class FormComponents : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IComponentLogic _logic;
-        public FormComponents(ILogger<FormComponents> logger, IComponentLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-        private void FormComponents_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["ComponentName"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка компонентов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки компонентов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
-            if (service is FormComponent form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
-                if (service is FormComponent form)
-                {
-                    form.Id =
-                    Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-        private void ButtonDel_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("Удаление компонента");
-                    try
-                    {
-                        if (!_logic.Delete(new ComponentBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления компонента");
-                        MessageBox.Show(ex.Message, "Ошибка",
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-        private void ButtonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

FishFactory/FishFactoryView/FormComponents.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>

FishFactory/FishFactoryView/FormCreateOrder.Designer.cs

@@ -1,153 +0,0 @@
-namespace FishFactoryView
-{
-    partial class FormCreateOrder
-    {
-        /// <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()
-        {
-            this.labelReinforced = new System.Windows.Forms.Label();
-            this.comboBoxCanned = new System.Windows.Forms.ComboBox();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.labelSumm = new System.Windows.Forms.Label();
-            this.textBoxSum = new System.Windows.Forms.TextBox();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // labelReinforced
-            // 
-            this.labelReinforced.AutoSize = true;
-            this.labelReinforced.Location = new System.Drawing.Point(10, 11);
-            this.labelReinforced.Name = "labelReinforced";
-            this.labelReinforced.Size = new System.Drawing.Size(59, 15);
-            this.labelReinforced.TabIndex = 0;
-            this.labelReinforced.Text = "Изделие: ";
-            // 
-            // comboBoxReinforced
-            // 
-            this.comboBoxCanned.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxCanned.FormattingEnabled = true;
-            this.comboBoxCanned.Location = new System.Drawing.Point(101, 9);
-            this.comboBoxCanned.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.comboBoxCanned.Name = "comboBoxReinforced";
-            this.comboBoxCanned.Size = new System.Drawing.Size(200, 23);
-            this.comboBoxCanned.TabIndex = 1;
-            this.comboBoxCanned.SelectedIndexChanged += new System.EventHandler(this.ComboBoxCanned_SelectedIndexChanged);
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(10, 37);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(78, 15);
-            this.labelCount.TabIndex = 2;
-            this.labelCount.Text = "Количество: ";
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(101, 34);
-            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(200, 23);
-            this.textBoxCount.TabIndex = 3;
-            this.textBoxCount.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged);
-            // 
-            // labelSumm
-            // 
-            this.labelSumm.AutoSize = true;
-            this.labelSumm.Location = new System.Drawing.Point(10, 60);
-            this.labelSumm.Name = "labelSumm";
-            this.labelSumm.Size = new System.Drawing.Size(51, 15);
-            this.labelSumm.TabIndex = 4;
-            this.labelSumm.Text = "Сумма: ";
-            // 
-            // textBoxSum
-            // 
-            this.textBoxSum.Location = new System.Drawing.Point(101, 60);
-            this.textBoxSum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxSum.Name = "textBoxSum";
-            this.textBoxSum.ReadOnly = true;
-            this.textBoxSum.Size = new System.Drawing.Size(200, 23);
-            this.textBoxSum.TabIndex = 5;
-            this.textBoxSum.Click += new System.EventHandler(this.TextBoxCount_TextChanged);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(203, 87);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(96, 24);
-            this.buttonCancel.TabIndex = 6;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(101, 87);
-            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(96, 24);
-            this.buttonSave.TabIndex = 7;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // FormCreateOrder
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(315, 118);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.textBoxSum);
-            this.Controls.Add(this.labelSumm);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.comboBoxCanned);
-            this.Controls.Add(this.labelReinforced);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormCreateOrder";
-            this.Text = "Заказ";
-            this.Load += new System.EventHandler(this.FormCreateOrder_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelReinforced;
-        private ComboBox comboBoxCanned;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Label labelSumm;
-        private TextBox textBoxSum;
-        private Button buttonCancel;
-        private Button buttonSave;
-    }
-}

FishFactory/FishFactoryView/FormCreateOrder.cs

@@ -1,127 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-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 FishFactoryView
-{
-    public partial class FormCreateOrder : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ICannedLogic _logicR;
-        private readonly IOrderLogic _logicO;
-        public FormCreateOrder(ILogger<FormCreateOrder> logger, ICannedLogic logicR, IOrderLogic logicO)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicR = logicR;
-            _logicO = logicO;
-        }
-        private void FormCreateOrder_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logicR.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxCanned.DisplayMember = "CannedName";
-                    comboBoxCanned.ValueMember = "Id";
-                    comboBoxCanned.DataSource = list;
-                    comboBoxCanned.SelectedItem = null;
-                }
-                _logger.LogInformation("Загрузка изделий для заказа");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки изделий для заказа");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
-        private void CalcSum()
-        {
-            if (comboBoxCanned.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                try
-                {
-                    int id = Convert.ToInt32(comboBoxCanned.SelectedValue);
-                    var Canned = _logicR.ReadElement(new CannedSearchModel
-                    {
-                        Id = id
-                    });
-                    int count = Convert.ToInt32(textBoxCount.Text);
-                    textBoxSum.Text = Math.Round(count * (Canned?.Price ?? 0), 2).ToString();
-                    _logger.LogInformation("Расчет суммы заказа");
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка расчета суммы заказа");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-        private void TextBoxCount_TextChanged(object sender, EventArgs e)
-        {
-            CalcSum();
-        }
-        private void ComboBoxCanned_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            CalcSum();
-        }
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxCanned.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание заказа");
-            try
-            {
-                var operationResult = _logicO.CreateOrder(new OrderBindingModel
-                {
-                    CannedId = Convert.ToInt32(comboBoxCanned.SelectedValue),
-                    CannedName = comboBoxCanned.Text,
-                    Count = Convert.ToInt32(textBoxCount.Text),
-                    Sum = Convert.ToDouble(textBoxSum.Text)
-                });
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания заказа");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

FishFactory/FishFactoryView/FormCreateOrder.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>

FishFactory/FishFactoryView/FormCreateSupply.Designer.cs

@@ -1,148 +0,0 @@
-namespace FishFactoryView
-{
-	partial class FormCreateSupply
-	{
-		/// <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()
-		{
-			comboBoxShop = new ComboBox();
-			labelShop = new Label();
-			labelCanned = new Label();
-			comboBoxCanned = new ComboBox();
-			labelCount = new Label();
-			textBoxCount = new TextBox();
-			buttonCancel = new Button();
-			buttonSave = new Button();
-			SuspendLayout();
-			// 
-			// comboBoxShop
-			// 
-			comboBoxShop.FormattingEnabled = true;
-			comboBoxShop.Location = new Point(101, 9);
-			comboBoxShop.Margin = new Padding(3, 2, 3, 2);
-			comboBoxShop.Name = "comboBoxShop";
-			comboBoxShop.Size = new Size(302, 23);
-			comboBoxShop.TabIndex = 0;
-			// 
-			// labelShop
-			// 
-			labelShop.AutoSize = true;
-			labelShop.Location = new Point(10, 11);
-			labelShop.Name = "labelShop";
-			labelShop.Size = new Size(60, 15);
-			labelShop.TabIndex = 1;
-			labelShop.Text = "Магазин: ";
-			// 
-			// labelCanned
-			// 
-			labelCanned.AutoSize = true;
-			labelCanned.Location = new Point(10, 37);
-			labelCanned.Name = "labelCanned";
-			labelCanned.Size = new Size(59, 15);
-			labelCanned.TabIndex = 2;
-			labelCanned.Text = "Изделие: ";
-			// 
-			// comboBoxCanned
-			// 
-			comboBoxCanned.FormattingEnabled = true;
-			comboBoxCanned.Location = new Point(101, 34);
-			comboBoxCanned.Margin = new Padding(3, 2, 3, 2);
-			comboBoxCanned.Name = "comboBoxCanned";
-			comboBoxCanned.Size = new Size(302, 23);
-			comboBoxCanned.TabIndex = 3;
-			// 
-			// labelCount
-			// 
-			labelCount.AutoSize = true;
-			labelCount.Location = new Point(10, 62);
-			labelCount.Name = "labelCount";
-			labelCount.Size = new Size(78, 15);
-			labelCount.TabIndex = 4;
-			labelCount.Text = "Количество: ";
-			// 
-			// textBoxCount
-			// 
-			textBoxCount.Location = new Point(101, 60);
-			textBoxCount.Margin = new Padding(3, 2, 3, 2);
-			textBoxCount.Name = "textBoxCount";
-			textBoxCount.Size = new Size(302, 23);
-			textBoxCount.TabIndex = 5;
-			// 
-			// buttonCancel
-			// 
-			buttonCancel.Location = new Point(262, 85);
-			buttonCancel.Margin = new Padding(3, 2, 3, 2);
-			buttonCancel.Name = "buttonCancel";
-			buttonCancel.Size = new Size(102, 29);
-			buttonCancel.TabIndex = 6;
-			buttonCancel.Text = "Отмена";
-			buttonCancel.UseVisualStyleBackColor = true;
-			buttonCancel.Click += ButtonCancel_Click;
-			// 
-			// buttonSave
-			// 
-			buttonSave.Location = new Point(147, 85);
-			buttonSave.Margin = new Padding(3, 2, 3, 2);
-			buttonSave.Name = "buttonSave";
-			buttonSave.Size = new Size(102, 29);
-			buttonSave.TabIndex = 7;
-			buttonSave.Text = "Сохранить";
-			buttonSave.UseVisualStyleBackColor = true;
-			buttonSave.Click += ButtonSave_Click;
-			// 
-			// FormCreateSupply
-			// 
-			AutoScaleDimensions = new SizeF(7F, 15F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(412, 123);
-			Controls.Add(buttonSave);
-			Controls.Add(buttonCancel);
-			Controls.Add(textBoxCount);
-			Controls.Add(labelCount);
-			Controls.Add(comboBoxCanned);
-			Controls.Add(labelCanned);
-			Controls.Add(labelShop);
-			Controls.Add(comboBoxShop);
-			Margin = new Padding(3, 2, 3, 2);
-			Name = "FormCreateSupply";
-			Text = "Создание поставки";
-			Load += FormCreateSupply_Load;
-			ResumeLayout(false);
-			PerformLayout();
-		}
-
-		#endregion
-
-		private ComboBox comboBoxShop;
-		private Label labelShop;
-		private Label labelCanned;
-		private ComboBox comboBoxCanned;
-		private Label labelCount;
-		private TextBox textBoxCount;
-		private Button buttonCancel;
-		private Button buttonSave;
-	}
-}

FishFactory/FishFactoryView/FormCreateSupply.cs

@@ -1,100 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.ViewModels;
-using System;
-using System.Collections;
-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;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-using FishFactoryContracts.BisinessLogicsContracts;
-
-namespace FishFactoryView
-{
-	public partial class FormCreateSupply : Form
-	{
-		private readonly ILogger _logger;
-		private readonly ICannedLogic _logicP;
-		private readonly IShopLogic _logicS;
-		private List<ShopViewModel> _shopList = new List<ShopViewModel>();
-		private List<CannedViewModel> _cannedList = new List<CannedViewModel>();
-
-		public FormCreateSupply(ILogger<FormCreateSupply> logger, ICannedLogic logicP, IShopLogic logicS)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logicP = logicP;
-			_logicS = logicS;
-		}
-
-		private void FormCreateSupply_Load(object sender, EventArgs e)
-		{
-			_shopList = _logicS.ReadList(null);
-			_cannedList = _logicP.ReadList(null);
-			if (_shopList != null)
-			{
-				comboBoxShop.DisplayMember = "ShopName";
-				comboBoxShop.ValueMember = "Id";
-				comboBoxShop.DataSource = _shopList;
-				comboBoxShop.SelectedItem = null;
-				_logger.LogInformation("Загрузка магазинов для поставок");
-			}
-			if (_cannedList != null)
-			{
-				comboBoxCanned.DisplayMember = "CannedName";
-				comboBoxCanned.ValueMember = "Id";
-				comboBoxCanned.DataSource = _cannedList;
-				comboBoxCanned.SelectedItem = null;
-				_logger.LogInformation("Загрузка консерв для поставок");
-			}
-		}
-
-		private void ButtonSave_Click(object sender, EventArgs e)
-		{
-			if (comboBoxShop.SelectedValue == null)
-			{
-				MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			if (comboBoxCanned.SelectedValue == null)
-			{
-				MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			_logger.LogInformation("Создание поставки");
-			try
-			{
-				var operationResult = _logicS.MakeSupply(new SupplyBindingModel
-				{
-					ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
-					CannedID = Convert.ToInt32(comboBoxCanned.SelectedValue),
-					Count = 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, "Ошибка создания поставки");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void ButtonCancel_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-	}
-}

FishFactory/FishFactoryView/FormCreateSupply.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <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>

FishFactory/FishFactoryView/FormMain.Designer.cs

@@ -1,210 +0,0 @@
-namespace FishFactoryView
-{
-	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);
-		}
-
-		#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()
-		{
-			menuStrip1 = new MenuStrip();
-			bookToolStripMenuItem = new ToolStripMenuItem();
-			ingridientsToolStripMenuItem = new ToolStripMenuItem();
-			canfdfnedsToolStripMenuItem = new ToolStripMenuItem();
-			shopsToolStripMenuItem = new ToolStripMenuItem();
-			operationToolStripMenuItem = new ToolStripMenuItem();
-			transactionToolStripMenuItem = new ToolStripMenuItem();
-			dataGridView = new DataGridView();
-			buttonCreateOrder = new Button();
-			buttonTakeOrderInWork = new Button();
-			buttonOrderReady = new Button();
-			buttonIssuedOrder = new Button();
-			buttonRef = new Button();
-			menuStrip1.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
-			// 
-			// menuStrip1
-			// 
-			menuStrip1.ImageScalingSize = new Size(20, 20);
-			menuStrip1.Items.AddRange(new ToolStripItem[] { bookToolStripMenuItem, operationToolStripMenuItem });
-			menuStrip1.Location = new Point(0, 0);
-			menuStrip1.Name = "menuStrip1";
-			menuStrip1.Padding = new Padding(5, 2, 0, 2);
-			menuStrip1.Size = new Size(1149, 24);
-			menuStrip1.TabIndex = 0;
-			menuStrip1.Text = "menuStrip1";
-			// 
-			// bookToolStripMenuItem
-			// 
-			bookToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ingridientsToolStripMenuItem, canfdfnedsToolStripMenuItem, shopsToolStripMenuItem });
-			bookToolStripMenuItem.Name = "bookToolStripMenuItem";
-			bookToolStripMenuItem.Size = new Size(87, 20);
-			bookToolStripMenuItem.Text = "Справочник";
-			// 
-			// ingridientsToolStripMenuItem
-			// 
-			ingridientsToolStripMenuItem.Name = "ingridientsToolStripMenuItem";
-			ingridientsToolStripMenuItem.Size = new Size(180, 22);
-			ingridientsToolStripMenuItem.Text = "Ингредиенты";
-			ingridientsToolStripMenuItem.Click += IngridentsToolStripMenuItem_Click;
-			// 
-			// canfdfnedsToolStripMenuItem
-			// 
-			canfdfnedsToolStripMenuItem.Name = "canfdfnedsToolStripMenuItem";
-			canfdfnedsToolStripMenuItem.Size = new Size(180, 22);
-			canfdfnedsToolStripMenuItem.Text = "Консервы";
-			canfdfnedsToolStripMenuItem.Click += CannedsToolStripMenuItem_Click;
-			// 
-			// shopsToolStripMenuItem
-			// 
-			shopsToolStripMenuItem.Name = "shopsToolStripMenuItem";
-			shopsToolStripMenuItem.Size = new Size(180, 22);
-			shopsToolStripMenuItem.Text = "Магазины";
-			shopsToolStripMenuItem.Click += shopsToolStripMenuItem_Click;
-			// 
-			// operationToolStripMenuItem
-			// 
-			operationToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { transactionToolStripMenuItem });
-			operationToolStripMenuItem.Name = "operationToolStripMenuItem";
-			operationToolStripMenuItem.Size = new Size(75, 20);
-			operationToolStripMenuItem.Text = "Операции";
-			// 
-			// transactionToolStripMenuItem
-			// 
-			transactionToolStripMenuItem.Name = "transactionToolStripMenuItem";
-			transactionToolStripMenuItem.Size = new Size(180, 22);
-			transactionToolStripMenuItem.Text = "Поставка";
-			transactionToolStripMenuItem.Click += transactionToolStripMenuItem_Click;
-			// 
-			// dataGridView
-			// 
-			dataGridView.AllowUserToAddRows = false;
-			dataGridView.AllowUserToDeleteRows = false;
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Location = new Point(10, 23);
-			dataGridView.Margin = new Padding(3, 2, 3, 2);
-			dataGridView.Name = "dataGridView";
-			dataGridView.ReadOnly = true;
-			dataGridView.RowHeadersWidth = 51;
-			dataGridView.RowTemplate.Height = 29;
-			dataGridView.Size = new Size(855, 286);
-			dataGridView.TabIndex = 1;
-			// 
-			// buttonCreateOrder
-			// 
-			buttonCreateOrder.Location = new Point(898, 53);
-			buttonCreateOrder.Margin = new Padding(3, 2, 3, 2);
-			buttonCreateOrder.Name = "buttonCreateOrder";
-			buttonCreateOrder.Size = new Size(216, 22);
-			buttonCreateOrder.TabIndex = 2;
-			buttonCreateOrder.Text = "Создать заказ";
-			buttonCreateOrder.UseVisualStyleBackColor = true;
-			buttonCreateOrder.Click += ButtonCreateOrder_Click;
-			// 
-			// buttonTakeOrderInWork
-			// 
-			buttonTakeOrderInWork.Location = new Point(898, 92);
-			buttonTakeOrderInWork.Margin = new Padding(3, 2, 3, 2);
-			buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-			buttonTakeOrderInWork.Size = new Size(216, 22);
-			buttonTakeOrderInWork.TabIndex = 3;
-			buttonTakeOrderInWork.Text = "Отдать на выполнение";
-			buttonTakeOrderInWork.UseVisualStyleBackColor = true;
-			buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
-			// 
-			// buttonOrderReady
-			// 
-			buttonOrderReady.Location = new Point(898, 129);
-			buttonOrderReady.Margin = new Padding(3, 2, 3, 2);
-			buttonOrderReady.Name = "buttonOrderReady";
-			buttonOrderReady.Size = new Size(216, 22);
-			buttonOrderReady.TabIndex = 4;
-			buttonOrderReady.Text = "Заказ готов";
-			buttonOrderReady.UseVisualStyleBackColor = true;
-			buttonOrderReady.Click += ButtonOrderReady_Click;
-			// 
-			// buttonIssuedOrder
-			// 
-			buttonIssuedOrder.Location = new Point(898, 169);
-			buttonIssuedOrder.Margin = new Padding(3, 2, 3, 2);
-			buttonIssuedOrder.Name = "buttonIssuedOrder";
-			buttonIssuedOrder.Size = new Size(216, 22);
-			buttonIssuedOrder.TabIndex = 5;
-			buttonIssuedOrder.Text = "Заказ выдан";
-			buttonIssuedOrder.UseVisualStyleBackColor = true;
-			buttonIssuedOrder.Click += ButtonIssuedOrder_Click;
-			// 
-			// buttonRef
-			// 
-			buttonRef.Location = new Point(898, 210);
-			buttonRef.Margin = new Padding(3, 2, 3, 2);
-			buttonRef.Name = "buttonRef";
-			buttonRef.Size = new Size(216, 22);
-			buttonRef.TabIndex = 6;
-			buttonRef.Text = "Обновить список";
-			buttonRef.UseVisualStyleBackColor = true;
-			buttonRef.Click += ButtonRef_Click;
-			// 
-			// FormMain
-			// 
-			AutoScaleDimensions = new SizeF(7F, 15F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(1149, 319);
-			Controls.Add(buttonRef);
-			Controls.Add(buttonIssuedOrder);
-			Controls.Add(buttonOrderReady);
-			Controls.Add(buttonTakeOrderInWork);
-			Controls.Add(buttonCreateOrder);
-			Controls.Add(dataGridView);
-			Controls.Add(menuStrip1);
-			MainMenuStrip = menuStrip1;
-			Margin = new Padding(3, 2, 3, 2);
-			Name = "FormMain";
-			Text = "Рыбный завод";
-			Load += FormMain_Load;
-			menuStrip1.ResumeLayout(false);
-			menuStrip1.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-			PerformLayout();
-		}
-
-		#endregion
-
-		private MenuStrip menuStrip1;
-		private ToolStripMenuItem bookToolStripMenuItem;
-		private ToolStripMenuItem ingridientsToolStripMenuItem;
-		private ToolStripMenuItem canfdfnedsToolStripMenuItem;
-		private DataGridView dataGridView;
-		private Button buttonCreateOrder;
-		private Button buttonTakeOrderInWork;
-		private Button buttonOrderReady;
-		private Button buttonIssuedOrder;
-		private Button buttonRef;
-		private ToolStripMenuItem shopsToolStripMenuItem;
-		private ToolStripMenuItem operationToolStripMenuItem;
-		private ToolStripMenuItem transactionToolStripMenuItem;
-	}
-}

FishFactory/FishFactoryView/FormMain.cs

@@ -1,175 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-
-namespace FishFactoryView
-{
-	public partial class FormMain : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IOrderLogic _orderLogic;
-
-		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_orderLogic = orderLogic;
-		}
-
-		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["CannedId"].Visible = false;
-					dataGridView.Columns["CannedName"].AutoSizeMode =
-					DataGridViewAutoSizeColumnMode.Fill;
-				}
-				_logger.LogInformation("Загрузка заказов");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки заказов");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void IngridentsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
-			if (service is FormComponents form)
-			{
-				form.ShowDialog();
-			}
-		}
-
-		private void CannedsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormCanned));
-			if (service is FormCanned form)
-			{
-				form.ShowDialog();
-			}
-		}
-
-		private void ButtonCreateOrder_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
-			if (service is FormCreateOrder form)
-			{
-				form.ShowDialog();
-				LoadData();
-			}
-		}
-
-		private void ButtonTakeOrderInWork_Click(object sender, EventArgs e)
-		{
-			if (dataGridView.SelectedRows.Count == 1)
-			{
-				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-				_logger.LogInformation("Заказ No{id}. Меняется статус на 'В работе'", id);
-				try
-				{
-					var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
-					{
-						Id = id
-					});
-					if (!operationResult)
-					{
-						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-					}
-					LoadData();
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Ошибка передачи заказа в работу");
-					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-			}
-		}
-
-		private void ButtonOrderReady_Click(object sender, EventArgs e)
-		{
-			if (dataGridView.SelectedRows.Count == 1)
-			{
-				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-				_logger.LogInformation("Заказ No{id}. Меняется статус на 'Готов'", id);
-				try
-				{
-					var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
-					{
-						Id = id
-					});
-					if (!operationResult)
-					{
-						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-					}
-					LoadData();
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Ошибка отметки о готовности заказа");
-					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-			}
-		}
-
-		private void ButtonIssuedOrder_Click(object sender, EventArgs e)
-		{
-			if (dataGridView.SelectedRows.Count == 1)
-			{
-				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-				_logger.LogInformation("Заказ No{id}. Меняется статус на 'Выдан'", id);
-				try
-				{
-					var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
-					{
-						Id = id
-					});
-					if (!operationResult)
-					{
-						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-					}
-					_logger.LogInformation("Заказ No{id} выдан", id);
-					LoadData();
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Ошибка отметки о выдачи заказа");
-					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-			}
-		}
-
-		private void ButtonRef_Click(object sender, EventArgs e)
-		{
-			LoadData();
-		}
-
-		private void shopsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-			if (service is FormShops form)
-			{
-				form.ShowDialog();
-			}
-		}
-
-		private void transactionToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormCreateSupply));
-			if (service is FormCreateSupply form)
-			{
-				form.ShowDialog();
-			}
-		}
-	}
-}

FishFactory/FishFactoryView/FormMain.resx

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <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="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

FishFactory/FishFactoryView/FormShop.Designer.cs

@@ -1,193 +0,0 @@
-namespace FishFactoryView
-{
-    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()
-        {
-            this.labelName = new System.Windows.Forms.Label();
-            this.textBoxName = new System.Windows.Forms.TextBox();
-            this.textBoxAdress = new System.Windows.Forms.TextBox();
-            this.labelAdress = new System.Windows.Forms.Label();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.PizzaName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.label1 = new System.Windows.Forms.Label();
-            this.dateTimeOpen = new System.Windows.Forms.DateTimePicker();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // labelName
-            // 
-            this.labelName.AutoSize = true;
-            this.labelName.Location = new System.Drawing.Point(11, 15);
-            this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(84, 20);
-            this.labelName.TabIndex = 0;
-            this.labelName.Text = "Название: ";
-            // 
-            // textBoxName
-            // 
-            this.textBoxName.Location = new System.Drawing.Point(102, 12);
-            this.textBoxName.Name = "textBoxName";
-            this.textBoxName.Size = new System.Drawing.Size(276, 27);
-            this.textBoxName.TabIndex = 1;
-            // 
-            // textBoxAdress
-            // 
-            this.textBoxAdress.Location = new System.Drawing.Point(102, 59);
-            this.textBoxAdress.Name = "textBoxAdress";
-            this.textBoxAdress.Size = new System.Drawing.Size(427, 27);
-            this.textBoxAdress.TabIndex = 3;
-            // 
-            // labelAdress
-            // 
-            this.labelAdress.AutoSize = true;
-            this.labelAdress.Location = new System.Drawing.Point(11, 61);
-            this.labelAdress.Name = "labelAdress";
-            this.labelAdress.Size = new System.Drawing.Size(58, 20);
-            this.labelAdress.TabIndex = 2;
-            this.labelAdress.Text = "Адрес: ";
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(451, 457);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(130, 44);
-            this.buttonCancel.TabIndex = 5;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(315, 457);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(130, 44);
-            this.buttonSave.TabIndex = 6;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.id,
-            this.PizzaName,
-            this.Count});
-            this.dataGridView.Location = new System.Drawing.Point(12, 144);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
-            this.dataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(569, 307);
-            this.dataGridView.TabIndex = 7;
-            // 
-            // id
-            // 
-            this.id.HeaderText = "id";
-            this.id.MinimumWidth = 6;
-            this.id.Name = "id";
-            this.id.ReadOnly = true;
-            this.id.Visible = false;
-            // 
-            // PizzaName
-            // 
-            this.PizzaName.HeaderText = "Пицца";
-            this.PizzaName.MinimumWidth = 6;
-            this.PizzaName.Name = "PizzaName";
-            this.PizzaName.ReadOnly = true;
-            // 
-            // Count
-            // 
-            this.Count.HeaderText = "Количество";
-            this.Count.MinimumWidth = 6;
-            this.Count.Name = "Count";
-            this.Count.ReadOnly = true;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 103);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 20);
-            this.label1.TabIndex = 8;
-            this.label1.Text = "Дата открытия";
-            // 
-            // dateTimeOpen
-            // 
-            this.dateTimeOpen.Location = new System.Drawing.Point(128, 103);
-            this.dateTimeOpen.Name = "dateTimeOpen";
-            this.dateTimeOpen.Size = new System.Drawing.Size(401, 27);
-            this.dateTimeOpen.TabIndex = 9;
-            // 
-            // FormShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(593, 513);
-            this.Controls.Add(this.dateTimeOpen);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.dataGridView);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.textBoxAdress);
-            this.Controls.Add(this.labelAdress);
-            this.Controls.Add(this.textBoxName);
-            this.Controls.Add(this.labelName);
-            this.Name = "FormShop";
-            this.Text = "Магазин";
-            this.Load += new System.EventHandler(this.FormShop_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelName;
-        private TextBox textBoxName;
-        private TextBox textBoxAdress;
-        private Label labelAdress;
-        private Button buttonCancel;
-        private Button buttonSave;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn id;
-        private DataGridViewTextBoxColumn PizzaName;
-        private DataGridViewTextBoxColumn Count;
-        private Label label1;
-        private DateTimePicker dateTimeOpen;
-    }
-}

FishFactory/FishFactoryView/FormShop.cs

@@ -1,129 +0,0 @@
-using FishFactoryDataModels.Models;
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-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;
-using FishFactoryContracts.BisinessLogicsContracts;
-
-namespace FishFactoryView
-{
-    public partial class FormShop : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-        private int? _id;
-        public int Id { set { _id = value; } }
-        private Dictionary<int, (ICannedModel, int)> _ShopCanneds;
-        private DateTime? _openingDate = null;
-
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            _ShopCanneds = new Dictionary<int, (ICannedModel, int)>();
-        }
-
-        private void FormShop_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Загрузка магазина");
-                try
-                {
-                    var view = _logic.ReadElement(new ShopSearchModel
-                    {
-                        Id = _id.Value
-                    });
-                    if (view != null)
-                    {
-                        textBoxName.Text = view.ShopName;
-                        textBoxAdress.Text = view.Adress;
-                        dateTimeOpen.Value = view.OpeningDate;
-                        _ShopCanneds = view.ShopCanneds ?? new Dictionary<int, (ICannedModel, int)>();
-                        LoadData();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка загрузки магазина");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка изделий в магазине");
-            try
-            {
-                if (_ShopCanneds != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var sr in _ShopCanneds)
-                    {
-                        dataGridView.Rows.Add(new object[] { sr.Key, sr.Value.Item1.CannedName, sr.Value.Item2 });
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки изделий магазина");
-                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(textBoxAdress.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение магазина");
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    ShopName = textBoxName.Text,
-                    Adress = textBoxAdress.Text,
-                    OpeningDate = dateTimeOpen.Value
-                };
-                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, "Ошибка сохранения магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

FishFactory/FishFactoryView/FormShops.Designer.cs

@@ -1,130 +0,0 @@
-namespace FishFactoryView
-{
-    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()
-        {
-            this.ToolsPanel = new System.Windows.Forms.Panel();
-            this.buttonRef = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ToolsPanel.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // ToolsPanel
-            // 
-            this.ToolsPanel.Controls.Add(this.buttonRef);
-            this.ToolsPanel.Controls.Add(this.buttonDel);
-            this.ToolsPanel.Controls.Add(this.buttonUpd);
-            this.ToolsPanel.Controls.Add(this.buttonAdd);
-            this.ToolsPanel.Location = new System.Drawing.Point(608, 12);
-            this.ToolsPanel.Name = "ToolsPanel";
-            this.ToolsPanel.Size = new System.Drawing.Size(180, 426);
-            this.ToolsPanel.TabIndex = 3;
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(31, 206);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(126, 36);
-            this.buttonRef.TabIndex = 3;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(31, 142);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(126, 36);
-            this.buttonDel.TabIndex = 2;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(31, 76);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(126, 36);
-            this.buttonUpd.TabIndex = 1;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(31, 16);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(126, 36);
-            this.buttonAdd.TabIndex = 0;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(12, 12);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(590, 426);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // FormShops
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.ToolsPanel);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormShops";
-            this.Text = "Магазины";
-            this.Load += new System.EventHandler(this.FormShops_Load);
-            this.ToolsPanel.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Panel ToolsPanel;
-        private Button buttonRef;
-        private Button buttonDel;
-        private Button buttonUpd;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-    }
-}

FishFactory/FishFactoryView/FormShops.cs

@@ -1,118 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using FishFactoryContracts.BisinessLogicsContracts;
-
-namespace FishFactoryView
-{
-    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["ShopCanneds"].Visible = false;
-                    dataGridView.Columns["ShopName"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка магазинов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        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 ButtonUpd_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 ButtonDel_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("Удаление магазина");
-                    try
-                    {
-                        if (!_logic.Delete(new ShopBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления магазина");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-
-        private void ButtonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

FishFactory/FishFactoryView/FormShops.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <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>

FishFactory/FishFactoryView/Program.cs

@@ -1,61 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using NLog.Extensions.Logging;
-using FishFactoryBusinessLogic.BusinessLogics;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryListImplement.Implements;
-using System;
-using FishFactoryContracts.BisinessLogicsContracts;
-
-namespace FishFactoryView
-{
-    internal static class Program
-    {
-        private static ServiceProvider? _serviceProvider;
-        public static ServiceProvider? ServiceProvider => _serviceProvider;
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            var services = new ServiceCollection();
-            ConfigureServices(services);
-            _serviceProvider = services.BuildServiceProvider();
-            Application.Run(_serviceProvider.GetRequiredService<FormMain>());
-        }
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddLogging(option =>
-            {
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddNLog("nlog.config");
-            });
-
-            services.AddTransient<IComponentStorage, ComponentStorage>();
-            services.AddTransient<IOrderStorage, OrderStorage>();
-            services.AddTransient<ICannedStorage, CannedStorage>();
-
-            services.AddTransient<IComponentLogic, ComponentLogic>();
-            services.AddTransient<IOrderLogic, OrderLogic>();
-            services.AddTransient<ICannedLogic, CannedLogic>();
-
-            services.AddTransient<FormMain>();
-            services.AddTransient<FormComponent>();
-            services.AddTransient<FormComponents>();
-            services.AddTransient<FormCreateOrder>();
-            services.AddTransient<FormCanned>();
-            services.AddTransient<FormCannedComponent>();
-            services.AddTransient<FormCanneds>();
-			services.AddTransient<IShopStorage, ShopStorage>();
-			services.AddTransient<IShopLogic, ShopLogic>();
-			services.AddTransient<FormShop>();
-			services.AddTransient<FormShops>();
-			services.AddTransient<FormCreateSupply>();
-		}
-    }
-}

FishFactory/FishFactoryView/nlog.config

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        autoReload="true" internalLogLevel="Info">
-
-		<targets>
-			<target xsi:type="File" name="tofile" fileName="${basedir}/carlog-${shortdate}.log" />
-		</targets>
-
-		<rules>
-			<logger name="*" minlevel="Debug" writeTo="tofile" />
-		</rules>
-	</nlog>
-</configuration>