fix

AbstractComputerDataModel/Models/IComponentModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace ComputerShopDataModels.Models
 {
-    public interface IComponentModel : IId
+    public interface IComponentModel
     {
         string ComponentName { get; }
         double Cost { get; }

AbstractComputerDataModel/Models/IComputerModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace ComputerShopDataModels.Models
 {
-    public interface IComputerModel : IId
+    public interface IComputerModel
     {
         string ComputerName { get; }
         double Price { get; }

AbstractComputerDataModel/Models/IId.cs

@@ -8,6 +8,6 @@ namespace ComputerShopDataModels.Models
 {
     public interface IId
     {
-        int Id { get; }
+        string Id { get; }
     }
 }

AbstractComputerDataModel/Models/IOrderModel.cs

@@ -7,7 +7,7 @@ using ComputerShopDataModels.Enums;
 
 namespace ComputerShopDataModels.Models
 {
-    public interface IOrderModel : IId
+    public interface IOrderModel
     {
         int ComputerId { get; }
         string ComputerName { get; }

AbstractComputerDataModel/Models/IShopModel.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputerShopDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        String Name { get; }
-        String Adress { get; }
-        DateTime OpeningDate { get; }
-        Dictionary<int, (IComputerModel, int)> ShopComputers { get; }
-    }
-}

ComputerShopBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,167 +0,0 @@
-using ComputerShopContracts.BindingModels;
-using ComputerShopContracts.BusinessLogicsContracts;
-using ComputerShopContracts.SearchModels;
-using ComputerShopContracts.StoragesContracts;
-using ComputerShopContracts.ViewModels;
-using ComputerShopDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputerShopBusinessLogic.BusinessLogics
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. Shop Name:{0}.ID:{1}", model.Name, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. Shop Name:{0}.ID:{1} ", model?.Name, model?.Id);
-
-            var list = (model == null) ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        public bool SupplyComputers(ShopSearchModel model, IComputerModel computer, int count)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            if (computer == null)
-            {
-                throw new ArgumentNullException(nameof(computer));
-            }
-
-            if (count <= 0)
-            {
-                throw new ArgumentNullException("Count of computers in supply myst be more than 0", nameof(count));
-            }
-
-            var shopElement = _shopStorage.GetElement(model);
-            if (shopElement == null)
-            {
-                _logger.LogWarning("Required shop element not found in storage");
-                return false;
-            }
-            _logger.LogInformation("Shop element found. ID: {0}, Name: {1}", shopElement.Id, shopElement.Name);
-
-            if (shopElement.ShopComputers.TryGetValue(computer.Id, out var sameComputer))
-            {
-                shopElement.ShopComputers[computer.Id] = (computer, sameComputer.Item2 + count);
-                _logger.LogInformation("Same computer found by supply. Added {0} of {1} in {2} shop", count, computer.ComputerName, shopElement.Name);
-            }
-            else
-            {
-                shopElement.ShopComputers[computer.Id] = (computer, count);
-                _logger.LogInformation("New computer added by supply. Added {0} of {1} in {2} shop", count, computer.ComputerName, shopElement.Name);
-            }
-
-            _shopStorage.Update(new()
-            {
-                Id = shopElement.Id,
-                Name = shopElement.Name,
-                Adress = shopElement.Adress,
-                OpeningDate = shopElement.OpeningDate,
-                ShopComputers = shopElement.ShopComputers
-            });
-
-            return true;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                throw new ArgumentNullException("Нет названия магазина!", nameof(model.Name));
-            }
-            _logger.LogInformation("Shop. Name: {0}, Adress: {1}, ID: {2}", model.Name, model.Adress, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Name = model.Name
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-    }
-}

ComputerShopContracts/BindingModels/ShopBindingModel.cs

@@ -1,22 +0,0 @@
-using ComputerShopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputerShopContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public string Name { get; set; } = string.Empty;
-
-        public string Adress { get; set; } = string.Empty;
-
-        public DateTime OpeningDate { get; set; }
-
-        public Dictionary<int, (IComputerModel, int)> ShopComputers { get; set; } = new();
-
-        public int Id { get; set; }
-    }
-}

ComputerShopContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,22 +0,0 @@
-using ComputerShopContracts.BindingModels;
-using ComputerShopContracts.SearchModels;
-using ComputerShopContracts.ViewModels;
-using ComputerShopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputerShopContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        ShopViewModel? ReadElement(ShopSearchModel model);
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-        bool Create(ShopBindingModel model);
-        bool Update(ShopBindingModel model);
-        bool Delete(ShopBindingModel model);
-        bool SupplyComputers(ShopSearchModel model, IComputerModel computer, int count);
-    }
-}

ComputerShopContracts/SearchModels/ShopSearchModel.cs

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

ComputerShopContracts/StoragesContracts/IShopStorage.cs

