эх, если бы я не забыл написать тест...

Confectionery/Confectionery.sln

@@ -3,21 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryView", "ConfectioneryView\ConfectioneryView.csproj", "{5718C6C6-F67E-42AF-AD02-717591A7EF0D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryView", "ConfectioneryView\ConfectioneryView.csproj", "{5718C6C6-F67E-42AF-AD02-717591A7EF0D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryDataModels", "ConfectioneryDataModels\ConfectioneryDataModels.csproj", "{59A6CF78-3961-4DF4-890A-EF12B7EBEFBA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryDataModels", "ConfectioneryDataModels\ConfectioneryDataModels.csproj", "{59A6CF78-3961-4DF4-890A-EF12B7EBEFBA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryContracts", "ConfectioneryContracts\ConfectioneryContracts.csproj", "{0536044E-1122-41F6-89D4-318A58C14BD3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryContracts", "ConfectioneryContracts\ConfectioneryContracts.csproj", "{0536044E-1122-41F6-89D4-318A58C14BD3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryBusinessLogic", "ConfectioneryBusinessLogic\ConfectioneryBusinessLogic.csproj", "{FCB236F4-6F77-4609-BF82-2FA8045B6DF3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryBusinessLogic", "ConfectioneryBusinessLogic\ConfectioneryBusinessLogic.csproj", "{FCB236F4-6F77-4609-BF82-2FA8045B6DF3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryListImplement", "ConfectioneryListImplement\ConfectioneryListImplement.csproj", "{3EEB069F-7EF2-4596-9748-46FB54F1910D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryListImplement", "ConfectioneryListImplement\ConfectioneryListImplement.csproj", "{3EEB069F-7EF2-4596-9748-46FB54F1910D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryFileImplement", "ConfectioneryFileImplement\ConfectioneryFileImplement.csproj", "{35298639-B7D6-41CF-B8BE-4A2B024CB9E4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0536044E-1122-41F6-89D4-318A58C14BD3} = {0536044E-1122-41F6-89D4-318A58C14BD3}
-		{59A6CF78-3961-4DF4-890A-EF12B7EBEFBA} = {59A6CF78-3961-4DF4-890A-EF12B7EBEFBA}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,10 +39,6 @@ Global
 		{3EEB069F-7EF2-4596-9748-46FB54F1910D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3EEB069F-7EF2-4596-9748-46FB54F1910D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3EEB069F-7EF2-4596-9748-46FB54F1910D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35298639-B7D6-41CF-B8BE-4A2B024CB9E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35298639-B7D6-41CF-B8BE-4A2B024CB9E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35298639-B7D6-41CF-B8BE-4A2B024CB9E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35298639-B7D6-41CF-B8BE-4A2B024CB9E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Confectionery/ConfectioneryBusinessLogic/ShopLogic.cs

@@ -0,0 +1,171 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BussinessLogicsContracts;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryBusinessLogic
+{
+    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;
+        }
+
+        public bool Supply(ShopSearchModel shopModel, IPastryModel Pastry, int count)
+        {
+            if (shopModel == null)
+            {
+                throw new ArgumentNullException(nameof(shopModel));
+            }
+            if (Pastry == null)
+            {
+                throw new ArgumentNullException(nameof(Pastry));
+            }
+            if (count <= 0)
+            {
+                throw new ArgumentException("Количество товаров(выпечки) в магазине должно быть больше нуля", nameof(count));
+            }
+            _logger.LogInformation("Supply(GetElement). ShopName: {ShopName}. Id: {Id}", shopModel.ShopName, shopModel.Id);
+            var shop = _shopStorage.GetElement(shopModel);
+            if (shop == null)
+            {
+                _logger.LogWarning("Supply(GetElement). Element not found");
+                return false;
+            }
+            if (shop.ShopPastries.ContainsKey(Pastry.Id))
+            {
+                var shopP = shop.ShopPastries[Pastry.Id];
+                shopP.Item2 += count;
+                shop.ShopPastries[Pastry.Id] = shopP;
+                _logger.LogInformation("Supply. Added {count} '{Pastry}' to '{ShopName}' shop", count, Pastry.PastryName,
+                    shop.ShopName);
+            }
+            else
+            {
+                shop.ShopPastries.Add(Pastry.Id, (Pastry, count));
+                _logger.LogInformation("Supply. Added {count} new '{Pastry}' to '{ShopName}' shop", count, Pastry.PastryName,
+                    shop.ShopName);
+            }
+            if (_shopStorage.Update(new ShopBindingModel()
+            {
+                Id = shop.Id,
+                ShopName = shop.ShopName,
+                Address = shop.Address,
+                DateOpening = shop.DateOpening,
+                ShopPastries = shop.ShopPastries,
+            }) == null)
+            {
+                _logger.LogWarning("Supply. Update operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        private void CheckModel(ShopBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName));
+            }
+            if (string.IsNullOrEmpty(model.Address))
+            {
+                throw new ArgumentNullException("Нет адреса магазина", nameof(model.Address));
+            }
+            _logger.LogInformation("Shop. ShopName: {ShopName}. Address: {Address}. Id: {Id}", model.ShopName, model.Address, model.Id);
+            var element = _shopStorage.GetElement(new ShopSearchModel
+            {
+                ShopName = model.ShopName
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Магазин с таким названием уже есть");
+            }
+        }
+    }
+}

Confectionery/ConfectioneryContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,27 @@
+using ConfectioneryDataModels;
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryContracts.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, (IPastryModel, int)> ShopPastries
+        {
+            get;
+            set;
+        } = new();
+    }
+}

Confectionery/ConfectioneryContracts/BussinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,27 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryContracts.BussinessLogicsContracts
+{
+    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 Supply(ShopSearchModel shopModel, IPastryModel pastry, int count);
+    }
+}

Confectionery/ConfectioneryContracts/SearchModels/ShopSearchModel.cs

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

Confectionery/ConfectioneryContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,26 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryContracts.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);
+    }
+}

Confectionery/ConfectioneryContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,31 @@
+using ConfectioneryDataModels;
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryContracts.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, (IPastryModel, int)> ShopPastries
+        {
+            get;
+            set;
+        } = new();
+    }
+}

Confectionery/ConfectioneryDataModels/IShopModel.cs

@@ -0,0 +1,20 @@
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryDataModels
+{
+    public interface IShopModel : IId
+    {
+        string ShopName { get; }
+
+        string Address { get; }
+
+        DateTime DateOpening { get; }
+
+        Dictionary<int, (IPastryModel, int)> ShopPastries { get; }
+    }
+}

Confectionery/ConfectioneryFileImplement/Class1.cs

@@ -1,7 +0,0 @@
-namespace ConfectioneryFileImplement
-{
-    public class Class1
-    {
-
-    }
-}

Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj

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

Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using ConfectioneryFileImplement.Models;
-
-namespace ConfectioneryFileImplement
-{
-    internal class DataFileSingleton
-    {
-        private static DataFileSingleton? instance;
-
-        private readonly string ComponentFileName = "Component.xml";
-
-        private readonly string OrderFileName = "Order.xml";
-
-        private readonly string PastryFileName = "Pastry.xml";
-
-        public List<Component> Components { get; private set; }
-
-        public List<Order> Orders { get; private set; }
-
-        public List<Pastry> Pastries { 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 SavePastries() => SaveData(Pastries, PastryFileName, "Pastries", x => x.GetXElement);
-
-        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-
-        private DataFileSingleton()
-        {
-            Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
-            Pastries = LoadData(PastryFileName, "Pastry", x => Pastry.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);
-            }
-        }
-    }
-}

Confectionery/ConfectioneryFileImplement/Implements/ComponentStorage.cs

@@ -1,91 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryFileImplement.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;
-        }
-    }
-}

Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs

@@ -1,83 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryFileImplement.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 == model.Id).Select(x => GetViewModel(x)).ToList();
-        }
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            return GetViewModel(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id));
-        }
-        public OrderViewModel? Update(OrderBindingModel model)
-        {
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            order.Update(model);
-            source.SaveOrders();
-            return GetViewModel(order);
-        }
-        public OrderViewModel? Insert(OrderBindingModel model)
-        {
-            model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
-            var newOrder = Order.Create(model);
-            if (newOrder == null)
-            {
-                return null;
-            }
-            source.Orders.Add(newOrder);
-            source.SaveOrders();
-            return GetViewModel(newOrder);
-        }
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            source.Orders.Remove(order);
-            source.SaveOrders();
-            return GetViewModel(order);
-        }
-        private OrderViewModel GetViewModel(Order order)
-        {
-            var viewModel = order.GetViewModel;
-            var pastry = source.Pastries.FirstOrDefault(x => x.Id == order.PastryId);
-            viewModel.PastryName = pastry?.PastryName;
-            return viewModel;
-        }
-    }
-}

Confectionery/ConfectioneryFileImplement/Implements/PastryStorage.cs

@@ -1,91 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryFileImplement.Implements
-{
-    public class PastryStorage : IPastryStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public PastryStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<PastryViewModel> GetFullList()
-        {
-            return source.Pastries
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
-
-        public List<PastryViewModel> GetFilteredList(PastrySearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.PastryName))
-            {
-                return new();
-            }
-            return source.Pastries
-                    .Where(x => x.PastryName.Contains(model.PastryName))
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
-
-        public PastryViewModel? GetElement(PastrySearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.PastryName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Pastries
-                    .FirstOrDefault(x => (!string.IsNullOrEmpty(model.PastryName) && x.PastryName == model.PastryName) ||
-                                        (model.Id.HasValue && x.Id == model.Id))
-                    ?.GetViewModel;
-        }
-
-        public PastryViewModel? Insert(PastryBindingModel model)
-        {
-            model.Id = source.Pastries.Count > 0 ? source.Pastries.Max(x => x.Id) + 1 : 1;
-            var newIceCream = Pastry.Create(model);
-            if (newIceCream == null)
-            {
-                return null;
-            }
-            source.Pastries.Add(newIceCream);
-            source.SavePastries();
-            return newIceCream.GetViewModel;
-        }
-
-        public PastryViewModel? Update(PastryBindingModel model)
-        {
-            var iceCream = source.Pastries.FirstOrDefault(x => x.Id == model.Id);
-            if (iceCream == null)
-            {
-                return null;
-            }
-            iceCream.Update(model);
-            source.SavePastries();
-            return iceCream.GetViewModel;
-        }
-
-        public PastryViewModel? Delete(PastryBindingModel model)
-        {
-            var element = source.Pastries.FirstOrDefault(x => x.Id == model.Id);
-            if (element != null)
-            {
-                source.Pastries.Remove(element);
-                source.SavePastries();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

Confectionery/ConfectioneryFileImplement/Models/Component.cs

@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Models;
-using System.Xml.Linq;
-
-
-namespace ConfectioneryFileImplement.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()));
-    }
-}

Confectionery/ConfectioneryFileImplement/Models/Order.cs

@@ -1,97 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Enums;
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace ConfectioneryFileImplement.Models
-{
-    public class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-
-        public int PastryId { get; private set; }
-
-        public int Count { get; private set; }
-
-        public double Sum { get; private set; }
-
-        public OrderStatus Status { get; private set; }
-
-        public DateTime DateCreate { get; private set; }
-
-        public DateTime? DateImplement { get; private set; }
-
-        public static Order? Create(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Order()
-            {
-                Id = model.Id,
-                PastryId = model.PastryId,
-                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),
-                PastryId = Convert.ToInt32(element.Element("PastryId")!.Value),
-                Count = Convert.ToInt32(element.Element("Count")!.Value),
-                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
-                Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
-                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
-                DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null
-                                : Convert.ToDateTime(element.Element("DateImplement")!.Value)
-            };
-        }
-
-        public void Update(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Status = model.Status;
-            DateImplement = model.DateImplement;
-        }
-
-        public OrderViewModel GetViewModel => new()
-        {
-            Id = Id,
-            PastryId = PastryId,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement
-        };
-
-        public XElement GetXElement => new("Order",
-                        new XAttribute("Id", Id),
-                        new XElement("PastryId", PastryId),
-                        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()));
-    }
-}

