GarmentFactory/GarmentFactory.sln

@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryDataModels",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryListImplement", "GarmentFactoryListImplement\GarmentFactoryListImplement.csproj", "{AA691567-80A9-45EF-9916-C55FA3B53C47}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryFileImplement", "GarmentFactoryFileImplement\GarmentFactoryFileImplement.csproj", "{281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +39,6 @@ Global
 		{AA691567-80A9-45EF-9916-C55FA3B53C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA691567-80A9-45EF-9916-C55FA3B53C47}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AA691567-80A9-45EF-9916-C55FA3B53C47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{281A8DE2-A45A-4B4B-B4A6-DC13ECC0144E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -18,16 +18,11 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics
         private readonly ILogger _logger;
 
         private readonly IOrderStorage _orderStorage;
-		private readonly IShopLogic _shopLogic;
 
-		private readonly ITextileStorage _textileStorage;
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
-
-		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, ITextileStorage textileStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-			_shopLogic = shopLogic;
-			_textileStorage = textileStorage;
         }
 
         public bool CreateOrder(OrderBindingModel model)
@@ -116,20 +111,10 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics
                     newStatus, order.Status);
                 return false;
             }
-			if (newStatus == OrderStatus.Выдан)
+            model.TextileId = order.TextileId;
-			{
+            model.Count = order.Count;
-				var textile = _textileStorage.GetElement(new() { Id = order.TextileId });
+            model.Sum = order.Sum;
-				if (textile == null)
+            model.DateCreate = order.DateCreate;
-				{
-					_logger.LogWarning("Change status operation failed. Textile not found");
-					return false;
-				}
-				if (!_shopLogic.DeliverTextiles(textile, order.Count))
-				{
-					_logger.LogWarning("Change status operation failed. Textiles delivery operation failed");
-					return false;
-				}
-			}
             model.Status = newStatus;
             if (model.Status == OrderStatus.Готов)
             {

GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -105,11 +105,6 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics
             {
                 _logger.LogWarning("MakeDelivery(GetElement). Element not found");
                 return false;
-            }
-			if (shop.TextilesMaximum - shop.ShopTextiles.Sum(x => x.Value.Item2) < count)
-			{
-				_logger.LogWarning("MakeShipment error. No space for new textiles");
-				return false;
             }
             if (shop.ShopTextiles.ContainsKey(textile.Id))
             {
@@ -131,7 +126,6 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics
                 ShopName = shop.ShopName,
                 Address = shop.Address,
                 DateOpening = shop.DateOpening,
-                TextilesMaximum = shop.TextilesMaximum,
                 ShopTextiles = shop.ShopTextiles,
             }) == null)
             {
@@ -140,10 +134,7 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics
             }
             return true;
         }
-		public bool MakeSale(ITextileModel model, int count)
+
-		{
-			return _shopStorage.MakeSale(model, count);
-		}
         private void CheckModel(ShopBindingModel model, bool withParams = true)
         {
             if (model == null)
@@ -172,62 +163,5 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics
                 throw new InvalidOperationException("Магазин с таким названием уже есть");
             }
         }
-		public bool DeliverTextiles(ITextileModel textile, int count)
-		{
-			if (count <= 0)
-			{
-				_logger.LogWarning("Textiles delivery operation failed. Textile count <= 0");
-				return false;
-			}
-
-			var shopList = _shopStorage.GetFullList();
-			int shopsCapacity = shopList.Sum(x => x.TextilesMaximum);
-			int currentTextiles = shopList.Select(x => x.ShopTextiles.Sum(y => y.Value.Item2)).Sum();
-			int freePlaces = shopsCapacity - currentTextiles;
-
-			if (freePlaces < count)
-			{
-				_logger.LogWarning("Textiles delivery operation failed. No space for new textiles");
-				return false;
-			}
-
-			foreach (var shop in shopList)
-			{
-				freePlaces = shop.TextilesMaximum - shop.ShopTextiles.Sum(x => x.Value.Item2);
-				if (freePlaces == 0)
-				{
-					continue;
-				}
-				if (freePlaces >= count)
-				{
-					if (MakeDelivery(new() { Id = shop.Id }, textile, count))
-					{
-						count = 0;
-					}
-					else
-					{
-						_logger.LogWarning("Textiles delivery operation failed");
-						return false;
-					}
-				}
-				else
-				{
-					if (MakeDelivery(new() { Id = shop.Id }, textile, freePlaces))
-					{
-						count -= freePlaces;
-					}
-					else
-					{
-						_logger.LogWarning("Textiles delivery operation failed");
-						return false;
-					}
-				}
-				if (count == 0)
-				{
-					return true;
-				}
-			}
-			return false;
-		}
     }
 }

