LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -4,7 +4,6 @@ using AbstractLawFirmContracts.SearchModels;
 using AbstractLawFirmContracts.StoragesContracts;
 using AbstractLawFirmContracts.ViewModels;
 using AbstractLawFirmDataModels.Enums;
-using AbstractLawFirmDataModels.Models;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -18,17 +17,11 @@ namespace AbstractLawFirmBusinessLogic.BusinessLogic
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
-        private readonly IShopLogic _shopLogic;
-        private readonly IDocumentStorage _documentStorage;
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, IDocumentStorage documentStorage, IShopStorage shopStorage)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _shopLogic = shopLogic;
-            _documentStorage = documentStorage;
-            _shopStorage = shopStorage;
         }
 
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
@@ -52,7 +45,6 @@ namespace AbstractLawFirmBusinessLogic.BusinessLogic
             model.Status = OrderStatus.Принят;
             if (_orderStorage.Insert(model) == null)
             {
-                model.Status = OrderStatus.Неизвестен;
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
@@ -61,7 +53,7 @@ namespace AbstractLawFirmBusinessLogic.BusinessLogic
 
         public bool ChangeStatus(OrderBindingModel model, OrderStatus status)
         {
-            CheckModel(model, false);
+            CheckModel(model);
             var element = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
             if (element == null)
             {
@@ -73,31 +65,9 @@ namespace AbstractLawFirmBusinessLogic.BusinessLogic
                 _logger.LogWarning("Status change operation failed");
                 throw new InvalidOperationException("Текущий статус заказа не может быть переведен в выбранный");
             }
-            if (status == OrderStatus.Готов)
-            {
-                var document = _documentStorage.GetElement(new DocumentSearchModel() { Id = model.DocumentId });
-                if (document == null)
-                {
-                    _logger.LogWarning("Status change operation failed. Car not found.");
-                    return false;
-                }
-
-                if (!CheckThenSupplyMany(document, model.Count))
-                {
-                    _logger.LogWarning("Status change operation failed. Shop supply error.");
-                    return false;
-                }
-            }
-
             model.Status = status;
             if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now;
             _orderStorage.Update(model);
-            if (_orderStorage.Update(model) == null)
-            {
-                model.Status--;
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
             return true;
         }
 
@@ -127,10 +97,6 @@ true)
             {
                 return;
             }
-            if (model.DocumentId < 0)
-            {
-                throw new ArgumentNullException("Некорректный идентификатор документа", nameof(model.DocumentId));
-            }
             if (model.Sum <= 0)
             {
                 throw new ArgumentNullException("Цена заказа должна быть больше 0", nameof(model.Sum));
@@ -141,67 +107,5 @@ true)
             }
             _logger.LogInformation("Order. Sum:{ Cost}. Id: { Id}", model.Sum, model.Id);
         }
-        public bool CheckThenSupplyMany(IDocumentModel document, int count)
-        {
-            if (count <= 0)
-            {
-                _logger.LogWarning("Check then supply operation error. Car count < 0.");
-                return false;
-            }
-
-            int freeSpace = 0;
-            foreach (var shop in _shopStorage.GetFullList())
-            {
-                freeSpace += shop.MaxCountDocuments;
-                foreach (var c in shop.ShopDocuments)
-                {
-                    freeSpace -= c.Value.Item2;
-                }
-            }
-
-            if (freeSpace < count)
-            {
-                _logger.LogWarning("Check then supply operation error. There's no place for new cars in shops.");
-                return false;
-            }
-
-            foreach (var shop in _shopStorage.GetFullList())
-            {
-                freeSpace = shop.MaxCountDocuments;
-
-                foreach (var c in shop.ShopDocuments)
-                    freeSpace -= c.Value.Item2;
-
-                if (freeSpace <= 0)
-                    continue;
-
-                if (freeSpace >= count)
-                {
-                    if (_shopLogic.SupplyDocuments(new ShopSearchModel() { Id = shop.Id }, document, count))
-                        count = 0;
-                    else
-                    {
-                        _logger.LogWarning("Supply error");
-                        return false;
-                    }
-                }
-                if (freeSpace < count)
-                {
-                    if (_shopLogic.SupplyDocuments(new ShopSearchModel() { Id = shop.Id }, document, freeSpace))
-                        count -= freeSpace;
-                    else
-                    {
-                        _logger.LogWarning("Supply error");
-                        return false;
-                    }
-                }
-                if (count <= 0)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
     }
 }

LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/ShopLogic.cs

@@ -1,177 +0,0 @@
-using AbstractLawFirmContracts.BindingModels;
-using AbstractLawFirmContracts.BusinessLogicsContracts;
-using AbstractLawFirmContracts.SearchModels;
-using AbstractLawFirmContracts.StoragesContracts;
-using AbstractLawFirmContracts.ViewModels;
-using AbstractLawFirmDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractLawFirmBusinessLogic.BusinessLogic
-{
-    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 SupplyDocuments(ShopSearchModel model, IDocumentModel document, int count)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-            if (count <= 0)
-            {
-                throw new ArgumentException("Количество изделий должно быть больше 0", nameof(count));
-            }
-            _logger.LogInformation("AddPlaneInShop. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("AddPlaneInShop element not found");
-                return false;
-            }
-            _logger.LogInformation("AddPlaneInShop find. Id:{Id}", element.Id);
-            int countDocuments = 0;
-            foreach (var c in element.ShopDocuments)
-                countDocuments += c.Value.Item2;
-            if (count > element.MaxCountDocuments - countDocuments)
-            {
-                _logger.LogWarning("Required shop will be overflowed");
-                return false;
-            }
-            else
-            {
-                if (element.ShopDocuments.TryGetValue(document.Id, out var pair))
-                {
-                    element.ShopDocuments[document.Id] = (document, count + pair.Item2);
-                    _logger.LogInformation("AddPlaneInShop. Added {count} {plane} to '{ShopName}' shop", count, document.DocumentName, element.ShopName);
-                }
-                else
-                {
-                    element.ShopDocuments[document.Id] = (document, count);
-                    _logger.LogInformation("AddPlaneInShop. Added {count} new plane {plane} to '{ShopName}' shop", count, document.DocumentName, element.ShopName);
-                }
-
-                _shopStorage.Update(new()
-                {
-                    Id = element.Id,
-                    Address = element.Address,
-                    ShopName = element.ShopName,
-                    MaxCountDocuments = element.MaxCountDocuments,
-                    OpeningDate = element.OpeningDate,
-                    ShopDocuments = element.ShopDocuments
-                });
-            }
-            return true;
-        }
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName));
-            }
-            _logger.LogInformation("Shop. ShopName:{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 && element.ShopName == model.ShopName)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-        public bool SellDocument(IDocumentModel document, int count)
-        {
-            return _shopStorage.SellDocument(document, count);
-        }
-    }
-}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/ShopBindingModel.cs

@@ -1,27 +0,0 @@
-using AbstractLawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractLawFirmContracts.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 OpeningDate { get; set; } = DateTime.Now;
-
-        public Dictionary<int, (IDocumentModel, int)> ShopDocuments
-        {
-            get;
-            set;
-        } = new();
-        public int MaxCountDocuments { get; set;  }
-    }
-}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,23 +0,0 @@
-using AbstractLawFirmContracts.BindingModels;
-using AbstractLawFirmContracts.SearchModels;
-using AbstractLawFirmContracts.ViewModels;
-using AbstractLawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractLawFirmContracts.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 SupplyDocuments(ShopSearchModel model, IDocumentModel document, int count);
-        bool SellDocument(IDocumentModel document, int count);
-    }
-}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/ShopSearchModel.cs

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

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IShopStorage.cs

@@ -1,23 +0,0 @@
-using AbstractLawFirmContracts.BindingModels;
-using AbstractLawFirmContracts.ViewModels;
-using AbstractLawFirmContracts.SearchModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AbstractLawFirmDataModels.Models;
-
-namespace AbstractLawFirmContracts.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 SellDocument(IDocumentModel model, int count);
-    }
-}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ShopViewModel.cs