Confectionery/ConfectioneryFileImplement/Models/Pastry.cs

@@ -1,99 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace ConfectioneryFileImplement.Models
-{
-    public class Pastry : IPastryModel
-    {
-        public int Id { get; private set; }
-
-        public string PastryName { 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)>? _pastryComponents = null;
-
-        public Dictionary<int, (IComponentModel, int)> PastryComponents
-        {
-            get
-            {
-                if (_pastryComponents == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _pastryComponents = Components.ToDictionary(x => x.Key,
-                        y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
-                }
-                return _pastryComponents;
-            }
-        }
-
-        public static Pastry? Create(PastryBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Pastry()
-            {
-                Id = model.Id,
-                PastryName = model.PastryName,
-                Price = model.Price,
-                Components = model.PastryComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
-            };
-        }
-
-        public static Pastry? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Pastry()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                PastryName = element.Element("PastryName")!.Value,
-                Price = Convert.ToDouble(element.Element("Price")!.Value),
-                Components = element.Element("PastryComponents")!.Elements("PastryComponent")
-                                .ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
-            };
-        }
-
-        public void Update(PastryBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            PastryName = model.PastryName;
-            Price = model.Price;
-            Components = model.PastryComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _pastryComponents = null;
-        }
-
-        public PastryViewModel GetViewModel => new()
-        {
-            Id = Id,
-            PastryName = PastryName,
-            Price = Price,
-            PastryComponents = PastryComponents
-        };
-
-        public XElement GetXElement => new("Pastry",
-                        new XAttribute("Id", Id),
-                        new XElement("PastryName", PastryName),
-                        new XElement("Price", Price.ToString()),
-                        new XElement("PastryComponents",
-                            Components.Select(x => new XElement("PastryComponent",
-                                                                new XElement("Key", x.Key),
-                                                                new XElement("Value", x.Value))).ToArray()));
-    }
-}

Confectionery/ConfectioneryListImplement/DataListSingleton.cs

@@ -13,12 +13,14 @@ namespace ConfectioneryListImplement
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Pastry> Pastries { get; set; }
+        public List<Shop> Shops { get; set; }
 
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Pastries = new List<Pastry>();
+            Shops = new List<Shop>();
         }
 
         public static DataListSingleton GetInstance()

Confectionery/ConfectioneryListImplement/Implements/ShopStorage .cs

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

Confectionery/ConfectioneryListImplement/Models/Shop.cs

@@ -0,0 +1,66 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using ConfectioneryDataModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryListImplement.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, (IPastryModel, int)> ShopPastries
+        {
+            get;
+            private set;
+        } = new Dictionary<int, (IPastryModel, int)>();
+
+        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,
+                ShopPastries = model.ShopPastries
+            };
+        }
+
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ShopName = model.ShopName;
+            Address = model.Address;
+            DateOpening = model.DateOpening;
+            ShopPastries = model.ShopPastries;
+        }
+
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            DateOpening = DateOpening,
+            ShopPastries = ShopPastries
+        };
+    }
+}

Confectionery/ConfectioneryView/ConfectioneryView.csproj

@@ -9,13 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\ConfectioneryBusinessLogic\ConfectioneryBusinessLogic.csproj" />
-    <ProjectReference Include="..\ConfectioneryFileImplement\ConfectioneryFileImplement.csproj" />
+    <ProjectReference Include="..\ConfectioneryContracts\ConfectioneryContracts.csproj" />
     <ProjectReference Include="..\ConfectioneryListImplement\ConfectioneryListImplement.csproj" />
   </ItemGroup>
 

Confectionery/ConfectioneryView/FormComponents.Designer.cs

@@ -97,7 +97,6 @@
             this.Controls.Add(this.dataGridView);
             this.Name = "FormComponents";
             this.Text = "Компоненты";
-            Load += FormComponents_Load;
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
             this.ResumeLayout(false);
 

Confectionery/ConfectioneryView/FormMain.Designer.cs

@@ -28,136 +28,157 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.menuStrip = new System.Windows.Forms.MenuStrip();
+            menuStrip = new MenuStrip();
-            this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            справочникиToolStripMenuItem = new ToolStripMenuItem();
-            this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            КомпонентыToolStripMenuItem = new ToolStripMenuItem();
-            this.КондитерскиеИзделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            КондитерскиеИзделияToolStripMenuItem = new ToolStripMenuItem();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
+            магазиныToolStripMenuItem = new ToolStripMenuItem();
-            this.buttonCreateOrder = new System.Windows.Forms.Button();
+            пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem();
-            this.buttonTakeOrderInWork = new System.Windows.Forms.Button();
+            dataGridView = new DataGridView();
-            this.buttonOrderReady = new System.Windows.Forms.Button();
+            buttonCreateOrder = new Button();
-            this.buttonIssuedOrder = new System.Windows.Forms.Button();
+            buttonTakeOrderInWork = new Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
+            buttonOrderReady = new Button();
-            this.menuStrip.SuspendLayout();
+            buttonIssuedOrder = new Button();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            buttonUpd = new Button();
-            this.SuspendLayout();
+            menuStrip.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
             // 
             // menuStrip
             // 
-            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            menuStrip.ImageScalingSize = new Size(20, 20);
-            this.справочникиToolStripMenuItem});
+            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem });
-            this.menuStrip.Location = new System.Drawing.Point(0, 0);
+            menuStrip.Location = new Point(0, 0);
-            this.menuStrip.Name = "menuStrip";
+            menuStrip.Name = "menuStrip";
-            this.menuStrip.Size = new System.Drawing.Size(1009, 24);
+            menuStrip.Padding = new Padding(7, 3, 0, 3);
-            this.menuStrip.TabIndex = 0;
+            menuStrip.Size = new Size(1153, 30);
-            this.menuStrip.Text = "menuStrip1";
+            menuStrip.TabIndex = 0;
+            menuStrip.Text = "menuStrip1";
             // 
             // справочникиToolStripMenuItem
             // 
