CarpentryWorkshop/CarpentryWorkshopBusinessLogic/BusinessLogics/ComponentLogic.cs

@@ -95,10 +95,10 @@ namespace CarpentryWorkshopBusinessLogic.BusinessLogics
                 throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost));
             }
             _logger.LogInformation("Component. ComponentName:{ComponentName}. Cost:{ Cost}. Id: { Id}", model.ComponentName, model.Cost, model.Id);
-            var element = _componentStorage.GetElement(new ComponentSearchModel
-            {
-                ComponentName = model.ComponentName
-            });
+        var element = _componentStorage.GetElement(new ComponentSearchModel
+        {
+            ComponentName = model.ComponentName
+        });
             if (element != null && element.Id != model.Id)
             {
                 throw new InvalidOperationException("Компонент с таким названием уже есть");

CarpentryWorkshop/CarpentryWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -17,13 +17,10 @@ namespace CarpentryWorkshopBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
-
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _shopStorage=shopStorage;
         }
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
@@ -108,21 +105,8 @@ namespace CarpentryWorkshopBusinessLogic.BusinessLogics
         {
             var order = _orderStorage.GetElement(new OrderSearchModel
             {
-                Id = model.Id,
+                Id = model.Id
             });
-            if (order == null)
-            {
-                throw new ArgumentNullException(nameof(order));
-            }
-            if (!_shopStorage.RestockingShops(new SupplyBindingModel
-            {
-                WoodId = order.WoodId,
-                Count = order.Count
-            }))
-            {
-                throw new ArgumentException("Недостаточно места");
-            }
-            
             if (order == null)
             {
                 throw new Exception("Не найден заказ");

CarpentryWorkshop/CarpentryWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,170 +0,0 @@
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.BusinessLogicsContracts;
-using CarpentryWorkshopContracts.SearchModels;
-using CarpentryWorkshopContracts.StoragesContracts;
-using CarpentryWorkshopContracts.ViewModels;
-using CarpentryWorkshopDataModels.Models;
-using Microsoft.Extensions.Logging;
-
-namespace CarpentryWorkshopBusinessLogic.BusinessLogics
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        private readonly IWoodStorage _woodStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, IWoodStorage woodStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-            _woodStorage = woodStorage;
-        }
-
-        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 bool MakeSupply(SupplyBindingModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Количество изделий должно быть больше 0");
-            }
-            var shop = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Id = model.ShopId
-            });
-            if (shop == null)
-            {
-                throw new ArgumentException("Магазина не существует");
-            }
-            if (shop.ShopWoods.ContainsKey(model.WoodId))
-            {
-                var oldValue = shop.ShopWoods[model.WoodId];
-                oldValue.Item2 += model.Count;
-                shop.ShopWoods[model.WoodId] = oldValue;
-            }
-            else
-            {
-                var wood = _woodStorage.GetElement(new WoodSearchModel
-                {
-                    Id = model.WoodId
-                });
-                if (wood == null)
-                {
-                    throw new ArgumentException($"Поставка: Товар с id:{model.WoodId} не найденн");
-                }
-                shop.ShopWoods.Add(model.WoodId, (wood, model.Count));
-            }
-            return true;
-        }
-
-        public ShopViewModel ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.Address))
-            {
-                throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Address));
-            }
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName));
-            }
-            _logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Address, model.DateOpen, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = model.ShopName
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-        public bool Sale(SupplySearchModel model)
-        {
-            if (!model.WoodId.HasValue || !model.Count.HasValue)
-            {
-                return false;
-            }
-            _logger.LogInformation("Check pizza count in all shops");
-            if (_shopStorage.Sale(model))
-            {
-                _logger.LogInformation("Selling sucsess");
-                return true;
-            }
-            _logger.LogInformation("Selling failed");
-            return false;
-        }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj

@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CarpentryWorkshopContracts\CarpentryWorkshopContracts.csproj" />
-    <ProjectReference Include="..\CarpentryWorkshopDataModels\CarpentryWorkshopDataModels.csproj" />
   </ItemGroup>
 
 </Project>

CarpentryWorkshop/CarpentryWorkshopContracts/BindingModels/ShopBindingModel.cs

@@ -1,14 +0,0 @@
-using CarpentryWorkshopDataModels.Models;
-
-namespace CarpentryWorkshopContracts.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 DateOpen { get; set; }
-        public Dictionary<int, (IWoodModel, int)> ShopWoods { get; set; } = new();
-        public int WoodMaxCount { get; set; }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopContracts/BindingModels/SupplyBindingModel .cs

@@ -1,11 +0,0 @@
-using CarpentryWorkshopDataModels.Models;
-
-namespace CarpentryWorkshopContracts.BindingModels
-{
-    public class SupplyBindingModel : ISupplyModel
-    {
-        public int ShopId { get; set; }
-        public int WoodId { get; set; }
-        public int Count { get; set; }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,18 +0,0 @@
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.SearchModels;
-using CarpentryWorkshopContracts.ViewModels;
-using CarpentryWorkshopDataModels.Models;
-
-namespace CarpentryWorkshopContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-        ShopViewModel? ReadElement(ShopSearchModel model);
-        bool Create(ShopBindingModel model);
-        bool Update(ShopBindingModel model);
-        bool Delete(ShopBindingModel model);
-        bool MakeSupply(SupplyBindingModel model);
-        bool Sale(SupplySearchModel model);
-    }
-}

CarpentryWorkshop/CarpentryWorkshopContracts/SearchModels/ShopSearchModel.cs

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

CarpentryWorkshop/CarpentryWorkshopContracts/SearchModels/SupplySearchModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CarpentryWorkshopContracts.SearchModels
-{
-    public class SupplySearchModel
-    {
-        public int? WoodId { get; set; }
-        public int? Count { get; set; }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopContracts/StoragesContracts/IShopStorage.cs

@@ -1,24 +0,0 @@
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.SearchModels;
-using CarpentryWorkshopContracts.ViewModels;
-using CarpentryWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CarpentryWorkshopContracts.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);
-        bool Sale(SupplySearchModel model);
-        bool RestockingShops(SupplyBindingModel model);
-    }
-}

CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ShopViewModel.cs

