1!1!1!1!1!

PIbd-23_Panina.A.D_JewelryStore/JewelryShopDataModels/Enums/OrderStatus.cs

@@ -6,6 +6,7 @@
         Принят = 0,
         Выполняется = 1,
         Готов = 2,
-        Выдан = 3
+		Ожидает = 3,
+		Выдан = 4
 	}
 }

PIbd-23_Panina.A.D_JewelryStore/JewelryStore/Program.cs

@@ -40,9 +40,12 @@ namespace JewelryStore
             services.AddTransient<IStoreStorage, StoreStorage>();
 			services.AddTransient<IStoreStorage, StoreStorage>();
 			services.AddTransient<IComponentLogic, ComponentLogic>();
+			services.AddTransient<IImplementerStorage, ImplementerStorage>();
 			services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IJewelLogic, JewelLogic>();
             services.AddTransient<IStoreLogic, StoreLogic>();
+			services.AddTransient<IImplementerLogic, ImplementerLogic>();
+			services.AddTransient<IComponentLogic, ComponentLogic>();
 			services.AddTransient<FormMain>();
 			services.AddTransient<IReportLogic, ReportLogic>();
 			services.AddTransient<AbstractSaveToWord, SaveToWord>();
@@ -50,12 +53,15 @@ namespace JewelryStore
 			services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
 			services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
+			services.AddTransient<IWorkProcess, WorkModeling>();
 			services.AddTransient<FormCreateOrder>();
             services.AddTransient<FormJewel>();
             services.AddTransient<FormJewelComponent>();
             services.AddTransient<FormJewels>();
             services.AddTransient<FormStores>();
             services.AddTransient<FormStore>();
+			services.AddTransient<FormImplementers>();
+			services.AddTransient<FormImplementer>();
 			services.AddTransient<FormReportJewelComponents>();
 			services.AddTransient<FormReportOrders>();
 			services.AddTransient<FormReportShop>();

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/ImplementerLogic.cs

@@ -23,6 +23,36 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
             _implementerStorage = implementerStorage;
         }
 
+		public List<ImplementerViewModel>? ReadList(ImplementerSearchModel? model)
+		{
+			_logger.LogInformation("ReadList. ImplementerFIO:{ImplementerFIO}.Password:{Password}.Id:{ Id}", model?.ImplementerFIO, model?.Password?.Length, model?.Id);
+			var list = model == null ? _implementerStorage.GetFullList() : _implementerStorage.GetFilteredList(model);
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			return list;
+		}
+
+		public ImplementerViewModel? ReadElement(ImplementerSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			_logger.LogInformation("ReadElement. ImplementerFIO:{ImplementerFIO}.Password:{Password}.Id:{ Id}", model?.ImplementerFIO, model?.Password?.Length, model?.Id);
+			var element = _implementerStorage.GetElement(model);
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
+				return null;
+			}
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+			return element;
+		}
+
 		public bool Create(ImplementerBindingModel model)
 		{
 			CheckModel(model);
@@ -34,6 +64,17 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
 			return true;
 		}
 
+		public bool Update(ImplementerBindingModel model)
+		{
+			CheckModel(model);
+			if (_implementerStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
+				return false;
+			}
+			return true;
+		}
+
 		public bool Delete(ImplementerBindingModel model)
 		{
 			CheckModel(model, false);
@@ -46,47 +87,6 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
 			return true;
 		}
 
