lab3

.gitignore

@@ -14,11 +14,6 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
-# dll файлы
-*.dll
-
-/FishFactory/ImplementationExtensions
-
 # Mono auto generated files
 mono_crash.*
 

FishFactory/FishFactory.sln

@@ -5,13 +5,17 @@ VisualStudioVersion = 17.7.34009.444
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryView", "FishFactoryView\FishFactoryView.csproj", "{9A1F69E4-3ECA-4069-A87B-572944F04FF7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryDataModels", "FishFactoryDataModels\FishFactoryDataModels.csproj", "{663E0484-E2DB-4BDA-AC2E-1F97B2C7A6F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryDataModels", "FishFactoryDataModels\FishFactoryDataModels.csproj", "{663E0484-E2DB-4BDA-AC2E-1F97B2C7A6F3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryContracts", "FishFactoryContracts\FishFactoryContracts.csproj", "{AB3CD4CF-88EC-42C3-9160-F144FB6F6309}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryContracts", "FishFactoryContracts\FishFactoryContracts.csproj", "{AB3CD4CF-88EC-42C3-9160-F144FB6F6309}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryBusinessLogic", "FishFactoryBusinessLogic\FishFactoryBusinessLogic.csproj", "{7125EA65-3F20-429A-976A-3DA86EE6AEC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryBusinessLogic", "FishFactoryBusinessLogic\FishFactoryBusinessLogic.csproj", "{7125EA65-3F20-429A-976A-3DA86EE6AEC0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryListImplement", "FishFactoryListImplement\FishFactoryListImplement.csproj", "{C202EA8A-C0AF-4DF9-B2B0-963E56FA8528}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryListImplement", "FishFactoryListImplement\FishFactoryListImplement.csproj", "{C202EA8A-C0AF-4DF9-B2B0-963E56FA8528}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryFileImplement", "FishFactoryFileImplement\FishFactoryFileImplement.csproj", "{EB4AEC72-72EC-437B-A760-603FA90301B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryDatabaseImplement", "FishFactoryDatabaseImplement\FishFactoryDatabaseImplement.csproj", "{9BADDBDE-37C7-4E3F-8B4F-F663E3B17F65}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +43,14 @@ Global
 		{C202EA8A-C0AF-4DF9-B2B0-963E56FA8528}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C202EA8A-C0AF-4DF9-B2B0-963E56FA8528}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C202EA8A-C0AF-4DF9-B2B0-963E56FA8528}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB4AEC72-72EC-437B-A760-603FA90301B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB4AEC72-72EC-437B-A760-603FA90301B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB4AEC72-72EC-437B-A760-603FA90301B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB4AEC72-72EC-437B-A760-603FA90301B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BADDBDE-37C7-4E3F-8B4F-F663E3B17F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BADDBDE-37C7-4E3F-8B4F-F663E3B17F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BADDBDE-37C7-4E3F-8B4F-F663E3B17F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BADDBDE-37C7-4E3F-8B4F-F663E3B17F65}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

FishFactory/FishFactoryBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,153 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-
-namespace CannedBusinessLogic
-{
-	public class ShopLogic : IShopLogic
-	{
-		private readonly ILogger _logger;
-		private readonly IShopStorage _shopStorage;
-		public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
-		{
-			_logger = logger;
-			_shopStorage = shopStorage;
-		}
-		public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-		{
-			_logger.LogInformation("ReadList. ShopName: {ShopName}. Id: {Id}",
-				model?.ShopName, model?.Id);
-			var list = model == null ? _shopStorage.GetFullList() :
-				_shopStorage.GetFilteredList(model);
-			if (list == null)
-			{
-				_logger.LogWarning("ReadList return null list");
-				return null;
-			}
-			_logger.LogInformation("ReadList. Count: {Count}", list.Count);
-			return list;
-		}
-		public ShopViewModel? ReadElement(ShopSearchModel model)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-			_logger.LogInformation("ReadElement. ShopName: {ShopName}. Id: {Id}",
-				model.ShopName, model.Id);
-			var element = _shopStorage.GetElement(model);
-			if (element == null)
-			{
-				_logger.LogWarning("ReadElement element not found");
-				return null;
-			}
-			_logger.LogInformation("ReadElement find. Id: {Id}", element.Id);
-			return element;
-		}
-		public bool Create(ShopBindingModel model)
-		{
-			CheckModel(model);
-			if (_shopStorage.Insert(model) == null)
-			{
-				_logger.LogWarning("Insert operation failed");
-				return false;
-			}
-			return true;
-		}
-		public bool Update(ShopBindingModel model)
-		{
-			CheckModel(model);
-			if (_shopStorage.Update(model) == null)
-			{
-				_logger.LogWarning("Update operation failed");
-				return false;
-			}
-			return true;
-		}
-		public bool Delete(ShopBindingModel model)
-		{
-			CheckModel(model, false);
-			_logger.LogInformation("Delete. Id: {Id}", model.Id);
-			if (_shopStorage.Delete(model) == null)
-			{
-				_logger.LogWarning("Delete operation failed");
-				return false;
-			}
-			return true;
-		}
-		private void CheckModel(ShopBindingModel model, bool withParams = true)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-			if (!withParams)
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(model.ShopName))
-			{
-				throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName));
-			}
-			_logger.LogInformation("Shop. ShopName:{0}.Address:{1}. Id: {2}",
-				model.ShopName, model.Address, model.Id);
-			var element = _shopStorage.GetElement(new ShopSearchModel
-			{
-				ShopName = model.ShopName
-			});
-			if (element != null && element.Id != model.Id && element.ShopName == model.ShopName)
-			{
-				throw new InvalidOperationException("Магазин с таким названием уже есть");
-			}
-		}
-
-		public bool AddCannedInShop(ShopSearchModel model, ICannedModel Canned, int count)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-			if (count <= 0)
-			{
-				throw new ArgumentException("Количество консерв должно быть больше 0", nameof(count));
-			}
-			_logger.LogInformation("AddCannedInShop. ShopName:{ShopName}.Id:{ Id}",
-				model.ShopName, model.Id);
-			var element = _shopStorage.GetElement(model);
-			if (element == null)
-			{
-				_logger.LogWarning("AddCannedInShop element not found");
-				return false;
-			}
-			_logger.LogInformation("AddCannedInShop find. Id:{Id}", element.Id);
-
-			if (element.ListCanned.TryGetValue(Canned.Id, out var pair))
-			{
-				element.ListCanned[Canned.Id] = (Canned, count + pair.Item2);
-				_logger.LogInformation(
-					"AddCannedInShop. Added {count} {Canned} to '{ShopName}' shop",
-					count, Canned.CannedName, element.ShopName);
-			}
-			else
-			{
-				element.ListCanned[Canned.Id] = (Canned, count);
-				_logger.LogInformation(
-					"AddCannedInShop. Added {count} new Canned {Canned} to '{ShopName}' shop",
-					count, Canned.CannedName, element.ShopName);
-			}
-			_shopStorage.Update(new()
-			{
-				Id = element.Id,
-				Address = element.Address,
-				ShopName = element.ShopName,
-				DateOpening = element.DateOpening,
-				ListCanned = element.ListCanned
-			});
-			return true;
-		}
-	}
-}