GarmentFactory/GarmentFactoryContracts/BindingModels/ShopBindingModel.cs

@@ -22,6 +22,5 @@ namespace GarmentFactoryContracts.BindingModels
             get;
             set;
         } = new();
-		public int TextilesMaximum { get; set; }
     }
 }

GarmentFactory/GarmentFactoryContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -22,7 +22,5 @@ namespace GarmentFactoryContracts.BusinessLogicsContracts
         bool Delete(ShopBindingModel model);
 
         bool MakeDelivery(ShopSearchModel shopModel, ITextileModel textile, int count);
-		bool MakeSale(ITextileModel model, int count);
-		bool DeliverTextiles(ITextileModel model, int count);
     }
 }

GarmentFactory/GarmentFactoryContracts/StoragesContracts/IShopStorage.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using GarmentFactoryContracts.ViewModels;
-using GarmentFactoryDataModels.Models;
 
 namespace GarmentFactoryContracts.StoragesContracts
 {
@@ -23,6 +22,5 @@ namespace GarmentFactoryContracts.StoragesContracts
         ShopViewModel? Update(ShopBindingModel model);
 
         ShopViewModel? Delete(ShopBindingModel model);
-		bool MakeSale(ITextileModel model, int count);
     }
 }

GarmentFactory/GarmentFactoryContracts/ViewModels/ShopViewModel.cs

@@ -26,8 +26,5 @@ namespace GarmentFactoryContracts.ViewModels
             get;
             set;
         } = new();
-
-		[DisplayName("Максимальное количество изделий")]
-		public int TextilesMaximum { get; set; }
     }
 }

GarmentFactory/GarmentFactoryDataModels/Models/IShopModel.cs

@@ -15,6 +15,5 @@ namespace GarmentFactoryDataModels.Models
         DateTime DateOpening { get; }
 
         Dictionary<int, (ITextileModel, int)> ShopTextiles { get; }
-		int TextilesMaximum { get; }
     }
 }

GarmentFactory/GarmentFactoryFileImplement/DataFileSingleton.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using GarmentFactoryFileImplement.Models;
-using System.Xml.Linq;
-
-namespace GarmentFactoryFileImplement
-{
-    internal class DataFileSingleton
-    {
-        private static DataFileSingleton? instance;
-        private readonly string ComponentFileName = "Component.xml";
-        private readonly string OrderFileName = "Order.xml";
-        private readonly string TextileFileName = "Textile.xml";
-		private readonly string ShopFileName = "Shop.xml";
-		public List<Component> Components { get; private set; }
-        public List<Order> Orders { get; private set; }
-        public List<Textile> Textiles { get; private set; }
-		public List<Shop> Shops { 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 SaveTextiles() => SaveData(Textiles, TextileFileName, "Textiles", x => x.GetXElement);
-        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-		public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
-		private DataFileSingleton()
-        {
-            Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
-            Textiles = LoadData(TextileFileName, "Textile", x => Textile.Create(x)!)!;
-            Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-			Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
-		}
-        private static List<T>? LoadData<T>(string filename, string xmlNodeName,
-       Func<XElement, T> selectFunction)
-        {
-            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);
-            }
-        }
-    }
-}

GarmentFactory/GarmentFactoryFileImplement/GarmentFactoryFileImplement.csproj

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

GarmentFactory/GarmentFactoryFileImplement/Implements/ComponentStorage.cs

@@ -1,84 +0,0 @@
-using GarmentFactoryContracts.BindingModels;
-using GarmentFactoryContracts.SearchModels;
-using GarmentFactoryContracts.StoragesContracts;
-using GarmentFactoryContracts.ViewModels;
-using GarmentFactoryFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GarmentFactoryFileImplement.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;
-        }
-    }
-
-}

GarmentFactory/GarmentFactoryFileImplement/Implements/OrderStorage.cs

