FishFactory/FishFactory.sln

@@ -3,19 +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}") = "FishFactoryView", "FishFactoryView\FishFactoryView.csproj", "{C7F45F63-C57C-4226-84F6-0A66D81C4540}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryFileImplement", "FishFactoryFileImplement\FishFactoryFileImplement.csproj", "{5C490237-B393-4FE3-AE28-5383A186BD1A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryDatabaseImplement", "FishFactoryDatabaseImplement\FishFactoryDatabaseImplement.csproj", "{2AB3AFD6-25BC-4354-9D44-5E746EDB2B8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactory", "FishFactory\FishFactory.csproj", "{7D6246E7-96CD-455F-81EE-81A04D8845A3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,34 +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
-		{5C490237-B393-4FE3-AE28-5383A186BD1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C490237-B393-4FE3-AE28-5383A186BD1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C490237-B393-4FE3-AE28-5383A186BD1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C490237-B393-4FE3-AE28-5383A186BD1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2AB3AFD6-25BC-4354-9D44-5E746EDB2B8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AB3AFD6-25BC-4354-9D44-5E746EDB2B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2AB3AFD6-25BC-4354-9D44-5E746EDB2B8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2AB3AFD6-25BC-4354-9D44-5E746EDB2B8A}.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/ReportLogic.cs

@@ -1,88 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-using FishFactoryBusinessLogic.OfficePackage;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryBusinessLogic.BusinessLogics
-{
-    public class ReportLogic : IReportLogic
-    {
-        private readonly IComponentStorage _componentStorage;
-        private readonly ICannedStorage _cannedStorage;
-        private readonly IOrderStorage _orderStorage;
-        private readonly AbstractSaveToExcel _saveToExcel;
-        private readonly AbstractSaveToWord _saveToWord;
-        private readonly AbstractSaveToPdf _saveToPdf;
-
-        public ReportLogic(ICannedStorage cannedStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
-            AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
-        {
-            _cannedStorage = cannedStorage;
-            _componentStorage = componentStorage;
-            _orderStorage = orderStorage;
-
-            _saveToExcel = saveToExcel;
-            _saveToWord = saveToWord;
-            _saveToPdf = saveToPdf;
-        }
-
-        public List<ReportCannedComponentViewModel> GetCannedComponents()
-        {
-            return _cannedStorage.GetFullList().Select(x => new ReportCannedComponentViewModel
-            {
-                CannedName = x.CannedName,
-                Components = x.CannedComponents.Select(x => (x.Value.Item1.ComponentName, x.Value.Item2)).ToList(),
-                TotalCount = x.CannedComponents.Select(x => x.Value.Item2).Sum()
-            }).ToList();
-        }
-
-        public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
-        {
-            return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo })
-                    .Select(x => new ReportOrdersViewModel
-                    {
-                        Id = x.Id,
-                        DateCreate = x.DateCreate,
-                        CannedName = x.CannedName,
-                        Sum = x.Sum,
-                        Status = x.Status.ToString()
-                    })
-                    .ToList();
-        }
-
-        public void SaveCannedsToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateDoc(new WordInfo
-            {
-                FileName = model.FileName,
-                Title = "Список консерв",
-                Canneds = _cannedStorage.GetFullList()
-            });
-        }
-
-        public void SaveCannedComponentToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateReport(new ExcelInfo
-            {
-                FileName = model.FileName,
-                Title = "Список консерв",
-                CannedComponents = GetCannedComponents()
-            });
-        }
-
-        public void SaveOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateDoc(new PdfInfo
-            {
-                FileName = model.FileName,
-                Title = "Список заказов",
-                DateFrom = model.DateFrom!.Value,
-                DateTo = model.DateTo!.Value,
-                Orders = GetOrders(model)
-            });
-        }
-    }
-}

FishFactory/FishFactoryBusinessLogic/FishFactoryBusinessLogic.csproj

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

FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -1,83 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToExcel
-    {
-        public void CreateReport(ExcelInfo info)
-        {
-            CreateExcel(info);
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "C1"
-            });
-
-            uint rowIndex = 2;
-            foreach (var pc in info.CannedComponents)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = pc.CannedName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-
-                foreach (var (Component, Count) in pc.Components)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = rowIndex,
-                        Text = Component,
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "C",
-                        RowIndex = rowIndex,
-                        Text = Count.ToString(),
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-                    rowIndex++;
-                }
-
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Итого",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = pc.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-            }
-
-            SaveExcel(info);
-        }
-        protected abstract void CreateExcel(ExcelInfo info);
-        protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
-        protected abstract void MergeCells(ExcelMergeParameters excelParams);
-        protected abstract void SaveExcel(ExcelInfo info);
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -1,42 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToPdf
-    {
-        public void CreateDoc(PdfInfo info)
-        {
-            CreatePdf(info);
-            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-            CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
-
-            CreateRow(new PdfRowParameters
-            {
-                Texts = new List<string> { "Номер", "Дата заказа", "Консерва", "Статус", "Сумма" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-
-            foreach (var order in info.Orders)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.CannedName, order.Status.ToString(), order.Sum.ToString() },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
-            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Rigth });
-
-            SavePdf(info);
-        }
-        protected abstract void CreatePdf(PdfInfo info);
-        protected abstract void CreateParagraph(PdfParagraph paragraph);
-        protected abstract void CreateTable(List<string> columns);
-        protected abstract void CreateRow(PdfRowParameters rowParameters);
-        protected abstract void SavePdf(PdfInfo info);
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -1,49 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FishFactoryBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToWord
-    {
-        public void CreateDoc(WordInfo info)
-        {
-            CreateWord(info);
-
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            foreach (var canned in info.Canneds)
-            {
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> {
-                        (canned.CannedName, new WordTextProperties { Size = "24", Bold = true}),
-                        ("\t"+canned.Price.ToString(), new WordTextProperties{Size = "24"})
-                    },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
-
-            SaveWord(info);
-        }
-        protected abstract void CreateWord(WordInfo info);
-        protected abstract void CreateParagraph(WordParagraph paragraph);
-        protected abstract void SaveWord(WordInfo info);
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum ExcelStyleInfoType
-    {
-        Title,
-        Text,
-        TextWithBroder
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum PdfParagraphAlignmentType
-    {
-        Center,
-        Left,
-        Rigth
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs

@@ -1,8 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum WordJustificationType
-    {
-        Center,
-        Both
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs

@@ -1,13 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelCellParameters
-    {
-        public string ColumnName { get; set; } = string.Empty;
-        public uint RowIndex { get; set; }
-        public string Text { get; set; } = string.Empty;
-        public string CellReference => $"{ColumnName}{RowIndex}";
-        public ExcelStyleInfoType StyleInfo { get; set; }
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -1,11 +0,0 @@
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ReportCannedComponentViewModel> CannedComponents { get; set; } = new();
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelMergeParameters
-    {
-        public string CellFromName { get; set; } = string.Empty;
-        public string CellToName { get; set; } = string.Empty;
-        public string Merge => $"{CellFromName}:{CellToName}";
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -1,13 +0,0 @@
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public DateTime DateFrom { get; set; }
-        public DateTime DateTo { get; set; }
-        public List<ReportOrdersViewModel> Orders { get; set; } = new();
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs

@@ -1,11 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfParagraph
-    {
-        public string Text { get; set; } = string.Empty;
-        public string Style { get; set; } = string.Empty;
-        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs

@@ -1,11 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfRowParameters
-    {
-        public List<string> Texts { get; set; } = new();
-        public string Style { get; set; } = string.Empty;
-        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -1,11 +0,0 @@
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<CannedViewModel> Canneds { get; set; } = new();
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs

@@ -1,8 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordParagraph
-    {
-        public List<(string, WordTextProperties)> Texts { get; set; } = new();
-        public WordTextProperties? TextProperties { get; set; }
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs

@@ -1,11 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordTextProperties
-    {
-        public string Size { get; set; } = string.Empty;
-        public bool Bold { get; set; }
-        public WordJustificationType JustificationType { get; set; }
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -1,282 +0,0 @@
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Office2013.Excel;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml;
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-using FishFactoryBusinessLogic.OfficePackage;
-
-namespace FishFactoryBusinessLogic.OfficePackage.Implements
-{
-    public class SaveToExcel : AbstractSaveToExcel
-    {
-        private SpreadsheetDocument? _spreadsheetDocument;
-        private SharedStringTablePart? _shareStringPart;
-        private Worksheet? _worksheet;
-
-        private static void CreateStyles(WorkbookPart workbookpart)
-        {
-            var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
-            sp.Stylesheet = new Stylesheet();
-
-            var fonts = new Fonts() { Count = 2U, KnownFonts = true };
-
-            var fontUsual = new Font();
-            fontUsual.Append(new FontSize() { Val = 12D });
-            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
-            fontUsual.Append(new FontName() { Val = "Times New Roman" });
-            fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
-            fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
-            var fontTitle = new Font();
-            fontTitle.Append(new Bold());
-            fontTitle.Append(new FontSize() { Val = 14D });
-            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
-            fontTitle.Append(new FontName() { Val = "Times New Roman" });
-            fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
-            fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
-            fonts.Append(fontUsual);
-            fonts.Append(fontTitle);
-
-            var fills = new Fills() { Count = 2U };
-
-            var fill1 = new Fill();
-            fill1.Append(new PatternFill() { PatternType = PatternValues.None });
-
-            var fill2 = new Fill();
-            fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 });
-
-            fills.Append(fill1);
-            fills.Append(fill2);
-
-            var borders = new Borders() { Count = 2U };
-
-            var borderNoBorder = new Border();
-            borderNoBorder.Append(new LeftBorder());
-            borderNoBorder.Append(new RightBorder());
-            borderNoBorder.Append(new TopBorder());
-            borderNoBorder.Append(new BottomBorder());
-            borderNoBorder.Append(new DiagonalBorder());
-
-            var borderThin = new Border();
-
-            var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
-            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin };
-            rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
-            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin };
-            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            borderThin.Append(leftBorder);
-            borderThin.Append(rightBorder);
-            borderThin.Append(topBorder);
-            borderThin.Append(bottomBorder);
-            borderThin.Append(new DiagonalBorder());
-
-            borders.Append(borderNoBorder);
-            borders.Append(borderThin);
-
-            var cellStyleFormats = new CellStyleFormats() { Count = 1U };
-            var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U };
-
-            cellStyleFormats.Append(cellFormatStyle);
-
-            var cellFormats = new CellFormats() { Count = 3U };
-            var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true };
-            var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true };
-            var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true };
-
-            cellFormats.Append(cellFormatFont);
-            cellFormats.Append(cellFormatFontAndBorder);
-            cellFormats.Append(cellFormatTitle);
-
-            var cellStyles = new CellStyles() { Count = 1U };
-
-            cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U });
-
-            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U };
-
-            var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" };
-
-            var stylesheetExtensionList = new StylesheetExtensionList();
-
-            var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" };
-            stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
-            stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" });
-
-            var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" };
-            stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
-            stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" });
-
-            stylesheetExtensionList.Append(stylesheetExtension1);
-            stylesheetExtensionList.Append(stylesheetExtension2);
-
-            sp.Stylesheet.Append(fonts);
-            sp.Stylesheet.Append(fills);
-            sp.Stylesheet.Append(borders);
-            sp.Stylesheet.Append(cellStyleFormats);
-            sp.Stylesheet.Append(cellFormats);
-            sp.Stylesheet.Append(cellStyles);
-            sp.Stylesheet.Append(differentialFormats);
-            sp.Stylesheet.Append(tableStyles);
-            sp.Stylesheet.Append(stylesheetExtensionList);
-        }
-
-        private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
-        {
-            return styleInfo switch
-            {
-                ExcelStyleInfoType.Title => 2U,
-                ExcelStyleInfoType.TextWithBroder => 1U,
-                ExcelStyleInfoType.Text => 0U,
-                _ => 0U,
-            };
-        }
-
-        protected override void CreateExcel(ExcelInfo info)
-        {
-            _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
-            // Создаем книгу (в ней хранятся листы)
-            var workbookpart = _spreadsheetDocument.AddWorkbookPart();
-            workbookpart.Workbook = new Workbook();
-
-            CreateStyles(workbookpart);
-
-            // Получаем/создаем хранилище текстов для книги
-            _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
-                ? _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
-                : _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
-
-            // Создаем SharedStringTable, если его нет
-            if (_shareStringPart.SharedStringTable == null)
-            {
-                _shareStringPart.SharedStringTable = new SharedStringTable();
-            }
-
-            // Создаем лист в книгу
-            var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
-            worksheetPart.Worksheet = new Worksheet(new SheetData());
-
-            // Добавляем лист в книгу
-            var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
-            var sheet = new Sheet()
-            {
-                Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
-                SheetId = 1,
-                Name = "Лист"
-            };
-            sheets.Append(sheet);
-
-            _worksheet = worksheetPart.Worksheet;
-        }
-
-        protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
-        {
-            if (_worksheet == null || _shareStringPart == null)
-            {
-                return;
-            }
-            var sheetData = _worksheet.GetFirstChild<SheetData>();
-            if (sheetData == null)
-            {
-                return;
-            }
-
-            // Ищем строку, либо добавляем ее
-            Row row;
-            if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
-            {
-                row = sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).First();
-            }
-            else
-            {
-                row = new Row() { RowIndex = excelParams.RowIndex };
-                sheetData.Append(row);
-            }
-
-            // Ищем нужную ячейку  
-            Cell cell;
-            if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
-            {
-                cell = row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
-            }
-            else
-            {
-                // Все ячейки должны быть последовательно друг за другом расположены
-                // нужно определить, после какой вставлять
-                Cell? refCell = null;
-                foreach (Cell rowCell in row.Elements<Cell>())
-                {
-                    if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
-                    {
-                        refCell = rowCell;
-                        break;
-                    }
-                }
-
-                var newCell = new Cell() { CellReference = excelParams.CellReference };
-                row.InsertBefore(newCell, refCell);
-
-                cell = newCell;
-            }
-
-            // вставляем новый текст
-            _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
-            _shareStringPart.SharedStringTable.Save();
-
-            cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
-            cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
-            cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
-        }
-
-        protected override void MergeCells(ExcelMergeParameters excelParams)
-        {
-            if (_worksheet == null)
-            {
-                return;
-            }
-            MergeCells mergeCells;
-
-            if (_worksheet.Elements<MergeCells>().Any())
-            {
-                mergeCells = _worksheet.Elements<MergeCells>().First();
-            }
-            else
-            {
-                mergeCells = new MergeCells();
-
-                if (_worksheet.Elements<CustomSheetView>().Any())
-                {
-                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<CustomSheetView>().First());
-                }
-                else
-                {
-                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<SheetData>().First());
-                }
-            }
-
-            var mergeCell = new MergeCell()
-            {
-                Reference = new StringValue(excelParams.Merge)
-            };
-            mergeCells.Append(mergeCell);
-        }
-
-        protected override void SaveExcel(ExcelInfo info)
-        {
-            if (_spreadsheetDocument == null)
-            {
-                return;
-            }
-            _spreadsheetDocument.WorkbookPart!.Workbook.Save();
-            _spreadsheetDocument.Dispose();
-        }
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -1,109 +0,0 @@
-using MigraDoc.DocumentObjectModel;
-using MigraDoc.DocumentObjectModel.Tables;
-using MigraDoc.Rendering;
-using FishFactoryBusinessLogic.OfficePackage;
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage.Implements
-{
-    public class SaveToPdf : AbstractSaveToPdf
-    {
-        private Document? _document;
-        private Section? _section;
-        private Table? _table;
-
-        private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
-        {
-            return type switch
-            {
-                PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
-                PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
-                PdfParagraphAlignmentType.Rigth => ParagraphAlignment.Right,
-                _ => ParagraphAlignment.Justify,
-            };
-        }
-
-        private static void DefineStyles(Document document)
-        {
-            var style = document.Styles["Normal"];
-            style.Font.Name = "Times New Roman";
-            style.Font.Size = 14;
-
-            style = document.Styles.AddStyle("NormalTitle", "Normal");
-            style.Font.Bold = true;
-        }
-
-        protected override void CreatePdf(PdfInfo info)
-        {
-            _document = new Document();
-            DefineStyles(_document);
-
-            _section = _document.AddSection();
-        }
-
-        protected override void CreateParagraph(PdfParagraph pdfParagraph)
-        {
-            if (_section == null)
-            {
-                return;
-            }
-            var paragraph = _section.AddParagraph(pdfParagraph.Text);
-            paragraph.Format.SpaceAfter = "1cm";
-            paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
-            paragraph.Style = pdfParagraph.Style;
-        }
-
-        protected override void CreateTable(List<string> columns)
-        {
-            if (_document == null)
-            {
-                return;
-            }
-            _table = _document.LastSection.AddTable();
-
-            foreach (var elem in columns)
-            {
-                _table.AddColumn(elem);
-            }
-        }
-
-        protected override void CreateRow(PdfRowParameters rowParameters)
-        {
-            if (_table == null)
-            {
-                return;
-            }
-            var row = _table.AddRow();
-            for (int i = 0; i < rowParameters.Texts.Count; ++i)
-            {
-                row.Cells[i].AddParagraph(rowParameters.Texts[i]);
-
-                if (!string.IsNullOrEmpty(rowParameters.Style))
-                {
-                    row.Cells[i].Style = rowParameters.Style;
-                }
-
-                Unit borderWidth = 0.5;
-
-                row.Cells[i].Borders.Left.Width = borderWidth;
-                row.Cells[i].Borders.Right.Width = borderWidth;
-                row.Cells[i].Borders.Top.Width = borderWidth;
-                row.Cells[i].Borders.Bottom.Width = borderWidth;
-
-                row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
-                row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
-            }
-        }
-
-        protected override void SavePdf(PdfInfo info)
-        {
-            var renderer = new PdfDocumentRenderer(true)
-            {
-                Document = _document
-            };
-            renderer.RenderDocument();
-            renderer.PdfDocument.Save(info.FileName);
-        }
-    }
-}

FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -1,116 +0,0 @@
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using FishFactoryBusinessLogic.OfficePackage;
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage.Implements
-{
-    public class SaveToWord : AbstractSaveToWord
-    {
-        private WordprocessingDocument? _wordDocument;
-        private Body? _docBody;
-
-        private static JustificationValues GetJustificationValues(WordJustificationType type)
-        {
-            return type switch
-            {
-                WordJustificationType.Both => JustificationValues.Both,
-                WordJustificationType.Center => JustificationValues.Center,
-                _ => JustificationValues.Left,
-            };
-        }
-        private static SectionProperties CreateSectionProperties()
-        {
-            var properties = new SectionProperties();
-
-            var pageSize = new PageSize
-            {
-                Orient = PageOrientationValues.Portrait
-            };
-
-            properties.AppendChild(pageSize);
-
-            return properties;
-        }
-        private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
-        {
-            if (paragraphProperties == null)
-            {
-                return null;
-            }
-
-            var properties = new ParagraphProperties();
-
-            properties.AppendChild(new Justification()
-            {
-                Val = GetJustificationValues(paragraphProperties.JustificationType)
-            });
-
-            properties.AppendChild(new SpacingBetweenLines
-            {
-                LineRule = LineSpacingRuleValues.Auto
-            });
-
-            properties.AppendChild(new Indentation());
-
-            var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
-            if (!string.IsNullOrEmpty(paragraphProperties.Size))
-            {
-                paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size });
-            }
-            properties.AppendChild(paragraphMarkRunProperties);
-
-            return properties;
-        }
-        protected override void CreateWord(WordInfo info)
-        {
-            _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
-            MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
-            mainPart.Document = new Document();
-            _docBody = mainPart.Document.AppendChild(new Body());
-        }
-        protected override void CreateParagraph(WordParagraph paragraph)
-        {
-            if (_docBody == null || paragraph == null)
-            {
-                return;
-            }
-            var docParagraph = new Paragraph();
-
-            docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
-
-            foreach (var run in paragraph.Texts)
-            {
-                var docRun = new Run();
-
-                var properties = new RunProperties();
-                properties.AppendChild(new FontSize { Val = run.Item2.Size });
-                if (run.Item2.Bold)
-                {
-                    properties.AppendChild(new Bold());
-                }
-                docRun.AppendChild(properties);
-
-                docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
-
-                docParagraph.AppendChild(docRun);
-            }
-
-            _docBody.AppendChild(docParagraph);
-        }
-        protected override void SaveWord(WordInfo info)
-        {
-            if (_docBody == null || _wordDocument == null)
-            {
-                return;
-            }
-            _docBody.AppendChild(CreateSectionProperties());
-
-            _wordDocument.MainDocumentPart!.Document.Save();
-
-            _wordDocument.Dispose();
-        }
-    }
-}

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/ReportBindingModel.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryContracts.BindingModels
-{
-    public class ReportBindingModel
-    {
-        public string FileName { get; set; } = string.Empty;
-        public DateTime? DateFrom { get; set; }
-        public DateTime? DateTo { get; set; }
-    }
-}