-        public ImplementerViewModel? ReadElement(ImplementerSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. FIO:{FIO}.Id:{ Id}", model.ImplementerFIO, model.Id);
-            var element = _implementerStorage.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<ImplementerViewModel>? ReadList(ImplementerSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. FIO:{FIO}.Id:{ Id} ", model?.ImplementerFIO, model?.Id);
-            var list = (model == null) ? _implementerStorage.GetFullList() : _implementerStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        public bool Update(ImplementerBindingModel model)
-        {
-            CheckModel(model);
-            if (_implementerStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
 		private void CheckModel(ImplementerBindingModel model, bool withParams = true)
 		{
 			if (model == null)
@@ -97,26 +97,27 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
 			{
 				return;
 			}
-            if (model.WorkExperience < 0)
-            {
-                throw new ArgumentException("Опыт работы не должен быть отрицательным", nameof(model.WorkExperience));
-            }
-            if (model.Qualification < 0)
-            {
-                throw new ArgumentException("Квалификация не должна быть отрицательной", nameof(model.Qualification));
-            }
-            if (string.IsNullOrEmpty(model.Password))
-            {
-                throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.ImplementerFIO));
-            }
 			if (string.IsNullOrEmpty(model.ImplementerFIO))
 			{
 				throw new ArgumentNullException("Нет ФИО исполнителя", nameof(model.ImplementerFIO));
 			}
-            _logger.LogInformation("Implementer. Id: {Id}, FIO: {FIO}", model.Id, model.ImplementerFIO);
+			if (string.IsNullOrEmpty(model.Password))
+			{
+				throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.Password));
+			}
+			if (model.WorkExperience < 0)
+			{
+				throw new ArgumentNullException("Стаж должен быть больше 0", nameof(model.WorkExperience));
+			}
+			if (model.Qualification < 0)
+			{
+				throw new ArgumentNullException("Квалификация должна быть положительной", nameof(model.Qualification));
+			}
+			_logger.LogInformation("Implementer. ImplementerFIO:{ImplementerFIO}.Password:{Password}.WorkExperience:{WorkExperience}.Qualification:{Qualification}.Id: { Id}",
+				model.ImplementerFIO, model.Password, model.WorkExperience, model.Qualification, model.Id);
 			var element = _implementerStorage.GetElement(new ImplementerSearchModel
 			{
-                ImplementerFIO = model.ImplementerFIO,
+				ImplementerFIO = model.ImplementerFIO
 			});
 			if (element != null && element.Id != model.Id)
 			{

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -1,11 +1,16 @@
-using JewelryStoreContracts.BindingModels;
+using JewelryStoreDataModels.Enums;
+using Microsoft.Extensions.Logging;
+using JewelryStoreContracts.BindingModels;
+using JewelryStoreContracts.BusinessLogicsContracts;
+using JewelryStoreContracts.SearchModels;
+using JewelryStoreContracts.StoragesContracts;
+using JewelryStoreContracts.ViewModels;
+using JewelryStoreContracts.BindingModels;
 using JewelryStoreContracts.BusinessLogicsContracts;
 using JewelryStoreContracts.SearchModels;
 using JewelryStoreContracts.StoragesContracts;
-using JewelryStoreContracts.StoragesModels;
 using JewelryStoreContracts.ViewModels;
 using JewelryStoreDataModels.Enums;
-using Microsoft.Extensions.Logging;
 
 namespace JewelryStoreBusinessLogic.BusinessLogics
 {
@@ -13,90 +18,38 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
 	{
 		private readonly ILogger _logger;
 		private readonly IOrderStorage _orderStorage;
-		private readonly IStoreStorage _shopStorage;
+		static readonly object _locker = new object();
+		private readonly IShopStorage _shopStorage;
 
-		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IStoreStorage shopStorage)
+		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
 		{
 			_logger = logger;
 			_orderStorage = orderStorage;
 			_shopStorage = shopStorage;
 		}
 
-        public bool CreateOrder(OrderBindingModel model)
+		public OrderViewModel? ReadElement(OrderSearchModel model)
 		{
-            CheckModel(model);
+			if (model == null)
-            if (model.Status != OrderStatus.Неизвестен) return false;
-            model.Status = OrderStatus.Принят;
-            if (_orderStorage.Insert(model) == null)
 			{
-                _logger.LogWarning("Insert operation failed");
+				throw new ArgumentNullException(nameof(model));
-                return false;
 			}
-            return true;
+			_logger.LogInformation("ReadElement. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
+				model.ClientId, model.Status, model.ImplementerId, model.DateFrom, model.DateTo, model.Id);
+			var element = _orderStorage.GetElement(model);
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
+				return null;
 			}
-
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-        public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
+			return element;
-        {
-			var order = _orderStorage.GetElement(new OrderSearchModel
-			{
-				Id = model.Id,
-			});
-			if (order == null)
-			{
-				throw new ArgumentNullException(nameof(order));
-			}
-			if (!_shopStorage.RestockingShops(new SupplyBindingModel
-			{
-				JewelId = order.JewelId,
-				Count = order.Count
-			}))
-			{
-				throw new ArgumentException("Недостаточно места");
-			}
-
-			model.Status = OrderStatus.Выдан;
-            model.DateImplement = DateTime.Now;
-            _orderStorage.Update(model);
-            return true;
-        }
-
-            model.Status = newStatus;
-            model.DateCreate = vmodel.DateCreate;
-            if (model.DateImplement == null)
-            {
-                model.DateImplement = vmodel.DateImplement;
-            }
-            if (vmodel.ImplementerId.HasValue)
-            {
-                model.ImplementerId = vmodel.ImplementerId;
-            }
-            model.JewelId = vmodel.JewelId;
-            model.Sum = vmodel.Sum;
-            model.Count = vmodel.Count;
-            if (_orderStorage.Update(model) == null)
-            {
-                model.Status--;
-                _logger.LogWarning("Update operation failed");
-
-                return false;
-            }
-            return true;
-        }
-
-        public bool DeliveryOrder(OrderBindingModel model)
-        {
-            model.DateImplement = DateTime.Now;
-            return StatusUpdate(model, OrderStatus.Готов);
-        }
-
-        public bool FinishOrder(OrderBindingModel model)
-        {
-            return StatusUpdate(model, OrderStatus.Выдан);
 		}
 
 		public List<OrderViewModel>? ReadList(OrderSearchModel? model)
 		{
-            _logger.LogInformation("ReadList. Id:{Id}", model?.Id);
+			_logger.LogInformation("ReadList. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
+			model?.ClientId, model?.Status, model?.ImplementerId, model?.DateFrom, model?.DateTo, model?.Id);
 			var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
 			if (list == null)
 			{
@@ -107,47 +60,135 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
 			return list;
 		}
 
-        public bool TakeOrderInWork(OrderBindingModel model)
+		public bool CreateOrder(OrderBindingModel model)
 		{
-            return StatusUpdate(model, OrderStatus.Выполняется);
+			CheckModel(model);
-        }
+			if (model.Status != OrderStatus.Неизвестен)
-
+				return false;
-        private bool CheckModel(OrderBindingModel model)
+			model.Status = OrderStatus.Принят;
+			if (_orderStorage.Insert(model) == null)
 			{
-            if (model == null)
+				_logger.LogWarning("Insert operation failed");
-            {
+				return false;
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Количество изделий в заказе должно быть больше 0", nameof(model.Count));
-            }
-            if (model.Sum <= 0)
-            {
-                throw new ArgumentException("Суммарная стоимость заказа должна быть больше 0", nameof(model.Sum));
-            }
-            if (model.DateCreate > model.DateImplement)
-            {
-                throw new ArgumentException("Время создания заказа не может быть больше времени его выполнения", nameof(model.DateImplement));
 			}
 			return true;
 		}
 
-        public OrderViewModel? ReadElement(OrderSearchModel model)
+		public bool TakeOrderInWork(OrderBindingModel model)
+		{
+			lock (_locker)
+			{
+				return ChangeStatus(model, OrderStatus.Выполняется);
+			}
+		}
+
+		public bool FinishOrder(OrderBindingModel model)
+		{
+			return ChangeStatus(model, OrderStatus.Готов);
+		}
+
+		public bool DeliveryOrder(OrderBindingModel model)
+		{
+			lock (_locker)
+			{
+				model = FillOrderBindingModel(model);
+				if (model.Status != OrderStatus.Готов && model.Status != OrderStatus.Ожидает)
+				{
+					_logger.LogWarning("Changing status operation faled: Current-{Status}:required-Выдан.", model.Status);
+					throw new InvalidOperationException($"Невозможно приствоить статус выдан заказу с текущим статусом {model.Status}");
+				}
+				if (!_shopStorage.RestockingShops(new SupplyBindingModel
+				{
+					JewelId = model.JewelId,
+					Count = model.Count
+				}))
+				{
+					if (model.Status == OrderStatus.Готов || model.Status == OrderStatus.Ожидает)
+					{
+						model.Status = OrderStatus.Ожидает;
+						return UpdateOrder(model);
+					}
+				}
+				model.Status = OrderStatus.Выдан;
+				return UpdateOrder(model);
+			}
+		}
+
+		private void CheckModel(OrderBindingModel model, bool withParams = true)
 		{
 			if (model == null)
 			{
 				throw new ArgumentNullException(nameof(model));
 			}
-            _logger.LogInformation("ReadElement. Id:{ Id}", model.Id);
+			if (!withParams)
-            var element = _orderStorage.GetElement(model);
+			{
+				return;
+			}
+			if (model.Count <= 0)
+			{
+				throw new ArgumentException("Колличество украшения в заказе не может быть меньше 1", nameof(model.Count));
+			}
+			if (model.Sum <= 0)
+			{
+				throw new ArgumentException("Стоимость заказа на может быть меньше 1", nameof(model.Sum));
+			}
+			if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate)
+			{
+				throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} не может быть раньше даты его создания {model.DateCreate}");
+			}
+			_logger.LogInformation("Jewel. JewelId:{JewelId}.Count:{Count}.Sum:{Sum}Id:{Id}",
+				model.JewelId, model.Count, model.Sum, model.Id);
+		}
+		private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus)
+		{
+			model = FillOrderBindingModel(model);
+
+			if (requiredStatus - model.Status == 1)
+			{
+				model.Status = requiredStatus;
+				if (model.Status == OrderStatus.Готов)
+					model.DateImplement = DateTime.Now;
+				return UpdateOrder(model);
+			}
+			_logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
+			throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+		}
+
+		private OrderBindingModel FillOrderBindingModel(OrderBindingModel model)
+		{
+			CheckModel(model, false);
+			var element = _orderStorage.GetElement(new OrderSearchModel()
+			{
+				Id = model.Id
+			});
 			if (element == null)
 			{
-                _logger.LogWarning("ReadElement element not found");
+				throw new InvalidOperationException(nameof(element));
-                return null;
 			}
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+			model.Id = element.Id;
-            return element;
+			model.DateCreate = element.DateCreate;
+			model.JewelId = element.JewelId;
+			model.DateImplement = element.DateImplement;
+			model.ClientId = element.ClientId;
+			model.Status = element.Status;
+			model.Count = element.Count;
+			model.Sum = element.Sum;
+			if (!model.ImplementerId.HasValue)
+			{
+				model.ImplementerId = element.ImplementerId;
+			}
+			return model;
+		}
+
+		private bool UpdateOrder(OrderBindingModel model)
+		{
+			if (_orderStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
+				return false;
+			}
+			_logger.LogWarning("Update operation sucsess");
+			return true;
 		}
 	}
 }

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -4,11 +4,11 @@ using JewelryStoreContracts.SearchModels;
 using JewelryStoreContracts.ViewModels;
 using JewelryStoreDataModels.Enums;
 using Microsoft.Extensions.Logging;
