AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -4,7 +4,6 @@ using AutomobilePlantContracts.SearchModels;
 using AutomobilePlantContracts.StoragesContracts;
 using AutomobilePlantContracts.ViewModels;
 using AutomobilePlantDataModels.Enums;
-using AutomobilePlantDataModels.Models;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -18,17 +17,11 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
-        private readonly IShopLogic _shopLogic;
-        private readonly ICarStorage _carStorage;
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, ICarStorage carStorage, IShopStorage shopStorage)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _shopLogic = shopLogic;
-            _carStorage = carStorage;
-            _shopStorage = shopStorage;
         }
 
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
@@ -47,80 +40,16 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
         public bool CreateOrder(OrderBindingModel model)
         {
             CheckModel(model);
-            if (model.Status != OrderStatus.Неизвестен)
+            if (model.Status != OrderStatus.Неизвестен) return false;
-                return false;
             model.Status = OrderStatus.Принят;
             if (_orderStorage.Insert(model) == null)
             {
-                model.Status = OrderStatus.Неизвестен;
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
             return true;
         }
 
-        public bool CheckThenSupplyMany(ICarModel car, int count)
-        {
-            if (count <= 0)
-            {
-                _logger.LogWarning("Check then supply operation error. Car count < 0.");
-                return false;
-            }
-
-            int freeSpace = 0;
-            foreach (var shop in _shopStorage.GetFullList())
-            {
-                freeSpace += shop.MaxCountCars;
-                foreach (var c in shop.ShopCars)
-                {
-                    freeSpace -= c.Value.Item2;
-                }
-            }
-
-            if (freeSpace < count)
-            {
-                _logger.LogWarning("Check then supply operation error. There's no place for new cars in shops.");
-                return false;
-            }
-
-            foreach (var shop in _shopStorage.GetFullList())
-            {
-                freeSpace = shop.MaxCountCars;
-
-                foreach (var c in shop.ShopCars)
-                    freeSpace -= c.Value.Item2;
-
-                if (freeSpace <= 0)
-                    continue;
-
-                if (freeSpace >= count)
-                {
-                    if (_shopLogic.SupplyCars(new ShopSearchModel() { Id = shop.Id }, car, count))
-                        count = 0;
-                    else
-                    {
-                        _logger.LogWarning("Supply error");
-                        return false;
-                    }
-                }
-                if (freeSpace < count)
-                {
-                    if (_shopLogic.SupplyCars(new ShopSearchModel() { Id = shop.Id }, car, freeSpace))
-                        count -= freeSpace;
-                    else
-                    {
-                        _logger.LogWarning("Supply error");
-                        return false;
-                    }
-                }
-                if (count <= 0)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         public bool ChangeStatus(OrderBindingModel model, OrderStatus status)
         {
             CheckModel(model, false);
@@ -135,23 +64,6 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
                 _logger.LogWarning("Status change operation failed");
                 throw new InvalidOperationException("Текущий статус заказа не может быть переведен в выбранный");
             }
-
-            if (status == OrderStatus.Выдан)
-            {
-                var car = _carStorage.GetElement(new CarSearchModel() { Id = model.CarId });
-                if (car == null)
-                {
-                    _logger.LogWarning("Status change operation failed. Car not found.");
-                    return false;
-                }
-
-                if (!CheckThenSupplyMany(car, model.Count))
-                {
-                    _logger.LogWarning("Status change operation failed. Shop supply error.");
-                    return false;
-                }
-            }
-
             OrderStatus oldStatus = model.Status;
             model.Status = status;
             if (model.Status == OrderStatus.Выдан)

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,206 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicsContracts;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantContracts.StoragesContracts;
-using AutomobilePlantContracts.ViewModels;
-using AutomobilePlantDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantBusinessLogic.BusinessLogics
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            _logger.LogInformation("ReadElement. Shop Name:{0}, ID:{1}", model.Name, 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 List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. Shop Name:{0}, ID:{1} ", model?.Name, 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 SupplyCars(ShopSearchModel model, ICarModel car, int count)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            if (car == null)
-            {
-                throw new ArgumentNullException(nameof(car));
-            }
-
-            if (count <= 0)
-            {
-                throw new ArgumentNullException("Count of cars in supply must be more than 0", nameof(count));
-            }
-
-            var shopElement = _shopStorage.GetElement(model);
-            if (shopElement == null)
-            {
-                _logger.LogWarning("Required shop element not found in storage");
-                return false;
-            }
-
-            _logger.LogInformation("Shop element found. ID: {0}, Name: {1}", shopElement.Id, shopElement.Name);
-
-            int countCars = 0;
-            foreach (var c in shopElement.ShopCars)
-                countCars += c.Value.Item2;
-
-            if (count > shopElement.MaxCountCars - countCars)
-            {
-                _logger.LogWarning("Required shop will be overflowed");
-                return false;
-            }
-            else
-            {
-                if (shopElement.ShopCars.TryGetValue(car.Id, out var sameCar))
-                {
-                    shopElement.ShopCars[car.Id] = (car, sameCar.Item2 + count);
-                    _logger.LogInformation("Same car found by supply. Added {0} of {1} in {2} shop", count, car.CarName, shopElement.Name);
-                }
-                else
-                {
-                    shopElement.ShopCars[car.Id] = (car, count);
-                    _logger.LogInformation("New car added by supply. Added {0} of {1} in {2} shop", count, car.CarName, shopElement.Name);
-                }
-
-                _shopStorage.Update(new()
-                {
-                    Id = shopElement.Id,
-                    Name = shopElement.Name,
-                    Address = shopElement.Address,
-                    MaxCountCars = shopElement.MaxCountCars,
-                    OpeningDate = shopElement.OpeningDate,
-                    ShopCars = shopElement.ShopCars
-                });
-            }
-
-            return true;
-        }
-
-        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);
-
-            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.Name))
-            {
-                throw new ArgumentNullException("Нет названия магазина!", nameof(model.Name));
-            }
-
-            if (model.MaxCountCars < 0)
-            {
-                throw new InvalidOperationException("Отрицательное максимальное количество авто!");
-            }
-
-            _logger.LogInformation("Shop. Name: {0}, Address: {1}, ID: {2}", model.Name, model.Address, model.Id);
-
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Name = model.Name
-            });
-
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-
-        public bool SellCar(ICarModel car, int count)
-        {
-            return _shopStorage.SellCar(car, count);
-        }
-    }
-}