FishFactory/FishFactoryContracts/BindingModels/ShopBindingModel.cs

@@ -1,20 +0,0 @@
-using FishFactoryDataModels.Models;
-
-namespace FishFactoryContracts.BindingModels
-{
-	public class ShopBindingModel : IShopModel
-	{
-		public int Id { get; set; }
-		public string ShopName { get; set; } = string.Empty;
-
-		public string Address { get; set; } = string.Empty;
-
-		public DateTime DateOpening { get; set; } = DateTime.Now;
-
-		public Dictionary<int, (ICannedModel, int)> ListCanned
-		{
-			get;
-			set;
-		} = new();
-	}
-}

FishFactory/FishFactoryContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,17 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-
-namespace FishFactoryContracts.BusinessLogicsContracts
-{
-	public interface IShopLogic
-	{
-		List<ShopViewModel>? ReadList(ShopSearchModel? model);
-		ShopViewModel? ReadElement(ShopSearchModel model);
-		bool Create(ShopBindingModel model);
-		bool Update(ShopBindingModel model);
-		bool Delete(ShopBindingModel model);
-		bool AddCannedInShop(ShopSearchModel model, ICannedModel canned, int count);
-	}
-}

FishFactory/FishFactoryContracts/SearchModels/ShopSearchModel.cs

@@ -1,8 +0,0 @@
-namespace FishFactoryContracts.SearchModels
-{
-	public class ShopSearchModel
-	{
-		public int? Id { get; set; }
-		public string? ShopName { get; set; }
-	}
-}

FishFactory/FishFactoryContracts/StoragesContracts/IShopStorage.cs

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

FishFactory/FishFactoryContracts/ViewModels/ShopViewModel.cs

@@ -1,24 +0,0 @@
-using FishFactoryDataModels.Models;
-using System.ComponentModel;
-
-namespace FishFactoryContracts.ViewModels
-{
-	public class ShopViewModel : IShopModel
-	{
-		public int Id { get; set; }
-		[DisplayName("Название магазина")]
-		public string ShopName { get; set; } = string.Empty;
-
-		[DisplayName("Адрес магазина")]
-		public string Address { get; set; } = string.Empty;
-
-		[DisplayName("Дата открытия")]
-		public DateTime DateOpening { get; set; } = DateTime.Now;
-
-		public Dictionary<int, (ICannedModel, int)> ListCanned
-		{
-			get;
-			set;
-		} = new();
-	}
-}

FishFactory/FishFactoryDataModels/Models/IShopModel.cs

@@ -1,10 +0,0 @@
-namespace FishFactoryDataModels.Models
-{
-	public interface IShopModel : IId
-	{
-		string ShopName { get; }
-		string Address { get; }
-		DateTime DateOpening { get; }
-		Dictionary<int, (ICannedModel, int)> ListCanned { get; }
-	}
-}

FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabase.cs

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

FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj

@@ -0,0 +1,23 @@
+<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.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+      <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

@@ -0,0 +1,107 @@
+using Microsoft.EntityFrameworkCore;
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDatabaseImplement.Models;
+
+namespace FishFactoryDatabaseImplement.Implements
+{
+    public class CannedStorage : ICannedStorage
+    {
+        public List<CannedViewModel> GetFullList()
+        {
+            using var context = new FishFactoryDatabase();
+            return context.CannedList
+                    .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.CannedList
+                    .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.CannedList
+                .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.CannedList.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.CannedList.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.CannedList
+                .Include(x => x.Components)
+                .Include(x => x.Orders)
+                .FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.CannedList.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

FishFactory/FishFactoryDatabaseImplement/Implements/ComponentStorage.cs

@@ -0,0 +1,83 @@
+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

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

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

@@ -0,0 +1,171 @@
+// <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("20240330161357_InitialCreate")]
+    partial class InitialCreate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .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("CannedList");
+                });
+
+            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/20240330161357_InitialCreate.cs

@@ -0,0 +1,125 @@
+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: "CannedList",
+                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_CannedList", 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_CannedList_CannedId",
+                        column: x => x.CannedId,
+                        principalTable: "CannedList",
+                        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_CannedList_CannedId",
+                        column: x => x.CannedId,
+                        principalTable: "CannedList",
+                        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: "CannedList");
+        }
+    }
+}

FishFactory/FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs

@@ -0,0 +1,168 @@
+// <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.3")
+                .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("CannedList");
+                });
+
+            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

@@ -0,0 +1,99 @@
+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.CannedList.First(x => x.Id == Id);
+            foreach (var cd in model.CannedComponents)
+            {
+                context.CannedComponents.Add(new CannedComponent
+                {
+                    Canned = canned,
+                    Component = context.Components.First(x => x.Id == cd.Key),
+                    Count = cd.Value.Item2
+                });
+                context.SaveChanges();
+            }
+            _cannedComponents = null;
+        }
+    }
+}

FishFactory/FishFactoryDatabaseImplement/Models/CannedComponent.cs

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,63 @@
+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