@@ -1,100 +0,0 @@
-using GarmentFactoryContracts.BindingModels;
-using GarmentFactoryContracts.SearchModels;
-using GarmentFactoryContracts.StoragesContracts;
-using GarmentFactoryContracts.ViewModels;
-using GarmentFactoryFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GarmentFactoryFileImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public OrderStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<OrderViewModel> GetFullList()
-        {
-            return source.Orders
-                    .Select(x => AddTextileName(x.GetViewModel))
-                    .ToList();
-        }
-
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            return source.Orders
-                    .Where(x => x.Id == model.Id)
-                    .Select(x => AddTextileName(x.GetViewModel))
-                    .ToList();
-        }
-
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            return AddTextileName(order.GetViewModel);
-        }
-
-        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 AddTextileName(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 AddTextileName(order.GetViewModel);
-        }
-
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (element != null)
-            {
-                source.Orders.Remove(element);
-                source.SaveOrders();
-                return AddTextileName(element.GetViewModel);
-            }
-            return null;
-        }
-
-        private OrderViewModel AddTextileName(OrderViewModel model)
-        {
-            var selectedTextile = source.Textiles.FirstOrDefault(x => x.Id == model.TextileId);
-            model.TextileName = selectedTextile?.TextileName;
-            return model;
-        }
-    }
-}

GarmentFactory/GarmentFactoryFileImplement/Implements/ShopStorage.cs

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

GarmentFactory/GarmentFactoryFileImplement/Implements/TextileStorage.cs

@@ -1,91 +0,0 @@
-using GarmentFactoryContracts.BindingModels;
-using GarmentFactoryContracts.SearchModels;
-using GarmentFactoryContracts.StoragesContracts;
-using GarmentFactoryContracts.ViewModels;
-using GarmentFactoryFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GarmentFactoryFileImplement.Implements
-{
-    public class TextileStorage : ITextileStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public TextileStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<TextileViewModel> GetFullList()
-        {
-            return source.Textiles
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
-
-        public List<TextileViewModel> GetFilteredList(TextileSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.TextileName))
-            {
-                return new();
-            }
-            return source.Textiles
-                    .Where(x => x.TextileName.Contains(model.TextileName))
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
-
-        public TextileViewModel? GetElement(TextileSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.TextileName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Textiles
-                    .FirstOrDefault(x => (!string.IsNullOrEmpty(model.TextileName) && x.TextileName == model.TextileName) ||
-                                        (model.Id.HasValue && x.Id == model.Id))
-                    ?.GetViewModel;
-        }
-
-        public TextileViewModel? Insert(TextileBindingModel model)
-        {
-            model.Id = source.Textiles.Count > 0 ? source.Textiles.Max(x => x.Id) + 1 : 1;
-            var newTextile = Textile.Create(model);
-            if (newTextile == null)
-            {
-                return null;
-            }
-            source.Textiles.Add(newTextile);
-            source.SaveTextiles();
-            return newTextile.GetViewModel;
-        }
-
-        public TextileViewModel? Update(TextileBindingModel model)
-        {
-            var textile = source.Textiles.FirstOrDefault(x => x.Id == model.Id);
-            if (textile == null)
-            {
-                return null;
-            }
-            textile.Update(model);
-            source.SaveTextiles();
-            return textile.GetViewModel;
-        }
-
-        public TextileViewModel? Delete(TextileBindingModel model)
-        {
-            var element = source.Textiles.FirstOrDefault(x => x.Id == model.Id);
-            if (element != null)
-            {
-                source.Textiles.Remove(element);
-                source.SaveTextiles();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

GarmentFactory/GarmentFactoryFileImplement/Models/Component.cs

@@ -1,66 +0,0 @@
-using GarmentFactoryContracts.BindingModels;
-using GarmentFactoryContracts.ViewModels;
-using GarmentFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace GarmentFactoryFileImplement.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()));
-    }
-
-}
-

GarmentFactory/GarmentFactoryFileImplement/Models/Order.cs

@@ -1,97 +0,0 @@
-using GarmentFactoryContracts.BindingModels;
-using GarmentFactoryContracts.ViewModels;
-using GarmentFactoryDataModels.Enums;
-using GarmentFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace GarmentFactoryFileImplement.Models
-{
-    public class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-
-        public int TextileId { get; private set; }
-
-        public int Count { get; private set; }
-
-        public double Sum { get; private set; }
-
-        public OrderStatus Status { get; private set; }
-
-        public DateTime DateCreate { get; private set; }
-
-        public DateTime? DateImplement { get; private set; }
-
-        public static Order? Create(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Order()
-            {
-                Id = model.Id,
-                TextileId = model.TextileId,
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement
-            };
-        }
-
-        public static Order? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Order()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                TextileId = Convert.ToInt32(element.Element("TextileId")!.Value),
-                Count = Convert.ToInt32(element.Element("Count")!.Value),
-                Sum = Convert.ToDouble(element.Element("Sum")!.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;
-            }
-            Status = model.Status;
-            DateImplement = model.DateImplement;
-        }
-
-        public OrderViewModel GetViewModel => new()
-        {
-            Id = Id,
-            TextileId = TextileId,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement
-        };
-
-        public XElement GetXElement => new("Order",
-        new XAttribute("Id", Id),
-        new XElement("TextileId", TextileId),
-        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()));
-    }
-}