AutomobilePlant/AutomobilePlantContracts/BindingModels/ShopBindingModel.cs

@@ -1,28 +0,0 @@
-using AutomobilePlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; } = string.Empty;
-
-        public string Address { get; set; } = string.Empty;
-
-        public int MaxCountCars { get; set; }
-
-        public DateTime OpeningDate { get; set; }
-
-        public Dictionary<int, (ICarModel, int)> ShopCars
-        {
-            get;
-            set;
-        } = new();
-    }
-}

AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,23 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantContracts.ViewModels;
-using AutomobilePlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        ShopViewModel? ReadElement(ShopSearchModel model);
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-        bool Create(ShopBindingModel model);
-        bool Update(ShopBindingModel model);
-        bool Delete(ShopBindingModel model);
-        bool SupplyCars(ShopSearchModel model, ICarModel car, int count);
-        bool SellCar(ICarModel car, int count);
-    }
-}

AutomobilePlant/AutomobilePlantContracts/SearchModels/ShopSearchModel.cs

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

AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IShopStorage.cs

@@ -1,23 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantContracts.ViewModels;
-using AutomobilePlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantContracts.StoragesContracts
-{
-    public interface IShopStorage
-    {
-        ShopViewModel? GetElement(ShopSearchModel model);
-        List<ShopViewModel> GetFullList();
-        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
-        ShopViewModel? Insert(ShopBindingModel model);
-        ShopViewModel? Update(ShopBindingModel model);
-        ShopViewModel? Delete(ShopBindingModel model);
-        bool SellCar(ICarModel model, int count);
-    }
-}

AutomobilePlant/AutomobilePlantContracts/ViewModels/ShopViewModel.cs

@@ -1,29 +0,0 @@
-using AutomobilePlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantContracts.ViewModels
-{
-    public class ShopViewModel : IShopModel
-    {
-        public int Id { get; set; }
-
-        [DisplayName("Shop's name")]
-        public string Name { get; set; } = string.Empty;
-
-        [DisplayName("Address")]
-        public string Address { get; set; } = string.Empty;
-
-        [DisplayName("Maximum cars' count in shop")]
-        public int MaxCountCars { get; set; }
-
-        [DisplayName("Opening date")]
-        public DateTime OpeningDate { get; set; }
-
-        public Dictionary<int, (ICarModel, int)> ShopCars { get; set; } = new();
-    }
-}

AutomobilePlant/AutomobilePlantDataModels/Models/IShopModel.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        string Name { get; }
-        string Address { get; }
-        int MaxCountCars { get; }
-        DateTime OpeningDate { get; }
-        Dictionary<int, (ICarModel, int)> ShopCars { get; }
-    }
-}

AutomobilePlant/AutomobilePlantFileImplement/DataFileSingleton.cs