@@ -1,19 +0,0 @@
-using CarpentryWorkshopDataModels.Models;
-using System.ComponentModel;
-
-namespace CarpentryWorkshopContracts.ViewModels
-{
-    public class ShopViewModel : IShopModel
-    {
-        public int Id { get; set; }
-        [DisplayName("Название магазина")]
-        public string ShopName { get; set; }
-        [DisplayName("Адрес магазина")]
-        public string Address { get; set; }
-        [DisplayName("Дата открытия")]
-        public DateTime DateOpen { get; set; }
-        public Dictionary<int, (IWoodModel, int)> ShopWoods { get; set; } = new();
-        [DisplayName("Вместимость")]
-        public int WoodMaxCount { get; set; }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopDataModels/Models/IShopModel.cs

@@ -1,11 +0,0 @@
-namespace CarpentryWorkshopDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        string ShopName { get; }
-        string Address { get; }
-        DateTime DateOpen { get; }
-        Dictionary<int, (IWoodModel, int)> ShopWoods { get; }
-        public int WoodMaxCount { get; }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopDataModels/Models/ISupplyModel.cs

@@ -1,9 +0,0 @@
-namespace CarpentryWorkshopDataModels.Models
-{
-    public interface ISupplyModel
-    {
-        int ShopId { get; }
-        int WoodId { get; }
-        int Count { get; }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopFileImplement/DataFileSingleton.cs

@@ -9,11 +9,9 @@ namespace CarpentryWorkshopFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string WoodFileName = "Wood.xml";
-        private readonly string ShopFileName = "Shop.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Wood> Woods { get; private set; }
-        public List<Shop> Shops { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -25,13 +23,11 @@ namespace CarpentryWorkshopFileImplement
         public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
         public void SaveWoods() => SaveData(Woods, WoodFileName, "Woods", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
             Woods = LoadData(WoodFileName, "Wood", x => Wood.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/ShopStorage.cs

@@ -1,154 +0,0 @@
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.SearchModels;
-using CarpentryWorkshopContracts.StoragesContracts;
-using CarpentryWorkshopContracts.ViewModels;
-using CarpentryWorkshopFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CarpentryWorkshopFileImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public ShopStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return source.Shops.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return new();
-            }
-            return source.Shops.Where(x => x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Shops.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
-            (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            source.Shops.Add(newShop);
-            source.SaveShops();
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop == null)
-            {
-                return null;
-            }
-            shop.Update(model);
-            source.SaveShops();
-            return shop.GetViewModel;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop != null)
-            {
-                source.Shops.Remove(shop);
-                source.SaveShops();
-                return shop.GetViewModel;
-            }
-            return null;
-        }
-
-        public bool Sale(SupplySearchModel model)
-        {
-            if (model == null || !model.WoodId.HasValue || !model.Count.HasValue)
-                return false;
-            int remainingSpace = source.Shops.Select(x => x.Woods.ContainsKey(model.WoodId.Value) ? x.Woods[model.WoodId.Value] : 0).Sum();
-            if (remainingSpace < model.Count)
-            {
-                return false;
-            }
-            var shops = source.Shops.Where(x => x.Woods.ContainsKey(model.WoodId.Value)).OrderByDescending(x => x.Woods[model.WoodId.Value]).ToList();
-            foreach (var shop in shops)
-            {
-                int residue = model.Count.Value - shop.Woods[model.WoodId.Value];
-                if (residue > 0)
-                {
-                    shop.Woods.Remove(model.WoodId.Value);
-                    shop.WoodsUpdate();
-                    model.Count = residue;
-                }
-                else
-                {
-                    if (residue == 0)
-                    {
-                        shop.Woods.Remove(model.WoodId.Value);
-                    }
-                    else
-                    {
-                        shop.Woods[model.WoodId.Value] = -residue;
-                    }
-                    shop.WoodsUpdate();
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            source.SaveShops();
-            return false;
-        }
-
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            if (model == null || source.Shops.Select(x => x.WoodMaxCount - x.ShopWoods.Select(y => y.Value.Item2).Sum()).Sum() < model.Count)
-            {
-                return false;
-            }
-            foreach (Shop shop in source.Shops)
-            {
-                int free_places = shop.WoodMaxCount - shop.ShopWoods.Select(x => x.Value.Item2).Sum();
-                if (free_places <= 0)
-                    continue;
-                free_places = Math.Min(free_places, model.Count);
-                model.Count -= free_places;
-                if (shop.Woods.ContainsKey(model.WoodId))
-                {
-                    shop.Woods[model.WoodId] += free_places;
-                }
-                else
-                {
-                    shop.Woods.Add(model.WoodId, free_places);
-                }
-                shop.WoodsUpdate();
-                if (model.Count == 0)
-                {
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Shop.cs

@@ -1,113 +0,0 @@
-using CarpentryWorkshopDataModels.Models;
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using CarpentryWorkshopFileImplement;
-
-namespace CarpentryWorkshopFileImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string ShopName { get; private set; }
-        public string Address { get; private set; }
-        public DateTime DateOpen { get; private set; }
-        public Dictionary<int, int> Woods { get; private set; } = new();
-        public int WoodMaxCount { get; private set; }
-
-        private Dictionary<int, (IWoodModel, int)>? _shopWoods = null;
-
-        public Dictionary<int, (IWoodModel, int)> ShopWoods
-        {
-            get
-            {
-                if (_shopWoods == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _shopWoods = Woods.ToDictionary(x => x.Key, y => ((source.Woods.FirstOrDefault(z => z.Id == y.Key) as IWoodModel)!, y.Value));
-                }
-                return _shopWoods;
-            }
-        }
-
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Address = model.Address,
-                DateOpen = model.DateOpen,
-                Woods = model.ShopWoods.ToDictionary(x => x.Key, x => x.Value.Item2),
-                WoodMaxCount = model.WoodMaxCount
-            };
-        }
-
-        public static Shop? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ShopName = element.Element("ShopName")!.Value,
-                Address = element.Element("Address")!.Value,
-                DateOpen = Convert.ToDateTime(element.Element("DateOpen")!.Value),
-                Woods = element.Element("ShopWoods")!.Elements("ShopWood")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
-                x => Convert.ToInt32(x.Element("Value")?.Value)),
-                WoodMaxCount = Convert.ToInt32(element.Element("WoodMaxCount")!.Value)
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Address = model.Address;
-            DateOpen = model.DateOpen;
-            WoodMaxCount = model.WoodMaxCount;
-            Woods = model.ShopWoods.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _shopWoods = null;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            DateOpen = DateOpen,
-            ShopWoods = ShopWoods,
-            WoodMaxCount = WoodMaxCount
-        };
-
-        public XElement GetXElement => new("Shop",
-            new XAttribute("Id", Id),
-            new XElement("ShopName", ShopName),
-            new XElement("Address", Address),
-            new XElement("DateOpen", DateOpen.ToString()),
-            new XElement("ShopWoods", Woods.Select(
-                x => new XElement("ShopWood", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()),
-            new XElement("WoodMaxCount", WoodMaxCount.ToString())
-            );
-
-        public void WoodsUpdate()
-        {
-            _shopWoods = null;
-        }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopListImplement/DataListSingleton.cs

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

CarpentryWorkshop/CarpentryWorkshopListImplement/Implements/ShopStorage.cs

@@ -1,113 +0,0 @@
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.SearchModels;
-using CarpentryWorkshopContracts.StoragesContracts;
-using CarpentryWorkshopContracts.ViewModels;
-using CarpentryWorkshopDataModels.Models;
-using CarpentryWorkshopListImplement.Models;
-
-namespace CarpentryWorkshopListImplement.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;
-        }
-        public bool Sale(SupplySearchModel model)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopListImplement/Models/Shop.cs

@@ -1,55 +0,0 @@
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.ViewModels;
-using CarpentryWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CarpentryWorkshopListImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string ShopName { get; private set; }
-        public string Address { get; private set; }
-        public DateTime DateOpen { get; private set; }
-        public Dictionary<int, (IWoodModel, int)> ShopWoods { get; private set; } = new();
-        public int WoodMaxCount { get; private set; }
-
-        public static Shop? Create(ShopBindingModel model)
-        {
-            if (model == null)
-                return null;
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Address = model.Address,
-                DateOpen = model.DateOpen,
-                WoodMaxCount = model.WoodMaxCount,
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Address = model.Address;
-            DateOpen = model.DateOpen;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            DateOpen = DateOpen,
-            ShopWoods = ShopWoods
-        };
-    }
-}

CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj

@@ -18,6 +18,7 @@
   <ItemGroup>
     <ProjectReference Include="..\CarpentryWorkshopBusinessLogic\CarpentryWorkshopBusinessLogic.csproj" />
     <ProjectReference Include="..\CarpentryWorkshopContracts\CarpentryWorkshopContracts.csproj" />
+    <ProjectReference Include="..\CarpentryWorkshopDataModels\CarpentryWorkshopDataModels.csproj" />
     <ProjectReference Include="..\CarpentryWorkshopFileImplement\CarpentryWorkshopFileImplement.csproj" />
     <ProjectReference Include="..\CarpentryWorkshopListImplement\CarpentryWorkshopListImplement.csproj" />
   </ItemGroup>

CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs

@@ -28,165 +28,137 @@
         /// </summary>
         private void InitializeComponent()
         {
-            menuStrip1 = new MenuStrip();
-            справочникиToolStripMenuItem = new ToolStripMenuItem();
-            КомпонентыToolStripMenuItem = new ToolStripMenuItem();
-            ИзделияToolStripMenuItem = new ToolStripMenuItem();
-            магазиныToolStripMenuItem = new ToolStripMenuItem();
-            операцииToolStripMenuItem = new ToolStripMenuItem();
-            поставкаToolStripMenuItem = new ToolStripMenuItem();
-            продажаToolStripMenuItem = new ToolStripMenuItem();
-            dataGridView = new DataGridView();
-            ButtonCreateOrder = new Button();
-            ButtonTakeOrderInWork = new Button();
-            ButtonOrderReady = new Button();
-            ButtonIssuedOrder = new Button();
-            ButtonRef = new Button();
-            menuStrip1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ИзделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ButtonCreateOrder = new System.Windows.Forms.Button();
+            this.ButtonTakeOrderInWork = new System.Windows.Forms.Button();
+            this.ButtonOrderReady = new System.Windows.Forms.Button();
+            this.ButtonIssuedOrder = new System.Windows.Forms.Button();
+            this.ButtonRef = new System.Windows.Forms.Button();
+            this.menuStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
             // 
             // menuStrip1
             // 
-            menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem });
-            menuStrip1.Location = new Point(0, 0);
-            menuStrip1.Name = "menuStrip1";
-            menuStrip1.Size = new Size(896, 24);
-            menuStrip1.TabIndex = 0;
-            menuStrip1.Text = "menuStrip1";
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.справочникиToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(896, 24);
+            this.menuStrip1.TabIndex = 0;
+            this.menuStrip1.Text = "menuStrip1";
             // 
             // справочникиToolStripMenuItem
             // 
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ИзделияToolStripMenuItem, магазиныToolStripMenuItem });
-            справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
-            справочникиToolStripMenuItem.Size = new Size(94, 20);
-            справочникиToolStripMenuItem.Text = "Справочники";
+            this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.КомпонентыToolStripMenuItem,
+            this.ИзделияToolStripMenuItem});
+            this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
+            this.справочникиToolStripMenuItem.Text = "Справочники";
             // 
             // КомпонентыToolStripMenuItem
             // 