@@ -0,0 +1,64 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Models;
+using FishFactoryDataModels.Enums;
+using System.ComponentModel.DataAnnotations;
+
+namespace FishFactoryDatabaseImplement.Models
+{
+    public class Order : IOrderModel
+    {
+        [Required]
+        public int CannedId { get; set; }
+        [Required]
+        public int Count { get; set; }
+        [Required]
+        public double Sum { get; set; }
+        [Required]
+        public OrderStatus Status { get; set; }
+        [Required]
+        public DateTime DateCreate { get; set; }
+        public DateTime? DateImplement { get; set; }
+        public int Id { get; set; }
+        public Canned Canned { get; 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 void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Status = model.Status;
+            DateImplement = model.DateImplement;
+        }
+
+        public OrderViewModel GetViewModel => new()
+        {
+            CannedId = CannedId,
+            Count = Count,
+            Sum = Sum,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+            Id = Id,
+            Status = Status,
+            CannedName = Canned.CannedName,
+        };
+    }
+}

FishFactory/FishFactoryFileImplement/DataFileSingleton.cs

@@ -0,0 +1,59 @@
+using FishFactoryFileImplement.Models;
+using System.Threading.Channels;
+using System.Xml.Linq;
+
+namespace FishFactoryFileImplement
+{
+    public 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> ListCanned { 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 SaveListCanned() => SaveData(ListCanned, CannedFileName,
+            "ListCanned", x => x.GetXElement);
+
+        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+
+        private DataFileSingleton()
+        {
+            Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
+            ListCanned = 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

@@ -0,0 +1,14 @@
+<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

@@ -0,0 +1,80 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryFileImplement.Models;
+
+namespace FishFactoryFileImplement.Implements
+{
+    public class CannedStorage : ICannedStorage
+    {
+        private readonly DataFileSingleton source;
+        public CannedStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+
+        public List<CannedViewModel> GetFullList()
+        {
+            return source.ListCanned.Select(x => x.GetViewModel).ToList();
+        }
+
+        public List<CannedViewModel> GetFilteredList(CannedSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.CannedName))
+            {
+                return new();
+            }
+            return source.ListCanned.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.ListCanned.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.ListCanned.Count > 0 ? source.ListCanned.Max(x => x.Id) + 1 : 1;
+            var newCanned = Canned.Create(model);
+            if (newCanned == null)
+            {
+                return null;
+            }
+            source.ListCanned.Add(newCanned);
+            source.SaveListCanned();
+            return newCanned.GetViewModel;
+        }
+
+        public CannedViewModel? Update(CannedBindingModel model)
+        {
+            var canned = source.ListCanned.FirstOrDefault(x => x.Id == model.Id);
+            if (canned == null)
+            {
+                return null;
+            }
+            canned.Update(model);
+            source.SaveListCanned();
+            return canned.GetViewModel;
+        }
+
+        public CannedViewModel? Delete(CannedBindingModel model)
+        {
+            var element = source.ListCanned.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                source.ListCanned.Remove(element);
+                source.SaveListCanned();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

FishFactory/FishFactoryFileImplement/Implements/ComponentStorage.cs

@@ -0,0 +1,74 @@
+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

@@ -0,0 +1,91 @@
+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()
+        {
+            return source.Orders.Select(x => GetViewModel(x)).ToList();
+        }
+
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return new();
+            }
+            return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList();
+        }
+
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+
+            return source.Orders.FirstOrDefault(x =>
+                (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        private OrderViewModel GetViewModel(Order order)
+        {
+            var viewModel = order.GetViewModel;
+            foreach (var canned in source.ListCanned)
+            {
+                if (canned.Id == order.CannedId)
+                {
+                    viewModel.CannedName = canned.CannedName;
+                    break;
+                }
+            }
+            return viewModel;
+        }
+        public OrderViewModel? Insert(OrderBindingModel model)
+        {
+            model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
+            var newOrder = Order.Create(model);
+            if (newOrder == null)
+            {
+                return null;
+            }
+            source.Orders.Add(newOrder);
+            source.SaveOrders();
+            return GetViewModel(newOrder);
+        }
+
+        public OrderViewModel? Update(OrderBindingModel model)
+        {
+            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            order.Update(model);
+            source.SaveOrders();
+            return GetViewModel(order);
+        }
+
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
+            var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                source.Orders.Remove(element);
+                source.SaveOrders();
+                return GetViewModel(element);
+            }
+            return null;
+        }
+    }
+}

FishFactory/FishFactoryFileImplement/Models/Canned.cs

@@ -0,0 +1,86 @@
+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)>? _productComponents = null;
+        public Dictionary<int, (IComponentModel, int)> CannedComponents
+        {
+            get
+            {
+                if (_productComponents == null)
+                {
+                    var source = DataFileSingleton.GetInstance();
+                    _productComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
+                }
+                return _productComponents;
+            }
+        }
+
+        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);
+            _productComponents = 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

@@ -0,0 +1,59 @@
+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