@@ -1,21 +0,0 @@
-using ComputerShopContracts.BindingModels;
-using ComputerShopContracts.SearchModels;
-using ComputerShopContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputerShopContracts.StoragesContracts
-{
-    public interface IShopStorage
-    {
-        ShopViewModel? GetElement(ShopSearchModel model);
-        List<ShopViewModel> GetFullList();
-        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
-        ShopViewModel? Insert(ShopBindingModel model);
-        ShopViewModel? Update(ShopBindingModel model);
-        ShopViewModel? Delete(ShopBindingModel model);
-    }
-}

ComputerShopContracts/ViewModels/ShopViewModel.cs

@@ -1,24 +0,0 @@
-using ComputerShopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputerShopContracts.ViewModels
-{
-    public class ShopViewModel
-    {
-        [DisplayName("Название магазина")]
-        public string Name { get; set; } = string.Empty;
-        [DisplayName("Адрес")]
-        public string Adress { get; set; } = string.Empty;
-        [DisplayName("Дата открытия")]
-        public DateTime OpeningDate { get; set; }
-
-        public Dictionary<int, (IComputerModel, int)> ShopComputers { get; set; } = new();
-
-        public int Id { get; set; }
-    }
-}

ComputerShopFileImplement/ComputerShopFileImplement.csproj

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

ComputerShopFileImplement/DataFileSingleton.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputerShopFileImplement.Models;
+using System.Xml.Linq;
+
+namespace ComputerShopFileImplement
+{
+    internal class DataFileSingleton
+    {
+        private static DataFileSingleton? instance;
+        private readonly string ComponentFileName = "Component.xml";
+        private readonly string OrderFileName = "Order.xml";
+        private readonly string ComputerFileName = "Computer.xml";
+        public List<Component> Components { get; private set; }
+        public List<Order> Orders { get; private set; }
+        public List<Computer> Computers { get; private set; }
+        public static DataFileSingleton GetInstance()
+        {
+            if (instance == null)
+            {
+                instance = new DataFileSingleton();
+            }
+            return instance;
+        }
+        public void SaveComponents() => SaveData(Components, ComponentFileName,
+       "Components", x => x.GetXElement);
+        public void SaveComputers() => SaveData(Computers, ComputerFileName,
+       "Computers", x => x.GetXElement);
+        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+        private DataFileSingleton()
+        {
+            Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
+            Computers = LoadData(ComputerFileName, "Computer", x => Computer.Create(x)!)!;
+            Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
+        }
+        private static List<T>? LoadData<T>(string filename, string xmlNodeName,
+       Func<XElement, T> selectFunction)
+        {
+            if (File.Exists(filename))
+            {
+                return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
+            }
+            return new List<T>();
+        }
+        private static void SaveData<T>(List<T> data, string filename, string
+       xmlNodeName, Func<T, XElement> selectFunction)
+        {
+            if (data != null)
+            {
+                new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
+            }
+        }
+    }
+}