-using System;
+using JewelryStoreContracts.BindingModels;
-using System.Collections.Generic;
+using JewelryStoreContracts.BusinessLogicsContracts;
-using System.Linq;
+using JewelryStoreContracts.SearchModels;
-using System.Text;
+using JewelryStoreContracts.ViewModels;
-using System.Threading.Tasks;
+using JewelryStoreDataModels.Enums;
 
 namespace JewelryStoreBusinessLogic.BusinessLogics
 {
@@ -35,16 +35,15 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
 				_logger.LogWarning("DoWork. Implementers is null");
 				return;
 			}
-
+			var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Выдан });
-            var orders = _orderLogic.ReadList(new OrderSearchModel { Statuses = new() { OrderStatus.Принят, OrderStatus.Выполняется } });
+			int count = _orderLogic.ReadList(null).Count;
-            if (orders == null || orders.Count == 0)
+			if (orders == null || count == orders.Count)
 			{
 				_logger.LogWarning("DoWork. Orders is null or empty");
 				return;
 			}
-
+			orders = _orderLogic.ReadList(null);
 			_logger.LogDebug("DoWork for {Count} orders", orders.Count);
-
 			foreach (var implementer in implementers)
 			{
 				Task.Run(() => WorkerWorkAsync(implementer, orders));
@@ -57,7 +56,8 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
 			{
 				return;
 			}
-            await RunOrderInWork(implementer, orders);
+			await DeliverWaitingOrder(implementer);
+			await RunOrderInWork(implementer);
 
 			await Task.Run(() =>
 			{
@@ -66,69 +66,115 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
 					try
 					{
 						_logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
-
+						// пытаемся назначить заказ на исполнителя
 						_orderLogic.TakeOrderInWork(new OrderBindingModel
 						{
 							Id = order.Id,
 							ImplementerId = implementer.Id
 						});
-
+						// делаем работу
 						Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
 						_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
-
+						_orderLogic.FinishOrder(new OrderBindingModel
-                        _orderLogic.DeliveryOrder(new OrderBindingModel
 						{
 							Id = order.Id
 						});
-
+						_orderLogic.DeliveryOrder(new OrderBindingModel { Id = order.Id });
-                        Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
 					}
-
+					// кто-то мог уже перехватить заказ, игнорируем ошибку
 					catch (InvalidOperationException ex)
 					{
 						_logger.LogWarning(ex, "Error try get work");
 					}
-
+					// заканчиваем выполнение имитации в случае иной ошибки
 					catch (Exception ex)
 					{
 						_logger.LogError(ex, "Error while do work");
 						throw;
 					}
+					// отдыхаем
+					Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
 				}
 			});
 		}
 
-        private async Task RunOrderInWork(ImplementerViewModel implementer, List<OrderViewModel> allOrders)
+		private async Task RunOrderInWork(ImplementerViewModel implementer)
 		{
-            if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0)
+			if (_orderLogic == null || implementer == null)
 			{
 				return;
 			}
 			try
 			{
-                var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
+				var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
+				{
+					ImplementerId = implementer.Id,
+					Status = OrderStatus.Выполняется
+				}));
 				if (runOrder == null)
 				{
 					return;
 				}
 
 				_logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
-
+				// доделываем работу
 				Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
 				_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
-                _orderLogic.DeliveryOrder(new OrderBindingModel
+				_orderLogic.FinishOrder(new OrderBindingModel
 				{
 					Id = runOrder.Id
 				});
-
+				_orderLogic.DeliveryOrder(new OrderBindingModel { Id = runOrder.Id });
+				// отдыхаем
 				Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
 			}
-
+			// заказа может не быть, просто игнорируем ошибку
 			catch (InvalidOperationException ex)
 			{
 				_logger.LogWarning(ex, "Error try get work");
 			}
+			// а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Error while do work");
+				throw;
+			}
+		}
 