GarmentFactory/GarmentFactoryFileImplement/Models/Shop.cs

@@ -1,114 +0,0 @@
-using GarmentFactoryContracts.BindingModels;
-using GarmentFactoryContracts.ViewModels;
-using GarmentFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace GarmentFactoryFileImplement.Models
-{
-	public class Shop : IShopModel
-	{
-		public int Id { get; private set; }
-
-		public string ShopName { get; private set; } = string.Empty;
-
-		public string Address { get; private set; } = string.Empty;
-
-		public DateTime DateOpening { get; private set; }
-
-		public Dictionary<int, int> Textiles { get; private set; } = new();
-
-		private Dictionary<int, (ITextileModel, int)>? _shopTextiles = null;
-
-		public Dictionary<int, (ITextileModel, int)> ShopTextiles
-		{
-			get
-			{
-				if (_shopTextiles == null)
-				{
-					var source = DataFileSingleton.GetInstance();
-					_shopTextiles = Textiles.ToDictionary(x => x.Key,
-						y => ((source.Textiles.FirstOrDefault(z => z.Id == y.Key) as ITextileModel)!, y.Value));
-				}
-				return _shopTextiles;
-			}
-		}
-
-		public int TextilesMaximum { get; private set; }
-
-		public static Shop? Create(ShopBindingModel? model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new Shop()
-			{
-				Id = model.Id,
-				ShopName = model.ShopName,
-				Address = model.Address,
-				DateOpening = model.DateOpening,
-				Textiles = model.ShopTextiles.ToDictionary(x => x.Key, x => x.Value.Item2),
-				TextilesMaximum = model.TextilesMaximum
-			};
-		}
-
-		public static Shop? Create(XElement element)
-		{
-			if (element == null)
-			{
-				return null;
-			}
-			return new Shop()
-			{
-				Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-				ShopName = element.Element("ShopName")!.Value,
-				Address = element.Element("Address")!.Value,
-				DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value),
-				TextilesMaximum = Convert.ToInt32(element.Element("TextilesMaximum")!.Value),
-				Textiles = element.Element("ShopTextiles")!.Elements("ShopTextile")
-								.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
-			};
-		}
-
-		public void Update(ShopBindingModel? model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			ShopName = model.ShopName;
-			Address = model.Address;
-			DateOpening = model.DateOpening;
-			TextilesMaximum = model.TextilesMaximum;
-			Textiles = model.ShopTextiles.ToDictionary(x => x.Key, x => x.Value.Item2);
-			_shopTextiles = null;
-		}
-
-		public ShopViewModel GetViewModel => new()
-		{
-			Id = Id,
-			ShopName = ShopName,
-			Address = Address,
-			DateOpening = DateOpening,
-			ShopTextiles = ShopTextiles,
-			TextilesMaximum = TextilesMaximum
-		};
-
-		public XElement GetXElement => new("Shop",
-						new XAttribute("Id", Id),
-						new XElement("ShopName", ShopName),
-						new XElement("Address", Address),
-						new XElement("DateOpening", DateOpening.ToString()),
-						new XElement("TextilesMaximum", TextilesMaximum.ToString()),
-						new XElement("ShopTextiles",
-							Textiles.Select(x => new XElement("ShopTextile",
-																new XElement("Key", x.Key),
-																new XElement("Value", x.Value))).ToArray()));
-
-	}
-}

GarmentFactory/GarmentFactoryFileImplement/Models/Textile.cs