FishFactory/FishFactoryContracts/BusinessLogicsContracts/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/BusinessLogicsContracts/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/BusinessLogicsContracts/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/BusinessLogicsContracts/IReportLogic.cs

@@ -1,14 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.BusinessLogicsContracts
-{
-    public interface IReportLogic
-    {
-        List<ReportCannedComponentViewModel> GetCannedComponents();
-        List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
-        void SaveCannedsToWordFile(ReportBindingModel model);
-        void SaveCannedComponentToExcelFile(ReportBindingModel model);
-        void SaveOrdersToPdfFile(ReportBindingModel 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,9 +0,0 @@
-namespace FishFactoryContracts.SearchModels
-{
-    public class OrderSearchModel
-    {
-        public int? Id { get; set; }
-        public DateTime? DateFrom { get; set; }
-        public DateTime? DateTo { 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/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/ReportCannedComponentViewModel.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryContracts.ViewModels
-{
-    public class ReportCannedComponentViewModel
-    {
-        public string CannedName { get; set; } = string.Empty;
-        public int TotalCount { get; set; }
-        public List<(string Component, int Count)> Components { get; set; } = new();
-    }
-}

FishFactory/FishFactoryContracts/ViewModels/ReportOrdersViewModel.cs

@@ -1,11 +0,0 @@
-namespace FishFactoryContracts.ViewModels
-{
-    public class ReportOrdersViewModel
-    {
-        public int Id { get; set; }
-        public DateTime DateCreate { get; set; }
-        public string CannedName { get; set; } = string.Empty;
-        public double Sum { get; set; }
-        public string Status { get; set; } = string.Empty;
-    }
-}

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/FishFactoryDatabaseImplement/FishFactoryDatabase.cs

@@ -1,21 +0,0 @@
-using FishFactoryDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-namespace FishFactoryDatabaseImplement
-{
-    public class FishFactoryDatabase : DbContext
-    {
-        protected override void OnConfiguring(DbContextOptionsBuilder
-       optionsBuilder)
-        {
-            if (optionsBuilder.IsConfigured == false)
-            {
-                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-CLVTSDS\SQLEXPRESS;Initial Catalog=FishFactoryDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
-            }
-            base.OnConfiguring(optionsBuilder);
-        }
-        public virtual DbSet<Component> Components { set; get; }
-        public virtual DbSet<Canned> Canneds { set; get; }
-        public virtual DbSet<CannedComponent> CannedComponents { set; get; }
-        public virtual DbSet<Order> Orders { set; get; }
-    }
-}

FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
-    <ProjectReference Include="..\FishFactoryDataModels\FishFactoryDataModels.csproj" />
-  </ItemGroup>
-
-</Project>

FishFactory/FishFactoryDatabaseImplement/Implements/CannedStorage.cs

@@ -1,105 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement;
-using FishFactoryDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class CannedStorage : ICannedStorage
-    {
-        public List<CannedViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.Canneds
-             .Include(x => x.Components)
-            .ThenInclude(x => x.Component)
-            .ToList()
-            .Select(x => x.GetViewModel)
-            .ToList();
-        }
-        public List<CannedViewModel> GetFilteredList(CannedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.CannedName))
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Canneds
-             .Include(x => x.Components)
-            .ThenInclude(x => x.Component)
-            .Where(x => x.CannedName.Contains(model.CannedName))
-            .ToList()
-            .Select(x => x.GetViewModel)
-            .ToList();
-        }
-        public CannedViewModel? GetElement(CannedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.CannedName) &&
-            !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Canneds
-             .Include(x => x.Components)
-             .ThenInclude(x => x.Component)
-             .FirstOrDefault(x => (!string.IsNullOrEmpty(model.CannedName) &&
-            x.CannedName == model.CannedName) ||
-            (model.Id.HasValue && x.Id ==
-            model.Id))
-            ?.GetViewModel;
-        }
-        public CannedViewModel? Insert(CannedBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var newCanned = Canned.Create(context, model);
-            if (newCanned == null)
-            {
-                return null;
-            }
-            context.Canneds.Add(newCanned);
-            context.SaveChanges();
-            return newCanned.GetViewModel;
-        }
-        public CannedViewModel? Update(CannedBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            using var transaction = context.Database.BeginTransaction();
-            try
-            {
-                var canned = context.Canneds.FirstOrDefault(rec =>
-                rec.Id == model.Id);
-                if (canned == null)
-                {
-                    return null;
-                }
-                canned.Update(model);
-                context.SaveChanges();
-                canned.UpdateComponents(context, model);
-                transaction.Commit();
-                return canned.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-        public CannedViewModel? Delete(CannedBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var element = context.Canneds
-            .Include(x => x.Components)
-            .FirstOrDefault(rec => rec.Id == model.Id);
-            if (element != null)
-            {
-                context.Canneds.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactory/FishFactoryDatabaseImplement/Implements/ComponentStorage.cs

@@ -1,84 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement.Models;
-
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class ComponentStorage : IComponentStorage
-    {
-        public List<ComponentViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.Components
-            .Select(x => x.GetViewModel)
-           .ToList();
-        }
-        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel
-       model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName))
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Components
-            .Where(x => x.ComponentName.Contains(model.ComponentName))
-           .Select(x => x.GetViewModel)
-           .ToList();
-        }
-        public ComponentViewModel? GetElement(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Components
-            .FirstOrDefault(x =>
-           (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName ==
-           model.ComponentName) ||
-            (model.Id.HasValue && x.Id == model.Id))
-            ?.GetViewModel;
-        }
-        public ComponentViewModel? Insert(ComponentBindingModel model)
-        {
-            var newComponent = Component.Create(model);
-            if (newComponent == null)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            context.Components.Add(newComponent);
-            context.SaveChanges();
-            return newComponent.GetViewModel;
-        }
-        public ComponentViewModel? Update(ComponentBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var component = context.Components.FirstOrDefault(x => x.Id ==
-           model.Id);
-            if (component == null)
-            {
-                return null;
-            }
-            component.Update(model);
-            context.SaveChanges();
-            return component.GetViewModel;
-        }
-        public ComponentViewModel? Delete(ComponentBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var element = context.Components.FirstOrDefault(rec => rec.Id ==
-           model.Id);
-            if (element != null)
-            {
-                context.Components.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs

@@ -1,84 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement;
-using FishFactoryDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        public List<OrderViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.Orders.Include(x => x.Canned).Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue || !model.DateFrom.HasValue || !model.DateTo.HasValue)
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            if (model.DateFrom.HasValue)
-            {
-                return context.Orders.Include(x => x.Canned).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
-            }
-            return context.Orders.Include(x => x.Canned).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
-        }
-
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Orders.Include(x => x.Canned).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
-        }
-
-        public OrderViewModel? Insert(OrderBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            if (model == null)
-                return null;
-            var newOrder = Order.Create(context, model);
-            if (newOrder == null)
-            {
-                return null;
-            }
-            context.Orders.Add(newOrder);
-            context.SaveChanges();
-            return newOrder.GetViewModel;
-        }
-
-        public OrderViewModel? Update(OrderBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            order.Update(model);
-            context.SaveChanges();
-            return order.GetViewModel;
-        }
-
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var order = context.Orders.FirstOrDefault(rec => rec.Id == model.Id);
-            if (order != null)
-            {
-                context.Orders.Remove(order);
-                context.SaveChanges();
-                return order.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactory/FishFactoryDatabaseImplement/Migrations/20240404143914_InitialCreate.Designer.cs

@@ -1,171 +0,0 @@
-// <auto-generated />
-using System;
-using FishFactoryDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    [DbContext(typeof(FishFactoryDatabase))]
-    [Migration("20240404143914_InitialCreate")]
-    partial class InitialCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.17")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("CannedName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Canneds");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ComponentId");
-
-                    b.ToTable("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Components")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
-                        .WithMany("CannedComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Component");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Orders")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("CannedComponents");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

FishFactory/FishFactoryDatabaseImplement/Migrations/20240404143914_InitialCreate.cs

@@ -1,125 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitialCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Canneds",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    CannedName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Price = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Canneds", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Components",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ComponentName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Cost = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Components", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Orders",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    CannedId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    Status = table.Column<int>(type: "int", nullable: false),
-                    DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Orders", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Orders_Canneds_CannedId",
-                        column: x => x.CannedId,
-                        principalTable: "Canneds",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "CannedComponents",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    CannedId = table.Column<int>(type: "int", nullable: false),
-                    ComponentId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CannedComponents", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_CannedComponents_Canneds_CannedId",
-                        column: x => x.CannedId,
-                        principalTable: "Canneds",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_CannedComponents_Components_ComponentId",
-                        column: x => x.ComponentId,
-                        principalTable: "Components",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CannedComponents_CannedId",
-                table: "CannedComponents",
-                column: "CannedId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CannedComponents_ComponentId",
-                table: "CannedComponents",
-                column: "ComponentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_CannedId",
-                table: "Orders",
-                column: "CannedId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "CannedComponents");
-
-            migrationBuilder.DropTable(
-                name: "Orders");
-
-            migrationBuilder.DropTable(
-                name: "Components");
-
-            migrationBuilder.DropTable(
-                name: "Canneds");
-        }
-    }
-}