@@ -14,11 +14,9 @@ namespace AutomobilePlantFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string CarFileName = "Car.xml";
-        private readonly string ShopFileName = "Shop.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Car> Cars { get; private set; }
-        public List<Shop> Shops { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -30,13 +28,11 @@ namespace AutomobilePlantFileImplement
         public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
         public void SaveCars() => SaveData(Cars, CarFileName, "Cars", 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)!)!;
             Cars = LoadData(CarFileName, "Car", x => Car.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)
         {

AutomobilePlant/AutomobilePlantFileImplement/Implements/ShopStorage.cs

@@ -1,137 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantContracts.StoragesContracts;
-using AutomobilePlantContracts.ViewModels;
-using AutomobilePlantDataModels.Models;
-using AutomobilePlantFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantFileImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton source;
-        public ShopStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Shops.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                return new();
-            }
-            return source.Shops
-                .Select(x => x.GetViewModel)
-                .Where(x => x.Name.Contains(model.Name ?? string.Empty))
-                .ToList();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return source.Shops.Select(shop => shop.GetViewModel).ToList();
-        }
-
-        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)
-            {
-                return null;
-            }
-            source.Shops.Remove(shop);
-            source.SaveShops();
-            return shop.GetViewModel;
-        }
-
-        public bool SellCar(ICarModel model, int count)
-        {
-            var car = source.Cars.FirstOrDefault(x => x.Id == model.Id);
-
-            if (car == null)
-            {
-                return false;
-            }
-
-
-            var shopCars = source.Shops.SelectMany(shop => shop.ShopCars.Where(c => c.Value.Item1.Id == car.Id));
-
-            int countStore = 0;
-
-            foreach (var it in shopCars)
-                countStore += it.Value.Item2;
-
-            if (count > countStore)
-                return false;
-
-            foreach (var shop in source.Shops)
-            {
-                var cars = shop.ShopCars;
-
-                foreach (var c in cars.Where(x => x.Value.Item1.Id == car.Id))
-                {
-                    int min = Math.Min(c.Value.Item2, count);
-                    cars[c.Value.Item1.Id] = (c.Value.Item1, c.Value.Item2 - min);
-                    count -= min;
-
-                    if (count <= 0)
-                        break;
-                }
-
-                shop.Update(new ShopBindingModel
-                {
-                    Id = shop.Id,
-                    Name = shop.Name,
-                    Address = shop.Address,
-                    MaxCountCars = shop.MaxCountCars,
-                    OpeningDate = shop.OpeningDate,
-                    ShopCars = cars
-                });
-
-                source.SaveShops();
-
-                if (count <= 0)
-                    return true;
-            }
-
-            return true;
-        }
-    }
-}

AutomobilePlant/AutomobilePlantFileImplement/Models/Shop.cs

@@ -1,116 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.ViewModels;
-using AutomobilePlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace AutomobilePlantFileImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = string.Empty;
-        public string Address { get; private set; } = string.Empty;
-        public int MaxCountCars { get; private set; }
-        public DateTime OpeningDate { get; private set; }
-        public Dictionary<int, int> Cars { get; private set; } = new();
-        private Dictionary<int, (ICarModel, int)>? _shopCars = null;
-
-        public Dictionary<int, (ICarModel, int)> ShopCars
-        {
-            get
-            {
-                if (_shopCars == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _shopCars = Cars.ToDictionary(
-                        x => x.Key,
-                        y => ((source.Cars.FirstOrDefault(z => z.Id == y.Key) as ICarModel)!, y.Value)
-                    );
-                }
-                return _shopCars;
-            }
-        }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                Name = model.Name,
-                Address = model.Address,
-                MaxCountCars = model.MaxCountCars,
-                OpeningDate = model.OpeningDate,
-                Cars = model.ShopCars.ToDictionary(x => x.Key, x => x.Value.Item2)
-            };
-        }
-
-        public static Shop? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                Name = element.Element("Name")!.Value,
-                Address = element.Element("Address")!.Value,
-                MaxCountCars = Convert.ToInt32(element.Element("MaxCountCars")!.Value),
-                OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
-                Cars = element.Element("ShopCars")!.Elements("ShopCar").ToDictionary(
-                    x => Convert.ToInt32(x.Element("Key")?.Value),
-                    x => Convert.ToInt32(x.Element("Value")?.Value)
-                )
-            };
-        }
-
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Name = model.Name;
-            Address = model.Address;
-            MaxCountCars = model.MaxCountCars;
-            OpeningDate = model.OpeningDate;
-            if (model.ShopCars.Count > 0)
-            {
-                Cars = model.ShopCars.ToDictionary(x => x.Key, x => x.Value.Item2);
-                _shopCars = null;
-            }
-        }
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            Name = Name,
-            Address = Address,
-            MaxCountCars = MaxCountCars,
-            OpeningDate = OpeningDate,
-            ShopCars = ShopCars,
-        };
-
-        public XElement GetXElement => new(
-            "Shop",
-             new XAttribute("Id", Id),
-             new XElement("Name", Name),
-             new XElement("Address", Address),
-             new XElement("MaxCountCars", MaxCountCars),
-             new XElement("OpeningDate", OpeningDate.ToString()),
-             new XElement("ShopCars", Cars.Select(x =>
-             new XElement("ShopCar",
-             new XElement("Key", x.Key),
-             new XElement("Value", x.Value)))
-            .ToArray()));
-    }
-}

AutomobilePlant/AutomobilePlantListImplement/DataListSingleton.cs

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

AutomobilePlant/AutomobilePlantListImplement/Implements/ShopStorage.cs