@@ -1,98 +0,0 @@
-using GarmentFactoryContracts.BindingModels;
-using GarmentFactoryContracts.ViewModels;
-using GarmentFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace GarmentFactoryFileImplement.Models
-{
-    public class Textile : ITextileModel
-    {
-        public int Id { get; private set; }
-        public string TextileName { 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)>? _textileComponents =
-       null;
-        public Dictionary<int, (IComponentModel, int)> TextileComponents
-        {
-            get
-            {
-                if (_textileComponents == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _textileComponents = Components.ToDictionary(x => x.Key, y =>
-                    ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!,
-                    y.Value));
-                }
-                return _textileComponents;
-            }
-        }
-        public static Textile? Create(TextileBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Textile()
-            {
-                Id = model.Id,
-                TextileName = model.TextileName,
-                Price = model.Price,
-                Components = model.TextileComponents.ToDictionary(x => x.Key, x
-               => x.Value.Item2)
-            };
-        }
-        public static Textile? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Textile()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                TextileName = element.Element("TextileName")!.Value,
-                Price = Convert.ToDouble(element.Element("Price")!.Value),
-                Components =
-           element.Element("TextileComponents")!.Elements("TextileComponent")
-            .ToDictionary(x =>
-           Convert.ToInt32(x.Element("Key")?.Value), x =>
-           Convert.ToInt32(x.Element("Value")?.Value))
-            };
-        }
-        public void Update(TextileBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            TextileName = model.TextileName;
-            Price = model.Price;
-            Components = model.TextileComponents.ToDictionary(x => x.Key, x =>
-           x.Value.Item2);
-            _textileComponents = null;
-        }
-        public TextileViewModel GetViewModel => new()
-        {
-            Id = Id,
-            TextileName = TextileName,
-            Price = Price,
-            TextileComponents = TextileComponents
-        };
-        public XElement GetXElement => new("Textile",
-        new XAttribute("Id", Id),
-        new XElement("TextileName", TextileName),
-        new XElement("Price", Price.ToString()),
-        new XElement("TextileComponents", Components.Select(x =>
-        new XElement("TextileComponent",
-        new XElement("Key", x.Key),
-       new XElement("Value", x.Value))).ToArray()));
-    }
-
-}
-

GarmentFactory/GarmentFactoryListImplement/Implements/ShopStorage.cs

@@ -2,7 +2,6 @@
 using GarmentFactoryContracts.SearchModels;
 using GarmentFactoryContracts.StoragesContracts;
 using GarmentFactoryContracts.ViewModels;
-using GarmentFactoryDataModels.Models;
 using GarmentFactoryListImplement.Models;
 using System;
 using System.Collections.Generic;
@@ -111,10 +110,5 @@ namespace GarmentFactoryListImplement.Implements
             }
             return null;
         }
-
-		public bool MakeSale(ITextileModel model, int count)
-		{
-			throw new NotImplementedException();
-		}
     }
 }

GarmentFactory/GarmentFactoryListImplement/Models/Shop.cs

@@ -61,7 +61,5 @@ namespace GarmentFactoryListImplement.Models
             DateOpening = DateOpening,
             ShopTextiles = ShopTextiles
         };
-
-		public int TextilesMaximum { get; private set; }
     }
 }

GarmentFactory/GarmentFactoryView/FormMain.Designer.cs

@@ -32,7 +32,6 @@
             справочникиToolStripMenuItem = new ToolStripMenuItem();
             компонентыToolStripMenuItem = new ToolStripMenuItem();
             изделиеToolStripMenuItem = new ToolStripMenuItem();
-			магазинToolStripMenuItem = new ToolStripMenuItem();
             пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem();
             dataGridView = new DataGridView();
             buttonCreateOrder = new Button();
@@ -40,7 +39,7 @@
             buttonOrderReady = new Button();
             buttonIssuedOrder = new Button();
             buttonUpd = new Button();
-			продажаИзделияToolStripMenuItem = new ToolStripMenuItem();
+            магазинToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -48,7 +47,7 @@
             // menuStrip
             // 
             menuStrip.ImageScalingSize = new Size(20, 20);
-			menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem, продажаИзделияToolStripMenuItem });
+            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
             menuStrip.Size = new Size(1178, 28);
@@ -76,13 +75,6 @@
             изделиеToolStripMenuItem.Text = "Изделие";
             изделиеToolStripMenuItem.Click += ИзделиеToolStripMenuItem_Click;
             // 
-			// магазинToolStripMenuItem
-			// 
-			магазинToolStripMenuItem.Name = "магазинToolStripMenuItem";
-			магазинToolStripMenuItem.Size = new Size(224, 26);
-			магазинToolStripMenuItem.Text = "Магазины";
-			магазинToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click;
-			// 
             // пополнениеМагазинаToolStripMenuItem
             // 
             пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem";
@@ -157,12 +149,12 @@
             buttonUpd.UseVisualStyleBackColor = true;
             buttonUpd.Click += ButtonUpd_Click;
             // 
-			// продажаИзделияToolStripMenuItem
+            // магазинToolStripMenuItem
             // 