FishFactory/FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs

@@ -1,168 +0,0 @@
-// <auto-generated />
-using System;
-using FishFactoryDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    [DbContext(typeof(FishFactoryDatabase))]
-    partial class FishFactoryDatabaseModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.17")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("CannedName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Canneds");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ComponentId");
-
-                    b.ToTable("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Components")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
-                        .WithMany("CannedComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Component");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Orders")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("CannedComponents");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

FishFactory/FishFactoryDatabaseImplement/Models/Canned.cs

@@ -1,96 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class Canned : ICannedModel
-    {
-        public int Id { get; set; }
-        [Required]
-        public string CannedName { get; set; } = string.Empty;
-        [Required]
-        public double Price { get; set; }
-        private Dictionary<int, (IComponentModel, int)>? _cannedComponents =
-       null;
-        [NotMapped]
-        public Dictionary<int, (IComponentModel, int)> CannedComponents
-        {
-            get
-            {
-                if (_cannedComponents == null)
-                {
-                    _cannedComponents = Components
-                    .ToDictionary(recPC => recPC.ComponentId, recPC =>
-                   (recPC.Component as IComponentModel, recPC.Count));
-                }
-                return _cannedComponents;
-            }
-        }
-        [ForeignKey("CannedId")]
-        public virtual List<CannedComponent> Components { get; set; } = new();
-        [ForeignKey("CannedId")]
-        public virtual List<Order> Orders { get; set; } = new();
-        public static Canned 
-            Create(FishFactoryDatabase context,CannedBindingModel model)
-        {
-            return new Canned()
-            {
-                Id = model.Id,
-                CannedName = model.CannedName,
-                Price = model.Price,
-                Components = model.CannedComponents.Select(x => new
-              CannedComponent
-                {
-                    Component = context.Components.First(y => y.Id == x.Key),
-                    Count = x.Value.Item2
-                }).ToList()
-            };
-        }
-        public void Update(CannedBindingModel model)
-        {
-            CannedName = model.CannedName;
-            Price = model.Price;
-        }
-        public CannedViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CannedName = CannedName,
-            Price = Price,
-            CannedComponents = CannedComponents
-        };
-        public void UpdateComponents(FishFactoryDatabase context,
-       CannedBindingModel model)
-        {
-            var cannedComponents = context.CannedComponents.Where(rec =>
-           rec.CannedId == model.Id).ToList();
-            if (cannedComponents != null && cannedComponents.Count > 0)
-            { // удалили те, которых нет в модели
-                context.CannedComponents.RemoveRange(cannedComponents.Where(rec
-               => !model.CannedComponents.ContainsKey(rec.ComponentId)));
-                context.SaveChanges();
-                // обновили количество у существующих записей
-                foreach (var updateComponent in cannedComponents)
-                {
-                    updateComponent.Count =
-                   model.CannedComponents[updateComponent.ComponentId].Item2;
-                    model.CannedComponents.Remove(updateComponent.ComponentId);
-                }
-                context.SaveChanges();
-            }
-            var canned = context.Canneds.First(x => x.Id == Id);
-            foreach (var pc in model.CannedComponents)
-            {
-                context.CannedComponents.Add(new CannedComponent
-                {
-                    Canned = canned,
-                    Component = context.Components.First(x => x.Id == pc.Key),
-                    Count = pc.Value.Item2
-                });
-                context.SaveChanges();
-            }
-            _cannedComponents = null;
-        }
-    }
-}