ComputerShopFileImplement/Implements/ComponentStorage.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.StoragesContracts;
+using ComputerShopContracts.ViewModels;
+using ComputerShopFileImplement.Models;
+
+namespace ComputerShopFileImplement.Implements
+{
+    public class ComponentStorage : IComponentStorage
+    {
+        private readonly DataFileSingleton source;
+        public ComponentStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<ComponentViewModel> GetFullList()
+        {
+            return source.Components
+            .Select(x => x.GetViewModel)
+           .ToList();
+        }
+        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel
+       model)
+        {
+            if (string.IsNullOrEmpty(model.ComponentName))
+            {
+                return new();
+            }
+            return source.Components
+            .Where(x => x.ComponentName.Contains(model.ComponentName))
+           .Select(x => x.GetViewModel)
+           .ToList();
+        }
+        public ComponentViewModel? GetElement(ComponentSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Components
+            .FirstOrDefault(x =>
+           (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName ==
+           model.ComponentName) ||
+            (model.Id.HasValue && x.Id == model.Id))
+            ?.GetViewModel;
+        }
+        public ComponentViewModel? Insert(ComponentBindingModel model)
+        {
+            model.Id = source.Components.Count > 0 ? source.Components.Max(x =>
+           x.Id) + 1 : 1;
+            var newComponent = Component.Create(model);
+            if (newComponent == null)
+            {
+                return null;
+            }
+            source.Components.Add(newComponent);
+            source.SaveComponents();
+            return newComponent.GetViewModel;
+        }
+        public ComponentViewModel? Update(ComponentBindingModel model)
+        {
+            var component = source.Components.FirstOrDefault(x => x.Id ==
+           model.Id);
+            if (component == null)
+            {
+                return null;
+            }
+            component.Update(model);
+            source.SaveComponents();
+            return component.GetViewModel;
+        }
+        public ComponentViewModel? Delete(ComponentBindingModel model)
+        {
+            var element = source.Components.FirstOrDefault(x => x.Id ==
+           model.Id);
+            if (element != null)
+            {
+                source.Components.Remove(element);
+                source.SaveComponents();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

ComputerShopFileImplement/Implements/ComputerStorage.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.StoragesContracts;
+using ComputerShopContracts.ViewModels;
+using ComputerShopFileImplement.Models;
+
+namespace ComputerShopFileImplement.Implements
+{
+    public class ComputerStorage : IComputerStorage
+    {
+        private readonly DataFileSingleton source;
+
+        public ComputerStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+
+        public ComputerViewModel? GetElement(ComputerSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ComputerName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Computers
+            .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComputerName) && x.ComputerName == model.ComputerName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+
+        public List<ComputerViewModel> GetFilteredList(ComputerSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ComputerName))
+            {
+                return new();
+            }
+            return source.Computers
+                .Where(x => x.ComputerName.Contains(model.ComputerName))
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+
+        public List<ComputerViewModel> GetFullList()
+        {
+            return source.Computers.Select(x => x.GetViewModel).ToList();
+        }
+
+        public ComputerViewModel? Insert(ComputerBindingModel model)
+        {
+            model.Id = source.Computers.Count > 0 ? source.Computers.Max(x => x.Id) + 1 : 1;
+            var newComp = Computer.Create(model);
+            if (newComp == null)
+            {
+                return null;
+            }
+            source.Computers.Add(newComp);
+            source.SaveComputers();
+            return newComp.GetViewModel;
+        }
+
+        public ComputerViewModel? Update(ComputerBindingModel model)
+        {
+            var Computer = source.Computers.FirstOrDefault(x => x.Id == model.Id);
+            if (Computer == null)
+            {
+                return null;
+            }
+            Computer.Update(model);
+            source.SaveComputers();
+            return Computer.GetViewModel;
+        }
+        public ComputerViewModel? Delete(ComputerBindingModel model)
+        {
+            var Computer = source.Computers.FirstOrDefault(x => x.Id == model.Id);
+            if (Computer == null)
+            {
+                return null;
+            }
+            source.Computers.Remove(Computer);
+            source.SaveComputers();
+            return Computer.GetViewModel;
+        }
+    }
+}

ComputerShopFileImplement/Implements/OrderStorage.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.StoragesContracts;
+using ComputerShopContracts.ViewModels;
+using ComputerShopFileImplement.Models;
+
+
+namespace ComputerShopFileImplement.Implements
+{
+    public class OrderStorage : IOrderStorage
+    {
+        private readonly DataFileSingleton source;
+
+        public OrderStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Orders
+            .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return new();
+            }
+            return source.Orders
+                .Where(x => x.Id == model.Id)
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+
+        public List<OrderViewModel> GetFullList()
+        {
+            return source.Orders.Select(x => x.GetViewModel).ToList();
+        }
+
+        public OrderViewModel? Insert(OrderBindingModel model)
+        {
+            model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
+            var newOrder = Order.Create(model);
+            if (newOrder == null)
+            {
+                return null;
+            }
+            source.Orders.Add(newOrder);
+            source.SaveOrders();
+            return newOrder.GetViewModel;
+        }
+
+        public OrderViewModel? Update(OrderBindingModel model)
+        {
+            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            order.Update(model);
+            source.SaveOrders();
+            return order.GetViewModel;
+        }
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
+            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            source.Orders.Remove(order);
+            source.SaveOrders();
+            return order.GetViewModel;
+        }
+    }
+}

ComputerShopFileImplement/Models/Component.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.ViewModels;
+using ComputerShopDataModels.Models;
+using System.Xml.Linq;
+
+namespace ComputerShopFileImplement.Models
+{
+    public class Component : IComponentModel
+    {
+        public int Id { get; private set; }
+        public string ComponentName { get; private set; } = string.Empty;
+        public double Cost { get; set; }
+        public static Component? Create(ComponentBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Component()
+            {
+                Id = model.Id,
+                ComponentName = model.ComponentName,
+                Cost = model.Cost
+            };
+        }
+        public static Component? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Component()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ComponentName = element.Element("ComponentName")!.Value,
+                Cost = Convert.ToDouble(element.Element("Cost")!.Value)
+            };
+        }
+        public void Update(ComponentBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ComponentName = model.ComponentName;
+            Cost = model.Cost;
+        }
+        public ComponentViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ComponentName = ComponentName,
+            Cost = Cost
+        };
+        public XElement GetXElement => new("Component",
+        new XAttribute("Id", Id),
+        new XElement("ComponentName", ComponentName),
+        new XElement("Cost", Cost.ToString()));
+    }
+}