@@ -1,131 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantContracts.StoragesContracts;
-using AutomobilePlantContracts.ViewModels;
-using AutomobilePlantDataModels.Models;
-using AutomobilePlantListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantListImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        public bool SellCar(ICarModel car, int count)
-        {
-            throw new NotImplementedException();
-        }
-        private readonly DataListSingleton _source;
-
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Name) && !model.Id.HasValue)
-            {
-                return null;
-            }
-
-            foreach (var shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(model.Name) && shop.Name == model.Name) || (model.Id.HasValue && shop.Id == model.Id))
-                {
-                    return shop.GetViewModel;
-                }
-            }
-
-            return null;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            var result = new List<ShopViewModel>();
-
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                return result;
-            }
-
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Name.Contains(model.Name))
-                {
-                    result.Add(shop.GetViewModel);
-                }
-            }
-
-            return result;
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            var result = new List<ShopViewModel>();
-
-            foreach (var shop in _source.Shops)
-            {
-                result.Add(shop.GetViewModel);
-            }
-
-            return result;
-        }
-
-        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;
-        }
-    }
-}

AutomobilePlant/AutomobilePlantListImplement/Models/Shop.cs

@@ -1,60 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.ViewModels;
-using AutomobilePlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantListImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = string.Empty;
-        public string Address { get; private set; } = string.Empty;
-        public int MaxCountCars { get; private set; }
-        public DateTime OpeningDate { get; private set; }
-        public Dictionary<int, (ICarModel, int)> ShopCars { get; private set; } = new();
-
-        public static Shop? Create(ShopBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-
-            return new Shop()
-            {
-                Id = model.Id,
-                Name = model.Name,
-                Address = model.Address,
-                OpeningDate = model.OpeningDate,
-                ShopCars = new()
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-
-            Name = model.Name;
-            Address = model.Address;
-            OpeningDate = model.OpeningDate;
-            ShopCars = model.ShopCars;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            Name = Name,
-            Address = Address,
-            OpeningDate = OpeningDate,
-            ShopCars = ShopCars
-        };
-    }
-}

AutomobilePlant/AutomobilePlantView/FormMain.Designer.cs

@@ -32,15 +32,12 @@
             toolStripMenuItemCatalogs = new ToolStripMenuItem();
             toolStripMenuItemComponents = new ToolStripMenuItem();
             toolStripMenuItemCars = new ToolStripMenuItem();
-            shopsToolStripMenuItem = new ToolStripMenuItem();
-            shopsSupplyToolStripMenuItem = new ToolStripMenuItem();
             dataGridView = new DataGridView();
             buttonCreateOrder = new Button();
             buttonTakeOrderInWork = new Button();
             buttonOrderReady = new Button();
             buttonIssuedOrder = new Button();
             buttonRefresh = new Button();
-            sellCarsToolStripMenuItem = new ToolStripMenuItem();
             menuStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -56,7 +53,7 @@
             // 
             // toolStripMenuItemCatalogs
             // 
-            toolStripMenuItemCatalogs.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemComponents, toolStripMenuItemCars, shopsToolStripMenuItem, shopsSupplyToolStripMenuItem, sellCarsToolStripMenuItem });
+            toolStripMenuItemCatalogs.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemComponents, toolStripMenuItemCars });
             toolStripMenuItemCatalogs.Name = "toolStripMenuItemCatalogs";
             toolStripMenuItemCatalogs.Size = new Size(65, 20);
             toolStripMenuItemCatalogs.Text = "Catalogs";
@@ -75,20 +72,6 @@
             toolStripMenuItemCars.Text = "Cars";
             toolStripMenuItemCars.Click += CarsToolStripMenuItem_Click;
             // 
-            // shopsToolStripMenuItem
-            // 
-            shopsToolStripMenuItem.Name = "shopsToolStripMenuItem";
-            shopsToolStripMenuItem.Size = new Size(180, 22);
-            shopsToolStripMenuItem.Text = "Shops";
-            shopsToolStripMenuItem.Click += shopsToolStripMenuItem_Click;
-            // 
-            // shopsSupplyToolStripMenuItem
-            // 
-            shopsSupplyToolStripMenuItem.Name = "shopsSupplyToolStripMenuItem";
-            shopsSupplyToolStripMenuItem.Size = new Size(180, 22);
-            shopsSupplyToolStripMenuItem.Text = "Shop's supply";
-            shopsSupplyToolStripMenuItem.Click += shopsSupplyToolStripMenuItem_Click;
-            // 
             // dataGridView
             // 
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -148,13 +131,6 @@
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRef_Click;
             // 
-            // sellCarsToolStripMenuItem
-            // 
-            sellCarsToolStripMenuItem.Name = "sellCarsToolStripMenuItem";
-            sellCarsToolStripMenuItem.Size = new Size(180, 22);
-            sellCarsToolStripMenuItem.Text = "Sell Cars";
-            sellCarsToolStripMenuItem.Click += sellCarsToolStripMenuItem_Click;
-            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -189,8 +165,5 @@
         private Button buttonOrderReady;
         private Button buttonIssuedOrder;
         private Button buttonRefresh;
-        private ToolStripMenuItem shopsToolStripMenuItem;
-        private ToolStripMenuItem shopsSupplyToolStripMenuItem;
-        private ToolStripMenuItem sellCarsToolStripMenuItem;
     }
 }

AutomobilePlant/AutomobilePlantView/FormMain.cs

