IceCreamShop/IceCreamShopBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -4,7 +4,6 @@ using IceCreamShopContracts.SearchModels;
 using IceCreamShopContracts.StoragesContracts;
 using IceCreamShopContracts.ViewModels;
 using IceCreamShopDataModels.Enums;
-using IceCreamShopDataModels.Models;
 using Microsoft.Extensions.Logging;
 
 namespace IceCreamShopBusinessLogic.BusinessLogics
@@ -15,20 +14,10 @@ namespace IceCreamShopBusinessLogic.BusinessLogics
 
         private readonly IOrderStorage _orderStorage;
 
-        private readonly IIceCreamStorage _iceCreamStorage;
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
-
-        private readonly IShopStorage _shopStorage;
-
-        private readonly IShopLogic _shopLogic;
-
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IIceCreamStorage iceCreamStorage, 
-            IShopStorage shopStorage, IShopLogic shopLogic)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _iceCreamStorage = iceCreamStorage;
-            _shopStorage = shopStorage;
-            _shopLogic = shopLogic;
         }
 
         public bool CreateOrder(OrderBindingModel model)
@@ -117,26 +106,15 @@ namespace IceCreamShopBusinessLogic.BusinessLogics
                     newStatus, order.Status);
                 return false;
             }
-            if (newStatus == OrderStatus.Выдан)
+            model.IceCreamId = order.IceCreamId;
-            {
+            model.Count = order.Count;
-                var iceCream = _iceCreamStorage.GetElement(new IceCreamSearchModel() { Id = order.IceCreamId });
+            model.Sum = order.Sum;
-                if (iceCream == null)
+            model.DateCreate = order.DateCreate;
-                {
-                    _logger.LogWarning("Change status operation failed. Ice cream not found");
-                    return false;
-                }
-                if (!DeliverIceCreams(iceCream, order.Count))
-                {
-                    _logger.LogWarning("Change status operation failed. Ice creams delivery operation failed");
-                    return false;
-                }
-            }
             model.Status = newStatus;
             if (model.Status == OrderStatus.Готов)
             {
                 model.DateImplement = DateTime.Now;
-            }
+            } else
-            else
             {
                 model.DateImplement = order.DateImplement;
             }
@@ -147,65 +125,5 @@ namespace IceCreamShopBusinessLogic.BusinessLogics
             }
             return true;
         }
-
-        private bool DeliverIceCreams(IIceCreamModel iceCream, int count)
-        {
-            if (count <= 0)
-            {
-                _logger.LogWarning("Ice creams delivery operation failed. Ice cream count <= 0");
-                return false;
     }
-
-            var shopList = _shopStorage.GetFullList();
-            int shopsCapacity = shopList.Sum(x => x.IceCreamsMaximum);
-            int currentIceCreams = shopList.Select(x => x.ShopIceCreams.Sum(y => y.Value.Item2)).Sum();
-            int freePlaces = shopsCapacity - currentIceCreams;
-
-            if (freePlaces < count)
-            {
-                _logger.LogWarning("Ice creams delivery operation failed. No space for new ice creams");
-                return false;
-            }
-
-            foreach (var shop in shopList)
-            {
-                freePlaces = shop.IceCreamsMaximum - shop.ShopIceCreams.Sum(x => x.Value.Item2);
-                if (freePlaces == 0)
-                {
-                    continue;
-                }
-                if (freePlaces >= count)
-                {
-                    if (_shopLogic.MakeShipment(new() { Id = shop.Id }, iceCream, count))
-                    {
-                        count = 0;
-                    }
-                    else
-                    {
-                        _logger.LogWarning("Ice creams delivery operation failed");
-                        return false;
-                    }
-                }
-                else
-                {
-                    if (_shopLogic.MakeShipment(new() { Id = shop.Id }, iceCream, freePlaces))
-                    {
-                        count -= freePlaces;
-                    }
-                    else
-                    {
-                        _logger.LogWarning("Ice creams delivery operation failed");
-                        return false;
-                    }
-                }
-                if (count == 0)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-
 }

IceCreamShop/IceCreamShopBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,177 +0,0 @@
-using IceCreamShopContracts.BindingModels;
-using IceCreamShopContracts.BusinessLogicsContracts;
-using IceCreamShopContracts.SearchModels;
-using IceCreamShopContracts.StoragesContracts;
-using IceCreamShopContracts.ViewModels;
-using IceCreamShopDataModels.Models;
-using Microsoft.Extensions.Logging;
-
-namespace IceCreamShopBusinessLogic.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 List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName: {ShopName}. Id: {Id}", model?.ShopName, model?.Id);
-            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count: {Count}", list.Count);
-            return list;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement.  ShopName: {ShopName}. Id: {Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id: {Id}", element.Id);
-            return element;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id: {Id}", model.Id);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool MakeShipment(ShopSearchModel shopModel, IIceCreamModel iceCream, int count)
-        {
-            if (shopModel == null)
-            {
-                throw new ArgumentNullException(nameof(shopModel));
-            }
-            if (iceCream == null)
-            {
-                throw new ArgumentNullException(nameof(iceCream));
-            }
-            if (count <= 0)
-            {
-                throw new ArgumentException("Количество товаров(мороженого) в магазине должно быть больше нуля", nameof(count));
-            }
-            _logger.LogInformation("MakeShipment(GetElement). ShopName: {ShopName}. Id: {Id}", shopModel.ShopName, shopModel.Id);
-            var shop = _shopStorage.GetElement(shopModel);
-            if (shop == null)
-            {
-                _logger.LogWarning("MakeShipment(GetElement). Element not found");
-                return false;
-            }
-            if (shop.IceCreamsMaximum - shop.ShopIceCreams.Sum(x => x.Value.Item2) < count)
-            {
-                _logger.LogWarning("MakeShipment error. No space for new ice creams");
-                return false;
-            }
-            if (shop.ShopIceCreams.ContainsKey(iceCream.Id))
-            {
-                var shopIC = shop.ShopIceCreams[iceCream.Id];
-                shopIC.Item2 += count;
-                shop.ShopIceCreams[iceCream.Id] = shopIC;
-                _logger.LogInformation("MakeShipment. Added {count} '{iceCream}' to '{ShopName}' shop", count, iceCream.IceCreamName, 
-                    shop.ShopName);
-            } 
-            else
-            {
-                shop.ShopIceCreams.Add(iceCream.Id, (iceCream, count));
-                _logger.LogInformation("MakeShipment. Added {count} new '{iceCream}' to '{ShopName}' shop", count, iceCream.IceCreamName, 
-                    shop.ShopName);
-            }
-            if (_shopStorage.Update(new ShopBindingModel()
-            {
-                Id = shop.Id,
-                ShopName = shop.ShopName,
-                Address = shop.Address,
-                DateOpening = shop.DateOpening,
-                IceCreamsMaximum = shop.IceCreamsMaximum,
-                ShopIceCreams = shop.ShopIceCreams,
-            }) == null)
-            {
-                _logger.LogWarning("MakeShipment. Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool MakeSale(IIceCreamModel model, int count)
-        {
-            return _shopStorage.MakeSale(model, count);
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName));
-            }
-            if (string.IsNullOrEmpty(model.Address))
-            {
-                throw new ArgumentNullException("Нет адреса магазина", nameof(model.Address));
-            }
-            _logger.LogInformation("Shop. ShopName: {ShopName}. Address: {Address}. Id: {Id}", model.ShopName, model.Address, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = model.ShopName
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-    }
-}

IceCreamShop/IceCreamShopContracts/BindingModels/ShopBindingModel.cs

@@ -1,23 +0,0 @@
-using IceCreamShopDataModels.Models;
-
-namespace IceCreamShopContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public int Id { get; set; }
-
-        public string ShopName { get; set; } = string.Empty;
-
-        public string Address { get; set; } = string.Empty;
-
-        public DateTime DateOpening { get; set; } = DateTime.Now;
-
-        public Dictionary<int, (IIceCreamModel, int)> ShopIceCreams
-        {
-            get;
-            set;
-        } = new();
-
-        public int IceCreamsMaximum { get; set; }
-    }
-}