ComputerShopFileImplement/Models/Computer.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.ViewModels;
+using ComputerShopDataModels.Models;
+using System.Xml.Linq;
+
+
+namespace ComputerShopFileImplement.Models
+{
+    public class Computer : IComputerModel
+    {
+        public int Id { get; private set; }
+        public string ComputerName { get; private set; } = string.Empty;
+        public double Price { get; private set; }
+        public Dictionary<int, int> Components { get; private set; } = new();
+        private Dictionary<int, (IComponentModel, int)>? _productComponents = null;
+        public Dictionary<int, (IComponentModel, int)> ComputerComponents
+        {
+            get
+            {
+                if (_productComponents == null)
+                {
+                    var source = DataFileSingleton.GetInstance();
+                    _productComponents = Components.ToDictionary(x => x.Key, y =>
+                    ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
+                }
+                return _productComponents;
+            }
+        }
+        public static Computer? Create(ComputerBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Computer()
+            {
+                Id = model.Id,
+                ComputerName = model.ComputerName,
+                Price = model.Price,
+                Components = model.ComputerComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
+            };
+        }
+        public static Computer? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Computer()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ComputerName = element.Element("ComputerName")!.Value,
+                Price = Convert.ToDouble(element.Element("Price")!.Value),
+                Components = element.Element("ComputerComponents")!.Elements("ComputerComponent").ToDictionary(x =>
+                    Convert.ToInt32(x.Element("Key")?.Value), x =>
+                    Convert.ToInt32(x.Element("Value")?.Value)
+                    )
+            };
+        }
+        public void Update(ComputerBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ComputerName = model.ComputerName;
+            Price = model.Price;
+            Components = model.ComputerComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
+            _productComponents = null;
+        }
+        public ComputerViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ComputerName = ComputerName,
+            Price = Price,
+            ComputerComponents = ComputerComponents
+        };
+        public XElement GetXElement => new("Computer",
+        new XAttribute("Id", Id),
+        new XElement("ComputerName", ComputerName),
+        new XElement("Price", Price.ToString()),
+        new XElement("ComputerComponents", Components.Select(x =>
+       new XElement("ComputerComponent",
+
+       new XElement("Key", x.Key),
+
+       new XElement("Value", x.Value)))
+
+       .ToArray()));
+    }
+
+}

ComputerShopFileImplement/Models/Order.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.ViewModels;
+using ComputerShopDataModels.Enums;
+using ComputerShopDataModels.Models;
+
+namespace ComputerShopFileImplement.Models
+{
+    public class Order : IOrderModel
+    {
+        public int ComputerId { get; private set; }
+
+        public string ComputerName { get; private set; } = string.Empty;
+
+        public int Count { get; private set; }
+
+        public double Sum { get; private set; }
+
+        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
+
+        public DateTime? DateImplement { get; private set; }
+
+        public int Id { get; private set; }
+
+        public static Order? Create(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Order
+            {
+                ComputerId = model.ComputerId,
+                ComputerName = model.ComputerName,
+                Count = model.Count,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+                Id = model.Id,
+            };
+        }
+
+        public static Order? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ComputerName = element.Element("ComputerName")!.Value,
+                ComputerId = Convert.ToInt32(element.Element("ComputerId")!.Value),
+                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+                Count = Convert.ToInt32(element.Element("Count")!.Value),
+                Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
+                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+                DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value)
+            };
+        }
+
+        public void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ComputerId = model.ComputerId;
+            ComputerName = model.ComputerName;
+            Count = model.Count;
+            Sum = model.Sum;
+            Status = model.Status;
+            DateCreate = model.DateCreate;
+            DateImplement = model.DateImplement;
+            Id = model.Id;
+        }
+
+        public OrderViewModel GetViewModel => new()
+        {
+            ComputerId = ComputerId,
+            ComputerName = ComputerName,
+            Count = Count,
+            Sum = Sum,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+            Id = Id,
+            Status = Status,
+        };
+
+        public XElement GetXElement => new(
+            "Order",
+             new XAttribute("Id", Id),
+             new XElement("ComputerName", ComputerName),
+             new XElement("ComputerId", ComputerId.ToString()),
+             new XElement("Count", Count.ToString()),
+             new XElement("Sum", Sum.ToString()),
+             new XElement("Status", Status.ToString()),
+             new XElement("DateCreate", DateCreate.ToString()),
+             new XElement("DateImplement", DateImplement.ToString())
+        );
+    }
+}

ComputerShopListImplement/Implements/ShopStorage.cs

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

ComputerShopListImplement/Models/DataListSingleton.cs

@@ -12,13 +12,11 @@ namespace ComputerShopListImplement.Models
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Computer> Computers { get; set; }
-        public List<Shop> Shops { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Computers = new List<Computer>();
-            Shops = new List<Shop>();
         }
         public static DataListSingleton GetInstance()
         {

ComputerShopListImplement/Models/Shop.cs

@@ -1,61 +0,0 @@
-using ComputerShopContracts.BindingModels;
-using ComputerShopContracts.ViewModels;
-using ComputerShopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ComputerShopListImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-
-        public string Name { get; private set; } = string.Empty;
-
-        public string Adress { get; private set; } = string.Empty;
-
-        public DateTime OpeningDate { get; private set; }
-
-        public Dictionary<int, (IComputerModel, int)> ShopComputers { get; private set; } = new();
-
-        public static Shop? Create(ShopBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                Name = model.Name,
-                Adress = model.Adress,
-                OpeningDate = model.OpeningDate,
-                ShopComputers = new()
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Name = model.Name;
-            Adress = model.Adress;
-            OpeningDate = model.OpeningDate;
-            ShopComputers = model.ShopComputers;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            Name = Name,
-            Adress = Adress,
-            OpeningDate = OpeningDate,
-            ShopComputers = ShopComputers
-        };
-    }
-}

ComputersShop/ComputersShop.csproj