+		private async Task DeliverWaitingOrder(ImplementerViewModel implementer)
+		{
+			if (_orderLogic == null || implementer == null)
+			{
+				return;
+			}
+			var waitingOrders = await Task.Run(() => _orderLogic.ReadList(new OrderSearchModel
+			{
+				ImplementerId = implementer.Id,
+				Status = OrderStatus.Ожидает
+			}));
+			if (waitingOrders == null || waitingOrders.Count == 0)
+			{
+				return;
+			}
+			_logger.LogInformation("DeliverWaitingOrder. Find some waitig order for implementer:{id}.Count:{count}", implementer.Id, waitingOrders.Count);
+			foreach (var waitingOrder in waitingOrders)
+			{
+				try
+				{
+					_logger.LogInformation("DeliverWaitingOrder. Trying to deliver order id:{id}", waitingOrder.Id);
+					var res = _orderLogic.DeliveryOrder(new OrderBindingModel
+					{
+						Id = waitingOrder.Id
+					});
+				}
+				catch (ArgumentException ex)
+				{
+					_logger.LogWarning(ex, "DeliverWaitingOrder. Fault");
+				}
+				catch (InvalidOperationException ex)
+				{
+					_logger.LogWarning(ex, "Error try deliver order");
+				}
 				catch (Exception ex)
 				{
 					_logger.LogError(ex, "Error while do work");
@@ -136,5 +182,5 @@ namespace JewelryStoreBusinessLogic.BusinessLogics
 				}
 			}
 		}
+	}
 }
-

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IWorkProcess.cs

@@ -8,9 +8,6 @@ namespace JewelryStoreContracts.BusinessLogicsContracts
 {
     public interface IWorkProcess
     {
-        /// <summary>
-        /// Запуск работ
-        /// </summary>
         void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
     }
 }

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/ImplementerStorage.cs

@@ -13,87 +13,72 @@ namespace JewelryStoreDatabaseImplement.Implements
 {
     public class ImplementerStorage : IImplementerStorage
     {
-        public ImplementerViewModel? Delete(ImplementerBindingModel model)
-        {
-            using var context = new JewelryStoreDatabase();
-            var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
-            if (res != null)
-            {
-                context.Implementers.Remove(res);
-                context.SaveChanges();
-            }
-            return res?.GetViewModel;
-        }
-
-        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-        {
-            using var context = new JewelryStoreDatabase();
-
-            if (model.Id.HasValue)
-            {
-                return context.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
-            }
-            if (model.ImplementerFIO != null && model.Password != null)
-            {
-                return context.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)&&x.Password.Equals(model.Password))
-                    ?.GetViewModel;
-            }
-            if (model.ImplementerFIO != null)
-            {
-                return context.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
-            }
-            return null;
-        }
-
-        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
-        {
-            if (model == null)
-            {
-                return new();
-            }
-            if (model.Id.HasValue)
-            {
-                var res = GetElement(model);
-                return res != null ? new() { res } : new();
-            }
-            if (model.ImplementerFIO != null)
-            {
-                using var context = new JewelryStoreDatabase();
-                return context.Implementers.Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))
-                    .Select(x => x.GetViewModel).ToList();
-            }
-            return new();
-        }
-
 		public List<ImplementerViewModel> GetFullList()
 		{
 			using var context = new JewelryStoreDatabase();
 			return context.Implementers.Select(x => x.GetViewModel).ToList();
 		}
 
-        public ImplementerViewModel? Insert(ImplementerBindingModel model)
+		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
 		{
+			if (string.IsNullOrEmpty(model.ImplementerFIO))
+			{
+				return new();
+			}
 			using var context = new JewelryStoreDatabase();
-            var res = Implementer.Create(model);
+			return context.Implementers.Where(x => x.ImplementerFIO.Contains(model.ImplementerFIO)).Select(x => x.GetViewModel).ToList();
-            if (res != null)
-            {
-                context.Implementers.Add(res);
-                context.SaveChanges();
 		}
 
-            return res?.GetViewModel;
+		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.ImplementerFIO) && !model.Id.HasValue)
+			{
+				return null;
+			}
+			using var context = new JewelryStoreDatabase();
+			return context.Implementers.FirstOrDefault(x =>
+				(!string.IsNullOrEmpty(model.ImplementerFIO) && x.ImplementerFIO == model.ImplementerFIO && (!string.IsNullOrEmpty(model.Password) ? x.Password == model.Password : true)) ||
+				(model.Id.HasValue && x.Id == model.Id))
+				?.GetViewModel;
+		}
+
+		public ImplementerViewModel? Insert(ImplementerBindingModel model)
+		{
+			var newImplementer = Implementer.Create(model);
+			if (newImplementer == null)
+			{
+				return null;
+			}
+			using var context = new JewelryStoreDatabase();
+			context.Implementers.Add(newImplementer);
+			context.SaveChanges();
+			return newImplementer.GetViewModel;
 		}
 
 		public ImplementerViewModel? Update(ImplementerBindingModel model)
 		{
 			using var context = new JewelryStoreDatabase();
-            var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			var implementer = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
-            if (res != null)
+			if (implementer == null)
 			{
-                res.Update(model);
+				return null;
-                context.SaveChanges();
 			}
-            return res?.GetViewModel;
+			implementer.Update(model);
+			context.SaveChanges();
+			return implementer.GetViewModel;
+		}
+
+		public ImplementerViewModel? Delete(ImplementerBindingModel model)
+		{
+			using var context = new JewelryStoreDatabase();
+			var implementer = context.Implementers.FirstOrDefault(rec => rec.Id == model.Id);
+			if (implementer != null)
+			{
+				context.Implementers.Remove(implementer);
+				context.SaveChanges();
+				return implementer.GetViewModel;
+			}
+			return null;
 		}
 	}
 }

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Implements/OrderStorage.cs

@@ -17,44 +17,32 @@ namespace JewelryStoreDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new JewelryStoreDatabase();
-            return context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(x => x.Implementer).Select(x => x.GetViewModel).ToList();
+			return context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(y => y.Implementer).Select(x => x.GetViewModel).ToList();
 		}
 		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
 		{
-            if (!model.DateFrom.HasValue || !model.DateTo.HasValue ||!model.Id.HasValue)
-            {
-                var result = GetElement(model);
-                return result != null ? new() { result } : new();
-            }
 			using var context = new JewelryStoreDatabase();
-            IQueryable<Order>? queryWhere = null;
+			if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue && !model.Status.HasValue)
-            if (model.DateFrom.HasValue && model.DateTo.HasValue)
-            {
-                queryWhere = context.Orders.Where(x => model.DateFrom <= x.DateCreate.Date && x.DateCreate.Date <= model.DateTo);
-            }
-            else if (model.Statuses != null)
-            {
-                queryWhere = context.Orders.Where(x => model.Statuses.Contains(x.Status));
-            }
-            else if (model.ClientId.HasValue)
-            {
-                queryWhere = context.Orders.Where(x => x.ClientId == model.ClientId);
-            }
-            else
 			{
 				return new();
 			}