FishFactory/FishFactoryDatabaseImplement/Models/CannedComponent.cs

@@ -1,16 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class CannedComponent
-    {
-        public int Id { get; set; }
-        [Required]
-        public int CannedId { get; set; }
-        [Required]
-        public int ComponentId { get; set; }
-        [Required]
-        public int Count { get; set; }
-        public virtual Component Component { get; set; } = new();
-        public virtual Canned Canned { get; set; } = new();
-    }
-}

FishFactory/FishFactoryDatabaseImplement/Models/Component.cs

@@ -1,57 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class Component : IComponentModel
-    {
-        public int Id { get; private set; }
-        [Required]
-        public string ComponentName { get; private set; } = string.Empty;
-        [Required]
-        public double Cost { get; set; }
-        [ForeignKey("ComponentId")]
-        public virtual List<CannedComponent> CannedComponents { get; set; } =
-       new();
-        public static Component? Create(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Component()
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-        public static Component Create(ComponentViewModel model)
-        {
-            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/FishFactoryDatabaseImplement/Models/Order.cs

@@ -1,69 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Enums;
-using FishFactoryDataModels.Models;
-using System.ComponentModel.DataAnnotations;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-
-        [Required]
-        public int CannedId { get; private set; }
-
-        public virtual Canned Canned { get; set; } = new();
-
-        [Required]
-        public int Count { get; private set; }
-
-        [Required]
-        public double Sum { get; private set; }
-
-        [Required]
-        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-
-        [Required]
-        public DateTime DateCreate { get; private set; } = DateTime.Now;
-
-        public DateTime? DateImplement { get; private set; }
-
-        public static Order Create(FishFactoryDatabase context, OrderBindingModel model)
-        {
-            return new Order()
-            {
-                Id = model.Id,
-                CannedId = model.CannedId,
-                Canned = context.Canneds.First(x => x.Id == model.CannedId),
-                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 = Canned.CannedName,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-        };
-    }
-}

FishFactory/FishFactoryFileImplement/DataFileSingleton.cs

@@ -1,56 +0,0 @@
-using FishFactoryFileImplement.Models;
-using System.Xml.Linq;
-namespace FishFactoryFileImplement
-{
-    internal class DataFileSingleton
-    {
-        private static DataFileSingleton? instance;
-        private readonly string ComponentFileName = "Component.xml";
-        private readonly string OrderFileName = "Order.xml";
-        private readonly string CannedFileName = "Canned.xml";
-        public List<Component> Components { get; private set; }
-        public List<Order> Orders { get; private set; }
-        public List<Canned> Canneds { get; private set; }
-        public static DataFileSingleton GetInstance()
-        {
-            if (instance == null)
-            {
-                instance = new DataFileSingleton();
-            }
-            return instance;
-        }
-        public void SaveComponents() => SaveData(Components, ComponentFileName,
-       "Components", x => x.GetXElement);
-        public void SaveCanneds() => SaveData(Canneds, CannedFileName,
-       "Canneds", x => x.GetXElement);
-        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        private DataFileSingleton()
-        {
-            Components = LoadData(ComponentFileName, "Component", x =>
-           Component.Create(x)!)!;
-            Canneds = LoadData(CannedFileName, "Canned", x =>
-           Canned.Create(x)!)!;
-            Orders = LoadData(OrderFileName, "Order", x => 
-           Order.Create(x)!)!;
-        }
-        private static List<T>? LoadData<T>(string filename, string xmlNodeName,
-       Func<XElement, T> selectFunction)
-        {
-            if (File.Exists(filename))
-            {
-                return
-               XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
-            }
-            return new List<T>();
-        }
-        private static void SaveData<T>(List<T> data, string filename, string
-       xmlNodeName, Func<T, XElement> selectFunction)
-        {
-            if (data != null)
-            {
-                new XDocument(new XElement(xmlNodeName,
-               data.Select(selectFunction).ToArray())).Save(filename);
-            }
-        }
-    }
-}

FishFactory/FishFactoryFileImplement/FishFactoryFileImplement.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/FishFactoryFileImplement/Implements/CannedStorage.cs

@@ -1,81 +0,0 @@
-using FishFactoryFileImplement.Models;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryFileImplement.Implements
-{
-    public class CannedStorage : ICannedStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public CannedStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<CannedViewModel> GetFullList()
-        {
-            return source.Canneds.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<CannedViewModel> GetFilteredList(CannedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.CannedName))
-            {
-                return new();
-            }
-            return source.Canneds.Where(x => x.CannedName.Contains(model.CannedName)).Select(x => x.GetViewModel).ToList();
-        }
-
-        public CannedViewModel? GetElement(CannedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.CannedName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Canneds.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.CannedName) && x.CannedName == model.CannedName) ||
-            (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-
-        public CannedViewModel? Insert(CannedBindingModel model)
-        {
-            model.Id = source.Canneds.Count > 0 ? source.Canneds.Max(x => x.Id) + 1 : 1;
-            var newCanned = Canned.Create(model);
-            if (newCanned == null)
-            {
-                return null;
-            }
-            source.Canneds.Add(newCanned);
-            source.SaveCanneds();
-            return newCanned.GetViewModel;
-        }
-
-        public CannedViewModel? Update(CannedBindingModel model)
-        {
-            var Canned = source.Canneds.FirstOrDefault(x => x.Id == model.Id);
-            if (Canned == null)
-            {
-                return null;
-            }
-            Canned.Update(model);
-            source.SaveCanneds();
-            return Canned.GetViewModel;
-        }
-
-        public CannedViewModel? Delete(CannedBindingModel model)
-        {
-            var Canned = source.Canneds.FirstOrDefault(x => x.Id == model.Id);
-            if (Canned != null)
-            {
-                source.Canneds.Remove(Canned);
-                source.SaveCanneds();
-                return Canned.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactory/FishFactoryFileImplement/Implements/ComponentStorage.cs

@@ -1,86 +0,0 @@
-
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryFileImplement.Models;
-
-namespace FishFactoryFileImplement.Implements
-{
-    public class ComponentStorage : IComponentStorage
-    {
-        private readonly DataFileSingleton source;
-        public ComponentStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-        public List<ComponentViewModel> GetFullList()
-        {
-            return source.Components
-            .Select(x => x.GetViewModel)
-           .ToList();
-        }
-        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel
-       model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName))
-            {
-                return new();
-            }
-            return source.Components
-            .Where(x => x.ComponentName.Contains(model.ComponentName))
-           .Select(x => x.GetViewModel)
-           .ToList();
-        }
-        public ComponentViewModel? GetElement(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Components
-            .FirstOrDefault(x =>
-           (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName ==
-           model.ComponentName) ||
-            (model.Id.HasValue && x.Id == model.Id))
-            ?.GetViewModel;
-        }
-        public ComponentViewModel? Insert(ComponentBindingModel model)
-        {
-            model.Id = source.Components.Count > 0 ? source.Components.Max(x =>
-           x.Id) + 1 : 1;
-            var newComponent = Component.Create(model);
-            if (newComponent == null)
-            {
-                return null;
-            }
-            source.Components.Add(newComponent);
-            source.SaveComponents();
-            return newComponent.GetViewModel;
-        }
-        public ComponentViewModel? Update(ComponentBindingModel model)
-        {
-            var component = source.Components.FirstOrDefault(x => x.Id ==
-           model.Id);
-            if (component == null)
-            {
-                return null;
-            }
-            component.Update(model);
-            source.SaveComponents();
-            return component.GetViewModel;
-        }
-        public ComponentViewModel? Delete(ComponentBindingModel model)
-        {
-            var element = source.Components.FirstOrDefault(x => x.Id ==
-           model.Id);
-            if (element != null)
-            {
-                source.Components.Remove(element);
-                source.SaveComponents();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactory/FishFactoryFileImplement/Implements/OrderStorage.cs

@@ -1,87 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryFileImplement.Models;
-
-namespace FishFactoryFileImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public OrderStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<OrderViewModel> GetFullList() => source.Orders.Select(x => AttachCannedName(x.GetViewModel)).ToList();
-
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue || !model.DateFrom.HasValue || !model.DateTo.HasValue)
-            {
-                return new();
-            }
-            return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => AttachCannedName(x.GetViewModel)).ToList();
-        }
-
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            return AttachCannedName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
-        }
-
-        public OrderViewModel? Insert(OrderBindingModel model)
-        {
-            model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
-            var newOrder = Order.Create(model);
-            if (newOrder == null)
-            {
-                return null;
-            }
-            source.Orders.Add(newOrder);
-            source.SaveOrders();
-            return AttachCannedName(newOrder.GetViewModel);
-        }
-
-        public OrderViewModel? Update(OrderBindingModel model)
-        {
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            order.Update(model);
-            source.SaveOrders();
-            return AttachCannedName(order.GetViewModel);
-        }
-
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order != null)
-            {
-                source.Orders.Remove(order);
-                source.SaveOrders();
-                return AttachCannedName(order.GetViewModel);
-            }
-            return null;
-        }
-
-        private OrderViewModel? AttachCannedName(OrderViewModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            var canned = source.Canneds.FirstOrDefault(x => x.Id == model.CannedId);
-                model.CannedName = canned?.CannedName;
-            return model;
-        }
-    }
-
-}