IceCreamShop/IceCreamShopContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,24 +0,0 @@
-using IceCreamShopContracts.BindingModels;
-using IceCreamShopContracts.SearchModels;
-using IceCreamShopContracts.ViewModels;
-using IceCreamShopDataModels.Models;
-
-namespace IceCreamShopContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-
-        ShopViewModel? ReadElement(ShopSearchModel model);
-
-        bool Create(ShopBindingModel model);
-
-        bool Update(ShopBindingModel model);
-
-        bool Delete(ShopBindingModel model);
-
-        bool MakeShipment(ShopSearchModel shopModel, IIceCreamModel iceCream, int count);
-
-        bool MakeSale(IIceCreamModel model, int count);
-    }
-}

IceCreamShop/IceCreamShopContracts/SearchModels/ShopSearchModel.cs

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

IceCreamShop/IceCreamShopContracts/StoragesContracts/IShopStorage.cs

@@ -1,24 +0,0 @@
-using IceCreamShopContracts.BindingModels;
-using IceCreamShopContracts.SearchModels;
-using IceCreamShopContracts.ViewModels;
-using IceCreamShopDataModels.Models;
-
-namespace IceCreamShopContracts.StoragesContracts
-{
-    public interface IShopStorage
-    {
-        List<ShopViewModel> GetFullList();
-
-        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
-
-        ShopViewModel? GetElement(ShopSearchModel model);
-
-        ShopViewModel? Insert(ShopBindingModel model);
-
-        ShopViewModel? Update(ShopBindingModel model);
-
-        ShopViewModel? Delete(ShopBindingModel model);
-
-        bool MakeSale(IIceCreamModel model, int count);
-    }
-}

IceCreamShop/IceCreamShopContracts/ViewModels/ShopViewModel.cs

@@ -1,28 +0,0 @@
-using IceCreamShopDataModels.Models;
-using System.ComponentModel;
-
-namespace IceCreamShopContracts.ViewModels
-{
-    public class ShopViewModel : IShopModel
-    {
-        public int Id { get; set; }
-
-        [DisplayName("Название магазина")]
-        public string ShopName { get; set; } = string.Empty;
-
-        [DisplayName("Адрес")]
-        public string Address { get; set; } = string.Empty;
-
-        [DisplayName("Дата открытия")]
-        public DateTime DateOpening { get; set; } = DateTime.Now;
-
-        public Dictionary<int, (IIceCreamModel, int)> ShopIceCreams
-        {
-            get;
-            set;
-        } = new();
-
-        [DisplayName("Максимальное количество мороженого")]
-        public int IceCreamsMaximum { get; set; }
-    }
-}

IceCreamShop/IceCreamShopDataModels/Models/IShopModel.cs

@@ -1,15 +0,0 @@
-namespace IceCreamShopDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        string ShopName { get; }
-
-        string Address { get; }
-
-        DateTime DateOpening { get; }
-
-        Dictionary<int, (IIceCreamModel, int)> ShopIceCreams { get; }
-
-        int IceCreamsMaximum { get; }
-    }
-}

IceCreamShop/IceCreamShopFileImplement/DataFileSingleton.cs

@@ -13,16 +13,12 @@ namespace IceCreamShopFileImplement
 
         private readonly string IceCreamFileName = "IceCream.xml";
 
-        private readonly string ShopFileName = "Shop.xml";
-
         public List<Component> Components { get; private set; }
 
         public List<Order> Orders { get; private set; }
 
         public List<IceCream> IceCreams { get; private set; }
 
-        public List<Shop> Shops { get; private set; }
-
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -38,14 +34,11 @@ namespace IceCreamShopFileImplement
 
         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)!)!;
             IceCreams = LoadData(IceCreamFileName, "IceCream", x => IceCream.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)