-			продажаИзделияToolStripMenuItem.Name = "продажаИзделияToolStripMenuItem";
+            магазинToolStripMenuItem.Name = "магазинToolStripMenuItem";
-			продажаИзделияToolStripMenuItem.Size = new Size(148, 24);
+            магазинToolStripMenuItem.Size = new Size(224, 26);
-			продажаИзделияToolStripMenuItem.Text = "Продажа изделия";
+            магазинToolStripMenuItem.Text = "Магазины";
-			продажаИзделияToolStripMenuItem.Click += продажаИзделияToolStripMenuItem_Click;
+            магазинToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click;
             // 
             // FormMain
             // 
@@ -202,6 +194,5 @@
         private Button buttonUpd;
         private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem;
         private ToolStripMenuItem магазинToolStripMenuItem;
-		private ToolStripMenuItem продажаИзделияToolStripMenuItem;
     }
 }

GarmentFactory/GarmentFactoryView/FormMain.cs

@@ -173,14 +173,5 @@ namespace GarmentFactoryView
                 form.ShowDialog();
             }
         }
-
-		private void продажаИзделияToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormTextileSale));
-			if (service is FormTextileSale form)
-			{
-				form.ShowDialog();
-			}
-		}
     }
 }

GarmentFactory/GarmentFactoryView/FormMakeDelivery.Designer.cs

@@ -124,7 +124,6 @@
             Controls.Add(labelProduct);
             Controls.Add(labelShop);
             Name = "FormMakeDelivery";
-			StartPosition = FormStartPosition.CenterScreen;
             Text = "Пополнение магазина";
             Load += FormMakeDelivery_Load;
             ResumeLayout(false);

GarmentFactory/GarmentFactoryView/FormShop.Designer.cs

@@ -41,8 +41,6 @@
             ColumnCount = new DataGridViewTextBoxColumn();
             buttonSave = new Button();
             buttonCancel = new Button();
-			labelMaxTextile = new Label();
-			textBoxMaximum = new TextBox();
             groupBoxTextiles.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -104,11 +102,11 @@
             // groupBoxTextiles
             // 
             groupBoxTextiles.Controls.Add(dataGridView);
-			groupBoxTextiles.Location = new Point(5, 168);
+            groupBoxTextiles.Location = new Point(5, 133);
             groupBoxTextiles.Margin = new Padding(5, 4, 5, 4);
             groupBoxTextiles.Name = "groupBoxTextiles";
             groupBoxTextiles.Padding = new Padding(5, 4, 5, 4);
-			groupBoxTextiles.Size = new Size(536, 397);
+            groupBoxTextiles.Size = new Size(536, 384);
             groupBoxTextiles.TabIndex = 7;
             groupBoxTextiles.TabStop = false;
             groupBoxTextiles.Text = "Мороженое";
@@ -129,7 +127,7 @@
             dataGridView.RowHeadersVisible = false;
             dataGridView.RowHeadersWidth = 51;
             dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-			dataGridView.Size = new Size(522, 369);
+            dataGridView.Size = new Size(522, 356);
             dataGridView.TabIndex = 0;
             // 
             // ColumnId
@@ -159,7 +157,7 @@
             // 
             // buttonSave
             // 
-			buttonSave.Location = new Point(301, 592);
+            buttonSave.Location = new Point(291, 525);
             buttonSave.Margin = new Padding(5, 4, 5, 4);
             buttonSave.Name = "buttonSave";
             buttonSave.Size = new Size(101, 36);
@@ -170,7 +168,7 @@
             // 
             // buttonCancel
             // 
-			buttonCancel.Location = new Point(421, 592);
+            buttonCancel.Location = new Point(410, 525);
             buttonCancel.Margin = new Padding(5, 4, 5, 4);
             buttonCancel.Name = "buttonCancel";
             buttonCancel.Size = new Size(101, 36);
@@ -179,29 +177,11 @@
             buttonCancel.UseVisualStyleBackColor = true;
             buttonCancel.Click += ButtonCancel_Click;
             // 
-			// labelMaxTextile
-			// 
-			labelMaxTextile.AutoSize = true;
-			labelMaxTextile.Location = new Point(16, 137);
-			labelMaxTextile.Name = "labelMaxTextile";
-			labelMaxTextile.Size = new Size(150, 20);
-			labelMaxTextile.TabIndex = 10;
-			labelMaxTextile.Text = "Максимум изделия :";
-			// 
-			// textBoxMaximum
-			// 
-			textBoxMaximum.Location = new Point(173, 134);
-			textBoxMaximum.Name = "textBoxMaximum";
-			textBoxMaximum.Size = new Size(219, 27);
-			textBoxMaximum.TabIndex = 11;
-			// 
             // FormShop
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(546, 641);
+            ClientSize = new Size(546, 576);
-			Controls.Add(textBoxMaximum);
-			Controls.Add(labelMaxTextile);
             Controls.Add(buttonCancel);
             Controls.Add(buttonSave);
             Controls.Add(groupBoxTextiles);