-            КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
-            КомпонентыToolStripMenuItem.Size = new Size(180, 22);
-            КомпонентыToolStripMenuItem.Text = "Компоненты";
-            КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
+            this.КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
+            this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+            this.КомпонентыToolStripMenuItem.Text = "Компоненты";
+            this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click);
             // 
             // ИзделияToolStripMenuItem
             // 
-            ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem";
-            ИзделияToolStripMenuItem.Size = new Size(180, 22);
-            ИзделияToolStripMenuItem.Text = "Изделия";
-            ИзделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
-            // 
-            // магазиныToolStripMenuItem
-            // 
-            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            магазиныToolStripMenuItem.Size = new Size(180, 22);
-            магазиныToolStripMenuItem.Text = "Магазины";
-            магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
-            // 
-            // операцииToolStripMenuItem
-            // 
-            операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { поставкаToolStripMenuItem, продажаToolStripMenuItem });
-            операцииToolStripMenuItem.Name = "операцииToolStripMenuItem";
-            операцииToolStripMenuItem.Size = new Size(75, 20);
-            операцииToolStripMenuItem.Text = "Операции";
-            // 
-            // поставкаToolStripMenuItem
-            // 
-            поставкаToolStripMenuItem.Name = "поставкаToolStripMenuItem";
-            поставкаToolStripMenuItem.Size = new Size(180, 22);
-            поставкаToolStripMenuItem.Text = "Поставка";
-            поставкаToolStripMenuItem.Click += поставкиToolStripMenuItem_Click;
-            // 
-            // продажаToolStripMenuItem
-            // 
-            продажаToolStripMenuItem.Name = "продажаToolStripMenuItem";
-            продажаToolStripMenuItem.Size = new Size(180, 22);
-            продажаToolStripMenuItem.Text = "Продажа";
-            продажаToolStripMenuItem.Click += SellToolStripMenuItem_Click;
+            this.ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem";
+            this.ИзделияToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+            this.ИзделияToolStripMenuItem.Text = "Изделия";
+            this.ИзделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click);
             // 
             // dataGridView
             // 