@@ -0,0 +1,85 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Models;
+using FishFactoryDataModels.Enums;
+using System.Xml.Linq;
+
+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;
+            }
+            return new Order()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                CannedId = Convert.ToInt32(element.Element("CannedId")!.Value),
+                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+                Count = Convert.ToInt32(element.Element("Count")!.Value),
+                Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
+                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+                DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value)
+            };
+        }
+
+        public void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Status = model.Status;
+            DateImplement = model.DateImplement;
+        }
+
+        public OrderViewModel GetViewModel => new()
+        {
+            CannedId = CannedId,
+            Count = Count,
+            Sum = Sum,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+            Id = Id,
+            Status = Status,
+        };
+
+        public XElement GetXElement => new("Order",
+          new XAttribute("Id", Id),
+          new XElement("CannedId", CannedId),
+          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

@@ -8,15 +8,13 @@ namespace FishFactoryListImplement
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Canned> ListCanned { get; set; }
-		public List<Shop> Shops { get; set; }
 
-		private DataListSingleton()
+        private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             ListCanned = new List<Canned>();
-			Shops = new List<Shop>();
-		}
+        }
 
         public static DataListSingleton GetInstance()
         {

FishFactory/FishFactoryListImplement/Implements/ShopStorage.cs

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

FishFactory/FishFactoryListImplement/Models/Shop.cs

@@ -1,53 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModels.Models;
-
-namespace FishFactoryListImplement.Models
-{
-	public class Shop : IShopModel
-	{
-		public int Id { get; private set; }
-		public string ShopName { get; private set; } = string.Empty;
-		public string Address { get; private set; } = string.Empty;
-		public DateTime DateOpening { get; private set; }
-		public Dictionary<int, (ICannedModel, int)> ListCanned
-		{
-			get;
-			private set;
-		} = new();
-		public static Shop? Create(ShopBindingModel? model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new Shop()
-			{
-				Id = model.Id,
-				ShopName = model.ShopName,
-				Address = model.Address,
-				DateOpening = model.DateOpening,
-				ListCanned = new()
-			};
-		}
-		public void Update(ShopBindingModel? model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			ShopName = model.ShopName;
-			Address = model.Address;
-			DateOpening = model.DateOpening;
-			ListCanned = model.ListCanned;
-		}
-		public ShopViewModel GetViewModel => new()
-		{
-			Id = Id,
-			ShopName = ShopName,
-			Address = Address,
-			ListCanned = ListCanned,
-			DateOpening = DateOpening,
-		};
-	}
-}

FishFactory/FishFactoryView/FishFactoryView.csproj

@@ -9,6 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
+      <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" />
@@ -18,6 +22,8 @@
   <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>
 

FishFactory/FishFactoryView/FormMain.Designer.cs

@@ -32,14 +32,12 @@
             this.reference_booksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ComponentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.cannedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.shopsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.buttonUpdate = new System.Windows.Forms.Button();
+            this.buttonUpdate = new System.Windows.Forms.Button();
             this.buttonSetToFinish = new System.Windows.Forms.Button();
             this.buttonSetToDone = new System.Windows.Forms.Button();
             this.buttonSetToWork = new System.Windows.Forms.Button();
             this.buttonCreateOrder = new System.Windows.Forms.Button();
-			this.buttonAddCannedInShop = new System.Windows.Forms.Button();
-			this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
             this.menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.SuspendLayout();
@@ -58,9 +56,8 @@
             // 
             this.reference_booksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ComponentsToolStripMenuItem,
-			this.cannedToolStripMenuItem,
-			this.shopsToolStripMenuItem});
-			this.reference_booksToolStripMenuItem.Name = "reference_booksToolStripMenuItem";
+            this.cannedToolStripMenuItem});
+            this.reference_booksToolStripMenuItem.Name = "reference_booksToolStripMenuItem";
             this.reference_booksToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
             this.reference_booksToolStripMenuItem.Text = "Справочники";
             // 
@@ -77,62 +74,55 @@
             this.cannedToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
             this.cannedToolStripMenuItem.Text = "Консервы";
             this.cannedToolStripMenuItem.Click += new System.EventHandler(this.CannedToolStripMenuItem_Click);
-			// 
-			// shopsToolStripMenuItem
-			// 
-			this.shopsToolStripMenuItem.Name = "shopsToolStripMenuItem";
-			this.shopsToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
-			this.shopsToolStripMenuItem.Text = "Магазины";
-			this.shopsToolStripMenuItem.Click += new System.EventHandler(this.ShopsToolStripMenuItem_Click);
-			//
-			// buttonUpdate
-			// 
-			this.buttonUpdate.Location = new System.Drawing.Point(781, 299);
-			this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            // 
+            // buttonUpdate
+            // 
+            this.buttonUpdate.Location = new System.Drawing.Point(780, 314);
+            this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonUpdate.Name = "buttonUpdate";
             this.buttonUpdate.Size = new System.Drawing.Size(170, 58);
             this.buttonUpdate.TabIndex = 12;
             this.buttonUpdate.Text = "Обновить";
             this.buttonUpdate.UseVisualStyleBackColor = true;
             this.buttonUpdate.Click += new System.EventHandler(this.ButtonRef_Click);
-			// 
-			// buttonSetToFinish
-			// 
-			this.buttonSetToFinish.Location = new System.Drawing.Point(781, 237);
-			this.buttonSetToFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            // 
+            // buttonSetToFinish
+            // 
+            this.buttonSetToFinish.Location = new System.Drawing.Point(780, 252);
+            this.buttonSetToFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonSetToFinish.Name = "buttonSetToFinish";
             this.buttonSetToFinish.Size = new System.Drawing.Size(170, 58);
             this.buttonSetToFinish.TabIndex = 11;
             this.buttonSetToFinish.Text = "Заказ выдан";
             this.buttonSetToFinish.UseVisualStyleBackColor = true;
             this.buttonSetToFinish.Click += new System.EventHandler(this.ButtonIssuedOrder_Click);
-			// 
-			// buttonSetToDone
-			// 
-			this.buttonSetToDone.Location = new System.Drawing.Point(781, 175);
-			this.buttonSetToDone.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            // 
+            // buttonSetToDone
+            // 
+            this.buttonSetToDone.Location = new System.Drawing.Point(780, 190);
+            this.buttonSetToDone.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonSetToDone.Name = "buttonSetToDone";
             this.buttonSetToDone.Size = new System.Drawing.Size(170, 58);
             this.buttonSetToDone.TabIndex = 10;
             this.buttonSetToDone.Text = "Заказ готов";
             this.buttonSetToDone.UseVisualStyleBackColor = true;
             this.buttonSetToDone.Click += new System.EventHandler(this.ButtonOrderReady_Click);
-			// 
-			// buttonSetToWork
-			// 
-			this.buttonSetToWork.Location = new System.Drawing.Point(781, 113);
-			this.buttonSetToWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            // 
+            // buttonSetToWork
+            // 
+            this.buttonSetToWork.Location = new System.Drawing.Point(780, 128);
+            this.buttonSetToWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonSetToWork.Name = "buttonSetToWork";
             this.buttonSetToWork.Size = new System.Drawing.Size(170, 58);
             this.buttonSetToWork.TabIndex = 9;
             this.buttonSetToWork.Text = "Отдать на выполнение";
             this.buttonSetToWork.UseVisualStyleBackColor = true;
             this.buttonSetToWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click);
-			// 
-			// buttonCreateOrder
-			// 
-			this.buttonCreateOrder.Location = new System.Drawing.Point(781, 51);
-			this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            // 
+            // buttonCreateOrder
+            // 
+            this.buttonCreateOrder.Location = new System.Drawing.Point(780, 66);
+            this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonCreateOrder.Name = "buttonCreateOrder";
             this.buttonCreateOrder.Size = new System.Drawing.Size(170, 58);
             this.buttonCreateOrder.TabIndex = 8;