IceCreamShop/IceCreamShopFileImplement/Implements/ShopStorage.cs

@@ -1,133 +0,0 @@
-using IceCreamShopContracts.BindingModels;
-using IceCreamShopContracts.SearchModels;
-using IceCreamShopContracts.StoragesContracts;
-using IceCreamShopContracts.ViewModels;
-using IceCreamShopDataModels.Models;
-using IceCreamShopFileImplement.Models;
-using System.Collections.Generic;
-
-namespace IceCreamShopFileImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public ShopStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return source.Shops
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return new();
-            }
-            return source.Shops
-                    .Where(x => x.ShopName.Contains(model.ShopName))
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Shops
-                    .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
-                                        (model.Id.HasValue && x.Id == model.Id))
-                    ?.GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            source.Shops.Add(newShop);
-            source.SaveShops();
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop == null)
-            {
-                return null;
-            }
-            shop.Update(model);
-            source.SaveShops();
-            return shop.GetViewModel;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            var element = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (element != null)
-            {
-                source.Shops.Remove(element);
-                source.SaveShops();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-
-        public bool MakeSale(IIceCreamModel model, int count)
-        {
-            var iceCream = source.IceCreams.FirstOrDefault(x => x.Id == model.Id);
-            int countInShops = source.Shops.SelectMany(x => x.ShopIceCreams).Sum(y => y.Key == model.Id ? y.Value.Item2 : 0);
-
-            if (iceCream == null || countInShops < count)
-            {
-                return false;
-            }
-
-            foreach (var shop in source.Shops)
-            {
-                var shopIceCreams = shop.ShopIceCreams.Where(x => x.Key == model.Id);
-                if (shopIceCreams.Any())
-                {
-                    var shopIceCream = shopIceCreams.First();
-                    int min = Math.Min(shopIceCream.Value.Item2, count);
-                    if (min == shopIceCream.Value.Item2) 
-                    {
-                        shop.ShopIceCreams.Remove(shopIceCream.Key);
-                    } 
-                    else
-                    {
-                        shop.ShopIceCreams[shopIceCream.Key] = (shopIceCream.Value.Item1, shopIceCream.Value.Item2 - min);
-                    }
-                    shop.Update(new ShopBindingModel
-                    {
-                        Id = shop.Id,
-                        ShopName = shop.ShopName,
-                        Address = shop.Address,
-                        DateOpening = shop.DateOpening,
-                        ShopIceCreams = shop.ShopIceCreams,
-                        IceCreamsMaximum = shop.IceCreamsMaximum
-                    });
-                    count -= min;
-                    if (count <= 0)
-                    {
-                        break;
-                    }
-                }
-            }
-            source.SaveShops();
-            return true;
-        }
-    }
-}

IceCreamShop/IceCreamShopFileImplement/Models/Shop.cs

@@ -1,108 +0,0 @@
-using IceCreamShopContracts.BindingModels;
-using IceCreamShopContracts.ViewModels;
-using IceCreamShopDataModels.Models;
-using System.Xml.Linq;
-
-namespace IceCreamShopFileImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-
-        public string ShopName { get; private set; } = string.Empty;
-
-        public string Address { get; private set; } = string.Empty;
-
-        public DateTime DateOpening { get; private set; }
-
-        public Dictionary<int, int> IceCreams { get; private set; } = new();
-
-        private Dictionary<int, (IIceCreamModel, int)>? _shopIceCreams = null;
-
-        public Dictionary<int, (IIceCreamModel, int)> ShopIceCreams
-        {
-            get
-            {
-                if (_shopIceCreams == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _shopIceCreams = IceCreams.ToDictionary(x => x.Key,
-                        y => ((source.IceCreams.FirstOrDefault(z => z.Id == y.Key) as IIceCreamModel)!, y.Value));
-                }
-                return _shopIceCreams;
-            }
-        }
-
-        public int IceCreamsMaximum { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Address = model.Address,
-                DateOpening = model.DateOpening,
-                IceCreams = model.ShopIceCreams.ToDictionary(x => x.Key, x => x.Value.Item2),
-                IceCreamsMaximum = model.IceCreamsMaximum
-            };
-        }
-
-        public static Shop? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ShopName = element.Element("ShopName")!.Value,
-                Address = element.Element("Address")!.Value,
-                DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value),
-                IceCreamsMaximum = Convert.ToInt32(element.Element("IceCreamsMaximum")!.Value),
-                IceCreams = element.Element("ShopIceCreams")!.Elements("ShopIceCream")
-                                .ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Address = model.Address;
-            DateOpening = model.DateOpening;
-            IceCreamsMaximum =  model.IceCreamsMaximum;
-            IceCreams = model.ShopIceCreams.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _shopIceCreams = null;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            DateOpening = DateOpening,
-            ShopIceCreams = ShopIceCreams,
-            IceCreamsMaximum = IceCreamsMaximum
-        };
-
-        public XElement GetXElement => new("Shop",
-                        new XAttribute("Id", Id),
-                        new XElement("ShopName", ShopName),
-                        new XElement("Address", Address),
-                        new XElement("DateOpening", DateOpening.ToString()),
-                        new XElement("IceCreamsMaximum", IceCreamsMaximum.ToString()),
-                        new XElement("ShopIceCreams",
-                            IceCreams.Select(x => new XElement("ShopIceCream",
-                                                                new XElement("Key", x.Key),
-                                                                new XElement("Value", x.Value))).ToArray()));
-    }
-}

IceCreamShop/IceCreamShopListImplement/DataListSingleton.cs

@@ -12,14 +12,11 @@ namespace IceCreamShopListImplement
 
         public List<IceCream> IceCreams { get; set; }
 
-        public List<Shop> Shops { get; set; }
-
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             IceCreams = new List<IceCream>();
-            Shops = new List<Shop>();
         }
 
         public static DataListSingleton GetInstance()

IceCreamShop/IceCreamShopListImplement/Implements/ShopStorage.cs

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