FishFactory/FishFactoryFileImplement/Models/Canned.cs

@@ -1,94 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-using System.Xml.Linq;
-namespace FishFactoryFileImplement.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, int> Components { get; private set; } = new();
-        private Dictionary<int, (IComponentModel, int)>? _cannedComponents =
-       null;
-        public Dictionary<int, (IComponentModel, int)> CannedComponents
-        {
-            get
-            {
-                if (_cannedComponents == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _cannedComponents = Components.ToDictionary(x => x.Key, y =>
-                    ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!,
-                    y.Value));
-                }
-                return _cannedComponents;
-            }
-        }
-        public static Canned? Create(CannedBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Canned()
-            {
-                Id = model.Id,
-                CannedName = model.CannedName,
-                Price = model.Price,
-                Components = model.CannedComponents.ToDictionary(x => x.Key, x
-               => x.Value.Item2)
-            };
-        }
-        public static Canned? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Canned()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                CannedName = element.Element("CannedName")!.Value,
-                Price = Convert.ToDouble(element.Element("Price")!.Value),
-                Components =
-           element.Element("CannedComponents")!.Elements("CannedComponent")
-            .ToDictionary(x =>
-           Convert.ToInt32(x.Element("Key")?.Value), x =>
-           Convert.ToInt32(x.Element("Value")?.Value))
-            };
-        }
-        public void Update(CannedBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            CannedName = model.CannedName;
-            Price = model.Price;
-            Components = model.CannedComponents.ToDictionary(x => x.Key, x =>
-           x.Value.Item2);
-            _cannedComponents = null;
-        }
-        public CannedViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CannedName = CannedName,
-            Price = Price,
-            CannedComponents = CannedComponents
-        };
-        public XElement GetXElement => new("Canned",
-        new XAttribute("Id", Id),
-        new XElement("CannedName", CannedName),
-        new XElement("Price", Price.ToString()),
-        new XElement("CannedComponents", Components.Select(x =>
-       new XElement("CannedComponent",
-
-       new XElement("Key", x.Key),
-
-       new XElement("Value", x.Value)))
-
-       .ToArray()));
-    }
-}