-            this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, КондитерскиеИзделияToolStripMenuItem, магазиныToolStripMenuItem });
-            this.КомпонентыToolStripMenuItem,
+            справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
-            this.КондитерскиеИзделияToolStripMenuItem});
+            справочникиToolStripMenuItem.Size = new Size(117, 24);
-            this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+            справочникиToolStripMenuItem.Text = "Справочники";
-            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
-            this.справочникиToolStripMenuItem.Text = "Справочники";
             // 
             // КомпонентыToolStripMenuItem
             // 
-            this.КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
+            КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
-            this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            КомпонентыToolStripMenuItem.Size = new Size(251, 26);
-            this.КомпонентыToolStripMenuItem.Text = "Компоненты";
+            КомпонентыToolStripMenuItem.Text = "Компоненты";
-            this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click);
+            КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
             // 
             // КондитерскиеИзделияToolStripMenuItem
             // 
-            this.КондитерскиеИзделияToolStripMenuItem.Name = "КондитерскиеИзделияToolStripMenuItem";
+            КондитерскиеИзделияToolStripMenuItem.Name = "КондитерскиеИзделияToolStripMenuItem";
-            this.КондитерскиеИзделияToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            КондитерскиеИзделияToolStripMenuItem.Size = new Size(251, 26);
-            this.КондитерскиеИзделияToolStripMenuItem.Text = "Кондитерские изделия";
+            КондитерскиеИзделияToolStripMenuItem.Text = "Кондитерские изделия";
-            this.КондитерскиеИзделияToolStripMenuItem.Click += new System.EventHandler(this.КондитерскиеИзделияToolStripMenuItem_Click);
+            КондитерскиеИзделияToolStripMenuItem.Click += КондитерскиеИзделияToolStripMenuItem_Click;
+            // 
+            // магазиныToolStripMenuItem
+            // 
+            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            магазиныToolStripMenuItem.Size = new Size(251, 26);
+            магазиныToolStripMenuItem.Text = "Магазины";
+            магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click;
+            // 
+            // пополнениеМагазинаToolStripMenuItem
+            // 
+            пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem";
+            пополнениеМагазинаToolStripMenuItem.Size = new Size(182, 24);
+            пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина";
+            пополнениеМагазинаToolStripMenuItem.Click += ПополнениеМагазинаToolStripMenuItem_Click;
             // 
             // dataGridView
             // 
-            this.dataGridView.AllowUserToAddRows = false;
+            dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
+            dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(0, 27);
+            dataGridView.Location = new Point(0, 36);
-            this.dataGridView.Name = "dataGridView";
+            dataGridView.Margin = new Padding(3, 4, 3, 4);
-            this.dataGridView.RowTemplate.Height = 25;
+            dataGridView.Name = "dataGridView";
-            this.dataGridView.Size = new System.Drawing.Size(757, 306);
+            dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.TabIndex = 1;
+            dataGridView.RowTemplate.Height = 25;
+            dataGridView.Size = new Size(865, 408);
+            dataGridView.TabIndex = 1;
             // 
             // buttonCreateOrder
             // 
-            this.buttonCreateOrder.Location = new System.Drawing.Point(806, 51);
+            buttonCreateOrder.Location = new Point(921, 68);
-            this.buttonCreateOrder.Name = "buttonCreateOrder";
+            buttonCreateOrder.Margin = new Padding(3, 4, 3, 4);
-            this.buttonCreateOrder.Size = new System.Drawing.Size(182, 27);
+            buttonCreateOrder.Name = "buttonCreateOrder";
-            this.buttonCreateOrder.TabIndex = 2;
+            buttonCreateOrder.Size = new Size(208, 36);
-            this.buttonCreateOrder.Text = "Создать заказ";
+            buttonCreateOrder.TabIndex = 2;
-            this.buttonCreateOrder.UseVisualStyleBackColor = true;
+            buttonCreateOrder.Text = "Создать заказ";
-            this.buttonCreateOrder.Click += new System.EventHandler(this.buttonCreateOrder_Click);
+            buttonCreateOrder.UseVisualStyleBackColor = true;
+            buttonCreateOrder.Click += buttonCreateOrder_Click;
             // 
             // buttonTakeOrderInWork
             // 
-            this.buttonTakeOrderInWork.Location = new System.Drawing.Point(806, 112);
+            buttonTakeOrderInWork.Location = new Point(921, 149);
-            this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
+            buttonTakeOrderInWork.Margin = new Padding(3, 4, 3, 4);
-            this.buttonTakeOrderInWork.Size = new System.Drawing.Size(184, 26);
+            buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            this.buttonTakeOrderInWork.TabIndex = 3;
+            buttonTakeOrderInWork.Size = new Size(210, 35);
-            this.buttonTakeOrderInWork.Text = "Отдать на выполнение";
+            buttonTakeOrderInWork.TabIndex = 3;
-            this.buttonTakeOrderInWork.UseVisualStyleBackColor = true;
+            buttonTakeOrderInWork.Text = "Отдать на выполнение";
-            this.buttonTakeOrderInWork.Click += new System.EventHandler(this.buttonTakeOrderInWork_Click);
+            buttonTakeOrderInWork.UseVisualStyleBackColor = true;
+            buttonTakeOrderInWork.Click += buttonTakeOrderInWork_Click;
             // 
             // buttonOrderReady
             // 
-            this.buttonOrderReady.Location = new System.Drawing.Point(806, 169);
+            buttonOrderReady.Location = new Point(921, 225);
-            this.buttonOrderReady.Name = "buttonOrderReady";
+            buttonOrderReady.Margin = new Padding(3, 4, 3, 4);
-            this.buttonOrderReady.Size = new System.Drawing.Size(182, 28);
+            buttonOrderReady.Name = "buttonOrderReady";
-            this.buttonOrderReady.TabIndex = 4;
+            buttonOrderReady.Size = new Size(208, 37);
-            this.buttonOrderReady.Text = "Заказ готов";
+            buttonOrderReady.TabIndex = 4;
-            this.buttonOrderReady.UseVisualStyleBackColor = true;
+            buttonOrderReady.Text = "Заказ готов";
-            this.buttonOrderReady.Click += new System.EventHandler(this.buttonOrderReady_Click);
+            buttonOrderReady.UseVisualStyleBackColor = true;
+            buttonOrderReady.Click += buttonOrderReady_Click;
             // 
             // buttonIssuedOrder
             // 