-            return queryWhere.Include(x => x.Client).Include(x => x.Implementer).Select(x => x.GetViewModel).ToList();
+			return context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(x => x.Implementer).Where(x =>
+				 (model.DateFrom.HasValue && model.DateTo.HasValue && x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) ||
+				 (model.ClientId.HasValue && x.ClientId == model.ClientId) ||
+				 (model.Status.HasValue && x.Status == model.Status))
+				 .Select(x => x.GetViewModel).ToList();
 		}
 		public OrderViewModel? GetElement(OrderSearchModel model)
 		{
-            if (!model.Id.HasValue)
+			if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue))
 			{
 				return new();
 			}
 			using var context = new JewelryStoreDatabase();
-            return AccessJewelStorage(context.Orders.Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x =>(model.Statuses == null || model.Statuses != null && model.Statuses.Contains(x.Status)) &&
+			return context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x =>
-                        model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId || model.Id.HasValue && x.Id == model.Id)?.GetViewModel, context);
+				(model.Id.HasValue && x.Id == model.Id) ||
+				(model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId && x.Status == model.Status))
+				?.GetViewModel;
 		}
 		public OrderViewModel? Insert(OrderBindingModel model)
         {
@@ -71,14 +59,14 @@ namespace JewelryStoreDatabaseImplement.Implements
         public OrderViewModel? Update(OrderBindingModel model)
         {
             using var context = new JewelryStoreDatabase();
-            var order = context.Orders.Include(x => x.Jewel).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => x.Id == model.Id);
+			var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
 			if (order == null)
 			{
 				return null;
 			}
-            order.Update(model);
+			order.Update(context, model);
 			context.SaveChanges();
-            return AccessJewelStorage(order.GetViewModel, context);
+			return order.GetViewModel;
 		}
         public OrderViewModel? Delete(OrderBindingModel model)
         {

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabase.cs

@@ -25,6 +25,7 @@ namespace JewelryStoreDatabaseImplement
         public virtual DbSet<Order> Orders { set; get; }
 		public virtual DbSet<Store> Shops { get; set; }
 		public virtual DbSet<StoreJewels> ShopJewels { get; set; }
+		public virtual DbSet<Implementer> Implementers { set; get; }
 	}
 
 }

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/20230513055059_AddImplementer.cs

@@ -5,7 +5,7 @@
 namespace JewelryStoreDatabaseImplement.Migrations
 {
 	/// <inheritdoc />
-    public partial class AddImplementer : Migration
+	public partial class implementors : Migration
 	{
 		/// <inheritdoc />
 		protected override void Up(MigrationBuilder migrationBuilder)

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Migrations/JewelryStoreDatabaseModelSnapshot.cs

@@ -1,10 +1,10 @@
 // <auto-generated />
 using System;
-using JewelryStoreDatabaseImplement;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using JewelryStoreDatabaseImplement;
 
 #nullable disable
 
@@ -67,6 +67,33 @@ namespace JewelryStoreDatabaseImplement.Migrations
 				b.ToTable("Components");
 			});
 
+			modelBuilder.Entity("JewelryStoreDatabaseImplement.Models.Implementer", b =>
+			{
+				b.Property<int>("Id")
+					.ValueGeneratedOnAdd()
+					.HasColumnType("int");
+
+				SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+				b.Property<string>("ImplementerFIO")
+					.IsRequired()
+					.HasColumnType("nvarchar(max)");
+
+				b.Property<string>("Password")
+					.IsRequired()
+					.HasColumnType("nvarchar(max)");
+
+				b.Property<int>("Qualification")
+					.HasColumnType("int");
+
+				b.Property<int>("WorkExperience")
+					.HasColumnType("int");
+
+				b.HasKey("Id");
+
+				b.ToTable("Implementers");
+			});
+
 			modelBuilder.Entity("JewelryStoreDatabaseImplement.Models.Order", b =>
 			{
 				b.Property<int>("Id")
@@ -87,6 +114,9 @@ namespace JewelryStoreDatabaseImplement.Migrations
 				b.Property<DateTime?>("DateImplement")
 					.HasColumnType("datetime2");
 
+				b.Property<int?>("ImplementerId")
+					.HasColumnType("int");
+
 				b.Property<int>("JewelId")
 					.HasColumnType("int");
 
@@ -100,6 +130,8 @@ namespace JewelryStoreDatabaseImplement.Migrations
 
 				b.HasIndex("ClientId");
 
+				b.HasIndex("ImplementerId");
+
 				b.HasIndex("JewelId");
 
 				b.ToTable("Orders");
@@ -212,6 +244,10 @@ namespace JewelryStoreDatabaseImplement.Migrations
 					.OnDelete(DeleteBehavior.Cascade)
 					.IsRequired();
 
+				b.HasOne("JewelryStoreDatabaseImplement.Models.Implementer", "Implementer")
+					.WithMany("Order")
+					.HasForeignKey("ImplementerId");
+
 				b.HasOne("JewelryStoreDatabaseImplement.Models.Jewel", "Jewel")
 					.WithMany("Orders")
 					.HasForeignKey("JewelId")
@@ -220,6 +256,8 @@ namespace JewelryStoreDatabaseImplement.Migrations
 
 				b.Navigation("Client");
 
+				b.Navigation("Implementer");
+
 				b.Navigation("Jewel");
 			});
 
@@ -271,6 +309,11 @@ namespace JewelryStoreDatabaseImplement.Migrations
 				b.Navigation("JewelComponents");
 			});
 