@@ -237,7 +217,5 @@
         private DataGridViewTextBoxColumn ColumnId;
         private DataGridViewTextBoxColumn ColumnName;
         private DataGridViewTextBoxColumn ColumnCount;
-		private Label labelMaxTextile;
-		private TextBox textBoxMaximum;
     }
 }

GarmentFactory/GarmentFactoryView/FormShop.cs

@@ -39,7 +39,6 @@ namespace GarmentFactoryView
                         textBoxName.Text = view.ShopName;
                         textBoxAddress.Text = view.Address;
                         dateTimePicker.Value = view.DateOpening;
-						textBoxMaximum.Text = view.TextilesMaximum.ToString();
                         _shopTextiles = view.ShopTextiles ?? new Dictionary<int, (ITextileModel, int)>();
                         LoadData();
                     }
@@ -90,11 +89,6 @@ namespace GarmentFactoryView
                 MessageBox.Show("Заполните дату", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
-			if (string.IsNullOrEmpty(textBoxMaximum.Text))
-			{
-				MessageBox.Show("Заполните максимальное количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
             _logger.LogInformation("Shop saving");
             try
             {
@@ -104,7 +98,6 @@ namespace GarmentFactoryView
                     ShopName = textBoxName.Text,
                     Address = textBoxAddress.Text,
                     DateOpening = dateTimePicker.Value,
-					TextilesMaximum = Convert.ToInt32(textBoxMaximum.Text),
                     ShopTextiles = _shopTextiles
                 };
                 var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
@@ -128,6 +121,5 @@ namespace GarmentFactoryView
             DialogResult = DialogResult.Cancel;
             Close();
         }
-
     }
 }

GarmentFactory/GarmentFactoryView/FormTextileSale.Designer.cs