@@ -1,31 +0,0 @@
-using AbstractLawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractLawFirmContracts.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 OpeningDate { get; set; } = DateTime.Now;
-        public Dictionary<int, (IDocumentModel, int)> ShopDocuments
-        {
-            get;
-            set;
-        } = new();
-        [DisplayName("Максимальное количество пакетов документов в магазине")]
-        public int MaxCountDocuments { get; set; }
-    }
-}

LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IShopModel.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractLawFirmDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        String ShopName { get; }
-        String Address { get; }
-        DateTime OpeningDate { get; }
-        Dictionary<int, (IDocumentModel, int)> ShopDocuments { get; }
-        int MaxCountDocuments { get; }
-    }
-}

LawFirm/AbstractLawFirmFileImplement/DataFileSingleton.cs

@@ -14,12 +14,9 @@ namespace AbstractLawFirmFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string DocumentFileName = "Document.xml";
-        private readonly string ShopFileName = "Shop.xml";
-
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Document> Documents { get; private set; }
-        public List<Shop> Shops { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -31,13 +28,11 @@ namespace AbstractLawFirmFileImplement
         public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
         public void SaveDocuments() => SaveData(Documents, DocumentFileName, "Documents", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
             Documents = LoadData(DocumentFileName, "Document", x => Document.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)

LawFirm/AbstractLawFirmFileImplement/Implements/ShopStorage.cs

@@ -1,137 +0,0 @@
-using AbstractLawFirmContracts.BindingModels;
-using AbstractLawFirmContracts.SearchModels;
-using AbstractLawFirmContracts.StoragesContracts;
-using AbstractLawFirmContracts.ViewModels;
-using AbstractLawFirmDataModels.Models;
-using AbstractLawFirmFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractLawFirmFileImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton source;
-        public ShopStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Shops.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return new();
-            }
-            return source.Shops
-                .Select(x => x.GetViewModel)
-                .Where(x => x.ShopName.Contains(model.ShopName ?? string.Empty))
-                .ToList();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return source.Shops.Select(shop => shop.GetViewModel).ToList();
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            source.Shops.Add(newShop);
-            source.SaveShops();
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop == null)
-            {
-                return null;
-            }
-            shop.Update(model);
-            source.SaveShops();
-            return shop.GetViewModel;
-        }
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop == null)
-            {
-                return null;
-            }
-            source.Shops.Remove(shop);
-            source.SaveShops();
-            return shop.GetViewModel;
-        }
-
-        public bool SellDocument(IDocumentModel model, int count)
-        {
-            var document = source.Documents.FirstOrDefault(x => x.Id == model.Id);
-
-            if (document == null)
-            {
-                return false;
-            }
-
-
-            var shopDocuments = source.Shops.SelectMany(shop => shop.ShopDocuments.Where(c => c.Value.Item1.Id == document.Id));
-
-            int countStore = 0;
-
-            foreach (var it in shopDocuments)
-                countStore += it.Value.Item2;
-
-            if (count > countStore)
-                return false;
-
-            foreach (var shop in source.Shops)
-            {
-                var documents = shop.ShopDocuments;
-
-                foreach (var c in documents.Where(x => x.Value.Item1.Id == document.Id))
-                {
-                    int min = Math.Min(c.Value.Item2, count);
-                    documents[c.Value.Item1.Id] = (c.Value.Item1, c.Value.Item2 - min);
-                    count -= min;
-
-                    if (count <= 0)
-                        break;
-                }
-
-                shop.Update(new ShopBindingModel
-                {
-                    Id = shop.Id,
-                    ShopName = shop.ShopName,
-                    Address = shop.Address,
-                    MaxCountDocuments = shop.MaxCountDocuments,
-                    OpeningDate = shop.OpeningDate,
-                    ShopDocuments = documents
-                });
-
-                source.SaveShops();
-
-                if (count <= 0)
-                    return true;
-            }
-
-            return true;
-        }
-    }
-}

LawFirm/AbstractLawFirmFileImplement/Models/Shop.cs