@@ -17,6 +17,7 @@
     <ProjectReference Include="..\AbstractComputerDataModel\ComputerShopDataModels.csproj" />
     <ProjectReference Include="..\ComputerShopBusinessLogic\ComputerShopBusinessLogic.csproj" />
     <ProjectReference Include="..\ComputerShopContracts\ComputerShopContracts.csproj" />
+    <ProjectReference Include="..\ComputerShopFileImplement\ComputerShopFileImplement.csproj" />
     <ProjectReference Include="..\ComputerShopListImplement\ComputerShopListImplement.csproj" />
   </ItemGroup>
 

ComputersShop/ComputersShop.sln

@@ -3,15 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32819.101
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShop", "ComputersShop.csproj", "{7BE0F575-7A99-4161-BCD0-4F14E5AC7B95}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShop", "ComputersShop.csproj", "{7BE0F575-7A99-4161-BCD0-4F14E5AC7B95}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputerShopDataModels", "..\AbstractComputerDataModel\ComputerShopDataModels.csproj", "{07BF1453-7129-45C4-AB54-AFC38F1E579D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputerShopDataModels", "..\AbstractComputerDataModel\ComputerShopDataModels.csproj", "{07BF1453-7129-45C4-AB54-AFC38F1E579D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputerShopContracts", "..\ComputerShopContracts\ComputerShopContracts.csproj", "{4684F24F-29DC-496C-803F-0877E5100939}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputerShopContracts", "..\ComputerShopContracts\ComputerShopContracts.csproj", "{4684F24F-29DC-496C-803F-0877E5100939}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputerShopBusinessLogic", "..\ComputerShopBusinessLogic\ComputerShopBusinessLogic.csproj", "{8A6D08BB-449A-4C35-81CA-F82B6293D241}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputerShopBusinessLogic", "..\ComputerShopBusinessLogic\ComputerShopBusinessLogic.csproj", "{8A6D08BB-449A-4C35-81CA-F82B6293D241}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputerShopListImplement", "..\ComputerShopListImplement\ComputerShopListImplement.csproj", "{D632C3A7-3E0E-4B53-B2B4-696A9F6B8D38}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputerShopListImplement", "..\ComputerShopListImplement\ComputerShopListImplement.csproj", "{D632C3A7-3E0E-4B53-B2B4-696A9F6B8D38}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputerShopFileImplement", "..\ComputerShopFileImplement\ComputerShopFileImplement.csproj", "{AC377840-5B04-4C11-BBFA-C7933C40AB2C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
 		{D632C3A7-3E0E-4B53-B2B4-696A9F6B8D38}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D632C3A7-3E0E-4B53-B2B4-696A9F6B8D38}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D632C3A7-3E0E-4B53-B2B4-696A9F6B8D38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC377840-5B04-4C11-BBFA-C7933C40AB2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC377840-5B04-4C11-BBFA-C7933C40AB2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC377840-5B04-4C11-BBFA-C7933C40AB2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC377840-5B04-4C11-BBFA-C7933C40AB2C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ComputersShop/FormMain.Designer.cs

@@ -32,14 +32,12 @@
             this.справочникиToolStripMenuItem = 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.menuStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.SuspendLayout();
@@ -58,8 +56,7 @@
             // 
             this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.компьютерыToolStripMenuItem,
-            this.компонентыToolStripMenuItem,
-            this.магазиныToolStripMenuItem});
+            this.компонентыToolStripMenuItem});
             this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
             this.справочникиToolStripMenuItem.Text = "Справочники";
@@ -78,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(147, 22);
-            this.магазиныToolStripMenuItem.Text = "Магазины";
-            this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click);
-            // 
             // dataGridView
             // 
             this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -144,23 +134,11 @@
             this.ButtonRef.UseVisualStyleBackColor = true;
             this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click);
             // 
-            // buttonSupplyShop
-            // 
-            this.buttonSupplyShop.Location = new System.Drawing.Point(786, 155);
-            this.buttonSupplyShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSupplyShop.Name = "buttonSupplyShop";
-            this.buttonSupplyShop.Size = new System.Drawing.Size(192, 22);
-            this.buttonSupplyShop.TabIndex = 8;
-            this.buttonSupplyShop.Text = "Пополнение магазина";
-            this.buttonSupplyShop.UseVisualStyleBackColor = true;
-            this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
-            // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1006, 323);
-            this.Controls.Add(this.buttonSupplyShop);
             this.Controls.Add(this.ButtonRef);
             this.Controls.Add(this.ButtonIssuedOrder);
             this.Controls.Add(this.ButtonOrderReady);
@@ -192,7 +170,5 @@
         private Button ButtonOrderReady;
         private Button ButtonIssuedOrder;
         private Button ButtonRef;
-        private ToolStripMenuItem магазиныToolStripMenuItem;
-        private Button buttonSupplyShop;
     }
 }

ComputersShop/FormMain.cs

@@ -66,15 +66,6 @@ namespace ComputersShop
             }
         }
 