-            this.buttonIssuedOrder.Location = new System.Drawing.Point(806, 227);
+            buttonIssuedOrder.Location = new Point(921, 303);
-            this.buttonIssuedOrder.Name = "buttonIssuedOrder";
+            buttonIssuedOrder.Margin = new Padding(3, 4, 3, 4);
-            this.buttonIssuedOrder.Size = new System.Drawing.Size(182, 27);
+            buttonIssuedOrder.Name = "buttonIssuedOrder";
-            this.buttonIssuedOrder.TabIndex = 5;
+            buttonIssuedOrder.Size = new Size(208, 36);
-            this.buttonIssuedOrder.Text = "Заказ выдан";
+            buttonIssuedOrder.TabIndex = 5;
-            this.buttonIssuedOrder.UseVisualStyleBackColor = true;
+            buttonIssuedOrder.Text = "Заказ выдан";
-            this.buttonIssuedOrder.Click += new System.EventHandler(this.buttonIssuedOrder_Click);
+            buttonIssuedOrder.UseVisualStyleBackColor = true;
+            buttonIssuedOrder.Click += buttonIssuedOrder_Click;
             // 
             // buttonUpd
             // 
-            this.buttonUpd.Location = new System.Drawing.Point(806, 281);
+            buttonUpd.Location = new Point(921, 375);
-            this.buttonUpd.Name = "buttonUpd";
+            buttonUpd.Margin = new Padding(3, 4, 3, 4);
-            this.buttonUpd.Size = new System.Drawing.Size(182, 29);
+            buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.TabIndex = 6;
+            buttonUpd.Size = new Size(208, 39);
-            this.buttonUpd.Text = "Обновить список";
+            buttonUpd.TabIndex = 6;
-            this.buttonUpd.UseVisualStyleBackColor = true;
+            buttonUpd.Text = "Обновить список";
-            this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click);
+            buttonUpd.UseVisualStyleBackColor = true;
+            buttonUpd.Click += buttonUpd_Click;
             // 
             // FormMain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            AutoScaleMode = AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1009, 332);
+            ClientSize = new Size(1153, 443);
-            this.Controls.Add(this.buttonUpd);
+            Controls.Add(buttonUpd);
-            this.Controls.Add(this.buttonIssuedOrder);
+            Controls.Add(buttonIssuedOrder);
-            this.Controls.Add(this.buttonOrderReady);
+            Controls.Add(buttonOrderReady);
-            this.Controls.Add(this.buttonTakeOrderInWork);
+            Controls.Add(buttonTakeOrderInWork);
-            this.Controls.Add(this.buttonCreateOrder);
+            Controls.Add(buttonCreateOrder);
-            this.Controls.Add(this.dataGridView);
+            Controls.Add(dataGridView);
-            this.Controls.Add(this.menuStrip);
+            Controls.Add(menuStrip);
-            this.MainMenuStrip = this.menuStrip;
+            MainMenuStrip = menuStrip;
-            this.Name = "FormMain";
+            Margin = new Padding(3, 4, 3, 4);
-            this.Text = "Кондитерская";
+            Name = "FormMain";
-            Load += FormMain_Load;
+            Text = "Кондитерская";
-            this.menuStrip.ResumeLayout(false);
+            menuStrip.ResumeLayout(false);
-            this.menuStrip.PerformLayout();
+            menuStrip.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            this.ResumeLayout(false);
+            ResumeLayout(false);
-            this.PerformLayout();
+            PerformLayout();
-
         }
 
         #endregion
@@ -172,5 +193,7 @@
         private Button buttonOrderReady;
         private Button buttonIssuedOrder;
         private Button buttonUpd;
+        private ToolStripMenuItem магазиныToolStripMenuItem;
+        private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem;
     }
 }

Confectionery/ConfectioneryView/FormMain.cs

@@ -150,5 +150,23 @@ namespace ConfectioneryView
         {
             LoadData();
         }
+
+        private void МагазиныToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            if (service is FormShops form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void ПополнениеМагазинаToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormSupply));
+            if (service is FormSupply form)
+            {
+                form.ShowDialog();
+            }
+        }
     }
 }

Confectionery/ConfectioneryView/FormMain.resx

@@ -1,4 +1,64 @@
-<root>
+<?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">

Confectionery/ConfectioneryView/FormPastries.Designer.cs

@@ -97,7 +97,6 @@
             this.Controls.Add(this.dataGridView);
             this.Name = "FormPastries";
             this.Text = "Кондитерские изделия";
-            Load += FormPastries_Load;
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
             this.ResumeLayout(false);
 

Confectionery/ConfectioneryView/FormShop.Designer.cs