@@ -1,113 +0,0 @@
-using AbstractLawFirmContracts.BindingModels;
-using AbstractLawFirmContracts.ViewModels;
-using AbstractLawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace AbstractLawFirmFileImplement.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 int MaxCountDocuments { get; private set; }
-        public DateTime OpeningDate { get; private set; }
-        public Dictionary<int, int> Documents { get; private set; } = new();
-        private Dictionary<int, (IDocumentModel, int)>? _shopDocuments = null;
-        public Dictionary<int, (IDocumentModel, int)> ShopDocuments
-        {
-            get
-            {
-                if (_shopDocuments == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _shopDocuments = Documents.ToDictionary(
-                        x => x.Key,
-                        y => ((source.Documents.FirstOrDefault(z => z.Id == y.Key) as IDocumentModel)!, y.Value)
-                    );
-                }
-                return _shopDocuments;
-            }
-        }
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Address = model.Address,
-                MaxCountDocuments = model.MaxCountDocuments,
-                OpeningDate = model.OpeningDate,
-                Documents = model.ShopDocuments.ToDictionary(x => x.Key, x => x.Value.Item2)
-            };
-        }
-        public static Shop? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ShopName = element.Element("ShopName")!.Value,
-                Address = element.Element("Address")!.Value,
-                MaxCountDocuments = Convert.ToInt32(element.Element("MaxCountDocuments")!.Value),
-                OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
-                Documents = element.Element("ShopDocuments")!.Elements("ShopDocument").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;
-            MaxCountDocuments = model.MaxCountDocuments;
-            OpeningDate = model.OpeningDate;
-            if (model.ShopDocuments.Count > 0)
-            {
-                Documents = model.ShopDocuments.ToDictionary(x => x.Key, x => x.Value.Item2);
-                _shopDocuments = null;
-            }
-        }
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            MaxCountDocuments = MaxCountDocuments,
-            OpeningDate = OpeningDate,
-            ShopDocuments = ShopDocuments,
-        };
-
-        public XElement GetXElement => new(
-        "Shop",
-             new XAttribute("Id", Id),
-             new XElement("ShopName", ShopName),
-             new XElement("Address", Address),
-             new XElement("MaxCountDocuments", MaxCountDocuments),
-             new XElement("OpeningDate", OpeningDate.ToString()),
-             new XElement("ShopDocuments", Documents.Select(x =>
-             new XElement("ShopDocument",
-             new XElement("Key", x.Key),
-             new XElement("Value", x.Value)))
-            .ToArray()));
-    }
-}

LawFirm/AbstractLawFirmListImplement/DataListSingleton.cs

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

LawFirm/AbstractLawFirmListImplement/Implements/ShopStorage.cs

@@ -1,123 +0,0 @@
-using AbstractLawFirmContracts.BindingModels;
-using AbstractLawFirmContracts.SearchModels;
-using AbstractLawFirmContracts.StoragesContracts;
-using AbstractLawFirmContracts.ViewModels;
-using AbstractLawFirmListImplement.Models;
-using AbstractLawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractLawFirmListImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataListSingleton _source;
-        public bool SellDocument(IDocumentModel document, int count)
-        {
-            throw new NotImplementedException();
-        }
-
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-
-        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 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 List<ShopViewModel> GetFullList()
-        {
-            var result = new List<ShopViewModel>();
-            foreach (var shop in _source.Shops)
-            {
-                result.Add(shop.GetViewModel);
-            }
-            return result;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = 1;
-
-            foreach (var shop in _source.Shops)
-            {
-                if (model.Id <= shop.Id)
-                {
-                    model.Id = shop.Id + 1;
-                }
-            }
-
-            var newShop = Shop.Create(model);
-
-            if (newShop == null)
-            {
-                return null;
-            }
-            _source.Shops.Add(newShop);
-
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Id == model.Id)
-                {
-                    shop.Update(model);
-                    return shop.GetViewModel;
-                }
-            }
-
-            return null;
-        }
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            for (int i = 0; i < _source.Shops.Count; ++i)
-            {
-                if (_source.Shops[i].Id == model.Id)
-                {
-                    var element = _source.Shops[i];
-                    _source.Shops.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
-}

LawFirm/AbstractLawFirmListImplement/Models/Shop.cs

@@ -1,61 +0,0 @@
-using AbstractLawFirmContracts.BindingModels;
-using AbstractLawFirmContracts.ViewModels;
-using AbstractLawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractLawFirmListImplement.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 int MaxCountDocuments { get; private set; }
-        public DateTime OpeningDate { get; private set; }
-        public Dictionary<int, (IDocumentModel, int)> ShopDocuments
-        {
-            get;
-            private set;
-        } = new Dictionary<int, (IDocumentModel, int)>();
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Address = model.Address,
-                OpeningDate = model.OpeningDate,
-                ShopDocuments = model.ShopDocuments
-            };
-        }
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-
-            ShopName = model.ShopName;
-            Address = model.Address;
-            OpeningDate = model.OpeningDate;
-            ShopDocuments = model.ShopDocuments;
-        }
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            OpeningDate = OpeningDate,
-            ShopDocuments = ShopDocuments
-        };
-    }
-}