@@ -38,6 +38,7 @@ namespace AutomobilePlantView
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["CarId"].Visible = false;
+
                 }
                 _logger.LogInformation("Загрузка заказов");
             }
@@ -47,8 +48,6 @@ namespace AutomobilePlantView
                 MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
-
-        // управление менюшкой
         private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
@@ -65,32 +64,6 @@ namespace AutomobilePlantView
                 form.ShowDialog();
             }
         }
-        private void shopsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-        private void shopsSupplyToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply));
-            if (service is FormShopSupply form)
-            {
-                form.ShowDialog();
-            }
-        }
-        private void sellCarsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShopSell));
-            if (service is FormShopSell form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        // управление заказами
         private void ButtonCreateOrder_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
@@ -184,7 +157,6 @@ namespace AutomobilePlantView
         {
             LoadData();
         }
-
     }
 
 }

AutomobilePlant/AutomobilePlantView/FormShop.Designer.cs

@@ -1,204 +0,0 @@
-namespace AutomobilePlantView
-{
-    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()
-        {
-            textBoxName = new TextBox();
-            textBoxAddress = new TextBox();
-            openingDateTimePicker = new DateTimePicker();
-            labelName = new Label();
-            labelAdress = new Label();
-            labelOpeningDate = new Label();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            dataGridView = new DataGridView();
-            IdCol = new DataGridViewTextBoxColumn();
-            CarCol = new DataGridViewTextBoxColumn();
-            CountCol = new DataGridViewTextBoxColumn();
-            textBoxMaxCountCars = new TextBox();
-            labelMaxCountCars = new Label();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // textBoxName
-            // 
-            textBoxName.Location = new Point(60, 6);
-            textBoxName.Name = "textBoxName";
-            textBoxName.Size = new Size(418, 23);
-            textBoxName.TabIndex = 0;
-            // 
-            // textBoxAddress
-            // 
-            textBoxAddress.Location = new Point(60, 35);
-            textBoxAddress.Name = "textBoxAddress";
-            textBoxAddress.Size = new Size(418, 23);
-            textBoxAddress.TabIndex = 1;
-            // 
-            // openingDateTimePicker
-            // 
-            openingDateTimePicker.Location = new Point(100, 93);
-            openingDateTimePicker.Name = "openingDateTimePicker";
-            openingDateTimePicker.Size = new Size(378, 23);
-            openingDateTimePicker.TabIndex = 3;
-            // 
-            // labelName
-            // 
-            labelName.AutoSize = true;
-            labelName.Location = new Point(12, 9);
-            labelName.Name = "labelName";
-            labelName.Size = new Size(42, 15);
-            labelName.TabIndex = 4;
-            labelName.Text = "Name:";
-            // 
-            // labelAdress
-            // 
-            labelAdress.AutoSize = true;
-            labelAdress.Location = new Point(12, 38);
-            labelAdress.Name = "labelAdress";
-            labelAdress.Size = new Size(45, 15);
-            labelAdress.TabIndex = 5;
-            labelAdress.Text = "Adress:";
-            // 
-            // labelOpeningDate
-            // 
-            labelOpeningDate.AutoSize = true;
-            labelOpeningDate.Location = new Point(12, 99);
-            labelOpeningDate.Name = "labelOpeningDate";
-            labelOpeningDate.Size = new Size(82, 15);
-            labelOpeningDate.TabIndex = 6;
-            labelOpeningDate.Text = "Opening date:";
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(322, 363);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(75, 23);
-            buttonSave.TabIndex = 7;
-            buttonSave.Text = "Save";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(403, 363);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 8;
-            buttonCancel.Text = "Cancel";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToAddRows = false;
-            dataGridView.AllowUserToDeleteRows = false;
-            dataGridView.AllowUserToResizeColumns = false;
-            dataGridView.AllowUserToResizeRows = false;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { IdCol, CarCol, CountCol });
-            dataGridView.Location = new Point(12, 122);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(466, 235);
-            dataGridView.TabIndex = 9;
-            // 
-            // IdCol
-            // 
-            IdCol.HeaderText = "Id";
-            IdCol.Name = "IdCol";
-            IdCol.Visible = false;
-            // 
-            // CarCol
-            // 
-            CarCol.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-            CarCol.HeaderText = "Car";
-            CarCol.Name = "CarCol";
-            // 
-            // CountCol
-            // 
-            CountCol.HeaderText = "Count";
-            CountCol.Name = "CountCol";
-            // 
-            // textBoxMaxCountCars
-            // 
-            textBoxMaxCountCars.Location = new Point(144, 64);
-            textBoxMaxCountCars.Name = "textBoxMaxCountCars";
-            textBoxMaxCountCars.Size = new Size(334, 23);
-            textBoxMaxCountCars.TabIndex = 10;
-            // 
-            // labelMaxCountCars
-            // 
-            labelMaxCountCars.AutoSize = true;
-            labelMaxCountCars.Location = new Point(12, 67);
-            labelMaxCountCars.Name = "labelMaxCountCars";
-            labelMaxCountCars.Size = new Size(126, 15);
-            labelMaxCountCars.TabIndex = 11;
-            labelMaxCountCars.Text = "Maximum cars' count:";
-            // 
-            // FormShop
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(490, 396);
-            Controls.Add(labelMaxCountCars);
-            Controls.Add(textBoxMaxCountCars);
-            Controls.Add(dataGridView);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(labelOpeningDate);
-            Controls.Add(labelAdress);
-            Controls.Add(labelName);
-            Controls.Add(openingDateTimePicker);
-            Controls.Add(textBoxAddress);
-            Controls.Add(textBoxName);
-            Name = "FormShop";
-            Text = "Shop";
-            Load += FormShop_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private TextBox textBoxName;
-        private TextBox textBoxAddress;
-        private DateTimePicker openingDateTimePicker;
-        private Label labelName;
-        private Label labelAdress;
-        private Label labelOpeningDate;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn IdCol;
-        private DataGridViewTextBoxColumn CarCol;
-        private DataGridViewTextBoxColumn CountCol;
-        private TextBox textBoxMaxCountCars;
-        private Label labelMaxCountCars;
-    }
-}