-            dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.EnableHeadersVisualStyles = false;
-            dataGridView.Location = new Point(1, 32);
-            dataGridView.MultiSelect = false;
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(755, 243);
-            dataGridView.TabIndex = 1;
+            this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonHighlight;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.EnableHeadersVisualStyles = false;
+            this.dataGridView.Location = new System.Drawing.Point(1, 32);
+            this.dataGridView.MultiSelect = false;
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowTemplate.Height = 25;
+            this.dataGridView.Size = new System.Drawing.Size(755, 243);
+            this.dataGridView.TabIndex = 1;
             // 
             // ButtonCreateOrder
             // 
-            ButtonCreateOrder.Location = new Point(762, 44);
-            ButtonCreateOrder.Name = "ButtonCreateOrder";
-            ButtonCreateOrder.Size = new Size(122, 23);
-            ButtonCreateOrder.TabIndex = 2;
-            ButtonCreateOrder.Text = "Создать заказ";
-            ButtonCreateOrder.UseVisualStyleBackColor = true;
-            ButtonCreateOrder.Click += ButtonCreateOrder_Click;
+            this.ButtonCreateOrder.Location = new System.Drawing.Point(762, 44);
+            this.ButtonCreateOrder.Name = "ButtonCreateOrder";
+            this.ButtonCreateOrder.Size = new System.Drawing.Size(122, 23);
+            this.ButtonCreateOrder.TabIndex = 2;
+            this.ButtonCreateOrder.Text = "Создать заказ";
+            this.ButtonCreateOrder.UseVisualStyleBackColor = true;
+            this.ButtonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click);
             // 
             // ButtonTakeOrderInWork
             // 
-            ButtonTakeOrderInWork.Location = new Point(762, 73);
-            ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
-            ButtonTakeOrderInWork.Size = new Size(122, 42);
-            ButtonTakeOrderInWork.TabIndex = 3;
-            ButtonTakeOrderInWork.Text = "Отдать на выполнение";
-            ButtonTakeOrderInWork.UseVisualStyleBackColor = true;
-            ButtonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
+            this.ButtonTakeOrderInWork.Location = new System.Drawing.Point(762, 73);
+            this.ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
+            this.ButtonTakeOrderInWork.Size = new System.Drawing.Size(122, 42);
+            this.ButtonTakeOrderInWork.TabIndex = 3;
+            this.ButtonTakeOrderInWork.Text = "Отдать на выполнение";
+            this.ButtonTakeOrderInWork.UseVisualStyleBackColor = true;
+            this.ButtonTakeOrderInWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click);
             // 
             // ButtonOrderReady
             // 
-            ButtonOrderReady.Location = new Point(762, 121);
-            ButtonOrderReady.Name = "ButtonOrderReady";
-            ButtonOrderReady.Size = new Size(122, 23);
-            ButtonOrderReady.TabIndex = 4;
-            ButtonOrderReady.Text = "Заказ готов";
-            ButtonOrderReady.UseVisualStyleBackColor = true;
-            ButtonOrderReady.Click += ButtonOrderReady_Click;
+            this.ButtonOrderReady.Location = new System.Drawing.Point(762, 121);
+            this.ButtonOrderReady.Name = "ButtonOrderReady";
+            this.ButtonOrderReady.Size = new System.Drawing.Size(122, 23);
+            this.ButtonOrderReady.TabIndex = 4;
+            this.ButtonOrderReady.Text = "Заказ готов";
+            this.ButtonOrderReady.UseVisualStyleBackColor = true;
+            this.ButtonOrderReady.Click += new System.EventHandler(this.ButtonOrderReady_Click);
             // 
             // ButtonIssuedOrder
             // 
-            ButtonIssuedOrder.Location = new Point(762, 150);
-            ButtonIssuedOrder.Name = "ButtonIssuedOrder";
-            ButtonIssuedOrder.Size = new Size(122, 23);
-            ButtonIssuedOrder.TabIndex = 5;
-            ButtonIssuedOrder.Text = "Заказ выдан";
-            ButtonIssuedOrder.UseVisualStyleBackColor = true;
-            ButtonIssuedOrder.Click += ButtonIssuedOrder_Click;
+            this.ButtonIssuedOrder.Location = new System.Drawing.Point(762, 150);
+            this.ButtonIssuedOrder.Name = "ButtonIssuedOrder";
+            this.ButtonIssuedOrder.Size = new System.Drawing.Size(122, 23);
+            this.ButtonIssuedOrder.TabIndex = 5;
+            this.ButtonIssuedOrder.Text = "Заказ выдан";
+            this.ButtonIssuedOrder.UseVisualStyleBackColor = true;
+            this.ButtonIssuedOrder.Click += new System.EventHandler(this.ButtonIssuedOrder_Click);
             // 
             // ButtonRef
             // 
-            ButtonRef.Location = new Point(762, 179);
-            ButtonRef.Name = "ButtonRef";
-            ButtonRef.Size = new Size(122, 23);
-            ButtonRef.TabIndex = 6;
-            ButtonRef.Text = "Обновить список";
-            ButtonRef.UseVisualStyleBackColor = true;
-            ButtonRef.Click += ButtonRef_Click;
+            this.ButtonRef.Location = new System.Drawing.Point(762, 179);
+            this.ButtonRef.Name = "ButtonRef";
+            this.ButtonRef.Size = new System.Drawing.Size(122, 23);
+            this.ButtonRef.TabIndex = 6;
+            this.ButtonRef.Text = "Обновить список";
+            this.ButtonRef.UseVisualStyleBackColor = true;
+            this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click);
             // 
             // FormMain
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(896, 280);
-            Controls.Add(ButtonRef);
-            Controls.Add(ButtonIssuedOrder);
-            Controls.Add(ButtonOrderReady);
-            Controls.Add(ButtonTakeOrderInWork);
-            Controls.Add(ButtonCreateOrder);
-            Controls.Add(dataGridView);
-            Controls.Add(menuStrip1);
-            MainMenuStrip = menuStrip1;
-            Name = "FormMain";
-            Text = "Сборка Набора";
-            Load += FormMain_Load;
-            menuStrip1.ResumeLayout(false);
-            menuStrip1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(896, 280);
+            this.Controls.Add(this.ButtonRef);
+            this.Controls.Add(this.ButtonIssuedOrder);
+            this.Controls.Add(this.ButtonOrderReady);
+            this.Controls.Add(this.ButtonTakeOrderInWork);
+            this.Controls.Add(this.ButtonCreateOrder);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.menuStrip1);
+            this.MainMenuStrip = this.menuStrip1;
+            this.Name = "FormMain";
+            this.Text = "Сборка Набора";
+            this.Load += new System.EventHandler(this.FormMain_Load);
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
         }
 
         #endregion