+			modelBuilder.Entity("JewelryStoreDatabaseImplement.Models.Implementer", b =>
+			{
+				b.Navigation("Order");
+			});
+
 			modelBuilder.Entity("JewelryStoreDatabaseImplement.Models.Jewel", b =>
 			{
 				b.Navigation("Components");

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreDatabaseImplement/Models/Order.cs

@@ -15,76 +15,80 @@ namespace JewelryStoreDatabaseImplement.Models
     public class Order : IOrderModel
     {
 		public int Id { get; private set; }
+
 		[Required]
-        public int JewelId { get; set; }
+		public int ClientId { get; private set; }
+
+		public virtual Client Client { get; private set; } = new();
+
 		[Required]
-        public int Count { get; set; }
+		public int JewelId { get; private set; }
-        [Required]
+
-        public double Sum { get; set; }
+		public virtual Jewel Jewel { get; set; } = new();
-        [Required]
+
-        public OrderStatus Status { get; set; }
-        [Required]
-        public int ClientId { get; set; }
-        [Required]
-        public DateTime DateCreate { get; set; }
-        public DateTime? DateImplement { get; set; }
-        public Jewel Jewel { get; set; }
-        public Client Client { get; set; }
 		public int? ImplementerId { get; private set; }
-        public Implementer? Implementer { get; set; }
 
+		public virtual Implementer? Implementer { get; set; } = new();
 
-        public static Order? Create(OrderBindingModel? model)
+		[Required]
+		public int Count { get; private set; }
+
+		[Required]
+		public double Sum { get; private set; }
+
+		[Required]
+		public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+
+		[Required]
+		public DateTime DateCreate { get; private set; } = DateTime.Now;
+
+		public DateTime? DateImplement { get; private set; }
+
+		public static Order Create(JewelryStoreDatabase context, OrderBindingModel model)
 		{
-            if (model == null)
-            {
-                return null;
-            }
 			return new Order()
 			{
 				Id = model.Id,
-                JewelId = model.JewelId,
 				ClientId = model.ClientId,
+				Client = context.Clients.First(x => x.Id == model.ClientId),
+				JewelId = model.JewelId,
+				Jewel = context.Jewels.First(x => x.Id == model.JewelId),
 				ImplementerId = model.ImplementerId,
+				Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null,
 				Count = model.Count,
 				Sum = model.Sum,
 				Status = model.Status,
 				DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement
+				DateImplement = model.DateImplement,
 			};
 		}
-        public void Update(OrderBindingModel? model)
+
+		public void Update(JewelryStoreDatabase context, OrderBindingModel? model)
 		{
 			if (model == null)
 			{
 				return;
 			}
 			Status = model.Status;
-            ImplementerId = model.ImplementerId;
 			DateImplement = model.DateImplement;
+			ImplementerId = model.ImplementerId;
+			Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null;
 		}
-        public OrderViewModel GetViewModel
+
-        {
+		public OrderViewModel GetViewModel => new()
-            get
-            {
-                using var context = new JewelryStoreDatabase();
-                return new OrderViewModel
 		{
 			Id = Id,
-                    JewelId = JewelId,
 			ClientId = ClientId,
-                    ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
+			ClientFIO = Client.ClientFIO,
+			JewelId = JewelId,
+			JewelName = Jewel.JewelName,
 			ImplementerId = ImplementerId,
-                    ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
+			ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null,
-                    JewelName = context.Jewels.FirstOrDefault(x => x.Id == JewelId)?.JewelName ?? string.Empty,
 			Count = Count,
 			Sum = Sum,
 			Status = Status,
 			DateCreate = DateCreate,
-                    DateImplement = DateImplement
+			DateImplement = DateImplement,
 		};
 	}
-
-        }
-    }
 }

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/DataFileSingleton.cs

@@ -11,11 +11,13 @@ namespace JewelryStoreFileImplement
         private readonly string JewelFileName = "Jewel.xml";
         private readonly string ClientFileName = "Client.xml";
 		private readonly string ShopFileName = "Shop.xml";
+		private readonly string ImplementerFileName = "Implementer.xml";
 		public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Jewel> Jewels { get; private set; }
         public List<Client> Clients { get; private set; }
 		public List<Store> Shops { get; private set; }
+		public List<Implementer> Implementers { get; private set; }
 
 		public static DataFileSingleton GetInstance()
         {
@@ -34,6 +36,7 @@ namespace JewelryStoreFileImplement
 
         public void SaveClients() => SaveData(Clients, OrderFileName, "Clients", x => x.GetXElement);
 		public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
+		public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement);
 
 		private DataFileSingleton()
         {
@@ -42,6 +45,7 @@ namespace JewelryStoreFileImplement
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
 			Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
+			Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
 		}
 
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/ImplementerStorage.cs

@@ -18,33 +18,10 @@ namespace JewelryStoreFileImplement.Implements
 		{
 			_source = DataFileSingleton.GetInstance();
 		}
-        public ImplementerViewModel? Delete(ImplementerBindingModel model)
+
+		public List<ImplementerViewModel> GetFullList()
 		{
-            var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			return _source.Implementers.Select(x => x.GetViewModel).ToList();
-
-            if (res != null)
-            {
-                _source.Implementers.Remove(res);
-                _source.SaveImplementers();
-            }
-            return res?.GetViewModel;
-        }
-
-        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-        {
-            if (model.Id.HasValue)
-                return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
-
-            if (model.ImplementerFIO != null && model.Password != null)
-                return _source.Implementers
-                    .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)
-                                      && x.Password.Equals(model.Password))
-                    ?.GetViewModel;
-
-            if (model.ImplementerFIO != null)
-                return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
-
-            return null;
 		}
 
 		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
@@ -53,14 +30,11 @@ namespace JewelryStoreFileImplement.Implements
 			{
 				return new();
 			}
-
 			if (model.Id.HasValue)
 			{
 				var res = GetElement(model);
-
 				return res != null ? new() { res } : new();
 			}
-
 			if (model.ImplementerFIO != null)
 			{
 				return _source.Implementers
@@ -68,40 +42,57 @@ namespace JewelryStoreFileImplement.Implements
 					.Select(x => x.GetViewModel)
 					.ToList();
 			}
-
 			return new();
 		}
 
-        public List<ImplementerViewModel> GetFullList()
+		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
 		{
-            return _source.Implementers.Select(x => x.GetViewModel).ToList();
+			if (model.Id.HasValue)
+			{
+				return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+			}
+			if (model.ImplementerFIO != null && model.Password != null)
+			{
+				return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password))?.GetViewModel;
+			}
+			if (model.ImplementerFIO != null)
+			{
+				return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
+			}
+			return null;
 		}
 
 		public ImplementerViewModel? Insert(ImplementerBindingModel model)
 		{
 			model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1;
-
 			var res = Implementer.Create(model);
-
 			if (res != null)
 			{
 				_source.Implementers.Add(res);
 				_source.SaveImplementers();
 			}
-
 			return res?.GetViewModel;
 		}
 
 		public ImplementerViewModel? Update(ImplementerBindingModel model)
 		{
 			var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
-
 			if (res != null)
 			{
 				res.Update(model);
 				_source.SaveImplementers();
 			}
+			return res?.GetViewModel;
+		}
 