IceCreamShop/IceCreamShopListImplement/Models/Shop.cs

@@ -1,65 +0,0 @@
-using IceCreamShopContracts.BindingModels;
-using IceCreamShopContracts.ViewModels;
-using IceCreamShopDataModels.Models;
-
-namespace IceCreamShopListImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-
-        public string ShopName { get; private set; } = string.Empty;
-
-        public string Address { get; private set; } = string.Empty;
-
-        public DateTime DateOpening { get; private set; }
-
-        public Dictionary<int, (IIceCreamModel, int)> ShopIceCreams
-        {
-            get;
-            private set;
-        } = new Dictionary<int, (IIceCreamModel, int)>();
-
-        public int IceCreamsMaximum { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Address = model.Address,
-                DateOpening = model.DateOpening,
-                ShopIceCreams = model.ShopIceCreams, 
-                IceCreamsMaximum = model.IceCreamsMaximum
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Address = model.Address;
-            DateOpening = model.DateOpening;
-            ShopIceCreams = model.ShopIceCreams;
-            IceCreamsMaximum = model.IceCreamsMaximum;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            DateOpening = DateOpening,
-            ShopIceCreams = ShopIceCreams,
-            IceCreamsMaximum = IceCreamsMaximum
-        };
-    }
-}

IceCreamShop/IceCreamShopView/FormIceCreamSale.Designer.cs

@@ -1,127 +0,0 @@
-namespace IceCreamShopView
-{
-    partial class FormIceCreamSale
-    {
-        /// <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()
-        {
-            buttonCancel = new Button();
-            buttonSale = new Button();
-            textBoxCount = new TextBox();
-            labelCount = new Label();
-            comboBoxIceCream = new ComboBox();
-            labelIceCream = new Label();
-            SuspendLayout();
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(253, 83);
-            buttonCancel.Margin = new Padding(4, 3, 4, 3);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(88, 27);
-            buttonCancel.TabIndex = 17;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += ButtonCancel_Click;
-            // 
-            // buttonSale
-            // 
-            buttonSale.Location = new Point(159, 83);
-            buttonSale.Margin = new Padding(4, 3, 4, 3);
-            buttonSale.Name = "buttonSale";
-            buttonSale.Size = new Size(88, 27);
-            buttonSale.TabIndex = 16;
-            buttonSale.Text = "Продать";
-            buttonSale.UseVisualStyleBackColor = true;
-            buttonSale.Click += ButtonSale_Click;
-            // 
-            // textBoxCount
-            // 
-            textBoxCount.Location = new Point(101, 51);
-            textBoxCount.Margin = new Padding(4, 3, 4, 3);
-            textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(252, 23);
-            textBoxCount.TabIndex = 15;
-            // 
-            // labelCount
-            // 
-            labelCount.AutoSize = true;
-            labelCount.Location = new Point(13, 54);
-            labelCount.Margin = new Padding(4, 0, 4, 0);
-            labelCount.Name = "labelCount";
-            labelCount.Size = new Size(78, 15);
-            labelCount.TabIndex = 14;
-            labelCount.Text = "Количество :";
-            // 
-            // comboBoxIceCream
-            // 
-            comboBoxIceCream.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxIceCream.FormattingEnabled = true;
-            comboBoxIceCream.Location = new Point(101, 15);
-            comboBoxIceCream.Margin = new Padding(4, 3, 4, 3);
-            comboBoxIceCream.Name = "comboBoxIceCream";
-            comboBoxIceCream.Size = new Size(252, 23);
-            comboBoxIceCream.TabIndex = 13;
-            // 
-            // labelIceCream
-            // 
-            labelIceCream.AutoSize = true;
-            labelIceCream.Location = new Point(13, 19);
-            labelIceCream.Margin = new Padding(4, 0, 4, 0);
-            labelIceCream.Name = "labelIceCream";
-            labelIceCream.Size = new Size(80, 15);
-            labelIceCream.TabIndex = 12;
-            labelIceCream.Text = "Мороженое :";
-            // 
-            // FormIceCreamSale
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(373, 123);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSale);
-            Controls.Add(textBoxCount);
-            Controls.Add(labelCount);
-            Controls.Add(comboBoxIceCream);
-            Controls.Add(labelIceCream);
-            Name = "FormIceCreamSale";
-            StartPosition = FormStartPosition.CenterScreen;
-            Text = "Продажа мороженого";
-            Load += FormIceCreamSale_Load;
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Button buttonCancel;
-        private Button buttonSale;
-        private TextBox textBoxCount;
-        private Label labelCount;
-        private ComboBox comboBoxIceCream;
-        private Label labelIceCream;
-    }
-}

IceCreamShop/IceCreamShopView/FormIceCreamSale.cs

@@ -1,87 +0,0 @@
-using IceCreamShopContracts.BusinessLogicsContracts;
-using IceCreamShopContracts.BindingModels;
-using Microsoft.Extensions.Logging;
-
-namespace IceCreamShopView
-{
-    public partial class FormIceCreamSale : Form
-    {
-        private readonly ILogger _logger;
-
-        private readonly IIceCreamLogic _logicIceCream;
-
-        private readonly IShopLogic _logicShop;
-
-        public FormIceCreamSale(ILogger<FormMakeShipment> logger, IIceCreamLogic logicIceCream, IShopLogic logicShop)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicIceCream = logicIceCream;
-            _logicShop = logicShop;
-        }
-
-        private void FormIceCreamSale_Load(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Ice creams loading");
-            try
-            {
-                var list = _logicIceCream.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxIceCream.DisplayMember = "IceCreamName";
-                    comboBoxIceCream.ValueMember = "Id";
-                    comboBoxIceCream.DataSource = list;
-                    comboBoxIceCream.SelectedItem = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ice creams loading error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSale_Click(object sender, EventArgs e)
-        {
-            if (comboBoxIceCream.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите мороженое", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Ice cream sale");
-            try
-            {
-                var operationResult = _logicShop.MakeSale(
-                    new IceCreamBindingModel
-                    {
-                        Id = Convert.ToInt32(comboBoxIceCream.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, "Ice cream sale error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

IceCreamShop/IceCreamShopView/FormIceCreamSale.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>

IceCreamShop/IceCreamShopView/FormMain.cs

@@ -60,33 +60,6 @@ namespace IceCreamShopView
             }
         }
 
-        private void МагазиныToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void ПополнениеМагазинаToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormMakeShipment));
-            if (service is FormMakeShipment form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void продажаМороженогоToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormIceCreamSale));
-            if (service is FormIceCreamSale form)
-            {
-                form.ShowDialog();
-            }
-        }
-
         private void ButtonCreateOrder_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));