@@ -0,0 +1,223 @@
+namespace ConfectioneryView
+{
+    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.labelOpeningDate = new System.Windows.Forms.Label();
+            this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
+            this.textBoxAddress = new System.Windows.Forms.TextBox();
+            this.labelAddress = new System.Windows.Forms.Label();
+            this.textBoxName = new System.Windows.Forms.TextBox();
+            this.labelName = new System.Windows.Forms.Label();
+            this.groupBoxPastries = new System.Windows.Forms.GroupBox();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonSave = new System.Windows.Forms.Button();
+            this.groupBoxPastries.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // labelOpeningDate
+            // 
+            this.labelOpeningDate.AutoSize = true;
+            this.labelOpeningDate.Location = new System.Drawing.Point(31, 102);
+            this.labelOpeningDate.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.labelOpeningDate.Name = "labelOpeningDate";
+            this.labelOpeningDate.Size = new System.Drawing.Size(113, 20);
+            this.labelOpeningDate.TabIndex = 12;
+            this.labelOpeningDate.Text = "Дата открытия:";
+            // 
+            // dateTimePicker
+            // 
+            this.dateTimePicker.Location = new System.Drawing.Point(159, 98);
+            this.dateTimePicker.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.dateTimePicker.Name = "dateTimePicker";
+            this.dateTimePicker.Size = new System.Drawing.Size(249, 27);
+            this.dateTimePicker.TabIndex = 11;
+            // 
+            // textBoxAddress
+            // 
+            this.textBoxAddress.Location = new System.Drawing.Point(120, 59);
+            this.textBoxAddress.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBoxAddress.Name = "textBoxAddress";
+            this.textBoxAddress.Size = new System.Drawing.Size(287, 27);
+            this.textBoxAddress.TabIndex = 10;
+            // 
+            // labelAddress
+            // 
+            this.labelAddress.AutoSize = true;
+            this.labelAddress.Location = new System.Drawing.Point(31, 63);
+            this.labelAddress.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.labelAddress.Name = "labelAddress";
+            this.labelAddress.Size = new System.Drawing.Size(54, 20);
+            this.labelAddress.TabIndex = 9;
+            this.labelAddress.Text = "Адрес:";
+            // 
+            // textBoxName
+            // 
+            this.textBoxName.Location = new System.Drawing.Point(120, 19);
+            this.textBoxName.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBoxName.Name = "textBoxName";
+            this.textBoxName.Size = new System.Drawing.Size(287, 27);
+            this.textBoxName.TabIndex = 8;
+            // 
+            // labelName
+            // 
+            this.labelName.AutoSize = true;
+            this.labelName.Location = new System.Drawing.Point(31, 23);
+            this.labelName.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.labelName.Name = "labelName";
+            this.labelName.Size = new System.Drawing.Size(80, 20);
+            this.labelName.TabIndex = 7;
+            this.labelName.Text = "Название:";
+            // 
+            // groupBoxPastries
+            // 
+            this.groupBoxPastries.Controls.Add(this.dataGridView);
+            this.groupBoxPastries.Location = new System.Drawing.Point(31, 133);
+            this.groupBoxPastries.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.groupBoxPastries.Name = "groupBoxPastries";
+            this.groupBoxPastries.Padding = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.groupBoxPastries.Size = new System.Drawing.Size(536, 384);
+            this.groupBoxPastries.TabIndex = 13;
+            this.groupBoxPastries.TabStop = false;
+            this.groupBoxPastries.Text = "Выпечка";
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.AllowUserToAddRows = false;
+            this.dataGridView.AllowUserToDeleteRows = false;
+            this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ActiveBorder;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ColumnId,
+            this.ColumnName,
+            this.ColumnCount});
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left;
+            this.dataGridView.Location = new System.Drawing.Point(5, 24);
+            this.dataGridView.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.dataGridView.MultiSelect = false;
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.ReadOnly = true;
+            this.dataGridView.RowHeadersVisible = false;
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dataGridView.Size = new System.Drawing.Size(522, 356);
+            this.dataGridView.TabIndex = 0;
+            // 
+            // ColumnId
+            // 
+            this.ColumnId.HeaderText = "Id";
+            this.ColumnId.MinimumWidth = 6;
+            this.ColumnId.Name = "ColumnId";
+            this.ColumnId.ReadOnly = true;
+            this.ColumnId.Visible = false;
+            this.ColumnId.Width = 125;
+            // 
+            // ColumnName
+            // 
+            this.ColumnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumnName.HeaderText = "Название выпечки";
+            this.ColumnName.MinimumWidth = 6;
+            this.ColumnName.Name = "ColumnName";
+            this.ColumnName.ReadOnly = true;
+            // 
+            // ColumnCount
+            // 
+            this.ColumnCount.HeaderText = "Количество";
+            this.ColumnCount.MinimumWidth = 6;
+            this.ColumnCount.Name = "ColumnCount";
+            this.ColumnCount.ReadOnly = true;
+            this.ColumnCount.Width = 125;
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(449, 529);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(101, 36);
+            this.buttonCancel.TabIndex = 15;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Location = new System.Drawing.Point(330, 529);
+            this.buttonSave.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(101, 36);
+            this.buttonSave.TabIndex = 14;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // FormShop
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(603, 578);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.groupBoxPastries);
+            this.Controls.Add(this.labelOpeningDate);
+            this.Controls.Add(this.dateTimePicker);
+            this.Controls.Add(this.textBoxAddress);
+            this.Controls.Add(this.labelAddress);
+            this.Controls.Add(this.textBoxName);
+            this.Controls.Add(this.labelName);
+            this.Name = "FormShop";
+            this.Text = "Магазин";
+            this.Load += new System.EventHandler(this.FormShop_Load);
+            this.groupBoxPastries.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Label labelOpeningDate;
+        private DateTimePicker dateTimePicker;
+        private TextBox textBoxAddress;
+        private Label labelAddress;
+        private TextBox textBoxName;
+        private Label labelName;
+        private GroupBox groupBoxPastries;
+        private DataGridView dataGridView;
+        private Button buttonCancel;
+        private Button buttonSave;
+        private DataGridViewTextBoxColumn ColumnId;
+        private DataGridViewTextBoxColumn ColumnName;
+        private DataGridViewTextBoxColumn ColumnCount;
+    }
+}

Confectionery/ConfectioneryView/FormShop.cs