+		public ImplementerViewModel? Delete(ImplementerBindingModel model)
+		{
+			var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			if (res != null)
+			{
+				_source.Implementers.Remove(res);
+				_source.SaveImplementers();
+			}
 			return res?.GetViewModel;
 		}
 	}

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreFileImplement/Implements/OrderStorage.cs

@@ -14,99 +14,64 @@ namespace JewelryStoreFileImplement.Implements
 {
     public class OrderStorage : IOrderStorage
     {
-        private readonly DataFileSingleton _source;
+		private readonly DataFileSingleton source;
+
 		public OrderStorage()
 		{
-            _source = DataFileSingleton.GetInstance();
+			source = DataFileSingleton.GetInstance();
-        }
-        public List<OrderViewModel> GetFullList()
-        {
-            return _source.Orders.Select(x => SAddJewelName(x.GetViewModel)).ToList();
 		}
+
+		public List<OrderViewModel> GetFullList() => source.Orders.Select(x => AttachJewelName(x.GetViewModel)).ToList();
+
 		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
 		{
 			if (model.DateFrom.HasValue)
 			{
-                return _source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) .Select(x => GetViewModel(x)).ToList();
+				return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+					.Select(x => GetViewModel(x)).ToList();
 			}
+
 			if (model.ClientId.HasValue && !model.Id.HasValue)
 			{
-                return _source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
+				return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
 			}
+
+			if (!model.ImplementerId.HasValue && !model.Id.HasValue)
+			{
+				return source.Orders.Where(x => x.ImplementerId == model.ImplementerId).Select(x => x.GetViewModel).ToList();
+
+			}
+
 			if (model.Id.HasValue)
 			{
-                return _source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList();
+				return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList();
 			}
 			return new();
 		}
+
 		public OrderViewModel? GetElement(OrderSearchModel model)
 		{
-            if (model.ImplementerId.HasValue && model.Statuses != null)
-            {
-                return _source.Orders .FirstOrDefault(x => x.ImplementerId == model.ImplementerId &&model.Statuses.Contains(x.Status))?.GetViewModel;
-            }
 			if (model.ImplementerId.HasValue)
 			{
-                return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
+				return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
 			}
-
 			if (!model.Id.HasValue)
 			{
-                return null;
+				return new();
 			}
-            return SAddJewelName(_source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel);
+			return AttachJewelName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.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 SAddJewelName(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 SAddJewelName(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 SAddJewelName(element.GetViewModel);
-            }
-            return null;
-        }
-
-        public OrderViewModel SAddJewelName(OrderViewModel fullModel)
-        {
-            string? jewelName = _source.Jewels.FirstOrDefault(x => x.Id == fullModel?.JewelId)?.JewelName;
-            if (jewelName != null) fullModel.JewelName = jewelName;
-            return fullModel;
 		}
 
 		private OrderViewModel GetViewModel(Order order)
 		{
 			var viewModel = order.GetViewModel;
 
-            var jewel = _source.Jewels.FirstOrDefault(x => x.Id == order.JewelId);
+			var Jewel = source.Jewels.FirstOrDefault(x => x.Id == order.JewelId);
-            var client = _source.Clients.FirstOrDefault(x => x.Id == order.ClientId);
+			var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId);
-            if (jewel != null)
+
+			if (Jewel != null)
 			{
-                viewModel.JewelName = jewel.JewelName;
+				viewModel.JewelName = Jewel.JewelName;
 			}
 			if (client != null)
 			{
@@ -114,5 +79,57 @@ namespace JewelryStoreFileImplement.Implements
 			}
 			return viewModel;
 		}
+
+		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 AttachJewelName(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 AttachJewelName(order.GetViewModel);
+		}
+
+		public OrderViewModel? Delete(OrderBindingModel model)
+		{
+			var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+			if (order != null)
+			{
+				source.Orders.Remove(order);
+				source.SaveOrders();
+				return AttachJewelName(order.GetViewModel);
+			}
+			return null;
+		}
+
+		private OrderViewModel? AttachJewelName(OrderViewModel? model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			var Jewel = source.Jewels.FirstOrDefault(x => x.Id == model.JewelId);
+			if (Jewel != null)
+			{
+				model.JewelName = Jewel.JewelName;
+			}
+			return model;
+		}
+	}
+
 }

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/DataListSingleton.cs

@@ -9,6 +9,7 @@ namespace JewelryStoreListImplement
         public List<Order> Orders { get; set; }
         public List<Jewel> Jewels { get; set; }
         public List<Store> Stores { get; set; }
+		public List<Implementer> Implementers { get; set; }
 
 		private DataListSingleton()
         {
@@ -16,6 +17,7 @@ namespace JewelryStoreListImplement
             Orders = new List<Order>();
             Jewels = new List<Jewel>();
             Stores = new List<Store>();
+			Implementers = new List<Implementer>();
 		}
 
         public static DataListSingleton GetInstance()

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/ImplementerStorage.cs

@@ -27,7 +27,6 @@ namespace JewelryStoreListImplement.Implements
 				{
 					var element = _source.Implementers[i];
 					_source.Implementers.RemoveAt(i);
-
 					return element.GetViewModel;
 				}
 			}
@@ -39,16 +38,18 @@ namespace JewelryStoreListImplement.Implements
 			foreach (var x in _source.Implementers)
 			{
 				if (model.Id.HasValue && x.Id == model.Id)
+				{
 					return x.GetViewModel;
-
+				}
-                if (model.ImplementerFIO != null && model.Password != null &&
+				if (model.ImplementerFIO != null && model.Password != null && x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password))
-                    x.ImplementerFIO.Equals(model.ImplementerFIO) &&
+				{
-                    x.Password.Equals(model.Password))
 					return x.GetViewModel;
-
+				}
 				if (model.ImplementerFIO != null && x.ImplementerFIO.Equals(model.ImplementerFIO))
+				{
 					return x.GetViewModel;
 				}
+			}
 			return null;
 		}
 
@@ -58,16 +59,13 @@ namespace JewelryStoreListImplement.Implements
 			{
 				return new();
 			}
-
 			if (model.Id.HasValue)
 			{
 				var res = GetElement(model);
-
 				return res != null ? new() { res } : new();
 			}
 
 			List<ImplementerViewModel> result = new();