LawFirm/LawFirmView/FormMain.Designer.cs

@@ -32,15 +32,12 @@
             this.toolStripMenuItemCatalogs = new System.Windows.Forms.ToolStripMenuItem();
             this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.пакетыДокументовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.dataGridView = new System.Windows.Forms.DataGridView();
             this.buttonCreateOrder = new System.Windows.Forms.Button();
             this.buttonTakeOrderInWork = new System.Windows.Forms.Button();
             this.buttonOrderReady = new System.Windows.Forms.Button();
             this.buttonIssuedOrder = new System.Windows.Forms.Button();
             this.buttonRef = new System.Windows.Forms.Button();
-            this.buttonSupplyShop = new System.Windows.Forms.Button();
-            this.buttonSellDocs = new System.Windows.Forms.Button();
             this.menuStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.SuspendLayout();
@@ -59,8 +56,7 @@
             // 
             this.toolStripMenuItemCatalogs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.компонентыToolStripMenuItem,
-            this.пакетыДокументовToolStripMenuItem,
+            this.пакетыДокументовToolStripMenuItem});
-            this.магазиныToolStripMenuItem});
             this.toolStripMenuItemCatalogs.Name = "toolStripMenuItemCatalogs";
             this.toolStripMenuItemCatalogs.Size = new System.Drawing.Size(94, 20);
             this.toolStripMenuItemCatalogs.Text = "Справочники";
@@ -79,13 +75,6 @@
             this.пакетыДокументовToolStripMenuItem.Text = "Пакеты документов";
             this.пакетыДокументовToolStripMenuItem.Click += new System.EventHandler(this.пакетыДокументовToolStripMenuItem_Click);
             // 
-            // магазиныToolStripMenuItem
-            // 
-            this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
-            this.магазиныToolStripMenuItem.Text = "Магазины";
-            this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click);
-            // 
             // dataGridView
             // 
             this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -145,33 +134,11 @@
             this.buttonRef.UseVisualStyleBackColor = true;
             this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
             // 
-            // buttonSupplyShop
-            // 
-            this.buttonSupplyShop.Location = new System.Drawing.Point(742, 187);
-            this.buttonSupplyShop.Name = "buttonSupplyShop";
-            this.buttonSupplyShop.Size = new System.Drawing.Size(156, 23);
-            this.buttonSupplyShop.TabIndex = 7;
-            this.buttonSupplyShop.Text = "Пополнение магазина";
-            this.buttonSupplyShop.UseVisualStyleBackColor = true;
-            this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
-            // 
-            // buttonSellDocs
-            // 
-            this.buttonSellDocs.Location = new System.Drawing.Point(742, 216);
-            this.buttonSellDocs.Name = "buttonSellDocs";
-            this.buttonSellDocs.Size = new System.Drawing.Size(156, 23);
-            this.buttonSellDocs.TabIndex = 8;
-            this.buttonSellDocs.Text = "Продать документы";
-            this.buttonSellDocs.UseVisualStyleBackColor = true;
-            this.buttonSellDocs.Click += new System.EventHandler(this.buttonSellDocs_Click);
-            // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(910, 477);
-            this.Controls.Add(this.buttonSellDocs);
-            this.Controls.Add(this.buttonSupplyShop);
             this.Controls.Add(this.buttonRef);
             this.Controls.Add(this.buttonIssuedOrder);
             this.Controls.Add(this.buttonOrderReady);