-        private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
         private void ButtonCreateOrder_Click(object sender, EventArgs e)
         {
             var service =
@@ -184,14 +175,5 @@ namespace ComputersShop
         {
             LoadData();
         }
-
-        private void buttonSupplyShop_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply));
-            if (service is FormShopSupply form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

ComputersShop/FormShop.Designer.cs

@@ -1,194 +0,0 @@
-namespace ComputersShop
-{
-    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.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnComputerName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
-            this.labelOpeningDate = new System.Windows.Forms.Label();
-            this.textBoxAddress = new System.Windows.Forms.TextBox();
-            this.textBoxName = new System.Windows.Forms.TextBox();
-            this.labelAddress = new System.Windows.Forms.Label();
-            this.labelName = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(200, 339);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(136, 22);
-            this.buttonCancel.TabIndex = 21;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(42, 339);
-            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(136, 22);
-            this.buttonSave.TabIndex = 20;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.ColumnId,
-            this.ColumnComputerName,
-            this.ColumnCount});
-            this.dataGridView.Location = new System.Drawing.Point(12, 107);
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(351, 225);
-            this.dataGridView.TabIndex = 19;
-            // 
-            // ColumnId
-            // 
-            this.ColumnId.HeaderText = "ID";
-            this.ColumnId.MinimumWidth = 6;
-            this.ColumnId.Name = "ColumnId";
-            this.ColumnId.Visible = false;
-            this.ColumnId.Width = 125;
-            // 
-            // ColumnComputerName
-            // 
-            this.ColumnComputerName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.ColumnComputerName.HeaderText = "Компьютер";
-            this.ColumnComputerName.MinimumWidth = 6;
-            this.ColumnComputerName.Name = "ColumnComputerName";
-            // 
-            // ColumnCount
-            // 
-            this.ColumnCount.HeaderText = "Количество";
-            this.ColumnCount.MinimumWidth = 6;
-            this.ColumnCount.Name = "ColumnCount";
-            this.ColumnCount.Width = 125;
-            // 
-            // dateTimePicker
-            // 
-            this.dateTimePicker.Location = new System.Drawing.Point(144, 64);
-            this.dateTimePicker.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dateTimePicker.Name = "dateTimePicker";
-            this.dateTimePicker.Size = new System.Drawing.Size(219, 23);
-            this.dateTimePicker.TabIndex = 18;
-            // 
-            // labelOpeningDate
-            // 
-            this.labelOpeningDate.AutoSize = true;
-            this.labelOpeningDate.Location = new System.Drawing.Point(12, 67);
-            this.labelOpeningDate.Name = "labelOpeningDate";
-            this.labelOpeningDate.Size = new System.Drawing.Size(100, 15);
-            this.labelOpeningDate.TabIndex = 17;
-            this.labelOpeningDate.Text = "Время открытия:";
-            // 
-            // textBoxAddress
-            // 
-            this.textBoxAddress.Location = new System.Drawing.Point(88, 37);
-            this.textBoxAddress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxAddress.Name = "textBoxAddress";
-            this.textBoxAddress.Size = new System.Drawing.Size(276, 23);
-            this.textBoxAddress.TabIndex = 16;
-            // 
-            // textBoxName
-            // 
-            this.textBoxName.Location = new System.Drawing.Point(88, 12);
-            this.textBoxName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxName.Name = "textBoxName";
-            this.textBoxName.Size = new System.Drawing.Size(276, 23);
-            this.textBoxName.TabIndex = 15;
-            // 
-            // labelAddress
-            // 
-            this.labelAddress.AutoSize = true;
-            this.labelAddress.Location = new System.Drawing.Point(12, 41);
-            this.labelAddress.Name = "labelAddress";
-            this.labelAddress.Size = new System.Drawing.Size(43, 15);
-            this.labelAddress.TabIndex = 14;
-            this.labelAddress.Text = "Адрес:";
-            // 
-            // labelName
-            // 
-            this.labelName.AutoSize = true;
-            this.labelName.Location = new System.Drawing.Point(12, 14);
-            this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(62, 15);
-            this.labelName.TabIndex = 13;
-            this.labelName.Text = "Название:";
-            // 
-            // FormShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(383, 368);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.dataGridView);
-            this.Controls.Add(this.dateTimePicker);
-            this.Controls.Add(this.labelOpeningDate);
-            this.Controls.Add(this.textBoxAddress);
-            this.Controls.Add(this.textBoxName);
-            this.Controls.Add(this.labelAddress);
-            this.Controls.Add(this.labelName);
-            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 Button buttonCancel;
-        private Button buttonSave;
-        private DataGridView dataGridView;
-        private DateTimePicker dateTimePicker;
-        private Label labelOpeningDate;
-        private TextBox textBoxAddress;
-        private TextBox textBoxName;
-        private Label labelAddress;
-        private Label labelName;
-        private DataGridViewTextBoxColumn ColumnId;
-        private DataGridViewTextBoxColumn ColumnComputerName;
-        private DataGridViewTextBoxColumn ColumnCount;
-    }
-}

ComputersShop/FormShop.cs