IceCreamShop/IceCreamShopView/FormMain.designer.cs

@@ -32,22 +32,19 @@
             справочникиToolStripMenuItem = new ToolStripMenuItem();
             компонентыToolStripMenuItem = new ToolStripMenuItem();
             мороженоеToolStripMenuItem = new ToolStripMenuItem();
-            магазиныToolStripMenuItem = new ToolStripMenuItem();
-            пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem();
             buttonIssuedOrder = new Button();
             buttonOrderReady = new Button();
             buttonTakeOrderInWork = new Button();
             buttonCreateOrder = new Button();
             dataGridView = new DataGridView();
             buttonUpd = new Button();
-            продажаМороженогоToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
             // 
             // menuStrip
             // 
-            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem, продажаМороженогоToolStripMenuItem });
+            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
             menuStrip.Padding = new Padding(7, 2, 0, 2);
@@ -57,7 +54,7 @@
             // 
             // справочникиToolStripMenuItem
             // 
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, мороженоеToolStripMenuItem, магазиныToolStripMenuItem });
+            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, мороженоеToolStripMenuItem });
             справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             справочникиToolStripMenuItem.Size = new Size(94, 20);
             справочникиToolStripMenuItem.Text = "Справочники";
@@ -65,31 +62,17 @@
             // компонентыToolStripMenuItem
             // 
             компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-            компонентыToolStripMenuItem.Size = new Size(145, 22);
+            компонентыToolStripMenuItem.Size = new Size(180, 22);
             компонентыToolStripMenuItem.Text = "Компоненты";
             компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
             // 
             // мороженоеToolStripMenuItem
             // 
             мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem";
-            мороженоеToolStripMenuItem.Size = new Size(145, 22);
+            мороженоеToolStripMenuItem.Size = new Size(180, 22);
             мороженоеToolStripMenuItem.Text = "Мороженое";
             мороженоеToolStripMenuItem.Click += МороженоеToolStripMenuItem_Click;
             // 
-            // магазиныToolStripMenuItem
-            // 
-            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            магазиныToolStripMenuItem.Size = new Size(145, 22);
-            магазиныToolStripMenuItem.Text = "Магазины";
-            магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click;
-            // 
-            // пополнениеМагазинаToolStripMenuItem
-            // 
-            пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem";
-            пополнениеМагазинаToolStripMenuItem.Size = new Size(143, 20);
-            пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина";
-            пополнениеМагазинаToolStripMenuItem.Click += ПополнениеМагазинаToolStripMenuItem_Click;
-            // 
             // buttonIssuedOrder
             // 
             buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@@ -167,13 +150,6 @@
             buttonUpd.UseVisualStyleBackColor = true;
             buttonUpd.Click += ButtonUpd_Click;
             // 
-            // продажаМороженогоToolStripMenuItem
-            // 
-            продажаМороженогоToolStripMenuItem.Name = "продажаМороженогоToolStripMenuItem";
-            продажаМороженогоToolStripMenuItem.Size = new Size(143, 20);
-            продажаМороженогоToolStripMenuItem.Text = "Продажа мороженого";
-            продажаМороженогоToolStripMenuItem.Click += продажаМороженогоToolStripMenuItem_Click;
-            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -211,9 +187,6 @@
         private System.Windows.Forms.Button buttonCreateOrder;
         private System.Windows.Forms.DataGridView dataGridView;
         private System.Windows.Forms.Button buttonUpd;
-        private ToolStripMenuItem магазиныToolStripMenuItem;
-        private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem;
-        private ToolStripMenuItem продажаМороженогоToolStripMenuItem;
     }
 }
 

IceCreamShop/IceCreamShopView/FormMakeShipment.Designer.cs