@@ -203,8 +170,5 @@
         private Button buttonOrderReady;
         private Button buttonIssuedOrder;
         private Button buttonRef;
-        private ToolStripMenuItem магазиныToolStripMenuItem;
-        private Button buttonSupplyShop;
-        private Button buttonSellDocs;
     }
 }

LawFirm/LawFirmView/FormMain.cs

@@ -176,32 +176,5 @@ namespace LawFirmView
                 DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
             };
         }
-
-        private void buttonSupplyShop_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply));
-            if (service is FormShopSupply form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void buttonSellDocs_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSellDocuments));
-            if (service is FormSellDocuments form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

LawFirm/LawFirmView/FormSellDocuments.Designer.cs

@@ -1,120 +0,0 @@
-namespace LawFirmView
-{
-    partial class FormSellDocuments
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.comboBoxDoc = new System.Windows.Forms.ComboBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.buttonSell = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // comboBoxDoc
-            // 
-            this.comboBoxDoc.FormattingEnabled = true;
-            this.comboBoxDoc.Location = new System.Drawing.Point(149, 12);
-            this.comboBoxDoc.Name = "comboBoxDoc";
-            this.comboBoxDoc.Size = new System.Drawing.Size(218, 23);
-            this.comboBoxDoc.TabIndex = 0;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(24, 15);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 15);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "Пакет документов:";
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(149, 41);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(218, 23);
-            this.textBoxCount.TabIndex = 2;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(59, 49);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(75, 15);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "Количество:";
-            // 
-            // buttonSell
-            // 
-            this.buttonSell.Location = new System.Drawing.Point(149, 92);
-            this.buttonSell.Name = "buttonSell";
-            this.buttonSell.Size = new System.Drawing.Size(75, 23);
-            this.buttonSell.TabIndex = 5;
-            this.buttonSell.Text = "Продать";
-            this.buttonSell.UseVisualStyleBackColor = true;
-            this.buttonSell.Click += new System.EventHandler(this.buttonSell_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(259, 92);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(75, 23);
-            this.buttonCancel.TabIndex = 6;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
-            // 
-            // FormSellDocuments
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(394, 137);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSell);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.comboBoxDoc);
-            this.Name = "FormSellDocuments";
-            this.Text = "FormSellDocuments";
-            this.Load += new System.EventHandler(this.FormSellDocuments_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private ComboBox comboBoxDoc;
-        private Label label1;
-        private TextBox textBoxCount;
-        private Label label2;
-        private Button buttonSell;
-        private Button buttonCancel;
-    }
-}

LawFirm/LawFirmView/FormSellDocuments.cs

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

LawFirm/LawFirmView/FormSellDocuments.resx

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

LawFirm/LawFirmView/FormShop.Designer.cs