@@ -1,121 +0,0 @@
-namespace GarmentFactoryView
-{
-	partial class FormTextileSale
-	{
-		/// <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()
-		{
-			labelTextile = new Label();
-			labelCount = new Label();
-			buttonSale = new Button();
-			buttonCancel = new Button();
-			comboBoxTextile = new ComboBox();
-			textBoxCount = new TextBox();
-			SuspendLayout();
-			// 
-			// labelTextile
-			// 
-			labelTextile.AutoSize = true;
-			labelTextile.Location = new Point(25, 33);
-			labelTextile.Name = "labelTextile";
-			labelTextile.Size = new Size(75, 20);
-			labelTextile.TabIndex = 0;
-			labelTextile.Text = "Изделие :";
-			// 
-			// labelCount
-			// 
-			labelCount.AutoSize = true;
-			labelCount.Location = new Point(25, 81);
-			labelCount.Name = "labelCount";
-			labelCount.Size = new Size(97, 20);
-			labelCount.TabIndex = 1;
-			labelCount.Text = "Количество :";
-			// 
-			// buttonSale
-			// 
-			buttonSale.Location = new Point(212, 124);
-			buttonSale.Name = "buttonSale";
-			buttonSale.Size = new Size(101, 36);
-			buttonSale.TabIndex = 2;
-			buttonSale.Text = "Продать";
-			buttonSale.UseVisualStyleBackColor = true;
-			buttonSale.Click += ButtonSale_Click;
-			// 
-			// buttonCancel
-			// 
-			buttonCancel.Location = new Point(328, 124);
-			buttonCancel.Name = "buttonCancel";
-			buttonCancel.Size = new Size(101, 36);
-			buttonCancel.TabIndex = 3;
-			buttonCancel.Text = "Отмена";
-			buttonCancel.UseVisualStyleBackColor = true;
-			buttonCancel.Click += ButtonCancel_Click;
-			// 
-			// comboBoxTextile
-			// 
-			comboBoxTextile.DropDownStyle = ComboBoxStyle.DropDownList;
-			comboBoxTextile.FormattingEnabled = true;
-			comboBoxTextile.Location = new Point(132, 30);
-			comboBoxTextile.Name = "comboBoxTextile";
-			comboBoxTextile.Size = new Size(297, 28);
-			comboBoxTextile.TabIndex = 4;
-			// 
-			// textBoxCount
-			// 
-			textBoxCount.Location = new Point(132, 78);
-			textBoxCount.Name = "textBoxCount";
-			textBoxCount.Size = new Size(297, 27);
-			textBoxCount.TabIndex = 5;
-			// 
-			// FormTextileSale
-			// 
-			AutoScaleDimensions = new SizeF(8F, 20F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(464, 176);
-			Controls.Add(textBoxCount);
-			Controls.Add(comboBoxTextile);
-			Controls.Add(buttonCancel);
-			Controls.Add(buttonSale);
-			Controls.Add(labelCount);
-			Controls.Add(labelTextile);
-			Name = "FormTextileSale";
-			StartPosition = FormStartPosition.CenterScreen;
-			Text = "Продажа изделий";
-			Load += FormTextileSale_Load;
-			ResumeLayout(false);
-			PerformLayout();
-		}
-
-		#endregion
-
-		private Label labelTextile;
-		private Label labelCount;
-		private Button buttonSale;
-		private Button buttonCancel;
-		private ComboBox comboBoxTextile;
-		private TextBox textBoxCount;
-	}
-}

GarmentFactory/GarmentFactoryView/FormTextileSale.cs

@@ -1,95 +0,0 @@
-using GarmentFactoryContracts.BusinessLogicsContracts;
-using GarmentFactoryContracts.BindingModels;
-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 GarmentFactoryView
-{
-	public partial class FormTextileSale : Form
-	{
-		private readonly ILogger _logger;
-
-		private readonly ITextileLogic _logicTextile;
-
-		private readonly IShopLogic _logicShop;
-		public FormTextileSale(ILogger<FormMakeDelivery> logger, ITextileLogic logicTextile, IShopLogic logicShop)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logicTextile = logicTextile;
-			_logicShop = logicShop;
-		}
-
-		private void ButtonCancel_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		private void ButtonSale_Click(object sender, EventArgs e)
-		{
-			if (comboBoxTextile.SelectedValue == null)
-			{
-				MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			if (string.IsNullOrEmpty(textBoxCount.Text))
-			{
-				MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			_logger.LogInformation("Textile sale");
-			try
-			{
-				var operationResult = _logicShop.MakeSale(
-					new TextileBindingModel
-					{
-						Id = Convert.ToInt32(comboBoxTextile.SelectedValue)
-					},
-					Convert.ToInt32(textBoxCount.Text)
-				);
-				if (!operationResult)
-				{
-					throw new Exception("Ошибка при продаже.");
-				}
-				MessageBox.Show("Продажа прошла успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-				DialogResult = DialogResult.OK;
-				Close();
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Textile sale error");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void FormTextileSale_Load(object sender, EventArgs e)
-		{
-			_logger.LogInformation("Textiles loading");
-			try
-			{
-				var list = _logicTextile.ReadList(null);
-				if (list != null)
-				{
-					comboBoxTextile.DisplayMember = "TextileName";
-					comboBoxTextile.ValueMember = "Id";
-					comboBoxTextile.DataSource = list;
-					comboBoxTextile.SelectedItem = null;
-				}
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Textiles loading error");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-	}
-}

GarmentFactory/GarmentFactoryView/FormTextileSale.resx

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

GarmentFactory/GarmentFactoryView/GarmentFactoryView.csproj

@@ -17,7 +17,6 @@
   <ItemGroup>
     <ProjectReference Include="..\GarmentFactoryBusinessLogic\GarmentFactoryBusinessLogic.csproj" />
     <ProjectReference Include="..\GarmentFactoryContracts\GarmentFactoryContracts.csproj" />
-    <ProjectReference Include="..\GarmentFactoryFileImplement\GarmentFactoryFileImplement.csproj" />
     <ProjectReference Include="..\GarmentFactoryListImplement\GarmentFactoryListImplement.csproj" />
   </ItemGroup>
 

GarmentFactory/GarmentFactoryView/Program.cs

@@ -1,10 +1,10 @@
 using GarmentFactoryBusinessLogic.BusinessLogics;
 using GarmentFactoryContracts.BusinessLogicsContracts;
 using GarmentFactoryContracts.StoragesContracts;
+using GarmentFactoryListImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
-using GarmentFactoryFileImplement.Implements;
 using System.Drawing;
 
 namespace GarmentFactoryView
@@ -33,7 +33,6 @@ namespace GarmentFactoryView
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ITextileStorage, TextileStorage>();
             services.AddTransient<IShopStorage, ShopStorage>();
-
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ITextileLogic, TextileLogic>();
@@ -49,7 +48,6 @@ namespace GarmentFactoryView
             services.AddTransient<FormShop>();
             services.AddTransient<FormShops>();
             services.AddTransient<FormMakeDelivery>();
-			services.AddTransient<FormTextileSale>();
         }
 
     }