AutomobilePlant/AutomobilePlantView/FormShop.cs

@@ -1,142 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicsContracts;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AutomobilePlantView
-{
-    public partial class FormShop : Form
-    {
-        private readonly IShopLogic _logic;
-        private readonly ILogger _logger;
-        private Dictionary<int, (ICarModel, int)> _shopCars;
-        private int? _id;
-        public int Id { set { _id = value; } }
-
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            _shopCars = new();
-        }
-
-        private void FormShop_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Loading shop");
-
-                try
-                {
-                    var view = _logic.ReadElement(new ShopSearchModel { Id = _id.Value });
-
-                    if (view != null)
-                    {
-                        textBoxName.Text = view.Name;
-                        textBoxAddress.Text = view.Address;
-                        textBoxMaxCountCars.Text = view.MaxCountCars.ToString();
-                        openingDateTimePicker.Value = view.OpeningDate;
-                        _shopCars = view.ShopCars ?? new Dictionary<int, (ICarModel, int)>();
-                        LoadData();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка загрузки магазина");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка авто магазина");
-
-            try
-            {
-                if (_shopCars != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var car in _shopCars)
-                    {
-                        dataGridView.Rows.Add(new object[] { car.Key, car.Value.Item1.CarName, car.Value.Item2 });
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки авто магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxName.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (string.IsNullOrEmpty(textBoxAddress.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (string.IsNullOrEmpty(textBoxMaxCountCars.Text))
-            {
-                MessageBox.Show("Заполните макс. количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            _logger.LogInformation("Сохранение магазина");
-
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    Name = textBoxName.Text,
-                    Address = textBoxAddress.Text,
-                    MaxCountCars = Convert.ToInt32(textBoxMaxCountCars.Text),
-                    OpeningDate = openingDateTimePicker.Value.Date,
-                    ShopCars = _shopCars
-                };
-
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                }
-
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка при сохранении магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

AutomobilePlant/AutomobilePlantView/FormShop.resx

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

AutomobilePlant/AutomobilePlantView/FormShopSell.Designer.cs

@@ -1,119 +0,0 @@
-namespace AutomobilePlantView
-{
-    partial class FormShopSell
-    {
-        /// <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()
-        {
-            labelCar = new Label();
-            labelCount = new Label();
-            comboBoxCar = new ComboBox();
-            textBoxCount = new TextBox();
-            buttonCancel = new Button();
-            buttonSell = new Button();
-            SuspendLayout();
-            // 
-            // labelCar
-            // 
-            labelCar.AutoSize = true;
-            labelCar.Location = new Point(12, 9);
-            labelCar.Name = "labelCar";
-            labelCar.Size = new Size(28, 15);
-            labelCar.TabIndex = 0;
-            labelCar.Text = "Car:";
-            // 
-            // labelCount
-            // 
-            labelCount.AutoSize = true;
-            labelCount.Location = new Point(12, 38);
-            labelCount.Name = "labelCount";
-            labelCount.Size = new Size(43, 15);
-            labelCount.TabIndex = 1;
-            labelCount.Text = "Count:";
-            // 
-            // comboBoxCar
-            // 
-            comboBoxCar.FormattingEnabled = true;
-            comboBoxCar.Location = new Point(61, 6);
-            comboBoxCar.Name = "comboBoxCar";
-            comboBoxCar.Size = new Size(324, 23);
-            comboBoxCar.TabIndex = 2;
-            // 
-            // textBoxCount
-            // 
-            textBoxCount.Location = new Point(61, 35);
-            textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(324, 23);
-            textBoxCount.TabIndex = 3;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(229, 64);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 4;
-            buttonCancel.Text = "Cancel";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // buttonSell
-            // 
-            buttonSell.Location = new Point(310, 64);
-            buttonSell.Name = "buttonSell";
-            buttonSell.Size = new Size(75, 23);
-            buttonSell.TabIndex = 5;
-            buttonSell.Text = "Sell";
-            buttonSell.UseVisualStyleBackColor = true;
-            buttonSell.Click += buttonSell_Click;
-            // 
-            // FormShopSell
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(397, 93);
-            Controls.Add(buttonSell);
-            Controls.Add(buttonCancel);
-            Controls.Add(textBoxCount);
-            Controls.Add(comboBoxCar);
-            Controls.Add(labelCount);
-            Controls.Add(labelCar);
-            Name = "FormShopSell";
-            Text = "Sell";
-            Load += FormShopSell_Load;
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label labelCar;
-        private Label labelCount;
-        private ComboBox comboBoxCar;
-        private TextBox textBoxCount;
-        private Button buttonCancel;
-        private Button buttonSell;
-    }
-}

AutomobilePlant/AutomobilePlantView/FormShopSell.cs

@@ -1,95 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AutomobilePlantView
-{
-    public partial class FormShopSell : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ICarLogic _logicCar;
-        private readonly IShopLogic _logicShop;
-
-        public FormShopSell(ILogger<FormShopSell> logger, ICarLogic logicCar, IShopLogic logicShop)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicCar = logicCar;
-            _logicShop = logicShop;
-        }
-
-        private void FormShopSell_Load(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Загрузка авто для продажи");
-            try
-            {
-                var list = _logicCar.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxCar.DisplayMember = "CarName";
-                    comboBoxCar.ValueMember = "Id";
-                    comboBoxCar.DataSource = list;
-                    comboBoxCar.SelectedItem = null;
-                }
-
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка авто");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonSell_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxCar.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите авто", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание продажи");
-            try
-            {
-                var operationResult = _logicShop.SellCar(
-                    new CarBindingModel
-                    {
-                        Id = Convert.ToInt32(comboBoxCar.SelectedValue)
-                    },
-                    Convert.ToInt32(textBoxCount.Text)
-                );
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при создании продажи. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания продажи");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

AutomobilePlant/AutomobilePlantView/FormShopSell.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>

AutomobilePlant/AutomobilePlantView/FormShopSupply.Designer.cs

@@ -1,143 +0,0 @@
-namespace AutomobilePlantView
-{
-    partial class FormShopSupply
-    {
-        /// <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()
-        {
-            comboBoxCar = new ComboBox();
-            comboBoxShop = new ComboBox();
-            textBoxCount = new TextBox();
-            labelCar = new Label();
-            labelShop = new Label();
-            labelCount = new Label();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            SuspendLayout();
-            // 
-            // comboBoxCar
-            // 
-            comboBoxCar.FormattingEnabled = true;
-            comboBoxCar.Location = new Point(61, 6);
-            comboBoxCar.Name = "comboBoxCar";
-            comboBoxCar.Size = new Size(275, 23);
-            comboBoxCar.TabIndex = 0;
-            // 
-            // comboBoxShop
-            // 
-            comboBoxShop.FormattingEnabled = true;
-            comboBoxShop.Location = new Point(61, 35);
-            comboBoxShop.Name = "comboBoxShop";
-            comboBoxShop.Size = new Size(275, 23);
-            comboBoxShop.TabIndex = 1;
-            // 
-            // textBoxCount
-            // 
-            textBoxCount.Location = new Point(61, 64);
-            textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(275, 23);
-            textBoxCount.TabIndex = 2;
-            // 
-            // labelCar
-            // 
-            labelCar.AutoSize = true;
-            labelCar.BackColor = SystemColors.Control;
-            labelCar.Location = new Point(12, 9);
-            labelCar.Name = "labelCar";
-            labelCar.Size = new Size(28, 15);
-            labelCar.TabIndex = 3;
-            labelCar.Text = "Car:";
-            // 
-            // labelShop
-            // 
-            labelShop.AutoSize = true;
-            labelShop.Location = new Point(12, 38);
-            labelShop.Name = "labelShop";
-            labelShop.Size = new Size(37, 15);
-            labelShop.TabIndex = 4;
-            labelShop.Text = "Shop:";
-            // 
-            // labelCount
-            // 
-            labelCount.AutoSize = true;
-            labelCount.Location = new Point(12, 67);
-            labelCount.Name = "labelCount";
-            labelCount.Size = new Size(43, 15);
-            labelCount.TabIndex = 5;
-            labelCount.Text = "Count:";
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(180, 93);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(75, 23);
-            buttonSave.TabIndex = 6;
-            buttonSave.Text = "Save";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(261, 93);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 7;
-            buttonCancel.Text = "Cancel";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // FormShopSupply
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(348, 127);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(labelCount);
-            Controls.Add(labelShop);
-            Controls.Add(labelCar);
-            Controls.Add(textBoxCount);
-            Controls.Add(comboBoxShop);
-            Controls.Add(comboBoxCar);
-            Name = "FormShopSupply";
-            Text = "Shop's supply";
-            Load += FormShopSupply_Load;
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private ComboBox comboBoxCar;
-        private ComboBox comboBoxShop;
-        private TextBox textBoxCount;
-        private Label labelCar;
-        private Label labelShop;
-        private Label labelCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

AutomobilePlant/AutomobilePlantView/FormShopSupply.cs

@@ -1,126 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicsContracts;
-using AutomobilePlantContracts.SearchModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AutomobilePlantView
-{
-    public partial class FormShopSupply : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ICarLogic _logicCar;
-        private readonly IShopLogic _logicShop;
-
-        public FormShopSupply(ILogger<FormShopSupply> logger, ICarLogic logicCar, IShopLogic logicShop)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicCar = logicCar;
-            _logicShop = logicShop;
-        }
-
-        private void FormShopSupply_Load(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Загрузка авто для пополнения");
-
-            try
-            {
-                var list = _logicCar.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxCar.DisplayMember = "CarName";
-                    comboBoxCar.ValueMember = "Id";
-                    comboBoxCar.DataSource = list;
-                    comboBoxCar.SelectedItem = null;
-                }
-
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка авто");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-            _logger.LogInformation("Загрузка магазинов для пополнения");
-
-            try
-            {
-                var list = _logicShop.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxShop.DisplayMember = "Name";
-                    comboBoxShop.ValueMember = "Id";
-                    comboBoxShop.DataSource = list;
-                    comboBoxShop.SelectedItem = null;
-                }
-
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (comboBoxCar.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите авто", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (comboBoxShop.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            _logger.LogInformation("Создание поставки");
-
-            try
-            {
-                var operationResult = _logicShop.SupplyCars(
-                    new ShopSearchModel { Id = Convert.ToInt32(comboBoxShop.SelectedValue), Name = comboBoxShop.Text },
-                    new CarBindingModel { Id = Convert.ToInt32(comboBoxCar.SelectedValue), CarName = comboBoxCar.Text },
-                    Convert.ToInt32(textBoxCount.Text)
-                );
-
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах.");
-                }
-
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания поставки");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

AutomobilePlant/AutomobilePlantView/FormShopSupply.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>

AutomobilePlant/AutomobilePlantView/FormShops.Designer.cs

@@ -1,113 +0,0 @@
-namespace AutomobilePlantView
-{
-    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()
-        {
-            buttonRefresh = new Button();
-            buttonDelete = new Button();
-            buttonUpdate = new Button();
-            buttonAdd = new Button();
-            dataGridView = new DataGridView();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // buttonRefresh
-            // 
-            buttonRefresh.Location = new Point(678, 105);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(116, 23);
-            buttonRefresh.TabIndex = 9;
-            buttonRefresh.Text = "Refresh";
-            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += buttonRefresh_Click;
-            // 
-            // buttonDelete
-            // 
-            buttonDelete.Location = new Point(678, 76);
-            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(116, 23);
-            buttonDelete.TabIndex = 8;
-            buttonDelete.Text = "Delete";
-            buttonDelete.UseVisualStyleBackColor = true;
-            buttonDelete.Click += buttonDelete_Click;
-            // 
-            // buttonUpdate
-            // 
-            buttonUpdate.Location = new Point(678, 47);
-            buttonUpdate.Name = "buttonUpdate";
-            buttonUpdate.Size = new Size(116, 23);
-            buttonUpdate.TabIndex = 7;
-            buttonUpdate.Text = "Update";
-            buttonUpdate.UseVisualStyleBackColor = true;
-            buttonUpdate.Click += buttonUpdate_Click;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.Location = new Point(678, 18);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(116, 23);
-            buttonAdd.TabIndex = 6;
-            buttonAdd.Text = "Add";
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // dataGridView
-            // 
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(6, 6);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(666, 438);
-            dataGridView.TabIndex = 5;
-            // 
-            // FormShops
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
-            Controls.Add(buttonRefresh);
-            Controls.Add(buttonDelete);
-            Controls.Add(buttonUpdate);
-            Controls.Add(buttonAdd);
-            Controls.Add(dataGridView);
-            Name = "FormShops";
-            Text = "Shops";
-            Load += FormShops_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Button buttonRefresh;
-        private Button buttonDelete;
-        private Button buttonUpdate;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-    }
-}

AutomobilePlant/AutomobilePlantView/FormShops.cs

@@ -1,120 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AutomobilePlantView
-{
-    public partial class FormShops : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-
-        public FormShops(ILogger<FormShops> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormShops_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["Name"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["ShopCars"].Visible = false;
-                }
-
-                _logger.LogInformation("Загрузка магазинов");
-
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonRefresh_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void buttonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-
-            if (service is FormShop form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-
-        private void buttonUpdate_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-
-                if (service is FormShop form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void buttonDelete_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);
-                    }
-                }
-            }
-        }
-    }
-}

AutomobilePlant/AutomobilePlantView/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>

AutomobilePlant/AutomobilePlantView/Program.cs

@@ -40,8 +40,6 @@ namespace AutomobilePlantView
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ICarLogic, CarLogic>();
-            services.AddTransient<IShopStorage, ShopStorage>();
-            services.AddTransient<IShopLogic, ShopLogic>();
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -49,10 +47,6 @@ namespace AutomobilePlantView
             services.AddTransient<FormCar>();
             services.AddTransient<FormCarComponent>();
             services.AddTransient<FormCars>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormShopSupply>();
-            services.AddTransient<FormShopSell>();
         }
     }
 }