@@ -200,9 +172,5 @@
         private System.Windows.Forms.Button ButtonRef;
         private System.Windows.Forms.ToolStripMenuItem КомпонентыToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem ИзделияToolStripMenuItem;
-        private ToolStripMenuItem магазиныToolStripMenuItem;
-        private ToolStripMenuItem операцииToolStripMenuItem;
-        private ToolStripMenuItem поставкаToolStripMenuItem;
-        private ToolStripMenuItem продажаToolStripMenuItem;
     }
 }

CarpentryWorkshop/CarpentryWorkshopView/FormMain.cs

@@ -1,7 +1,6 @@
 using CarpentryWorkshopContracts.BindingModels;
 using CarpentryWorkshopContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
-using CarpentryWorkshopDataModels.Enums;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -12,7 +11,6 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-
 namespace CarpentryWorkshopView
 {
     public partial class FormMain : Form
@@ -146,30 +144,5 @@ namespace CarpentryWorkshopView
         {
             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();
-            }
-        }
-        private void SellToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSell));
-            if (service is FormSell form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

CarpentryWorkshop/CarpentryWorkshopView/FormMain.resx

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

CarpentryWorkshop/CarpentryWorkshopView/FormSell.Designer.cs

@@ -1,124 +0,0 @@
-namespace CarpentryWorkshopView
-{
-    partial class FormSell
-    {
-        /// <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()
-        {
-            labelWood = new Label();
-            comboBoxWood = new ComboBox();
-            labelCount = new Label();
-            textBoxCount = new TextBox();
-            buttonSell = new Button();
-            buttonCancel = new Button();
-            SuspendLayout();
-            // 
-            // labelWood
-            // 
-            labelWood.AutoSize = true;
-            labelWood.Location = new Point(10, 10);
-            labelWood.Name = "labelWood";
-            labelWood.Size = new Size(59, 15);
-            labelWood.TabIndex = 0;
-            labelWood.Text = "Изделие: ";
-            // 
-            // comboBoxWood
-            // 
-            comboBoxWood.FormattingEnabled = true;
-            comboBoxWood.Location = new Point(101, 8);
-            comboBoxWood.Margin = new Padding(3, 2, 3, 2);
-            comboBoxWood.Name = "comboBoxWood";
-            comboBoxWood.Size = new Size(210, 23);
-            comboBoxWood.TabIndex = 1;
-            // 
-            // labelCount
-            // 
-            labelCount.AutoSize = true;
-            labelCount.Location = new Point(10, 41);
-            labelCount.Name = "labelCount";
-            labelCount.Size = new Size(78, 15);
-            labelCount.TabIndex = 2;
-            labelCount.Text = "Количество: ";
-            // 
-            // textBoxCount
-            // 
-            textBoxCount.Location = new Point(101, 39);
-            textBoxCount.Margin = new Padding(3, 2, 3, 2);
-            textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(210, 23);
-            textBoxCount.TabIndex = 3;
-            // 
-            // buttonSell
-            // 
-            buttonSell.Location = new Point(112, 74);
-            buttonSell.Margin = new Padding(3, 2, 3, 2);
-            buttonSell.Name = "buttonSell";
-            buttonSell.Size = new Size(82, 22);
-            buttonSell.TabIndex = 4;
-            buttonSell.Text = "Продать";
-            buttonSell.UseVisualStyleBackColor = true;
-            buttonSell.Click += ButtonSell_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(212, 74);
-            buttonCancel.Margin = new Padding(3, 2, 3, 2);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(82, 22);
-            buttonCancel.TabIndex = 5;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += ButtonCancel_Click;
-            // 
-            // FormSell
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(320, 105);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSell);
-            Controls.Add(textBoxCount);
-            Controls.Add(labelCount);
-            Controls.Add(comboBoxWood);
-            Controls.Add(labelWood);
-            Margin = new Padding(3, 2, 3, 2);
-            Name = "FormSell";
-            Text = "Продажа изделий";
-            Load += FormSellingPizza_Load;
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label labelWood;
-        private ComboBox comboBoxWood;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonSell;
-        private Button buttonCancel;
-    }
-}

CarpentryWorkshop/CarpentryWorkshopView/FormSell.cs

@@ -1,88 +0,0 @@
-using Microsoft.Extensions.Logging;
-using CarpentryWorkshopContracts.BusinessLogicsContracts;
-using CarpentryWorkshopContracts.SearchModels;
-using CarpentryWorkshopContracts.StoragesContracts;
-using CarpentryWorkshopContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace CarpentryWorkshopView
-{
-    public partial class FormSell : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IWoodLogic _logicP;
-        private readonly IShopLogic _logicS;
-        private List<WoodViewModel> _woodList = new List<WoodViewModel>();
-
-        public FormSell(ILogger<FormSell> logger, IWoodLogic logicP, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicP = logicP;
-            _logicS = logicS;
-        }
-
-        private void FormSellingPizza_Load(object sender, EventArgs e)
-        {
-            _woodList = _logicP.ReadList(null);
-            if (_woodList != null)
-            {
-                comboBoxWood.DisplayMember = "WoodName";
-                comboBoxWood.ValueMember = "Id";
-                comboBoxWood.DataSource = _woodList;
-                comboBoxWood.SelectedItem = null;
-                _logger.LogInformation("Загрузка изделий для продажи");
-            }
-        }
-
-        private void ButtonSell_Click(object sender, EventArgs e)
-        {
-            if (comboBoxWood.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание покупки");
-            try
-            {
-                bool resout = _logicS.Sale(new SupplySearchModel
-                {
-                    WoodId = Convert.ToInt32(comboBoxWood.SelectedValue),
-                    Count = Convert.ToInt32(textBoxCount.Text)
-                });
-                if (resout)
-                {
-                    _logger.LogInformation("Проверка пройдена, продажа  проведена");
-                    MessageBox.Show("Продажа проведена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    DialogResult = DialogResult.OK;
-                    Close();
-                }
-                else
-                {
-                    _logger.LogInformation("Проверка не пройдена");
-                    MessageBox.Show("Продажа не может быть создана.", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания покупки");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopView/FormSell.resx

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

CarpentryWorkshop/CarpentryWorkshopView/FormShop.Designer.cs

@@ -1,213 +0,0 @@
-namespace CarpentryWorkshopView
-{
-    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()
-        {
-            DateTimePicker = new DateTimePicker();
-            NameTextBox = new TextBox();
-            AddressTextBox = new TextBox();
-            NameLabel = new Label();
-            AdressLabel = new Label();
-            DateLabel = new Label();
-            SaveButton = new Button();
-            CancelButton = new Button();
-            DataGridView = new DataGridView();
-            Column1 = new DataGridViewTextBoxColumn();
-            Название = new DataGridViewTextBoxColumn();
-            Цена = new DataGridViewTextBoxColumn();
-            Количество = new DataGridViewTextBoxColumn();
-            labelCapacity = new Label();
-            numericUpWoodMaxCount = new NumericUpDown();
-            ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpWoodMaxCount).BeginInit();
-            SuspendLayout();
-            // 
-            // DateTimePicker
-            // 
-            DateTimePicker.Location = new Point(98, 70);
-            DateTimePicker.Name = "DateTimePicker";
-            DateTimePicker.Size = new Size(305, 23);
-            DateTimePicker.TabIndex = 0;
-            // 
-            // NameTextBox
-            // 
-            NameTextBox.Location = new Point(98, 12);
-            NameTextBox.Name = "NameTextBox";
-            NameTextBox.Size = new Size(305, 23);
-            NameTextBox.TabIndex = 1;
-            // 
-            // AddressTextBox
-            // 
-            AddressTextBox.Location = new Point(98, 41);
-            AddressTextBox.Name = "AddressTextBox";
-            AddressTextBox.Size = new Size(305, 23);
-            AddressTextBox.TabIndex = 2;
-            // 
-            // NameLabel
-            // 
-            NameLabel.AutoSize = true;
-            NameLabel.Location = new Point(12, 15);
-            NameLabel.Name = "NameLabel";
-            NameLabel.Size = new Size(59, 15);
-            NameLabel.TabIndex = 3;
-            NameLabel.Text = "Название";
-            // 
-            // AdressLabel
-            // 
-            AdressLabel.AutoSize = true;
-            AdressLabel.Location = new Point(12, 44);
-            AdressLabel.Name = "AdressLabel";
-            AdressLabel.Size = new Size(40, 15);
-            AdressLabel.TabIndex = 4;
-            AdressLabel.Text = "Адрес";
-            // 
-            // DateLabel
-            // 
-            DateLabel.AutoSize = true;
-            DateLabel.Location = new Point(12, 76);
-            DateLabel.Name = "DateLabel";
-            DateLabel.Size = new Size(32, 15);
-            DateLabel.TabIndex = 5;
-            DateLabel.Text = "Дата";
-            // 
-            // SaveButton
-            // 
-            SaveButton.Location = new Point(248, 320);
-            SaveButton.Name = "SaveButton";
-            SaveButton.Size = new Size(75, 23);
-            SaveButton.TabIndex = 6;
-            SaveButton.Text = "Сохранить";
-            SaveButton.UseVisualStyleBackColor = true;
-            SaveButton.Click += SaveButton_Click;
-            // 
-            // CancelButton
-            // 
-            CancelButton.Location = new Point(329, 320);
-            CancelButton.Name = "CancelButton";
-            CancelButton.Size = new Size(75, 23);
-            CancelButton.TabIndex = 7;
-            CancelButton.Text = "Отмена";
-            CancelButton.UseVisualStyleBackColor = true;
-            CancelButton.Click += CancelButton_Click;
-            // 
-            // DataGridView
-            // 
-            DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            DataGridView.Columns.AddRange(new DataGridViewColumn[] { Column1, Название, Цена, Количество });
-            DataGridView.Location = new Point(12, 139);
-            DataGridView.Name = "DataGridView";
-            DataGridView.Size = new Size(391, 175);
-            DataGridView.TabIndex = 8;
-            // 
-            // Column1
-            // 
-            Column1.HeaderText = "Column1";
-            Column1.Name = "Column1";
-            Column1.Visible = false;
-            // 
-            // Название
-            // 
-            Название.HeaderText = "Название";
-            Название.Name = "Название";
-            Название.ReadOnly = true;
-            Название.Width = 150;
-            // 
-            // Цена
-            // 
-            Цена.HeaderText = "Цена";
-            Цена.Name = "Цена";
-            Цена.ReadOnly = true;
-            // 
-            // Количество
-            // 
-            Количество.HeaderText = "Количество";
-            Количество.Name = "Количество";
-            Количество.ReadOnly = true;
-            // 
-            // labelCapacity
-            // 
-            labelCapacity.AutoSize = true;
-            labelCapacity.Location = new Point(12, 103);
-            labelCapacity.Name = "labelCapacity";
-            labelCapacity.Size = new Size(80, 15);
-            labelCapacity.TabIndex = 9;
-            labelCapacity.Text = "Вместимость";
-            // 
-            // numericUpWoodMaxCount
-            // 
-            numericUpWoodMaxCount.Location = new Point(98, 101);
-            numericUpWoodMaxCount.Margin = new Padding(3, 2, 3, 2);
-            numericUpWoodMaxCount.Maximum = new decimal(new int[] { 10000, 0, 0, 0 });
-            numericUpWoodMaxCount.Name = "numericUpWoodMaxCount";
-            numericUpWoodMaxCount.Size = new Size(305, 23);
-            numericUpWoodMaxCount.TabIndex = 12;
-            // 
-            // FormShop
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(411, 355);
-            Controls.Add(numericUpWoodMaxCount);
-            Controls.Add(labelCapacity);
-            Controls.Add(DataGridView);
-            Controls.Add(CancelButton);
-            Controls.Add(SaveButton);
-            Controls.Add(DateLabel);
-            Controls.Add(AdressLabel);
-            Controls.Add(NameLabel);
-            Controls.Add(AddressTextBox);
-            Controls.Add(NameTextBox);
-            Controls.Add(DateTimePicker);
-            Name = "FormShop";
-            Text = "Редактор магазина";
-            Load += ShopForm_Load;
-            ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpWoodMaxCount).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private DateTimePicker DateTimePicker;
-        private TextBox NameTextBox;
-        private TextBox AddressTextBox;
-        private Label NameLabel;
-        private Label AdressLabel;
-        private Label DateLabel;
-        private Button SaveButton;
-        private Button CancelButton;
-        private DataGridView DataGridView;
-        private DataGridViewTextBoxColumn Column1;
-        private DataGridViewTextBoxColumn Название;
-        private DataGridViewTextBoxColumn Цена;
-        private DataGridViewTextBoxColumn Количество;
-        private Label labelCapacity;
-        private NumericUpDown numericUpWoodMaxCount;
-    }
-}

CarpentryWorkshop/CarpentryWorkshopView/FormShop.cs

@@ -1,120 +0,0 @@
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.BusinessLogicsContracts;
-using CarpentryWorkshopContracts.SearchModels;
-using CarpentryWorkshopDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System.Windows.Forms;
-
-namespace CarpentryWorkshopView
-{
-    public partial class FormShop : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-        public int? _id;
-        public int Id { set { _id = value; } }
-        private Dictionary<int, (IWoodModel, int)> _woods;
-        private DateTime? _dateopen = null;
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            _woods = new Dictionary<int, (IWoodModel, int)>();
-        }
-
-        private void ShopForm_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Загрузка магазина");
-                try
-                {
-                    var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
-                    if (shop != null)
-                    {
-                        NameTextBox.Text = shop.ShopName;
-                        AddressTextBox.Text = shop.Address;
-                        DateTimePicker.Text = shop.DateOpen.ToString();
-                        numericUpWoodMaxCount.Value = shop.WoodMaxCount;
-                        _woods = shop.ShopWoods ?? new Dictionary<int, (IWoodModel, int)>();
-                    }
-                    LoadData();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка загрузки магазина");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка товаров магазина");
-            try
-            {
-                if (_woods != null)
-                {
-                    foreach (var wood in _woods)
-                    {
-                        DataGridView.Rows.Add(new object[] { wood.Key, wood.Value.Item1.WoodName, wood.Value.Item1.Price, wood.Value.Item2 });
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки изделий магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-               MessageBoxIcon.Error);
-            }
-        }
-
-        private void CancelButton_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-
-        private void SaveButton_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(NameTextBox.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(AddressTextBox.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение магазина");
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    ShopName = NameTextBox.Text,
-                    Address = AddressTextBox.Text,
-                    DateOpen = DateTimePicker.Value.Date,
-                    WoodMaxCount = (int)numericUpWoodMaxCount.Value,
-                    ShopWoods = _woods
-                };
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка сохранения магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopView/FormShop.resx

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

CarpentryWorkshop/CarpentryWorkshopView/FormShops.Designer.cs

@@ -1,117 +0,0 @@
-namespace CarpentryWorkshopView
-{
-    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()
-        {
-            DataGridView = new DataGridView();
-            AddButton = new Button();
-            UpdateButton = new Button();
-            RefreshButton = new Button();
-            DeleteButton = new Button();
-            ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // DataGridView
-            // 
-            DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            DataGridView.Location = new Point(12, 12);
-            DataGridView.Name = "DataGridView";
-            DataGridView.Size = new Size(393, 374);
-            DataGridView.TabIndex = 0;
-            // 
-            // AddButton
-            // 
-            AddButton.Location = new Point(411, 12);
-            AddButton.Name = "AddButton";
-            AddButton.Size = new Size(114, 23);
-            AddButton.TabIndex = 1;
-            AddButton.Text = "Добавить";
-            AddButton.UseVisualStyleBackColor = true;
-            AddButton.Click += AddButton_Click;
-            // 
-            // UpdateButton
-            // 
-            UpdateButton.Location = new Point(411, 41);
-            UpdateButton.Name = "UpdateButton";
-            UpdateButton.Size = new Size(114, 23);
-            UpdateButton.TabIndex = 2;
-            UpdateButton.Text = "Изменить";
-            UpdateButton.UseVisualStyleBackColor = true;
-            UpdateButton.Click += UpdateButton_Click;
-            // 
-            // RefreshButton
-            // 
-            RefreshButton.Location = new Point(411, 70);
-            RefreshButton.Name = "RefreshButton";
-            RefreshButton.Size = new Size(114, 23);
-            RefreshButton.TabIndex = 3;
-            RefreshButton.Text = "Обновить";
-            RefreshButton.UseVisualStyleBackColor = true;
-            RefreshButton.Click += RefreshButton_Click;
-            // 
-            // DeleteButton
-            // 
-            DeleteButton.Location = new Point(411, 99);
-            DeleteButton.Name = "DeleteButton";
-            DeleteButton.Size = new Size(114, 23);
-            DeleteButton.TabIndex = 4;
-            DeleteButton.Text = "Удалить";
-            DeleteButton.UseVisualStyleBackColor = true;
-            DeleteButton.Click += DeleteButton_Click;
-            // 
-            // FormShops
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(539, 403);
-            Controls.Add(DeleteButton);
-            Controls.Add(RefreshButton);
-            Controls.Add(UpdateButton);
-            Controls.Add(AddButton);
-            Controls.Add(DataGridView);
-            Name = "FormShops";
-            Text = "Магазины";
-            Load += ShopsForm_Load;
-            ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private DataGridView DataGridView;
-        private Button AddButton;
-        private Button UpdateButton;
-        private Button RefreshButton;
-        private Button DeleteButton;
-        private DataGridViewTextBoxColumn Column1;
-        private DataGridViewTextBoxColumn Column2;
-        private DataGridViewTextBoxColumn Column3;
-        private DataGridViewTextBoxColumn Column4;
-        private DataGridViewTextBoxColumn Column5;
-    }
-}

CarpentryWorkshop/CarpentryWorkshopView/FormShops.cs

@@ -1,107 +0,0 @@
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-
-namespace CarpentryWorkshopView
-{
-    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 LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    DataGridView.DataSource = list;
-                    DataGridView.Columns["Id"].Visible = false;
-                    DataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    DataGridView.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    DataGridView.Columns["DateOpen"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    DataGridView.Columns["ShopWoods"].Visible = false;
-                }
-                _logger.LogInformation("Загрузка магазинов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ShopsForm_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void AddButton_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 UpdateButton_Click(object sender, EventArgs e)
-        {
-            if (DataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-                if (service is FormShop form)
-                {
-                    var tmp = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value);
-                    form._id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void RefreshButton_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void DeleteButton_Click(object sender, EventArgs e)
-        {
-            if (DataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    int id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление магазина");
-                    try
-                    {
-                        if (!_logic.Delete(new ShopBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления магазина");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopView/FormShops.resx

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

CarpentryWorkshop/CarpentryWorkshopView/FormSupply.Designer.cs

@@ -1,107 +0,0 @@
-namespace CarpentryWorkshopView
-{
-    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()
-        {
-            ShopComboBox = new ComboBox();
-            WoodComboBox = new ComboBox();
-            CountTextBox = new TextBox();
-            SaveButton = new Button();
-            CancelButton = new Button();
-            SuspendLayout();
-            // 
-            // ShopComboBox
-            // 
-            ShopComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
-            ShopComboBox.FormattingEnabled = true;
-            ShopComboBox.Location = new Point(12, 12);
-            ShopComboBox.Name = "ShopComboBox";
-            ShopComboBox.Size = new Size(331, 23);
-            ShopComboBox.TabIndex = 0;
-            // 
-            // WoodComboBox
-            // 
-            WoodComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
-            WoodComboBox.FormattingEnabled = true;
-            WoodComboBox.Location = new Point(12, 41);
-            WoodComboBox.Name = "WoodComboBox";
-            WoodComboBox.Size = new Size(331, 23);
-            WoodComboBox.TabIndex = 1;
-            // 
-            // CountTextBox
-            // 
-            CountTextBox.Location = new Point(12, 70);
-            CountTextBox.Name = "CountTextBox";
-            CountTextBox.Size = new Size(331, 23);
-            CountTextBox.TabIndex = 2;
-            // 
-            // SaveButton
-            // 
-            SaveButton.Location = new Point(187, 99);
-            SaveButton.Name = "SaveButton";
-            SaveButton.Size = new Size(75, 23);
-            SaveButton.TabIndex = 3;
-            SaveButton.Text = "Сохранить";
-            SaveButton.UseVisualStyleBackColor = true;
-            SaveButton.Click += SaveButton_Click;
-            // 
-            // CancelButton
-            // 
-            CancelButton.Location = new Point(268, 99);
-            CancelButton.Name = "CancelButton";
-            CancelButton.Size = new Size(75, 23);
-            CancelButton.TabIndex = 4;
-            CancelButton.Text = "Отмена";
-            CancelButton.UseVisualStyleBackColor = true;
-            CancelButton.Click += CancelButton_Click;
-            // 
-            // FormSupply
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(355, 136);
-            Controls.Add(CancelButton);
-            Controls.Add(SaveButton);
-            Controls.Add(CountTextBox);
-            Controls.Add(WoodComboBox);
-            Controls.Add(ShopComboBox);
-            Name = "FormSupply";
-            Text = "Поставки";
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private ComboBox ShopComboBox;
-        private ComboBox WoodComboBox;
-        private TextBox CountTextBox;
-        private Button SaveButton;
-        private Button CancelButton;
-    }
-}

CarpentryWorkshop/CarpentryWorkshopView/FormSupply.cs

@@ -1,153 +0,0 @@
-using CarpentryWorkshopContracts.BindingModels;
-using CarpentryWorkshopContracts.BusinessLogicsContracts;
-using CarpentryWorkshopContracts.SearchModels;
-using CarpentryWorkshopContracts.ViewModels;
-using CarpentryWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace CarpentryWorkshopView
-{
-    public partial class FormSupply : Form
-    {
-        private readonly List<WoodViewModel>? _woodList;
-        private readonly List<ShopViewModel>? _shopsList;
-        IShopLogic _shopLogic;
-        IWoodLogic _woodLogic;
-        public int ShopId
-        {
-            get
-            {
-                return
-       Convert.ToInt32(ShopComboBox.SelectedValue);
-            }
-            set
-            {
-                ShopComboBox.SelectedValue = value;
-            }
-        }
-        public int WoodId
-        {
-            get
-            {
-                return
-       Convert.ToInt32(WoodComboBox.SelectedValue);
-            }
-            set
-            {
-                WoodComboBox.SelectedValue = value;
-            }
-        }
-
-        public IWoodModel? WoodModel
-        {
-            get
-            {
-                if (_woodList == null)
-                {
-                    return null;
-                }
-                foreach (var elem in _woodList)
-                {
-                    if (elem.Id == WoodId)
-                    {
-                        return elem;
-                    }
-                }
-                return null;
-            }
-        }
-
-
-        public int Count
-        {
-            get { return Convert.ToInt32(CountTextBox.Text); }
-            set
-            { CountTextBox.Text = value.ToString(); }
-        }
-        public FormSupply(IWoodLogic woodLogic, IShopLogic shopLogic)
-        {
-            InitializeComponent();
-            _shopLogic = shopLogic;
-            _woodLogic = woodLogic;
-            _woodList = woodLogic.ReadList(null);
-            _shopsList = shopLogic.ReadList(null);
-            if (_woodList != null)
-            {
-                WoodComboBox.DisplayMember = "WoodName";
-                WoodComboBox.ValueMember = "Id";
-                WoodComboBox.DataSource = _woodList;
-                WoodComboBox.SelectedItem = null;
-            }
-            if (_shopsList != null)
-            {
-                ShopComboBox.DisplayMember = "ShopName";
-                ShopComboBox.ValueMember = "Id";
-                ShopComboBox.DataSource = _shopsList;
-                ShopComboBox.SelectedItem = null;
-            }
-        }
-
-        private void SaveButton_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(CountTextBox.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (WoodComboBox.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (ShopComboBox.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            try
-            {
-                int count = Convert.ToInt32(CountTextBox.Text);
-
-                bool res = _shopLogic.MakeSupply(new SupplyBindingModel
-                {
-                    ShopId = Convert.ToInt32(ShopComboBox.SelectedValue),
-                    WoodId = Convert.ToInt32(WoodComboBox.SelectedValue),
-                    Count = Convert.ToInt32(CountTextBox.Text)
-                });
-
-                if (!res)
-                {
-                    throw new Exception("Ошибка при пополнении. Дополнительная информация в логах");
-                }
-
-                MessageBox.Show("Пополнение прошло успешно");
-                DialogResult = DialogResult.OK;
-                Close();
-
-            }
-            catch (Exception err)
-            {
-                MessageBox.Show("Ошибка пополнения");
-                return;
-            }
-        }
-
-        private void CancelButton_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

CarpentryWorkshop/CarpentryWorkshopView/FormSupply.resx

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

CarpentryWorkshop/CarpentryWorkshopView/Program.cs

@@ -5,7 +5,6 @@ using CarpentryWorkshopFileImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
-using CarpentryWorkshopView;
 
 namespace CarpentryWorkshopView
 {
@@ -37,13 +36,9 @@ namespace CarpentryWorkshopView
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IWoodStorage, WoodStorage>();
-            services.AddTransient<IShopStorage, ShopStorage>();
-
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IWoodLogic, WoodLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
-
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -51,10 +46,6 @@ namespace CarpentryWorkshopView
             services.AddTransient<FormWood>();
             services.AddTransient<FormWoodComponent>();
             services.AddTransient<FormWoods>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormSupply>();
-            services.AddTransient<FormSell>();
         }
     }
 }