@@ -1,204 +0,0 @@
-namespace LawFirmView
-{
-    partial class FormShop
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.textBoxName = new System.Windows.Forms.TextBox();
-            this.textBoxAddress = new System.Windows.Forms.TextBox();
-            this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.textBoxMaxCountDoc = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // textBoxName
-            // 
-            this.textBoxName.Location = new System.Drawing.Point(274, 15);
-            this.textBoxName.Name = "textBoxName";
-            this.textBoxName.Size = new System.Drawing.Size(200, 23);
-            this.textBoxName.TabIndex = 0;
-            // 
-            // textBoxAddress
-            // 
-            this.textBoxAddress.Location = new System.Drawing.Point(274, 41);
-            this.textBoxAddress.Name = "textBoxAddress";
-            this.textBoxAddress.Size = new System.Drawing.Size(200, 23);
-            this.textBoxAddress.TabIndex = 1;
-            // 
-            // dateTimePicker
-            // 
-            this.dateTimePicker.Location = new System.Drawing.Point(274, 102);
-            this.dateTimePicker.Name = "dateTimePicker";
-            this.dateTimePicker.Size = new System.Drawing.Size(200, 23);
-            this.dateTimePicker.TabIndex = 2;
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column1,
-            this.Column2,
-            this.Column3});
-            this.dataGridView.Location = new System.Drawing.Point(12, 155);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowTemplate.Height = 25;
-            this.dataGridView.Size = new System.Drawing.Size(536, 245);
-            this.dataGridView.TabIndex = 3;
-            // 
-            // Column1
-            // 
-            this.Column1.HeaderText = "id";
-            this.Column1.Name = "Column1";
-            this.Column1.Visible = false;
-            // 
-            // Column2
-            // 
-            this.Column2.HeaderText = "Название пакета документов";
-            this.Column2.Name = "Column2";
-            // 
-            // Column3
-            // 
-            this.Column3.HeaderText = "Количество";
-            this.Column3.Name = "Column3";
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(346, 406);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(75, 23);
-            this.buttonSave.TabIndex = 4;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(445, 406);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(75, 23);
-            this.buttonCancel.TabIndex = 5;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(206, 18);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 15);
-            this.label1.TabIndex = 6;
-            this.label1.Text = "Название:";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(225, 44);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(43, 15);
-            this.label2.TabIndex = 7;
-            this.label2.Text = "Адрес:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(178, 108);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(90, 15);
-            this.label3.TabIndex = 8;
-            this.label3.Text = "Дата открытия:";
-            // 
-            // textBoxMaxCountDoc
-            // 
-            this.textBoxMaxCountDoc.Location = new System.Drawing.Point(274, 73);
-            this.textBoxMaxCountDoc.Name = "textBoxMaxCountDoc";
-            this.textBoxMaxCountDoc.Size = new System.Drawing.Size(200, 23);
-            this.textBoxMaxCountDoc.TabIndex = 9;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(42, 73);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(229, 15);
-            this.label4.TabIndex = 10;
-            this.label4.Text = "Максимальное количество документов:";
-            // 
-            // FormShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(649, 459);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.textBoxMaxCountDoc);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.dataGridView);
-            this.Controls.Add(this.dateTimePicker);
-            this.Controls.Add(this.textBoxAddress);
-            this.Controls.Add(this.textBoxName);
-            this.Name = "FormShop";
-            this.Text = "FormShop";
-            this.Load += new System.EventHandler(this.FormShop_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private TextBox textBoxName;
-        private TextBox textBoxAddress;
-        private DateTimePicker dateTimePicker;
-        private DataGridView dataGridView;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private Label label1;
-        private Label label2;
-        private Label label3;
-        private DataGridViewTextBoxColumn Column1;
-        private DataGridViewTextBoxColumn Column2;
-        private DataGridViewTextBoxColumn Column3;
-        private TextBox textBoxMaxCountDoc;
-        private Label label4;
-    }
-}

LawFirm/LawFirmView/FormShop.cs

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

LawFirm/LawFirmView/FormShop.resx

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

LawFirm/LawFirmView/FormShopSupply.Designer.cs