@@ -151,21 +141,10 @@
             this.dataGridView.RowTemplate.Height = 29;
             this.dataGridView.Size = new System.Drawing.Size(755, 426);
             this.dataGridView.TabIndex = 7;
-			// 
-			// buttonAddCannedInShop
-			// 
-			this.buttonAddCannedInShop.Location = new System.Drawing.Point(781, 361);
-			this.buttonAddCannedInShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-			this.buttonAddCannedInShop.Name = "buttonAddCannedInShop";
-			this.buttonAddCannedInShop.Size = new System.Drawing.Size(170, 58);
-			this.buttonAddCannedInShop.TabIndex = 13;
-			this.buttonAddCannedInShop.Text = "Добавить консерву в магазин";
-			this.buttonAddCannedInShop.UseVisualStyleBackColor = true;
-			this.buttonAddCannedInShop.Click += new System.EventHandler(this.ButtonAddCannedInShop_Click);
-            //
-			// FormMain
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            // 
+            // FormMain
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(975, 450);
             this.Controls.Add(this.buttonUpdate);
@@ -173,8 +152,7 @@
             this.Controls.Add(this.buttonSetToDone);
             this.Controls.Add(this.buttonSetToWork);
             this.Controls.Add(this.buttonCreateOrder);
-			this.Controls.Add(this.buttonAddCannedInShop);
-			this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.dataGridView);
             this.Controls.Add(this.menuStrip);
             this.MainMenuStrip = this.menuStrip;
             this.Name = "FormMain";
@@ -194,13 +172,11 @@
         private ToolStripMenuItem reference_booksToolStripMenuItem;
         private ToolStripMenuItem ComponentsToolStripMenuItem;
         private ToolStripMenuItem cannedToolStripMenuItem;
-		private ToolStripMenuItem shopsToolStripMenuItem;
-		private Button buttonUpdate;
+        private Button buttonUpdate;
         private Button buttonSetToFinish;
         private Button buttonSetToDone;
         private Button buttonSetToWork;
         private Button buttonCreateOrder;
-		private Button buttonAddCannedInShop;
-		private DataGridView dataGridView;
+        private DataGridView dataGridView;
     }
 }

FishFactory/FishFactoryView/FormMain.cs

@@ -54,23 +54,7 @@ namespace FishFactoryView
             {
                 form.ShowDialog();
             }
-		}
-		private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-			if (service is FormShops form)
-			{
-				form.ShowDialog();
-			}
-		}
-		private void ButtonAddCannedInShop_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormShopCanned));
-			if (service is FormShopCanned form)
-			{
-				form.ShowDialog();
-			}
-		}
+        }
         private void ButtonCreateOrder_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));

FishFactory/FishFactoryView/FormShop.Designer.cs

@@ -1,190 +0,0 @@
-namespace FishFactoryView
-{
-	partial class FormShop
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.buttonSave = new System.Windows.Forms.Button();
-			this.buttonCancel = new System.Windows.Forms.Button();
-			this.textBoxAddress = new System.Windows.Forms.TextBox();
-			this.labelTime = new System.Windows.Forms.Label();
-			this.labelAddress = new System.Windows.Forms.Label();
-			this.dataGridView = new System.Windows.Forms.DataGridView();
-			this.labelShop = new System.Windows.Forms.Label();
-			this.textBoxShop = new System.Windows.Forms.TextBox();
-			this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
-			this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ColumnCannedName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// buttonSave
-			// 
-			this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.buttonSave.Location = new System.Drawing.Point(364, 303);
-			this.buttonSave.Name = "buttonSave";
-			this.buttonSave.Size = new System.Drawing.Size(120, 22);
-			this.buttonSave.TabIndex = 17;
-			this.buttonSave.Text = "Сохранить";
-			this.buttonSave.UseVisualStyleBackColor = true;
-			this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-			// 
-			// buttonCancel
-			// 
-			this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.buttonCancel.Location = new System.Drawing.Point(490, 302);
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.Size = new System.Drawing.Size(103, 23);
-			this.buttonCancel.TabIndex = 16;
-			this.buttonCancel.Text = "Отмена";
-			this.buttonCancel.UseVisualStyleBackColor = true;
-			this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-			// 
-			// textBoxAddress
-			// 
-			this.textBoxAddress.Location = new System.Drawing.Point(159, 27);
-			this.textBoxAddress.Name = "textBoxAddress";
-			this.textBoxAddress.Size = new System.Drawing.Size(221, 23);
-			this.textBoxAddress.TabIndex = 14;
-			// 
-			// labelTime
-			// 
-			this.labelTime.AutoSize = true;
-			this.labelTime.Location = new System.Drawing.Point(386, 9);
-			this.labelTime.Name = "labelTime";
-			this.labelTime.Size = new System.Drawing.Size(87, 15);
-			this.labelTime.TabIndex = 13;
-			this.labelTime.Text = "Дата открытия";
-			// 
-			// labelAddress
-			// 
-			this.labelAddress.AutoSize = true;
-			this.labelAddress.Location = new System.Drawing.Point(159, 9);
-			this.labelAddress.Name = "labelAddress";
-			this.labelAddress.Size = new System.Drawing.Size(40, 15);
-			this.labelAddress.TabIndex = 12;
-			this.labelAddress.Text = "Адрес";
-			// 
-			// dataGridView
-			// 
-			this.dataGridView.AllowUserToAddRows = false;
-			this.dataGridView.AllowUserToDeleteRows = false;
-			this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-			| System.Windows.Forms.AnchorStyles.Left)
-			| System.Windows.Forms.AnchorStyles.Right)));
-			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-			this.ColumnID,
-			this.ColumnCannedName,
-			this.ColumnCount});
-			this.dataGridView.Location = new System.Drawing.Point(12, 56);
-			this.dataGridView.Name = "dataGridView";
-			this.dataGridView.RowTemplate.Height = 25;
-			this.dataGridView.Size = new System.Drawing.Size(581, 240);
-			this.dataGridView.TabIndex = 11;
-			// 
-			// labelShop
-			// 
-			this.labelShop.AutoSize = true;
-			this.labelShop.Location = new System.Drawing.Point(12, 9);
-			this.labelShop.Name = "labelShop";
-			this.labelShop.Size = new System.Drawing.Size(54, 15);
-			this.labelShop.TabIndex = 9;
-			this.labelShop.Text = "Магазин";
-			// 
-			// textBoxShop
-			// 
-			this.textBoxShop.Location = new System.Drawing.Point(12, 27);
-			this.textBoxShop.Name = "textBoxShop";
-			this.textBoxShop.Size = new System.Drawing.Size(141, 23);
-			this.textBoxShop.TabIndex = 18;
-			// 
-			// dateTimePicker
-			// 
-			this.dateTimePicker.Location = new System.Drawing.Point(386, 27);
-			this.dateTimePicker.Name = "dateTimePicker";
-			this.dateTimePicker.Size = new System.Drawing.Size(207, 23);
-			this.dateTimePicker.TabIndex = 19;
-			// 
-			// ColumnID
-			// 
-			this.ColumnID.HeaderText = "ID";
-			this.ColumnID.Name = "ColumnID";
-			this.ColumnID.Visible = false;
-			// 
-			// ColumnCannedName
-			// 
-			this.ColumnCannedName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-			this.ColumnCannedName.HeaderText = "Консерва";
-			this.ColumnCannedName.Name = "ColumnCannedName";
-			// 
-			// ColumnCount
-			// 
-			this.ColumnCount.HeaderText = "Количество";
-			this.ColumnCount.Name = "ColumnCount";
-			// 
-			// FormShop
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(605, 337);
-			this.Controls.Add(this.dateTimePicker);
-			this.Controls.Add(this.textBoxShop);
-			this.Controls.Add(this.buttonSave);
-			this.Controls.Add(this.buttonCancel);
-			this.Controls.Add(this.textBoxAddress);
-			this.Controls.Add(this.labelTime);
-			this.Controls.Add(this.labelAddress);
-			this.Controls.Add(this.dataGridView);
-			this.Controls.Add(this.labelShop);
-			this.Name = "FormShop";
-			this.Text = "Магазин";
-			this.Load += new System.EventHandler(this.FormShop_Load);
-			this.Click += new System.EventHandler(this.FormShop_Load);
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private Button buttonSave;
-		private Button buttonCancel;
-		private TextBox textBoxAddress;
-		private Label labelTime;
-		private Label labelAddress;
-		private DataGridView dataGridView;
-		private Label labelShop;
-		private TextBox textBoxShop;
-		private DateTimePicker dateTimePicker;
-		private DataGridViewTextBoxColumn ColumnID;
-		private DataGridViewTextBoxColumn ColumnCannedName;
-		private DataGridViewTextBoxColumn ColumnCount;
-	}
-}