-
 			if (model.ImplementerFIO != null)
 			{
 				foreach (var implementer in _source.Implementers)
@@ -84,19 +82,16 @@ namespace JewelryStoreListImplement.Implements
 		public List<ImplementerViewModel> GetFullList()
 		{
 			var result = new List<ImplementerViewModel>();
-
 			foreach (var implementer in _source.Implementers)
 			{
 				result.Add(implementer.GetViewModel);
 			}
-
 			return result;
 		}
 
 		public ImplementerViewModel? Insert(ImplementerBindingModel model)
 		{
 			model.Id = 1;
-
 			foreach (var implementer in _source.Implementers)
 			{
 				if (model.Id <= implementer.Id)
@@ -104,9 +99,7 @@ namespace JewelryStoreListImplement.Implements
 					model.Id = implementer.Id + 1;
 				}
 			}
-
 			var res = Implementer.Create(model);
-
 			if (res != null)
 			{
 				_source.Implementers.Add(res);
@@ -121,7 +114,6 @@ namespace JewelryStoreListImplement.Implements
 				if (implementer.Id == model.Id)
 				{
 					implementer.Update(model);
-
 					return implementer.GetViewModel;
 				}
 			}

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs

@@ -20,7 +20,7 @@ namespace JewelryStoreListImplement.Implements
 			var result = new List<OrderViewModel>();
 			foreach (var order in _source.Orders)
 			{
-                result.Add(AccessJewelStorage(order.GetViewModel));
+				result.Add(AttachJewelName(order.GetViewModel));
 			}
 			return result;
 		}
@@ -30,7 +30,6 @@ namespace JewelryStoreListImplement.Implements
 			var result = new List<OrderViewModel>();
 			if (model.DateFrom.HasValue)
 			{
-                return result;
 				foreach (var order in _source.Orders)
 				{
 					if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
@@ -49,6 +48,16 @@ namespace JewelryStoreListImplement.Implements
 					}
 				}
 			}
+			else if (model.ImplementerId.HasValue && !model.Id.HasValue)
+			{
+				foreach (var order in _source.Orders)
+				{
+					if (order.ImplementerId == model.ImplementerId)
+					{
+						result.Add(GetViewModel(order));
+					}
+				}
+			}
 			else if (model.Id.HasValue)
 			{
 				foreach (var order in _source.Orders)
@@ -57,20 +66,33 @@ namespace JewelryStoreListImplement.Implements
 					{
 						result.Add(GetViewModel(order));
 					}
-                    else if (model.ImplementerId.HasValue && order.ImplementerId == model.ImplementerId)
-                    {
-                        result.Add(GetViewModel(order));
-                    }
-
-                    else if (model.Statuses != null && model.Statuses.Contains(order.Status))
-                    {
-                        result.Add(GetViewModel(order));
-                    }
 				}
 			}
 			return result;
 		}
 
+		private OrderViewModel GetViewModel(Order order)
+		{
+			var viewModel = order.GetViewModel;
+			foreach (var package in _source.Jewels)
+			{
+				if (package.Id == order.JewelId)
+				{
+					viewModel.JewelName = package.JewelName;
+					break;
+				}
+			}
+			foreach (var client in _source.Clients)
+			{
+				if (client.Id == order.ClientId)
+				{
+					viewModel.ClientFIO = client.ClientFIO;
+					break;
+				}
+			}
+			return viewModel;
+		}
+
 		public OrderViewModel? GetElement(OrderSearchModel model)
 		{
 			if (!model.Id.HasValue)
@@ -81,14 +103,8 @@ namespace JewelryStoreListImplement.Implements
 			{
 				if (model.Id.HasValue && order.Id == model.Id)
 				{
-                    return AccessJewelStorage(order.GetViewModel);
+					return AttachJewelName(order.GetViewModel);
 				}
-                else if (model.ImplementerId.HasValue && model.Statuses != null && order.ImplementerId == model.ImplementerId &&
-                    model.Statuses.Contains(order.Status))
-                {
-                    return GetViewModel(order);
-                }
-
 				else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId)
 				{
 					return GetViewModel(order);
@@ -113,7 +129,7 @@ namespace JewelryStoreListImplement.Implements
 				return null;
 			}
 			_source.Orders.Add(newOrder);
-            return AccessJewelStorage(newOrder.GetViewModel);
+			return AttachJewelName(newOrder.GetViewModel);
 		}
 
 		public OrderViewModel? Update(OrderBindingModel model)
@@ -123,7 +139,7 @@ namespace JewelryStoreListImplement.Implements
 				if (order.Id == model.Id)
 				{
 					order.Update(model);
-                    return AccessJewelStorage(order.GetViewModel);
+					return AttachJewelName(order.GetViewModel);
 				}
 			}
 			return null;
@@ -137,45 +153,23 @@ namespace JewelryStoreListImplement.Implements
 				{
 					var element = _source.Orders[i];
 					_source.Orders.RemoveAt(i);
-                    return AccessJewelStorage(element.GetViewModel);
+					return AttachJewelName(element.GetViewModel);
 				}
 			}
 			return null;
 		}
 
-        public OrderViewModel AccessJewelStorage(OrderViewModel model)
+		private OrderViewModel AttachJewelName(OrderViewModel model)
 		{
-            foreach (var jewel in _source.Jewels)
+			foreach (var Jewel in _source.Jewels)
 			{
-                if (jewel.Id == model.JewelId)
+				if (Jewel.Id == model.JewelId)
 				{
-                    model.JewelName = jewel.JewelName;
+					model.JewelName = Jewel.JewelName;
-                    break;
+					return model;
 				}
 			}
 			return model;
 		}
-
-        private OrderViewModel GetViewModel(Order order)
-        {
-            var viewModel = order.GetViewModel;
-            foreach (var jewel in _source.Jewels)
-            {
-                if (jewel.Id == order.JewelId)
-                {
-                    viewModel.JewelName = jewel.JewelName;
-                    break;
-                }
-            }
-            foreach (var client in _source.Clients)
-            {
-                if (client.Id == order.ClientId)
-                {
-                    viewModel.ClientFIO = client.ClientFIO;
-                    break;
-                }
-            }
-            return viewModel;
-        }
 	}
 }

PIbd-23_Panina.A.D_JewelryStore/JewelryStoreRestApi/Program.cs

@@ -16,10 +16,13 @@ builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IJewelStorage, JewelStorage>();
 builder.Services.AddTransient<IStoreStorage, StoreStorage>();
+builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IJewelLogic, JewelLogic>();
 builder.Services.AddTransient<IStoreLogic, StoreLogic>();
+builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
+
 
 
 builder.Services.AddControllers();