@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BussinessLogicsContracts;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryDataModels.Models;
+using Microsoft.Extensions.Logging;
+
+namespace ConfectioneryView
+{
+    public partial class FormShop : Form
+    {
+        private readonly ILogger _logger;
+
+        private readonly IShopLogic _logic;
+
+        private int? _id;
+
+        private Dictionary<int, (IPastryModel, int)> _shopPastries;
+
+        public int Id { set { _id = value; } }
+        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            _shopPastries = new Dictionary<int, (IPastryModel, int)>();
+        }
+
+        private void FormShop_Load(object sender, EventArgs e)
+        {
+            if (_id.HasValue)
+            {
+                _logger.LogInformation("Shop loading");
+                try
+                {
+                    var view = _logic.ReadElement(new ShopSearchModel { Id = _id.Value });
+                    if (view != null)
+                    {
+                        textBoxName.Text = view.ShopName;
+                        textBoxAddress.Text = view.Address;
+                        dateTimePicker.Value = view.DateOpening;
+                        _shopPastries = view.ShopPastries ?? new Dictionary<int, (IPastryModel, int)>();
+                        LoadData();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Shop loading error");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadData()
+        {
+            _logger.LogInformation("Shop pastries loading");
+            try
+            {
+                if (_shopPastries != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var pastry in _shopPastries)
+                    {
+                        dataGridView.Rows.Add(new object[] { pastry.Key, pastry.Value.Item1.PastryName, pastry.Value.Item2 });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Shop pastries loading error");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxName.Text))
+            {
+                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(textBoxAddress.Text))
+            {
+                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(dateTimePicker.Text))
+            {
+                MessageBox.Show("Заполните дату", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Shop saving");
+            try
+            {
+                var model = new ShopBindingModel
+                {
+                    Id = _id ?? 0,
+                    ShopName = textBoxName.Text,
+                    Address = textBoxAddress.Text,
+                    DateOpening = dateTimePicker.Value,
+                    ShopPastries = _shopPastries
+                };
+                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, "Shop saving error");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

Confectionery/ConfectioneryView/FormShop.resx

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

Confectionery/ConfectioneryView/FormShops.Designer.cs

@@ -0,0 +1,127 @@
+namespace ConfectioneryView
+{
+    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.buttonUpd = new System.Windows.Forms.Button();
+            this.buttonDel = new System.Windows.Forms.Button();
+            this.buttonEdit = new System.Windows.Forms.Button();
+            this.buttonAdd = new System.Windows.Forms.Button();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // buttonUpd
+            // 
+            this.buttonUpd.Location = new System.Drawing.Point(511, 221);
+            this.buttonUpd.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.buttonUpd.Name = "buttonUpd";
+            this.buttonUpd.Size = new System.Drawing.Size(101, 36);
+            this.buttonUpd.TabIndex = 16;
+            this.buttonUpd.Text = "Обновить";
+            this.buttonUpd.UseVisualStyleBackColor = true;
+            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
+            // 
+            // buttonDel
+            // 
+            this.buttonDel.Location = new System.Drawing.Point(511, 158);
+            this.buttonDel.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.buttonDel.Name = "buttonDel";
+            this.buttonDel.Size = new System.Drawing.Size(101, 36);
+            this.buttonDel.TabIndex = 15;
+            this.buttonDel.Text = "Удалить";
+            this.buttonDel.UseVisualStyleBackColor = true;
+            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
+            // 
+            // buttonEdit
+            // 
+            this.buttonEdit.Location = new System.Drawing.Point(511, 95);
+            this.buttonEdit.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.buttonEdit.Name = "buttonEdit";
+            this.buttonEdit.Size = new System.Drawing.Size(101, 36);
+            this.buttonEdit.TabIndex = 14;
+            this.buttonEdit.Text = "Изменить";
+            this.buttonEdit.UseVisualStyleBackColor = true;
+            this.buttonEdit.Click += new System.EventHandler(this.ButtonEdit_Click);
+            // 
+            // buttonAdd
+            // 
+            this.buttonAdd.Location = new System.Drawing.Point(511, 37);
+            this.buttonAdd.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(101, 36);
+            this.buttonAdd.TabIndex = 13;
+            this.buttonAdd.Text = "Добавить";
+            this.buttonAdd.UseVisualStyleBackColor = true;
+            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.AllowUserToAddRows = false;
+            this.dataGridView.AllowUserToDeleteRows = false;
+            this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ActiveBorder;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left;
+            this.dataGridView.Location = new System.Drawing.Point(0, 0);
+            this.dataGridView.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.dataGridView.MultiSelect = false;
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.ReadOnly = true;
+            this.dataGridView.RowHeadersVisible = false;
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dataGridView.Size = new System.Drawing.Size(466, 538);
+            this.dataGridView.TabIndex = 17;
+            // 
+            // FormShops
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(650, 538);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.buttonUpd);
+            this.Controls.Add(this.buttonDel);
+            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 Button buttonUpd;
+        private Button buttonDel;
+        private Button buttonEdit;
+        private Button buttonAdd;
+        private DataGridView dataGridView;
+    }
+}

Confectionery/ConfectioneryView/FormShops.cs

@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BussinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+
+namespace ConfectioneryView
+{
+    public partial class FormShops : Form
+    {
+        private readonly ILogger _logger;
+
+        private readonly IShopLogic _logic;
+        public FormShops(ILogger<FormShops> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+        }
+        private void FormShops_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
+        private void LoadData()
+        {
+            try
+            {
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["ShopPastries"].Visible = false;
+                }
+                _logger.LogInformation("Shops loading");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Shops loading error");
+                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 ButtonEdit_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+                if (service is FormShop form)
+                {
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
+                }
+            }
+        }
+
+        private void 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("Deletion of shop");
+                    try
+                    {
+                        if (!_logic.Delete(new ShopBindingModel { Id = id }))
+                        {
+                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+                        }
+                        LoadData();
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Shop deletion error");
+                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                }
+            }
+        }
+
+        private void ButtonUpd_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+    }
+}

Confectionery/ConfectioneryView/FormShops.resx

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

Confectionery/ConfectioneryView/FormSupply.Designer.cs

@@ -0,0 +1,153 @@
+namespace ConfectioneryView
+{
+    partial class FormSupply
+    {
+        /// <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.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonSave = new System.Windows.Forms.Button();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
+            this.labelCount = new System.Windows.Forms.Label();
+            this.comboBoxPastry = new System.Windows.Forms.ComboBox();
+            this.labelPastry = new System.Windows.Forms.Label();
+            this.comboBoxShop = new System.Windows.Forms.ComboBox();
+            this.labelShop = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(312, 170);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(101, 36);
+            this.buttonCancel.TabIndex = 19;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Location = new System.Drawing.Point(205, 170);
+            this.buttonSave.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(101, 36);
+            this.buttonSave.TabIndex = 18;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(139, 128);
+            this.textBoxCount.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(287, 27);
+            this.textBoxCount.TabIndex = 17;
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(38, 132);
+            this.labelCount.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(93, 20);
+            this.labelCount.TabIndex = 16;
+            this.labelCount.Text = "Количество:";
+            // 
+            // comboBoxPastry
+            // 
+            this.comboBoxPastry.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxPastry.FormattingEnabled = true;
+            this.comboBoxPastry.Location = new System.Drawing.Point(139, 80);
+            this.comboBoxPastry.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.comboBoxPastry.Name = "comboBoxPastry";
+            this.comboBoxPastry.Size = new System.Drawing.Size(287, 28);
+            this.comboBoxPastry.TabIndex = 15;
+            // 
+            // labelPastry
+            // 
+            this.labelPastry.AutoSize = true;
+            this.labelPastry.Location = new System.Drawing.Point(38, 85);
+            this.labelPastry.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.labelPastry.Name = "labelPastry";
+            this.labelPastry.Size = new System.Drawing.Size(72, 20);
+            this.labelPastry.TabIndex = 14;
+            this.labelPastry.Text = "Выпечка:";
+            // 
+            // comboBoxShop
+            // 
+            this.comboBoxShop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxShop.FormattingEnabled = true;
+            this.comboBoxShop.Location = new System.Drawing.Point(139, 34);
+            this.comboBoxShop.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.comboBoxShop.Name = "comboBoxShop";
+            this.comboBoxShop.Size = new System.Drawing.Size(287, 28);
+            this.comboBoxShop.TabIndex = 13;
+            // 
+            // labelShop
+            // 
+            this.labelShop.AutoSize = true;
+            this.labelShop.Location = new System.Drawing.Point(38, 38);
+            this.labelShop.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.labelShop.Name = "labelShop";
+            this.labelShop.Size = new System.Drawing.Size(72, 20);
+            this.labelShop.TabIndex = 12;
+            this.labelShop.Text = "Магазин:";
+            // 
+            // FormSupply
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(464, 233);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.comboBoxPastry);
+            this.Controls.Add(this.labelPastry);
+            this.Controls.Add(this.comboBoxShop);
+            this.Controls.Add(this.labelShop);
+            this.Name = "FormSupply";
+            this.Text = "Пополнение магазина";
+            this.Load += new System.EventHandler(this.FormSupply_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Button buttonCancel;
+        private Button buttonSave;
+        private TextBox textBoxCount;
+        private Label labelCount;
+        private ComboBox comboBoxPastry;
+        private Label labelPastry;
+        private ComboBox comboBoxShop;
+        private Label labelShop;
+    }
+}

Confectionery/ConfectioneryView/FormSupply.cs

@@ -0,0 +1,124 @@
+using ConfectioneryContracts.BussinessLogicsContracts;
+using ConfectioneryContracts.SearchModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ConfectioneryView
+{
+    public partial class FormSupply : Form
+    {
+        private readonly ILogger _logger;
+
+        private readonly IPastryLogic _logicPastry;
+
+        private readonly IShopLogic _logicShop;
+        public FormSupply(ILogger<FormSupply> logger, IPastryLogic logicPastry, IShopLogic logicShop)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicPastry = logicPastry;
+            _logicShop = logicShop;
+        }
+
+        private void FormSupply_Load(object sender, EventArgs e)
+        {
+            _logger.LogInformation("Pastries loading");
+            try
+            {
+                var list = _logicPastry.ReadList(null);
+                if (list != null)
+                {
+                    comboBoxPastry.DisplayMember = "PastryName";
+                    comboBoxPastry.ValueMember = "Id";
+                    comboBoxPastry.DataSource = list;
+                    comboBoxPastry.SelectedItem = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Pastries loading error");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            _logger.LogInformation("Shops loading");
+            try
+            {
+                var list = _logicShop.ReadList(null);
+                if (list != null)
+                {
+                    comboBoxShop.DisplayMember = "ShopName";
+                    comboBoxShop.ValueMember = "Id";
+                    comboBoxShop.DataSource = list;
+                    comboBoxShop.SelectedItem = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Shops loading error");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (comboBoxShop.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxPastry.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите выпечку", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(textBoxCount.Text))
+            {
+                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Shop replenishment");
+            try
+            {
+                var pastry = _logicPastry.ReadElement(new PastrySearchModel
+                { Id = Convert.ToInt32(comboBoxPastry.SelectedValue) });
+                if (pastry == null)
+                {
+                    throw new Exception("Выпечка не найдена.");
+                }
+                var operationResult = _logicShop.Supply(new ShopSearchModel
+                {
+                    Id = Convert.ToInt32(comboBoxShop.SelectedValue)
+                },
+                pastry,
+                Convert.ToInt32(textBoxCount.Text));
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при проведении поставки.");
+                }
+                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Shop replenishment error");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            DialogResult = DialogResult.OK;
+            Close();
+        }
+
+        private void ButtonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

Confectionery/ConfectioneryView/FormSupply.resx

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

Confectionery/ConfectioneryView/Program.cs

@@ -1,7 +1,7 @@
 using ConfectioneryBusinessLogic;
 using ConfectioneryContracts.BussinessLogicsContracts;
 using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryFileImplement.Implements;
+using ConfectioneryListImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
@@ -20,7 +20,6 @@ namespace ConfectioneryView
         {
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
             var services = new ServiceCollection();
             ConfigureServices(services);
             _serviceProvider = services.BuildServiceProvider();
@@ -37,10 +36,12 @@ namespace ConfectioneryView
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IPastryStorage, PastryStorage>();
+            services.AddTransient<IShopStorage, ShopStorage>();
 
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IPastryLogic, PastryLogic>();
+            services.AddTransient<IShopLogic, ShopLogic>();
 
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
@@ -49,6 +50,9 @@ namespace ConfectioneryView
             services.AddTransient<FormPastry>();
             services.AddTransient<FormPastryComponent>();
             services.AddTransient<FormPastries>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormSupply>();
         }
     }
 }