@@ -1,136 +0,0 @@
-using ComputerShopContracts.BindingModels;
-using ComputerShopContracts.BusinessLogicsContracts;
-using ComputerShopContracts.SearchModels;
-using ComputerShopDataModels.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 ComputersShop
-{
-    public partial class FormShop : Form
-    {
-        private readonly IShopLogic _logic;
-        private readonly ILogger _logger;
-        private Dictionary<int, (IComputerModel, int)> _shopComputers;
-        private int? _id;
-        public int Id { set { _id = value; } }
-
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            _shopComputers = 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.Name;
-                        textBoxAddress.Text = view.Adress;
-                        _shopComputers = view.ShopComputers ?? new Dictionary<int, (IComputerModel, int)>();
-                        LoadData();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка загрузки магазина");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка компьютеров магазина");
-            try
-            {
-                if (_shopComputers != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var pc in _shopComputers)
-                    {
-                        dataGridView.Rows.Add(new object[]
-                        {
-                          pc.Key,
-                          pc.Value.Item1.ComputerName,
-                          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;
-            }
-            _logger.LogInformation("Сохранение магазина");
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    Name = textBoxName.Text,
-                    Adress = textBoxAddress.Text,
-                    OpeningDate = dateTimePicker.Value.Date,
-                    ShopComputers = _shopComputers
-                };
-                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();
-        }
-    }
-}

ComputersShop/FormShop.resx

@@ -1,78 +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="ColumnId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnComputerName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnComputerName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

ComputersShop/FormShopSupply.Designer.cs

@@ -1,149 +0,0 @@
-namespace ComputersShop
-{
-    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.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.comboBoxComputer = new System.Windows.Forms.ComboBox();
-            this.comboBoxShop = new System.Windows.Forms.ComboBox();
-            this.labelComputerCount = new System.Windows.Forms.Label();
-            this.labelComputer = new System.Windows.Forms.Label();
-            this.labelShop = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(259, 134);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(82, 22);
-            this.buttonCancel.TabIndex = 17;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(171, 134);
-            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(82, 22);
-            this.buttonSave.TabIndex = 16;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(122, 89);
-            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(110, 23);
-            this.textBoxCount.TabIndex = 15;
-            // 
-            // comboBoxComputer
-            // 
-            this.comboBoxComputer.FormattingEnabled = true;
-            this.comboBoxComputer.Location = new System.Drawing.Point(122, 49);
-            this.comboBoxComputer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.comboBoxComputer.Name = "comboBoxComputer";
-            this.comboBoxComputer.Size = new System.Drawing.Size(220, 23);
-            this.comboBoxComputer.TabIndex = 14;
-            // 
-            // comboBoxShop
-            // 
-            this.comboBoxShop.FormattingEnabled = true;
-            this.comboBoxShop.Location = new System.Drawing.Point(122, 11);
-            this.comboBoxShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.comboBoxShop.Name = "comboBoxShop";
-            this.comboBoxShop.Size = new System.Drawing.Size(220, 23);
-            this.comboBoxShop.TabIndex = 13;
-            // 
-            // labelComputerCount
-            // 
-            this.labelComputerCount.AutoSize = true;
-            this.labelComputerCount.Location = new System.Drawing.Point(15, 89);
-            this.labelComputerCount.Name = "labelComputerCount";
-            this.labelComputerCount.Size = new System.Drawing.Size(75, 15);
-            this.labelComputerCount.TabIndex = 12;
-            this.labelComputerCount.Text = "Количество:";
-            // 
-            // labelComputer
-            // 
-            this.labelComputer.AutoSize = true;
-            this.labelComputer.Location = new System.Drawing.Point(15, 51);
-            this.labelComputer.Name = "labelComputer";
-            this.labelComputer.Size = new System.Drawing.Size(74, 15);
-            this.labelComputer.TabIndex = 11;
-            this.labelComputer.Text = "Компьютер:";
-            // 
-            // labelShop
-            // 
-            this.labelShop.AutoSize = true;
-            this.labelShop.Location = new System.Drawing.Point(15, 11);
-            this.labelShop.Name = "labelShop";
-            this.labelShop.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.labelShop.Size = new System.Drawing.Size(57, 15);
-            this.labelShop.TabIndex = 10;
-            this.labelShop.Text = "Магазин:";
-            // 
-            // FormShopSupply
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(371, 180);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.comboBoxComputer);
-            this.Controls.Add(this.comboBoxShop);
-            this.Controls.Add(this.labelComputerCount);
-            this.Controls.Add(this.labelComputer);
-            this.Controls.Add(this.labelShop);
-            this.Name = "FormShopSupply";
-            this.Text = "FormShopSupply";
-            this.Load += new System.EventHandler(this.FormShopSupply_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Button buttonCancel;
-        private Button buttonSave;
-        private TextBox textBoxCount;
-        private ComboBox comboBoxComputer;
-        private ComboBox comboBoxShop;
-        private Label labelComputerCount;
-        private Label labelComputer;
-        private Label labelShop;
-    }
-}

ComputersShop/FormShopSupply.cs