@@ -1,143 +0,0 @@
-namespace LawFirmView
-{
-    partial class FormShopSupply
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.comboBoxShop = new System.Windows.Forms.ComboBox();
-            this.comboBoxDocument = new System.Windows.Forms.ComboBox();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // comboBoxShop
-            // 
-            this.comboBoxShop.FormattingEnabled = true;
-            this.comboBoxShop.Location = new System.Drawing.Point(98, 12);
-            this.comboBoxShop.Name = "comboBoxShop";
-            this.comboBoxShop.Size = new System.Drawing.Size(213, 23);
-            this.comboBoxShop.TabIndex = 0;
-            // 
-            // comboBoxDocument
-            // 
-            this.comboBoxDocument.FormattingEnabled = true;
-            this.comboBoxDocument.Location = new System.Drawing.Point(98, 41);
-            this.comboBoxDocument.Name = "comboBoxDocument";
-            this.comboBoxDocument.Size = new System.Drawing.Size(213, 23);
-            this.comboBoxDocument.TabIndex = 1;
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(98, 70);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(213, 23);
-            this.textBoxCount.TabIndex = 2;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(98, 122);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(75, 23);
-            this.buttonSave.TabIndex = 3;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(221, 122);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(75, 23);
-            this.buttonCancel.TabIndex = 4;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(21, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(66, 15);
-            this.label1.TabIndex = 5;
-            this.label1.Text = "Магазины:";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(14, 44);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(73, 15);
-            this.label2.TabIndex = 6;
-            this.label2.Text = "Документы:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(14, 73);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(75, 15);
-            this.label3.TabIndex = 7;
-            this.label3.Text = "Количество:";
-            // 
-            // FormShopSupply
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(358, 159);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.comboBoxDocument);
-            this.Controls.Add(this.comboBoxShop);
-            this.Name = "FormShopSupply";
-            this.Text = "FormShopSupply";
-            this.Load += new System.EventHandler(this.FormShopSupply_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private ComboBox comboBoxShop;
-        private ComboBox comboBoxDocument;
-        private TextBox textBoxCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private Label label1;
-        private Label label2;
-        private Label label3;
-    }
-}

LawFirm/LawFirmView/FormShopSupply.cs

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

LawFirm/LawFirmView/FormShopSupply.resx

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

LawFirm/LawFirmView/FormShops.Designer.cs

@@ -1,114 +0,0 @@
-namespace LawFirmView
-{
-    partial class FormShops
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonRef = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(450, 21);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(75, 23);
-            this.buttonAdd.TabIndex = 0;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(450, 62);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(75, 23);
-            this.buttonUpd.TabIndex = 1;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(450, 104);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(75, 23);
-            this.buttonDel.TabIndex = 2;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.buttonDel_Click);
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(450, 143);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(75, 23);
-            this.buttonRef.TabIndex = 3;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(0, 0);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowTemplate.Height = 25;
-            this.dataGridView.Size = new System.Drawing.Size(428, 368);
-            this.dataGridView.TabIndex = 4;
-            // 
-            // FormShops
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(558, 380);
-            this.Controls.Add(this.dataGridView);
-            this.Controls.Add(this.buttonRef);
-            this.Controls.Add(this.buttonDel);
-            this.Controls.Add(this.buttonUpd);
-            this.Controls.Add(this.buttonAdd);
-            this.Name = "FormShops";
-            this.Text = "FormShops";
-            this.Load += new System.EventHandler(this.FormShops_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Button buttonAdd;
-        private Button buttonUpd;
-        private Button buttonDel;
-        private Button buttonRef;
-        private DataGridView dataGridView;
-    }
-}

LawFirm/LawFirmView/FormShops.cs

@@ -1,122 +0,0 @@
-using AbstractLawFirmContracts.BindingModels;
-using AbstractLawFirmContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace LawFirmView
-{
-    public partial class FormShops : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-        public FormShops(ILogger<FormDocuments> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void buttonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-
-            if (service is FormShop form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-
-        private void buttonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-
-                if (service is FormShop form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void buttonDel_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить магазин?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление магазина");
-
-                    try
-                    {
-                        if (!_logic.Delete(new ShopBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления изделия");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-
-        private void buttonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        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["ShopDocuments"].Visible = false;
-                }
-
-                _logger.LogInformation("Загрузка магазинов");
-
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-    }
-}

LawFirm/LawFirmView/FormShops.resx

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

LawFirm/LawFirmView/Program.cs

@@ -37,11 +37,9 @@ namespace LawFirmView
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IDocumentStorage, DocumentStorage>();
-            services.AddTransient<IShopStorage, ShopStorage>();
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IDocumentLogic, DocumentLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -49,10 +47,6 @@ namespace LawFirmView
             services.AddTransient<FormDocument>();
             services.AddTransient<FormDocumentComponent>();
             services.AddTransient<FormDocuments>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormShopSupply>();
-            services.AddTransient<FormSellDocuments>();
         }
 
     }