FishFactory/FishFactoryView/FormShop.cs

@@ -1,121 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryDataModels.Models;
-
-namespace FishFactoryView
-{
-	public partial class FormShop : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IShopLogic _logic;
-		private int? _id;
-		private Dictionary<int, (ICannedModel, int)> _shopListCanned;
-		public int Id { set { _id = value; } }
-
-		public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-			_shopListCanned = new();
-		}
-
-		private void FormShop_Load(object sender, EventArgs e)
-		{
-
-			if (_id.HasValue)
-			{
-				_logger.LogInformation("Загрузка магазина");
-				try
-				{
-					var view = _logic.ReadElement(new ShopSearchModel
-					{
-						Id = _id.Value
-					});
-					if (view != null)
-					{
-						textBoxShop.Text = view.ShopName;
-						textBoxAddress.Text = view.Address;
-						dateTimePicker.Text = view.DateOpening.ToString();
-						_shopListCanned = view.ListCanned ?? new Dictionary<int, (ICannedModel, int)>();
-						LoadData();
-					}
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Ошибка загрузки магазина");
-					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-						MessageBoxIcon.Error);
-				}
-			}
-		}
-
-		private void LoadData()
-		{
-			_logger.LogInformation("Загрузка консервы магазина");
-			try
-			{
-				if (_shopListCanned != null)
-				{
-					dataGridView.Rows.Clear();
-					foreach (var elem in _shopListCanned)
-					{
-						dataGridView.Rows.Add(new object[] { elem.Key, elem.Value.Item1.CannedName, elem.Value.Item2 });
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки консерв магазина");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void ButtonSave_Click(object sender, EventArgs e)
-		{
-			if (string.IsNullOrEmpty(textBoxShop.Text))
-			{
-				MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			if (string.IsNullOrEmpty(textBoxAddress.Text))
-			{
-				MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			_logger.LogInformation("Сохранение магазина");
-			try
-			{
-				var model = new ShopBindingModel
-				{
-					Id = _id ?? 0,
-					ShopName = textBoxShop.Text,
-					Address = textBoxAddress.Text,
-					DateOpening = dateTimePicker.Value.Date,
-					ListCanned = _shopListCanned
-				};
-				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/FormShop.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

FishFactory/FishFactoryView/FormShopCanned.Designer.cs

@@ -1,151 +0,0 @@
-namespace FishFactoryView
-{
-	partial class FormShopCanned
-	{
-		/// <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.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
-			this.comboBoxCanned = new System.Windows.Forms.ComboBox();
-			this.labelCount = new System.Windows.Forms.Label();
-			this.labelCanned = new System.Windows.Forms.Label();
-			this.comboBoxShop = new System.Windows.Forms.ComboBox();
-			this.labelShop = new System.Windows.Forms.Label();
-			this.buttonCancel = new System.Windows.Forms.Button();
-			this.buttonSave = new System.Windows.Forms.Button();
-			((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// numericUpDownCount
-			// 
-			this.numericUpDownCount.Location = new System.Drawing.Point(87, 62);
-			this.numericUpDownCount.Maximum = new decimal(new int[] {
-			1410065408,
-			2,
-			0,
-			0});
-			this.numericUpDownCount.Name = "numericUpDownCount";
-			this.numericUpDownCount.Size = new System.Drawing.Size(344, 23);
-			this.numericUpDownCount.TabIndex = 13;
-			// 
-			// comboBoxCanned
-			// 
-			this.comboBoxCanned.FormattingEnabled = true;
-			this.comboBoxCanned.Location = new System.Drawing.Point(86, 35);
-			this.comboBoxCanned.Name = "comboBoxCanned";
-			this.comboBoxCanned.Size = new System.Drawing.Size(345, 23);
-			this.comboBoxCanned.TabIndex = 12;
-			// 
-			// labelCount
-			// 
-			this.labelCount.AutoSize = true;
-			this.labelCount.Location = new System.Drawing.Point(9, 64);
-			this.labelCount.Name = "labelCount";
-			this.labelCount.Size = new System.Drawing.Size(72, 15);
-			this.labelCount.TabIndex = 11;
-			this.labelCount.Text = "Количество";
-			// 
-			// labelCanned
-			// 
-			this.labelCanned.AutoSize = true;
-			this.labelCanned.Location = new System.Drawing.Point(21, 38);
-			this.labelCanned.Name = "labelCanned";
-			this.labelCanned.Size = new System.Drawing.Size(59, 15);
-			this.labelCanned.TabIndex = 10;
-			this.labelCanned.Text = "Консерва";
-			// 
-			// comboBoxShop
-			// 
-			this.comboBoxShop.FormattingEnabled = true;
-			this.comboBoxShop.Location = new System.Drawing.Point(86, 8);
-			this.comboBoxShop.Name = "comboBoxShop";
-			this.comboBoxShop.Size = new System.Drawing.Size(345, 23);
-			this.comboBoxShop.TabIndex = 9;
-			// 
-			// labelShop
-			// 
-			this.labelShop.AutoSize = true;
-			this.labelShop.Location = new System.Drawing.Point(26, 11);
-			this.labelShop.Name = "labelShop";
-			this.labelShop.Size = new System.Drawing.Size(54, 15);
-			this.labelShop.TabIndex = 8;
-			this.labelShop.Text = "Магазин";
-			// 
-			// buttonCancel
-			// 
-			this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.buttonCancel.Location = new System.Drawing.Point(356, 94);
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.Size = new System.Drawing.Size(75, 23);
-			this.buttonCancel.TabIndex = 15;
-			this.buttonCancel.Text = "Отмена";
-			this.buttonCancel.UseVisualStyleBackColor = true;
-			this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-			// 
-			// buttonSave
-			// 
-			this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.buttonSave.Location = new System.Drawing.Point(275, 94);
-			this.buttonSave.Name = "buttonSave";
-			this.buttonSave.Size = new System.Drawing.Size(75, 23);
-			this.buttonSave.TabIndex = 14;
-			this.buttonSave.Text = "Сохранить";
-			this.buttonSave.UseVisualStyleBackColor = true;
-			this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-			// 
-			// FormShopCanned
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(443, 129);
-			this.Controls.Add(this.buttonCancel);
-			this.Controls.Add(this.buttonSave);
-			this.Controls.Add(this.numericUpDownCount);
-			this.Controls.Add(this.comboBoxCanned);
-			this.Controls.Add(this.labelCount);
-			this.Controls.Add(this.labelCanned);
-			this.Controls.Add(this.comboBoxShop);
-			this.Controls.Add(this.labelShop);
-			this.Name = "FormShopCanned";
-			this.Text = "Поступление консервы в рыбный завод";
-			((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private NumericUpDown numericUpDownCount;
-		private ComboBox comboBoxCanned;
-		private Label labelCount;
-		private Label labelCanned;
-		private ComboBox comboBoxShop;
-		private Label labelShop;
-		private Button buttonCancel;
-		private Button buttonSave;
-	}
-}

FishFactory/FishFactoryView/FormShopCanned.cs

@@ -1,90 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryView
-{
-	public partial class FormShopCanned : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IShopLogic _shopLogic;
-		private readonly ICannedLogic _CannedLogic;
-		private readonly List<ShopViewModel>? _listShops;
-		private readonly List<CannedViewModel>? _listCanned;
-
-		public FormShopCanned(ILogger<FormShopCanned> logger, IShopLogic shopLogic, ICannedLogic CannedLogic)
-		{
-			InitializeComponent();
-			_shopLogic = shopLogic;
-			_CannedLogic = CannedLogic;
-			_logger = logger;
-			_listShops = shopLogic.ReadList(null);
-			if (_listShops != null)
-			{
-				comboBoxShop.DisplayMember = "ShopName";
-				comboBoxShop.ValueMember = "Id";
-				comboBoxShop.DataSource = _listShops;
-				comboBoxShop.SelectedItem = null;
-			}
-
-			_listCanned = CannedLogic.ReadList(null);
-			if (_listCanned != null)
-			{
-				comboBoxCanned.DisplayMember = "CannedName";
-				comboBoxCanned.ValueMember = "Id";
-				comboBoxCanned.DataSource = _listCanned;
-				comboBoxCanned.SelectedItem = null;
-			}
-		}
-
-		private void ButtonSave_Click(object sender, EventArgs e)
-		{
-			if (comboBoxShop.SelectedValue == null)
-			{
-				MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			if (comboBoxCanned.SelectedValue == null)
-			{
-				MessageBox.Show("Выберите консерву", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			_logger.LogInformation("Добавление консервы в магазин");
-			try
-			{
-				var сanned = _CannedLogic.ReadElement(new()
-				{
-					Id = (int)comboBoxCanned.SelectedValue
-				});
-				if (сanned == null)
-				{
-					throw new Exception("Не найдено консерва. Дополнительная информация в логах.");
-				}
-				var resultOperation = _shopLogic.AddCannedInShop(
-					 model: new() { Id = (int)comboBoxShop.SelectedValue },
-					 canned: сanned,
-					 count: (int)numericUpDownCount.Value
-				);
-				if (!resultOperation)
-				{
-					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/FormShopCanned.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

FishFactory/FishFactoryView/FormShops.Designer.cs

@@ -1,122 +0,0 @@
-namespace FishFactoryView
-{
-	partial class FormShops
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.dataGridView = new System.Windows.Forms.DataGridView();
-			this.buttonUpdate = new System.Windows.Forms.Button();
-			this.buttonDelete = new System.Windows.Forms.Button();
-			this.buttonEdit = new System.Windows.Forms.Button();
-			this.buttonAdd = new System.Windows.Forms.Button();
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// dataGridView
-			// 
-			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left;
-			this.dataGridView.GridColor = System.Drawing.Color.White;
-			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.RowHeadersWidth = 51;
-			this.dataGridView.RowTemplate.Height = 29;
-			this.dataGridView.Size = new System.Drawing.Size(426, 333);
-			this.dataGridView.TabIndex = 10;
-			// 
-			// buttonUpdate
-			// 
-			this.buttonUpdate.Location = new System.Drawing.Point(432, 175);
-			this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-			this.buttonUpdate.Name = "buttonUpdate";
-			this.buttonUpdate.Size = new System.Drawing.Size(130, 22);
-			this.buttonUpdate.TabIndex = 14;
-			this.buttonUpdate.Text = "Обновить";
-			this.buttonUpdate.UseVisualStyleBackColor = true;
-			this.buttonUpdate.Click += new System.EventHandler(this.ButtonRef_Click);
-			// 
-			// buttonDelete
-			// 
-			this.buttonDelete.Location = new System.Drawing.Point(432, 149);
-			this.buttonDelete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-			this.buttonDelete.Name = "buttonDelete";
-			this.buttonDelete.Size = new System.Drawing.Size(130, 22);
-			this.buttonDelete.TabIndex = 13;
-			this.buttonDelete.Text = "Удалить";
-			this.buttonDelete.UseVisualStyleBackColor = true;
-			this.buttonDelete.Click += new System.EventHandler(this.ButtonDel_Click);
-			// 
-			// buttonEdit
-			// 
-			this.buttonEdit.Location = new System.Drawing.Point(432, 123);
-			this.buttonEdit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-			this.buttonEdit.Name = "buttonEdit";
-			this.buttonEdit.Size = new System.Drawing.Size(130, 22);
-			this.buttonEdit.TabIndex = 12;
-			this.buttonEdit.Text = "Изменить";
-			this.buttonEdit.UseVisualStyleBackColor = true;
-			this.buttonEdit.Click += new System.EventHandler(this.ButtonUpd_Click);
-			// 
-			// buttonAdd
-			// 
-			this.buttonAdd.Location = new System.Drawing.Point(432, 97);
-			this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-			this.buttonAdd.Name = "buttonAdd";
-			this.buttonAdd.Size = new System.Drawing.Size(130, 22);
-			this.buttonAdd.TabIndex = 11;
-			this.buttonAdd.Text = "Добавить";
-			this.buttonAdd.UseVisualStyleBackColor = true;
-			this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-			// 
-			// FormShops
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(566, 333);
-			this.Controls.Add(this.dataGridView);
-			this.Controls.Add(this.buttonUpdate);
-			this.Controls.Add(this.buttonDelete);
-			this.Controls.Add(this.buttonEdit);
-			this.Controls.Add(this.buttonAdd);
-			this.Name = "FormShops";
-			this.Text = "Магазины";
-			this.Load += new System.EventHandler(this.FormShops_Load);
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private DataGridView dataGridView;
-		private Button buttonUpdate;
-		private Button buttonDelete;
-		private Button buttonEdit;
-		private Button buttonAdd;
-	}
-}

FishFactory/FishFactoryView/FormShops.cs

@@ -1,102 +0,0 @@
-using Microsoft.Extensions.Logging;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-
-namespace FishFactoryView
-{
-	public partial class FormShops : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IShopLogic _logic;
-		public FormShops(ILogger<FormShops> logger, IShopLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-		}
-		private void FormShops_Load(object sender, EventArgs e)
-		{
-			LoadData();
-		}
-		private void LoadData()
-		{
-			try
-			{
-				var list = _logic.ReadList(null);
-				if (list != null)
-				{
-					dataGridView.DataSource = list;
-					dataGridView.Columns["Id"].Visible = false;
-					dataGridView.Columns["ListCanned"].Visible = false;
-					dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-				}
-				_logger.LogInformation("Загрузка магазинов");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки магазинов");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-					MessageBoxIcon.Error);
-			}
-		}
-		private void ButtonAdd_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-			if (service is FormShop form)
-			{
-				if (form.ShowDialog() == DialogResult.OK)
-				{
-					LoadData();
-				}
-			}
-		}
-		private void ButtonUpd_Click(object sender, EventArgs e)
-		{
-			if (dataGridView.SelectedRows.Count == 1)
-			{
-				var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-				if (service is FormShop form)
-				{
-					form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-					if (form.ShowDialog() == DialogResult.OK)
-					{
-						LoadData();
-					}
-				}
-			}
-		}
-		private void ButtonDel_Click(object sender, EventArgs e)
-		{
-			if (dataGridView.SelectedRows.Count == 1)
-			{
-				if (MessageBox.Show("Удалить запись?", "Вопрос",
-				MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-				{
-					int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-					_logger.LogInformation("Удаление магазина");
-					try
-					{
-						if (!_logic.Delete(new ShopBindingModel
-						{
-							Id = id
-						}))
-						{
-							throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-						}
-						LoadData();
-					}
-					catch (Exception ex)
-					{
-						_logger.LogError(ex, "Ошибка удаления магазина");
-						MessageBox.Show(ex.Message, "Ошибка",
-							MessageBoxButtons.OK, MessageBoxIcon.Error);
-					}
-				}
-			}
-		}
-		private void ButtonRef_Click(object sender, EventArgs e)
-		{
-			LoadData();
-		}
-	}
-}

FishFactory/FishFactoryView/FormShops.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

FishFactory/FishFactoryView/Program.cs

@@ -4,9 +4,8 @@ using NLog.Extensions.Logging;
 using FishFactoryBusinessLogic.BusinessLogics;
 using FishFactoryContracts.BusinessLogicsContracts;
 using FishFactoryContracts.StoragesContracts;
-using FishFactoryListImplement.Implements;
+using FishFactoryDatabaseImplement.Implements;
 using FishFactoryView;
-using CannedBusinessLogic;
 
 namespace FishFactoryView
 {
@@ -41,21 +40,16 @@ namespace FishFactoryView
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ICannedStorage, CannedStorage>();
-			services.AddTransient<IShopStorage, ShopStorage>();
-			services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ICannedLogic, CannedLogic>();
-			services.AddTransient<IShopLogic, ShopLogic>();
-			services.AddTransient<FormMain>();
+            services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
             services.AddTransient<FormCreateOrder>();
             services.AddTransient<FormCanned>();
             services.AddTransient<FormCannedComponent>();
             services.AddTransient<FormListCanned>();
-			services.AddTransient<FormShopCanned>();
-			services.AddTransient<FormShops>();
-			services.AddTransient<FormShop>();
-		}
+        }
     }
 }