@@ -1,125 +0,0 @@
-using ComputerShopContracts.BindingModels;
-using ComputerShopContracts.BusinessLogicsContracts;
-using ComputerShopContracts.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 ComputersShop
-{
-    public partial class FormShopSupply : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IComputerLogic _logicC;
-        private readonly IShopLogic _logicS;
-        public FormShopSupply(ILogger<FormShopSupply> logger, IComputerLogic logicC, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicC = logicC;
-            _logicS = logicS;
-        }
-
-        private void FormShopSupply_Load(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Загрузка компьютеров для пополнения");
-            try
-            {
-                var list = _logicC.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxComputer.DisplayMember = "ComputerName";
-                    comboBoxComputer.ValueMember = "Id";
-                    comboBoxComputer.DataSource = list;
-                    comboBoxComputer.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 = "Name";
-                    comboBoxShop.ValueMember = "Id";
-                    comboBoxShop.DataSource = list;
-                    comboBoxShop.SelectedItem = null;
-                }
-
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxComputer.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.SupplyComputers(
-                    new ShopSearchModel
-                    {
-                        Id = Convert.ToInt32(comboBoxShop.SelectedValue),
-                        Name = comboBoxShop.Text
-                    },
-                    new ComputerBindingModel
-                    {
-                        Id = Convert.ToInt32(comboBoxComputer.SelectedValue),
-                        ComputerName = comboBoxComputer.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();
-        }
-    }
-}

ComputersShop/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>

ComputersShop/FormShops.Designer.cs

@@ -1,120 +0,0 @@
-namespace ComputersShop
-{
-    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.buttonUpdate = new System.Windows.Forms.Button();
-            this.buttonDelete = new System.Windows.Forms.Button();
-            this.buttonEdit = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // buttonUpdate
-            // 
-            this.buttonUpdate.Location = new System.Drawing.Point(551, 309);
-            this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonUpdate.Name = "buttonUpdate";
-            this.buttonUpdate.Size = new System.Drawing.Size(133, 22);
-            this.buttonUpdate.TabIndex = 14;
-            this.buttonUpdate.Text = "Обновить";
-            this.buttonUpdate.UseVisualStyleBackColor = true;
-            this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click);
-            // 
-            // buttonDelete
-            // 
-            this.buttonDelete.Location = new System.Drawing.Point(551, 64);
-            this.buttonDelete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonDelete.Name = "buttonDelete";
-            this.buttonDelete.Size = new System.Drawing.Size(133, 22);
-            this.buttonDelete.TabIndex = 13;
-            this.buttonDelete.Text = "Удалить";
-            this.buttonDelete.UseVisualStyleBackColor = true;
-            this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click);
-            // 
-            // buttonEdit
-            // 
-            this.buttonEdit.Location = new System.Drawing.Point(551, 37);
-            this.buttonEdit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonEdit.Name = "buttonEdit";
-            this.buttonEdit.Size = new System.Drawing.Size(133, 22);
-            this.buttonEdit.TabIndex = 12;
-            this.buttonEdit.Text = "Изменить";
-            this.buttonEdit.UseVisualStyleBackColor = true;
-            this.buttonEdit.Click += new System.EventHandler(this.buttonEdit_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(551, 11);
-            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(133, 22);
-            this.buttonAdd.TabIndex = 11;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(12, 11);
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(491, 320);
-            this.dataGridView.TabIndex = 10;
-            // 
-            // FormShops
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(695, 344);
-            this.Controls.Add(this.buttonUpdate);
-            this.Controls.Add(this.buttonDelete);
-            this.Controls.Add(this.buttonEdit);
-            this.Controls.Add(this.buttonAdd);
-            this.Controls.Add(this.dataGridView);
-            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 buttonUpdate;
-        private Button buttonDelete;
-        private Button buttonEdit;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-    }
-}

ComputersShop/FormShops.cs

@@ -1,123 +0,0 @@
-using ComputerShopContracts.BindingModels;
-using ComputerShopContracts.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 ComputersShop
-{
-    public partial class FormShops : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-
-        public FormShops(ILogger<FormComputers> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormShops_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["Name"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["ShopComputers"].Visible = false;
-                }
-
-                _logger.LogInformation("Загрузка магазинов");
-
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonUpdate_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void buttonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-
-            if (service is FormShop form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-
-        private void buttonEdit_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-
-                if (service is FormShop form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void buttonDelete_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить магазин?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление магазина");
-
-                    try
-                    {
-                        if (!_logic.Delete(new ShopBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления изделия");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-    }
-}

ComputersShop/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>

ComputersShop/Program.cs

@@ -1,7 +1,7 @@
 using ComputerShopBusinessLogic.BusinessLogics;
 using ComputerShopContracts.BusinessLogicsContracts;
 using ComputerShopContracts.StoragesContracts;
-using ComputerShopListImplement.Implements;
+using ComputerShopFileImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
@@ -36,22 +36,16 @@ namespace ComputersShop
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IComputerStorage, ComputerStorage>();
-            services.AddTransient<IShopStorage, ShopStorage>();
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IComputerLogic, ComputerLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
             services.AddTransient<FormCreateOrder>();
             services.AddTransient<FormComputer>();
             services.AddTransient<FormComputerComponent>();
-            services.AddTransient<FormComputers>(); 
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormShopSupply>();
+            services.AddTransient<FormComputers>();
         }
-
     }
 }