@@ -1,153 +0,0 @@
-namespace IceCreamShopView
-{
-    partial class FormMakeShipment
-    {
-        /// <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()
-        {
-            labelShop = new Label();
-            comboBoxShop = new ComboBox();
-            labelIceCream = new Label();
-            comboBoxIceCream = new ComboBox();
-            labelCount = new Label();
-            textBoxCount = new TextBox();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            SuspendLayout();
-            // 
-            // labelShop
-            // 
-            labelShop.AutoSize = true;
-            labelShop.Location = new Point(14, 13);
-            labelShop.Margin = new Padding(4, 0, 4, 0);
-            labelShop.Name = "labelShop";
-            labelShop.Size = new Size(60, 15);
-            labelShop.TabIndex = 2;
-            labelShop.Text = "Магазин :";
-            // 
-            // comboBoxShop
-            // 
-            comboBoxShop.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxShop.FormattingEnabled = true;
-            comboBoxShop.Location = new Point(102, 10);
-            comboBoxShop.Margin = new Padding(4, 3, 4, 3);
-            comboBoxShop.Name = "comboBoxShop";
-            comboBoxShop.Size = new Size(252, 23);
-            comboBoxShop.TabIndex = 5;
-            // 
-            // labelIceCream
-            // 
-            labelIceCream.AutoSize = true;
-            labelIceCream.Location = new Point(14, 48);
-            labelIceCream.Margin = new Padding(4, 0, 4, 0);
-            labelIceCream.Name = "labelIceCream";
-            labelIceCream.Size = new Size(80, 15);
-            labelIceCream.TabIndex = 6;
-            labelIceCream.Text = "Мороженое :";
-            // 
-            // comboBoxIceCream
-            // 
-            comboBoxIceCream.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxIceCream.FormattingEnabled = true;
-            comboBoxIceCream.Location = new Point(102, 44);
-            comboBoxIceCream.Margin = new Padding(4, 3, 4, 3);
-            comboBoxIceCream.Name = "comboBoxIceCream";
-            comboBoxIceCream.Size = new Size(252, 23);
-            comboBoxIceCream.TabIndex = 7;
-            // 
-            // labelCount
-            // 
-            labelCount.AutoSize = true;
-            labelCount.Location = new Point(14, 83);
-            labelCount.Margin = new Padding(4, 0, 4, 0);
-            labelCount.Name = "labelCount";
-            labelCount.Size = new Size(78, 15);
-            labelCount.TabIndex = 8;
-            labelCount.Text = "Количество :";
-            // 
-            // textBoxCount
-            // 
-            textBoxCount.Location = new Point(102, 80);
-            textBoxCount.Margin = new Padding(4, 3, 4, 3);
-            textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(252, 23);
-            textBoxCount.TabIndex = 9;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(160, 112);
-            buttonSave.Margin = new Padding(4, 3, 4, 3);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(88, 27);
-            buttonSave.TabIndex = 10;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += ButtonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(254, 112);
-            buttonCancel.Margin = new Padding(4, 3, 4, 3);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(88, 27);
-            buttonCancel.TabIndex = 11;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += ButtonCancel_Click;
-            // 
-            // FormMakeShipment
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(373, 147);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(textBoxCount);
-            Controls.Add(labelCount);
-            Controls.Add(comboBoxIceCream);
-            Controls.Add(labelIceCream);
-            Controls.Add(comboBoxShop);
-            Controls.Add(labelShop);
-            Name = "FormMakeShipment";
-            StartPosition = FormStartPosition.CenterScreen;
-            Text = "Пополнение магазина";
-            Load += FormMakeShipment_Load;
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label labelShop;
-        private ComboBox comboBoxShop;
-        private Label labelIceCream;
-        private ComboBox comboBoxIceCream;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

IceCreamShop/IceCreamShopView/FormMakeShipment.cs

@@ -1,116 +0,0 @@
-using IceCreamShopContracts.BusinessLogicsContracts;
-using IceCreamShopContracts.SearchModels;
-using Microsoft.Extensions.Logging;
-
-namespace IceCreamShopView
-{
-    public partial class FormMakeShipment : Form
-    {
-        private readonly ILogger _logger;
-
-        private readonly IIceCreamLogic _logicIceCream;
-
-        private readonly IShopLogic _logicShop;
-
-        public FormMakeShipment(ILogger<FormMakeShipment> logger, IIceCreamLogic logicIceCream, IShopLogic logicShop)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicIceCream = logicIceCream;
-            _logicShop = logicShop;
-        }
-
-        private void FormMakeShipment_Load(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Ice creams loading");
-            try
-            {
-                var list = _logicIceCream.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxIceCream.DisplayMember = "IceCreamName";
-                    comboBoxIceCream.ValueMember = "Id";
-                    comboBoxIceCream.DataSource = list;
-                    comboBoxIceCream.SelectedItem = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ice creams loading error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-            _logger.LogInformation("Shops loading");
-            try
-            {
-                var list = _logicShop.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxShop.DisplayMember = "ShopName";
-                    comboBoxShop.ValueMember = "Id";
-                    comboBoxShop.DataSource = list;
-                    comboBoxShop.SelectedItem = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Shops loading error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (comboBoxShop.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxIceCream.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите мороженое", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Shop replenishment");
-            try
-            {
-                var iceCream = _logicIceCream.ReadElement(new IceCreamSearchModel 
-                { Id = Convert.ToInt32(comboBoxIceCream.SelectedValue) });
-                if (iceCream == null)
-                {
-                    throw new Exception("Мороженое не найдено.");
-                }
-                var operationResult = _logicShop.MakeShipment(new ShopSearchModel
-                {
-                    Id = Convert.ToInt32(comboBoxShop.SelectedValue)
-                },
-                iceCream, 
-                Convert.ToInt32(textBoxCount.Text));
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при проведении поставки.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Shop replenishment error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

IceCreamShop/IceCreamShopView/FormMakeShipment.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>

IceCreamShop/IceCreamShopView/FormShop.Designer.cs

@@ -1,237 +0,0 @@
-namespace IceCreamShopView
-{
-    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()
-        {
-            labelName = new Label();
-            textBoxName = new TextBox();
-            labelAddress = new Label();
-            textBoxAddress = new TextBox();
-            dateTimePicker = new DateTimePicker();
-            labelOpeningDate = new Label();
-            groupBoxIceCreams = new GroupBox();
-            dataGridView = new DataGridView();
-            ColumnId = new DataGridViewTextBoxColumn();
-            ColumnName = new DataGridViewTextBoxColumn();
-            ColumnCount = new DataGridViewTextBoxColumn();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            textBoxMaximum = new TextBox();
-            labelMaximum = new Label();
-            groupBoxIceCreams.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // labelName
-            // 
-            labelName.AutoSize = true;
-            labelName.Location = new Point(14, 10);
-            labelName.Margin = new Padding(4, 0, 4, 0);
-            labelName.Name = "labelName";
-            labelName.Size = new Size(65, 15);
-            labelName.TabIndex = 1;
-            labelName.Text = "Название :";
-            // 
-            // textBoxName
-            // 
-            textBoxName.Location = new Point(92, 7);
-            textBoxName.Margin = new Padding(4, 3, 4, 3);
-            textBoxName.Name = "textBoxName";
-            textBoxName.Size = new Size(252, 23);
-            textBoxName.TabIndex = 2;
-            // 
-            // labelAddress
-            // 
-            labelAddress.AutoSize = true;
-            labelAddress.Location = new Point(14, 40);
-            labelAddress.Margin = new Padding(4, 0, 4, 0);
-            labelAddress.Name = "labelAddress";
-            labelAddress.Size = new Size(46, 15);
-            labelAddress.TabIndex = 3;
-            labelAddress.Text = "Адрес :";
-            // 
-            // textBoxAddress
-            // 
-            textBoxAddress.Location = new Point(92, 37);
-            textBoxAddress.Margin = new Padding(4, 3, 4, 3);
-            textBoxAddress.Name = "textBoxAddress";
-            textBoxAddress.Size = new Size(252, 23);
-            textBoxAddress.TabIndex = 4;
-            // 
-            // dateTimePicker
-            // 
-            dateTimePicker.Location = new Point(126, 66);
-            dateTimePicker.Name = "dateTimePicker";
-            dateTimePicker.Size = new Size(218, 23);
-            dateTimePicker.TabIndex = 5;
-            // 
-            // labelOpeningDate
-            // 
-            labelOpeningDate.AutoSize = true;
-            labelOpeningDate.Location = new Point(14, 69);
-            labelOpeningDate.Margin = new Padding(4, 0, 4, 0);
-            labelOpeningDate.Name = "labelOpeningDate";
-            labelOpeningDate.Size = new Size(93, 15);
-            labelOpeningDate.TabIndex = 6;
-            labelOpeningDate.Text = "Дата открытия :";
-            // 
-            // groupBoxIceCreams
-            // 
-            groupBoxIceCreams.Controls.Add(dataGridView);
-            groupBoxIceCreams.Location = new Point(5, 138);
-            groupBoxIceCreams.Margin = new Padding(4, 3, 4, 3);
-            groupBoxIceCreams.Name = "groupBoxIceCreams";
-            groupBoxIceCreams.Padding = new Padding(4, 3, 4, 3);
-            groupBoxIceCreams.Size = new Size(469, 288);
-            groupBoxIceCreams.TabIndex = 7;
-            groupBoxIceCreams.TabStop = false;
-            groupBoxIceCreams.Text = "Мороженое";
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToAddRows = false;
-            dataGridView.AllowUserToDeleteRows = false;
-            dataGridView.BackgroundColor = SystemColors.ControlLightLight;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnCount });
-            dataGridView.Dock = DockStyle.Left;
-            dataGridView.Location = new Point(4, 19);
-            dataGridView.Margin = new Padding(4, 3, 4, 3);
-            dataGridView.MultiSelect = false;
-            dataGridView.Name = "dataGridView";
-            dataGridView.ReadOnly = true;
-            dataGridView.RowHeadersVisible = false;
-            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(457, 266);
-            dataGridView.TabIndex = 0;
-            // 
-            // ColumnId
-            // 
-            ColumnId.HeaderText = "Id";
-            ColumnId.Name = "ColumnId";
-            ColumnId.ReadOnly = true;
-            ColumnId.Visible = false;
-            // 
-            // ColumnName
-            // 
-            ColumnName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-            ColumnName.HeaderText = "Название мороженого";
-            ColumnName.Name = "ColumnName";
-            ColumnName.ReadOnly = true;
-            // 
-            // ColumnCount
-            // 
-            ColumnCount.HeaderText = "Количество";
-            ColumnCount.Name = "ColumnCount";
-            ColumnCount.ReadOnly = true;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(256, 434);
-            buttonSave.Margin = new Padding(4, 3, 4, 3);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(88, 27);
-            buttonSave.TabIndex = 8;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += ButtonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(360, 434);
-            buttonCancel.Margin = new Padding(4, 3, 4, 3);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(88, 27);
-            buttonCancel.TabIndex = 9;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += ButtonCancel_Click;
-            // 
-            // textBoxMaximum
-            // 
-            textBoxMaximum.Location = new Point(169, 97);
-            textBoxMaximum.Margin = new Padding(4, 3, 4, 3);
-            textBoxMaximum.Name = "textBoxMaximum";
-            textBoxMaximum.Size = new Size(175, 23);
-            textBoxMaximum.TabIndex = 11;
-            // 
-            // labelMaximum
-            // 
-            labelMaximum.AutoSize = true;
-            labelMaximum.Location = new Point(14, 100);
-            labelMaximum.Margin = new Padding(4, 0, 4, 0);
-            labelMaximum.Name = "labelMaximum";
-            labelMaximum.Size = new Size(147, 15);
-            labelMaximum.TabIndex = 10;
-            labelMaximum.Text = "Максимум мороженого :";
-            // 
-            // FormShop
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(478, 468);
-            Controls.Add(textBoxMaximum);
-            Controls.Add(labelMaximum);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(groupBoxIceCreams);
-            Controls.Add(labelOpeningDate);
-            Controls.Add(dateTimePicker);
-            Controls.Add(textBoxAddress);
-            Controls.Add(labelAddress);
-            Controls.Add(textBoxName);
-            Controls.Add(labelName);
-            Name = "FormShop";
-            StartPosition = FormStartPosition.CenterScreen;
-            Text = "Магазин";
-            Load += FormShop_Load;
-            groupBoxIceCreams.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label labelName;
-        private TextBox textBoxName;
-        private Label labelAddress;
-        private TextBox textBoxAddress;
-        private DateTimePicker dateTimePicker;
-        private Label labelOpeningDate;
-        private GroupBox groupBoxIceCreams;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn ColumnId;
-        private DataGridViewTextBoxColumn ColumnName;
-        private DataGridViewTextBoxColumn ColumnCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private TextBox textBoxMaximum;
-        private Label labelMaximum;
-    }
-}

IceCreamShop/IceCreamShopView/FormShop.cs

@@ -1,132 +0,0 @@
-using IceCreamShopContracts.BindingModels;
-using IceCreamShopContracts.BusinessLogicsContracts;
-using IceCreamShopContracts.SearchModels;
-using IceCreamShopDataModels.Models;
-using Microsoft.Extensions.Logging;
-
-namespace IceCreamShopView
-{
-    public partial class FormShop : Form
-    {
-        private readonly ILogger _logger;
-
-        private readonly IShopLogic _logic;
-
-        private int? _id;
-
-        private Dictionary<int, (IIceCreamModel, int)> _shopIceCreams;
-
-        public int Id { set { _id = value; } }
-
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            _shopIceCreams = new Dictionary<int, (IIceCreamModel, int)>();
-        }
-
-        private void FormShop_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Shop loading");
-                try
-                {
-                    var view = _logic.ReadElement(new ShopSearchModel { Id = _id.Value });
-                    if (view != null)
-                    {
-                        textBoxName.Text = view.ShopName;
-                        textBoxAddress.Text = view.Address;
-                        dateTimePicker.Value = view.DateOpening;
-                        textBoxMaximum.Text = view.IceCreamsMaximum.ToString();
-                        _shopIceCreams = view.ShopIceCreams ?? new Dictionary<int, (IIceCreamModel, int)>();
-                        LoadData();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Shop loading error");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Shop ice creams loading");
-            try
-            {
-                if (_shopIceCreams != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var iceCream in _shopIceCreams)
-                    {
-                        dataGridView.Rows.Add(new object[] { iceCream.Key, iceCream.Value.Item1.IceCreamName, iceCream.Value.Item2 });
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Shop ice creams loading error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxName.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxAddress.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(dateTimePicker.Text))
-            {
-                MessageBox.Show("Заполните дату", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxMaximum.Text))
-            {
-                MessageBox.Show("Заполните максимальное количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Shop saving");
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    ShopName = textBoxName.Text,
-                    Address = textBoxAddress.Text,
-                    DateOpening = dateTimePicker.Value,
-                    IceCreamsMaximum = Convert.ToInt32(textBoxMaximum.Text),
-                    ShopIceCreams = _shopIceCreams
-                };
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Shop saving error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

IceCreamShop/IceCreamShopView/FormShop.resx

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

IceCreamShop/IceCreamShopView/FormShops.Designer.cs

@@ -1,126 +0,0 @@
-namespace IceCreamShopView
-{
-    partial class FormShops
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            dataGridView = new DataGridView();
-            buttonUpd = new Button();
-            buttonDel = new Button();
-            buttonEdit = new Button();
-            buttonAdd = new Button();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToAddRows = false;
-            dataGridView.AllowUserToDeleteRows = false;
-            dataGridView.BackgroundColor = SystemColors.ControlLightLight;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Dock = DockStyle.Left;
-            dataGridView.Location = new Point(0, 0);
-            dataGridView.Margin = new Padding(4, 3, 4, 3);
-            dataGridView.MultiSelect = false;
-            dataGridView.Name = "dataGridView";
-            dataGridView.ReadOnly = true;
-            dataGridView.RowHeadersVisible = false;
-            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(408, 360);
-            dataGridView.TabIndex = 2;
-            // 
-            // buttonUpd
-            // 
-            buttonUpd.Location = new Point(432, 152);
-            buttonUpd.Margin = new Padding(4, 3, 4, 3);
-            buttonUpd.Name = "buttonUpd";
-            buttonUpd.Size = new Size(88, 27);
-            buttonUpd.TabIndex = 12;
-            buttonUpd.Text = "Обновить";
-            buttonUpd.UseVisualStyleBackColor = true;
-            buttonUpd.Click += ButtonUpd_Click;
-            // 
-            // buttonDel
-            // 
-            buttonDel.Location = new Point(432, 105);
-            buttonDel.Margin = new Padding(4, 3, 4, 3);
-            buttonDel.Name = "buttonDel";
-            buttonDel.Size = new Size(88, 27);
-            buttonDel.TabIndex = 11;
-            buttonDel.Text = "Удалить";
-            buttonDel.UseVisualStyleBackColor = true;
-            buttonDel.Click += ButtonDel_Click;
-            // 
-            // buttonEdit
-            // 
-            buttonEdit.Location = new Point(432, 58);
-            buttonEdit.Margin = new Padding(4, 3, 4, 3);
-            buttonEdit.Name = "buttonEdit";
-            buttonEdit.Size = new Size(88, 27);
-            buttonEdit.TabIndex = 10;
-            buttonEdit.Text = "Изменить";
-            buttonEdit.UseVisualStyleBackColor = true;
-            buttonEdit.Click += ButtonEdit_Click;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.Location = new Point(432, 14);
-            buttonAdd.Margin = new Padding(4, 3, 4, 3);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(88, 27);
-            buttonAdd.TabIndex = 9;
-            buttonAdd.Text = "Добавить";
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += ButtonAdd_Click;
-            // 
-            // FormShops
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(541, 360);
-            Controls.Add(buttonUpd);
-            Controls.Add(buttonDel);
-            Controls.Add(buttonEdit);
-            Controls.Add(buttonAdd);
-            Controls.Add(dataGridView);
-            Name = "FormShops";
-            StartPosition = FormStartPosition.CenterScreen;
-            Text = "Магазины";
-            Load += FormShops_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private DataGridView dataGridView;
-        private Button buttonUpd;
-        private Button buttonDel;
-        private Button buttonEdit;
-        private Button buttonAdd;
-    }
-}

IceCreamShop/IceCreamShopView/FormShops.cs

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

IceCreamShop/IceCreamShopView/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>

IceCreamShop/IceCreamShopView/Program.cs

@@ -38,12 +38,10 @@ namespace IceCreamShopView
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IIceCreamStorage, IceCreamStorage>();
-            services.AddTransient<IShopStorage, ShopStorage>();
 
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IIceCreamLogic, IceCreamLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
 
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
@@ -52,10 +50,6 @@ namespace IceCreamShopView
             services.AddTransient<FormIceCream>();
             services.AddTransient<FormIceCreamComponent>();
             services.AddTransient<FormIceCreams>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormMakeShipment>();
-            services.AddTransient<FormIceCreamSale>();
         }
     }
 }