FishFactory/FishFactoryFileImplement/Models/Component.cs

@@ -1,58 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-using System.Xml.Linq;
-namespace FishFactoryFileImplement.Models
-{
-    public class Component : IComponentModel
-    {
-        public int Id { get; private set; }
-        public string ComponentName { get; private set; } = string.Empty;
-        public double Cost { get; set; }
-        public static Component? Create(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Component()
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-        public static Component? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Component()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ComponentName = element.Element("ComponentName")!.Value,
-                Cost = Convert.ToDouble(element.Element("Cost")!.Value)
-            };
-        }
-        public void Update(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ComponentName = model.ComponentName;
-            Cost = model.Cost;
-        }
-        public ComponentViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ComponentName = ComponentName,
-            Cost = Cost
-        };
-        public XElement GetXElement => new("Component",
-        new XAttribute("Id", Id),
-        new XElement("ComponentName", ComponentName),
-        new XElement("Cost", Cost.ToString()));
-    }
-}

FishFactory/FishFactoryFileImplement/Models/Order.cs

@@ -1,87 +0,0 @@
-using System.Xml.Linq;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Enums;
-using FishFactoryDataModels.Models;
-
-namespace FishFactoryFileImplement.Models
-{
-    public class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-        public int CannedId { get; private set; }
-        public int Count { get; private set; }
-        public double Sum { get; private set; }
-        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-        public DateTime DateCreate { get; private set; } = DateTime.Now;
-        public DateTime? DateImplement { get; private set; }
-
-        public static Order? Create(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Order()
-            {
-                Id = model.Id,
-                CannedId = model.CannedId,
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
-            };
-        }
-
-        public static Order? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            string dateImplement = element.Element("DateImplement")!.Value;
-            return new Order()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                CannedId = Convert.ToInt32(element.Element("CannedId")!.Value),
-                Count = Convert.ToInt32(element.Element("Count")!.Value),
-                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
-                Status = (OrderStatus)(Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value)),
-                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
-                DateImplement = (dateImplement == "" || dateImplement is null) ? Convert.ToDateTime(null) : Convert.ToDateTime(dateImplement)
-            };
-
-        }
-
-        public void Update(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Status = model.Status;
-            DateImplement = model.DateImplement;
-        }
-
-        public OrderViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CannedId = CannedId,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-        };
-
-        public XElement GetXElement => new("Order",
-           new XAttribute("Id", Id),
-           new XElement("CannedId", CannedId.ToString()),
-           new XElement("Count", Count.ToString()),
-           new XElement("Sum", Sum.ToString()),
-           new XElement("Status", Status.ToString()),
-           new XElement("DateCreate", DateCreate.ToString()),
-           new XElement("DateImplement", DateImplement.ToString()));
-    }
-}

FishFactory/FishFactoryListImplement/DataListSingleton.cs

@@ -1,32 +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; }
-        private DataListSingleton()
-        {
-            Components = new List<Component>();
-            Orders = new List<Order>();
-            Canneds = new List<Canned>();
-        }
-        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/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/FishFactoryView/FishFactoryView.csproj

@@ -1,41 +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.EntityFrameworkCore.Design" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <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" />
-    <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.19" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FishFactoryBusinessLogic\FishFactoryBusinessLogic.csproj" />
-    <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
-    <ProjectReference Include="..\FishFactoryDatabaseImplement\FishFactoryDatabaseImplement.csproj" />
-    <ProjectReference Include="..\FishFactoryFileImplement\FishFactoryFileImplement.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;
-    }
-}