fix

Pizzeria/Pizzeria.sln

@@ -19,9 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaDatabaseImplement",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaRestApi", "PizzeriaRestApi\PizzeriaRestApi.csproj", "{0C775FE6-A461-47EA-907F-C3AE34F7B6C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaClientApp", "PizzeriaClientApp\PizzeriaClientApp.csproj", "{7B233638-1F47-4A91-B483-7FFD9F5A4608}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaShopApp", "PizzeriaShopApp\PizzeriaShopApp.csproj", "{A7FCCF44-9D5B-4E68-8A70-7632227C39A2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaClientApp", "PizzeriaClientApp\PizzeriaClientApp.csproj", "{7B233638-1F47-4A91-B483-7FFD9F5A4608}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,10 +63,6 @@ Global
 		{7B233638-1F47-4A91-B483-7FFD9F5A4608}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7B233638-1F47-4A91-B483-7FFD9F5A4608}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B233638-1F47-4A91-B483-7FFD9F5A4608}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7FCCF44-9D5B-4E68-8A70-7632227C39A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7FCCF44-9D5B-4E68-8A70-7632227C39A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7FCCF44-9D5B-4E68-8A70-7632227C39A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7FCCF44-9D5B-4E68-8A70-7632227C39A2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ImplementerLogic.cs

@@ -0,0 +1,128 @@
+using Microsoft.Extensions.Logging;
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.BusinessLogicsContracts;
+using PizzeriaContracts.SearchModels;
+using PizzeriaContracts.StoragesContracts;
+using PizzeriaContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PizzeriaBusinessLogic.BusinessLogics
+{
+    public class ImplementerLogic : IImplementerLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IImplementerStorage _implementerStorage;
+
+        public ImplementerLogic(ILogger<IImplementerLogic> logger, IImplementerStorage implementerStorage)
+        {
+            _logger = logger;
+            _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);
+            if (_implementerStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            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);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_implementerStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        private void CheckModel(ImplementerBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(model.ImplementerFIO))
+            {
+                throw new ArgumentNullException("Нет ФИО исполнителя", nameof(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
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Исполнитель с таким ФИО уже есть");
+            }
+        }
+    }
+}

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -1,15 +1,10 @@
-using Microsoft.Extensions.Logging;
+using PizzeriaDataModels.Enums;
+using Microsoft.Extensions.Logging;
 using PizzeriaContracts.BindingModels;
 using PizzeriaContracts.BusinessLogicsContracts;
 using PizzeriaContracts.SearchModels;
 using PizzeriaContracts.StoragesContracts;
 using PizzeriaContracts.ViewModels;
-using PizzeriaDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PizzeriaBusinessLogic.BusinessLogics
 {
@@ -17,17 +12,35 @@ namespace PizzeriaBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
-
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
+        static readonly object _locker = new object();
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _shopStorage = shopStorage;
         }
+
+        public OrderViewModel? ReadElement(OrderSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _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);
+            return element;
+        }
+
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
-            _logger.LogInformation("ReadList. OrderId:{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)
             {
@@ -37,6 +50,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
             _logger.LogInformation("ReadList. Count:{Count}", list.Count);
             return list;
         }
+
         public bool CreateOrder(OrderBindingModel model)
         {
             CheckModel(model);
@@ -53,7 +67,10 @@ namespace PizzeriaBusinessLogic.BusinessLogics
 
         public bool TakeOrderInWork(OrderBindingModel model)
         {
-            return ChangeStatus(model, OrderStatus.Выполняется);
+            lock (_locker)
+            {
+                return ChangeStatus(model, OrderStatus.Выполняется);
+            }
         }
 
         public bool FinishOrder(OrderBindingModel model)
@@ -63,23 +80,6 @@ namespace PizzeriaBusinessLogic.BusinessLogics
 
         public bool DeliveryOrder(OrderBindingModel model)
         {
-            var order = _orderStorage.GetElement(new OrderSearchModel
-            {
-                Id = model.Id,
-            });
-            if (order == null)
-            {
-                throw new ArgumentNullException(nameof(order));
-            }
-            if (!_shopStorage.RestockingShops(new SupplyBindingModel
-            {
-                PizzaId = order.PizzaId,
-                Count = order.Count
-            }))
-            {
-                throw new ArgumentException("Недостаточно места");
-            }
-
             return ChangeStatus(model, OrderStatus.Выдан);
         }
 
@@ -118,19 +118,26 @@ namespace PizzeriaBusinessLogic.BusinessLogics
             });
             if (element == null)
             {
-                throw new ArgumentNullException(nameof(element));
+                throw new InvalidOperationException(nameof(element));
             }
             model.DateCreate = element.DateCreate;
             model.PizzaId = element.PizzaId;
             model.DateImplement = element.DateImplement;
+            model.ClientId = element.ClientId;
+            if (!model.ImplementerId.HasValue)
+            {
+                model.ImplementerId = element.ImplementerId;
+            }
             model.Status = element.Status;
             model.Count = element.Count;
             model.Sum = element.Sum;
             if (requiredStatus - model.Status == 1)
             {
                 model.Status = requiredStatus;
-                if (model.Status == OrderStatus.Выдан)
+                if (model.Status == OrderStatus.Готов)
+                {
                     model.DateImplement = DateTime.Now;
+                }
                 if (_orderStorage.Update(model) == null)
                 {
                     _logger.LogWarning("Update operation failed");
@@ -139,7 +146,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
                 return true;
             }
             _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
-            throw new ArgumentException($"Невозможно присвоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+            throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
         }
     }
 }

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ReportLogic.cs

@@ -13,18 +13,16 @@ namespace PizzeriaBusinessLogic.BusinessLogics
         private readonly IComponentStorage _componentStorage;
         private readonly IPizzaStorage _pizzaStorage;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
         private readonly AbstractSaveToExcel _saveToExcel;
         private readonly AbstractSaveToWord _saveToWord;
         private readonly AbstractSaveToPdf _saveToPdf;
 
-        public ReportLogic(IPizzaStorage pizzaStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, IShopStorage shopStorage,
+        public ReportLogic(IPizzaStorage pizzaStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
             AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
             _pizzaStorage = pizzaStorage;
             _componentStorage = componentStorage;
             _orderStorage = orderStorage;
-            _shopStorage = shopStorage;
 
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
@@ -57,7 +55,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
 
         public void SavePizzasToWordFile(ReportBindingModel model)
         {
-            _saveToWord.CreatePizzaDoc(new WordInfo
+            _saveToWord.CreateDoc(new WordInfo
             {
                 FileName = model.FileName,
                 Title = "Список пицц",
@@ -86,55 +84,5 @@ namespace PizzeriaBusinessLogic.BusinessLogics
                 Orders = GetOrders(model)
             });
         }
-
-        public List<ReportShopsViewModel> GetShops()
-        {
-            return _shopStorage.GetFullList().Select(x => new ReportShopsViewModel
-            {
-                ShopName = x.ShopName,
-                Pizzas = x.ShopPizzas.Select(x => (x.Value.Item1.PizzaName, x.Value.Item2)).ToList(),
-                TotalCount = x.ShopPizzas.Select(x => x.Value.Item2).Sum()
-            }).ToList();
-        }
-
-        public List<ReportGroupOrdersViewModel> GetGroupedOrders()
-        {
-            return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date).Select(x => new ReportGroupOrdersViewModel
-            {
-                Date = x.Key,
-                OrdersCount = x.Count(),
-                OrdersSum = x.Select(y => y.Sum).Sum()
-            }).ToList();
-        }
-
-        public void SaveShopsToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateShopsDoc(new WordShopInfo
-            {
-                FileName = model.FileName,
-                Title = "Список магазинов",
-                Shops = _shopStorage.GetFullList()
-            });
-        }
-
-        public void SaveShopsToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateShopPizzasReport(new ExcelShop
-            {
-                FileName = model.FileName,
-                Title = "Наполненость магазинов",
-                ShopPizzas = GetShops()
-            });
-        }
-
-        public void SaveGroupedOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateGroupedOrdersDoc(new PdfGroupedOrdersInfo
-            {
-                FileName = model.FileName,
-                Title = "Список заказов сгруппированных по дате заказов",
-                GroupedOrders = GetGroupedOrders()
-            });
-        }
     }
 }

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,187 +0,0 @@
-using Microsoft.Extensions.Logging;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using PizzeriaContracts.SearchModels;
-using PizzeriaContracts.StoragesContracts;
-using PizzeriaContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaBusinessLogic.BusinessLogics
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        private readonly IPizzaStorage _pizzaStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, IPizzaStorage pizzaStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-            _pizzaStorage = pizzaStorage;
-        }
-
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id);
-            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool MakeSupply(SupplyBindingModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Количество пиццы должно быть больше 0");
-            }
-            var shop = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Id = model.ShopId
-            });
-            if (shop == null)
-            {
-                throw new ArgumentException("Магазина не существует");
-            }
-            if (shop.ShopPizzas.ContainsKey(model.PizzaId))
-            {
-                var oldValue = shop.ShopPizzas[model.PizzaId];
-                oldValue.Item2 += model.Count;
-                shop.ShopPizzas[model.PizzaId] = oldValue;
-            }
-            else
-            {
-                var pizza = _pizzaStorage.GetElement(new PizzaSearchModel
-                {
-                    Id = model.PizzaId
-                });
-                if (pizza == null)
-                {
-                    throw new ArgumentException($"Поставка: Товар с id:{model.PizzaId} не найденн");
-                }
-                shop.ShopPizzas.Add(model.PizzaId, (pizza, model.Count));
-            }
-
-            _shopStorage.Update(new ShopBindingModel()
-            {
-                Id = shop.Id,
-                ShopName = shop.ShopName,
-                Adress = shop.Adress,
-                OpeningDate = shop.OpeningDate,
-                ShopPizzas = shop.ShopPizzas,
-                PizzaMaxCount = shop.PizzaMaxCount,
-            });
-
-            return true;
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.Adress))
-            {
-                throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Adress));
-            }
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName));
-            }
-            _logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = model.ShopName
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-
-        public bool Sale(SupplySearchModel model)
-        {
-            if (!model.PizzaId.HasValue || !model.Count.HasValue)
-            {
-                return false;
-            }
-            _logger.LogInformation("Check pizza count in all shops");
-            if (_shopStorage.Sale(model))
-            {
-                _logger.LogInformation("Selling sucsess");
-                return true;
-            }
-            _logger.LogInformation("Selling failed");
-            return false;
-        }
-    }
-}

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -0,0 +1,134 @@
+using Microsoft.Extensions.Logging;
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.BusinessLogicsContracts;
+using PizzeriaContracts.SearchModels;
+using PizzeriaContracts.ViewModels;
+using PizzeriaDataModels.Enums;
+
+namespace PizzeriaBusinessLogic.BusinessLogics
+{
+    public class WorkModeling : IWorkProcess
+    {
+        private readonly ILogger _logger;
+
+        private readonly Random _rnd;
+
+        private IOrderLogic? _orderLogic;
+
+        public WorkModeling(ILogger<WorkModeling> logger)
+        {
+            _logger = logger;
+            _rnd = new Random(1000);
+        }
+
+        public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic)
+        {
+            _orderLogic = orderLogic;
+            var implementers = implementerLogic.ReadList(null);
+            if (implementers == null)
+            {
+                _logger.LogWarning("DoWork. Implementers is null");
+                return;
+            }
+            var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
+            if (orders == null || orders.Count == 0)
+            {
+                _logger.LogWarning("DoWork. Orders is null or empty");
+                return;
+            }
+            _logger.LogDebug("DoWork for {Count} orders", orders.Count);
+            foreach (var implementer in implementers)
+            {
+                Task.Run(() => WorkerWorkAsync(implementer, orders));
+            }
+        }
+
+        private async Task WorkerWorkAsync(ImplementerViewModel implementer, List<OrderViewModel> orders)
+        {
+            if (_orderLogic == null || implementer == null)
+            {
+                return;
+            }
+            await RunOrderInWork(implementer);
+
+            await Task.Run(() =>
+            {
+                foreach (var order in orders)
+                {
+                    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
+                        {
+                            Id = order.Id
+                        });
+                    }
+                    // кто-то мог уже перехватить заказ, игнорируем ошибку
+                    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)
+        {
+            if (_orderLogic == null || implementer == null)
+            {
+                return;
+            }
+            try
+            {
+                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.FinishOrder(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;
+            }
+        }
+    }
+}

Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -75,82 +75,9 @@ namespace PizzeriaBusinessLogic.OfficePackage
 
             SaveExcel(info);
         }
-
-        public void CreateShopPizzasReport(ExcelShop info)
-        {
-            CreateExcel(info);
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "C1"
-            });
-
-            uint rowIndex = 2;
-            foreach (var sr in info.ShopPizzas)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = sr.ShopName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-
-                foreach (var (Pizza, Count) in sr.Pizzas)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = rowIndex,
-                        Text = Pizza,
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "C",
-                        RowIndex = rowIndex,
-                        Text = Count.ToString(),
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-                    rowIndex++;
-                }
-
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Итого",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = sr.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-            }
-
-            SaveExcel(info);
-        }
-
-        protected abstract void CreateExcel(IDocument info);
+        protected abstract void CreateExcel(ExcelInfo info);
         protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
         protected abstract void MergeCells(ExcelMergeParameters excelParams);
-        protected abstract void SaveExcel(IDocument info);
+        protected abstract void SaveExcel(ExcelInfo info);
     }
 }

Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -33,40 +33,10 @@ namespace PizzeriaBusinessLogic.OfficePackage
 
             SavePdf(info);
         }
-
-        public void CreateGroupedOrdersDoc(PdfGroupedOrdersInfo info)
-        {
-            CreatePdf(info);
-            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-            CreateTable(new List<string> { "4cm", "3cm", "2cm" });
-            CreateRow(new PdfRowParameters
-            {
-                Texts = new List<string> { "Дата заказа", "Кол-во", "Сумма" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-
-
-            foreach (var groupedOrder in info.GroupedOrders)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { groupedOrder.Date.ToShortDateString(), groupedOrder.OrdersCount.ToString(), groupedOrder.OrdersSum.ToString() },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
-
-            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.GroupedOrders.Sum(x => x.OrdersSum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-            SavePdf(info);
-        }
-
-        protected abstract void CreatePdf(IDocument info);
+        protected abstract void CreatePdf(PdfInfo info);
         protected abstract void CreateParagraph(PdfParagraph paragraph);
         protected abstract void CreateTable(List<string> columns);
         protected abstract void CreateRow(PdfRowParameters rowParameters);
-        protected abstract void SavePdf(IDocument info);
+        protected abstract void SavePdf(PdfInfo info);
     }
 }

Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -10,7 +10,7 @@ namespace PizzeriaBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToWord
     {
-        public void CreatePizzaDoc(WordInfo info)
+        public void CreateDoc(WordInfo info)
         {
             CreateWord(info);
 
@@ -42,52 +42,8 @@ namespace PizzeriaBusinessLogic.OfficePackage
 
             SaveWord(info);
         }
-
-        public void CreateShopsDoc(WordShopInfo info)
-        {
-            CreateWord(info);
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            CreateTable(new List<string> { "3000", "3000", "3000" });
-            CreateRow(new WordRowParameters
-            {
-                Texts = new List<string> { "Название", "Адрес", "Дата открытия" },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    Bold = true,
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            foreach (var shop in info.Shops)
-            {
-                CreateRow(new WordRowParameters
-                {
-                    Texts = new List<string> { shop.ShopName, shop.Adress, shop.OpeningDate.ToString() },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "22",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
-
-            SaveWord(info);
-        }
-
-        protected abstract void CreateWord(IDocument info);
+        protected abstract void CreateWord(WordInfo info);
         protected abstract void CreateParagraph(WordParagraph paragraph);
-        protected abstract void SaveWord(IDocument info);
-        protected abstract void CreateTable(List<string> colums);
-        protected abstract void CreateRow(WordRowParameters rowParameters);
+        protected abstract void SaveWord(WordInfo info);
     }
 }

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -2,7 +2,7 @@
 
 namespace PizzeriaBusinessLogic.OfficePackage.HelperModels
 {
-    public class ExcelInfo : IDocument
+    public class ExcelInfo
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/ExcelShop.cs

@@ -1,11 +0,0 @@
-using PizzeriaContracts.ViewModels;
-
-namespace PizzeriaBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelShop : IDocument
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ReportShopsViewModel> ShopPizzas { get; set; } = new();
-    }
-}

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs

@@ -1,18 +0,0 @@
-using PizzeriaContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfGroupedOrdersInfo : IDocument
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public DateTime DateFrom { get; set; }
-        public DateTime DateTo { get; set; }
-        public List<ReportGroupOrdersViewModel> GroupedOrders { get; set; } = new();
-    }
-}

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -2,7 +2,7 @@
 
 namespace PizzeriaBusinessLogic.OfficePackage.HelperModels
 {
-    public class PdfInfo : IDocument
+    public class PdfInfo
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -2,7 +2,7 @@
 
 namespace PizzeriaBusinessLogic.OfficePackage.HelperModels
 {
-    public class WordInfo : IDocument
+    public class WordInfo
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/WordRowParameters.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordRowParameters
-    {
-        public List<string> Texts { get; set; } = new();
-        public WordTextProperties TextProperties { get; set; } = new();
-    }
-}

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/WordShopInfo.cs

@@ -1,16 +0,0 @@
-using PizzeriaContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordShopInfo : IDocument
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ShopViewModel> Shops { get; set; } = new();
-    }
-}

Pizzeria/PizzeriaBusinessLogic/OfficePackage/IDocument.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaBusinessLogic.OfficePackage
-{
-    public interface IDocument
-    {
-        public string FileName { get; set; }
-        public string Title { get; set; }
-    }
-}

Pizzeria/PizzeriaBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -3,9 +3,9 @@ using DocumentFormat.OpenXml.Office2013.Excel;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Spreadsheet;
 using DocumentFormat.OpenXml;
-using PizzeriaBusinessLogic.OfficePackage;
 using PizzeriaBusinessLogic.OfficePackage.HelperEnums;
 using PizzeriaBusinessLogic.OfficePackage.HelperModels;
+using PizzeriaBusinessLogic.OfficePackage;
 
 namespace PizzeriaBusinessLogic.OfficePackage.Implements
 {
@@ -140,7 +140,7 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
             };
         }
 
-        protected override void CreateExcel(IDocument info)
+        protected override void CreateExcel(ExcelInfo info)
         {
             _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
             // Создаем книгу (в ней хранятся листы)
@@ -269,7 +269,7 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
             mergeCells.Append(mergeCell);
         }
 
-        protected override void SaveExcel(IDocument info)
+        protected override void SaveExcel(ExcelInfo info)
         {
             if (_spreadsheetDocument == null)
             {

Pizzeria/PizzeriaBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -34,7 +34,7 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
             style.Font.Bold = true;
         }
 
-        protected override void CreatePdf(IDocument info)
+        protected override void CreatePdf(PdfInfo info)
         {
             _document = new Document();
             DefineStyles(_document);
@@ -96,7 +96,7 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
             }
         }
 
-        protected override void SavePdf(IDocument info)
+        protected override void SavePdf(PdfInfo info)
         {
             var renderer = new PdfDocumentRenderer(true)
             {

Pizzeria/PizzeriaBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -21,7 +21,6 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
                 _ => JustificationValues.Left,
             };
         }
-
         private static SectionProperties CreateSectionProperties()
         {
             var properties = new SectionProperties();
@@ -35,7 +34,6 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
 
             return properties;
         }
-
         private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
         {
             if (paragraphProperties == null)
@@ -66,15 +64,13 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
 
             return properties;
         }
-
-        protected override void CreateWord(IDocument info)
+        protected override void CreateWord(WordInfo info)
         {
             _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
             MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
             mainPart.Document = new Document();
             _docBody = mainPart.Document.AppendChild(new Body());
         }
-
         protected override void CreateParagraph(WordParagraph paragraph)
         {
             if (_docBody == null || paragraph == null)
@@ -104,8 +100,7 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
 
             _docBody.AppendChild(docParagraph);
         }
-
-        protected override void SaveWord(IDocument info)
+        protected override void SaveWord(WordInfo info)
         {
             if (_docBody == null || _wordDocument == null)
             {
@@ -117,77 +112,5 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
 
             _wordDocument.Close();
         }
-
-        private Table? _lastTable;
-        protected override void CreateTable(List<string> columns)
-        {
-            if (_docBody == null)
-                return;
-
-            _lastTable = new Table();
-
-            var tableProp = new TableProperties();
-            tableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed });
-            tableProp.AppendChild(new TableBorders(
-                    new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 }
-                ));
-            tableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto });
-            _lastTable.AppendChild(tableProp);
-
-            TableGrid tableGrid = new TableGrid();
-            foreach (var column in columns)
-            {
-                tableGrid.AppendChild(new GridColumn() { Width = column });
-            }
-            _lastTable.AppendChild(tableGrid);
-
-            _docBody.AppendChild(_lastTable);
-        }
-
-        protected override void CreateRow(WordRowParameters rowParameters)
-        {
-            if (_docBody == null || _lastTable == null)
-                return;
-
-            TableRow docRow = new TableRow();
-            foreach (var column in rowParameters.Texts)
-            {
-                var docParagraph = new Paragraph();
-                WordParagraph paragraph = new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { (column, rowParameters.TextProperties) },
-                    TextProperties = rowParameters.TextProperties
-                };
-
-                docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
-
-                foreach (var run in paragraph.Texts)
-                {
-                    var docRun = new Run();
-
-                    var properties = new RunProperties();
-                    properties.AppendChild(new FontSize { Val = run.Item2.Size });
-                    if (run.Item2.Bold)
-                    {
-                        properties.AppendChild(new Bold());
-                    }
-                    docRun.AppendChild(properties);
-
-                    docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
-
-                    docParagraph.AppendChild(docRun);
-                }
-
-                TableCell docCell = new TableCell();
-                docCell.AppendChild(docParagraph);
-                docRow.AppendChild(docCell);
-            }
-            _lastTable.AppendChild(docRow);
-        }
     }
 }

Pizzeria/PizzeriaClientApp/Views/Shared/_Layout.cshtml

@@ -44,7 +44,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2024 - PizzeriaClientApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+            &copy; 2023 - PizzeriaClientApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
         </div>
     </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>

Pizzeria/PizzeriaContracts/BindingModels/ImplementerBindingModel.cs

@@ -0,0 +1,18 @@
+using PizzeriaDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PizzeriaContracts.BindingModels
+{
+    public class ImplementerBindingModel : IImplementerModel
+    {
+        public int Id { get; set; }
+        public string ImplementerFIO { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+        public int WorkExperience { get; set; }
+        public int Qualification { get; set; }
+    }
+}

Pizzeria/PizzeriaContracts/BindingModels/OrderBindingModel.cs

@@ -13,6 +13,7 @@ namespace PizzeriaContracts.BindingModels
         public int Id { get; set; }
         public int PizzaId { get; set; }
         public int ClientId { get; set; }
+        public int? ImplementerId { get; set; }
         public int Count { get; set; }
         public double Sum { get; set; }
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

Pizzeria/PizzeriaContracts/BindingModels/ShopBindingModel.cs

@@ -1,19 +0,0 @@
-using PizzeriaDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public int Id { get; set; }
-        public string ShopName { get; set; } = string.Empty;
-        public string Adress { get; set; } = string.Empty;
-        public DateTime OpeningDate { get; set; } = DateTime.Now;
-        public Dictionary<int, (IPizzaModel, int)> ShopPizzas { get; set; } = new();
-        public int PizzaMaxCount { get; set; }
-    }
-}

Pizzeria/PizzeriaContracts/BindingModels/SupplyBindingModel.cs

@@ -1,16 +0,0 @@
-using PizzeriaDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.BindingModels
-{
-    public class SupplyBindingModel : ISupplyModel
-    {
-        public int ShopId { get; set; }
-        public int PizzaId { get; set; }
-        public int Count { get; set; }
-    }
-}

Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IImplementerLogic.cs

@@ -0,0 +1,15 @@
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.SearchModels;
+using PizzeriaContracts.ViewModels;
+
+namespace PizzeriaContracts.BusinessLogicsContracts
+{
+    public interface IImplementerLogic
+    {
+        List<ImplementerViewModel>? ReadList(ImplementerSearchModel? model);
+        ImplementerViewModel? ReadElement(ImplementerSearchModel model);
+        bool Create(ImplementerBindingModel model);
+        bool Update(ImplementerBindingModel model);
+        bool Delete(ImplementerBindingModel model);
+    }
+}

Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -16,5 +16,6 @@ namespace PizzeriaContracts.BusinessLogicsContracts
         bool TakeOrderInWork(OrderBindingModel model);
         bool FinishOrder(OrderBindingModel model);
         bool DeliveryOrder(OrderBindingModel model);
+        OrderViewModel? ReadElement(OrderSearchModel model);
     }
 }

Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -7,13 +7,8 @@ namespace PizzeriaContracts.BusinessLogicsContracts
     {
         List<ReportPizzaComponentViewModel> GetPizzaComponents();
         List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
-        List<ReportShopsViewModel> GetShops();
-        List<ReportGroupOrdersViewModel> GetGroupedOrders();
         void SavePizzasToWordFile(ReportBindingModel model);
         void SavePizzaComponentToExcelFile(ReportBindingModel model);
         void SaveOrdersToPdfFile(ReportBindingModel model);
-        void SaveShopsToWordFile(ReportBindingModel model);
-        void SaveShopsToExcelFile(ReportBindingModel model);
-        void SaveGroupedOrdersToPdfFile(ReportBindingModel model);
     }
 }

Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,22 +0,0 @@
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.SearchModels;
-using PizzeriaContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-        ShopViewModel? ReadElement(ShopSearchModel model);
-        bool Create(ShopBindingModel model);
-        bool Update(ShopBindingModel model);
-        bool Delete(ShopBindingModel model);
-        bool MakeSupply(SupplyBindingModel model);
-        bool Sale(SupplySearchModel model);
-    }
-}

Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IWorkProcess.cs

@@ -0,0 +1,7 @@
+namespace PizzeriaContracts.BusinessLogicsContracts
+{
+    public interface IWorkProcess
+    {
+        void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
+    }
+}

Pizzeria/PizzeriaContracts/SearchModels/ImplementerSearchModel.cs

@@ -0,0 +1,9 @@
+namespace PizzeriaContracts.SearchModels
+{
+    public class ImplementerSearchModel
+    {
+        public int? Id { get; set; }
+        public string? ImplementerFIO { get; set; }
+        public string? Password { get; set; }
+    }
+}

Pizzeria/PizzeriaContracts/SearchModels/OrderSearchModel.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using PizzeriaDataModels.Enums;
 
 namespace PizzeriaContracts.SearchModels
 {
@@ -10,6 +6,8 @@ namespace PizzeriaContracts.SearchModels
     {
         public int? Id { get; set; }
         public int? ClientId { get; set; }
+        public OrderStatus? Status { get; set; }
+        public int? ImplementerId { get; set; }
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set; }
     }

Pizzeria/PizzeriaContracts/SearchModels/ShopSearchModel.cs

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

Pizzeria/PizzeriaContracts/SearchModels/SupplySearchModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.SearchModels
-{
-    public class SupplySearchModel
-    {
-        public int? PizzaId { get; set; }
-        public int? Count { get; set; }
-    }
-}

Pizzeria/PizzeriaContracts/StoragesContracts/IImplementerStorage.cs

@@ -0,0 +1,16 @@
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.SearchModels;
+using PizzeriaContracts.ViewModels;
+
+namespace PizzeriaContracts.StoragesContracts
+{
+    public interface IImplementerStorage
+    {
+        List<ImplementerViewModel> GetFullList();
+        List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model);
+        ImplementerViewModel? GetElement(ImplementerSearchModel model);
+        ImplementerViewModel? Insert(ImplementerBindingModel model);
+        ImplementerViewModel? Update(ImplementerBindingModel model);
+        ImplementerViewModel? Delete(ImplementerBindingModel model);
+    }
+}

Pizzeria/PizzeriaContracts/StoragesContracts/IShopStorage.cs

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

Pizzeria/PizzeriaContracts/ViewModels/ImplementerViewModel.cs

@@ -0,0 +1,27 @@
+using PizzeriaDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PizzeriaContracts.ViewModels
+{
+    public class ImplementerViewModel : IImplementerModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("ФИО исполнителя")]
+        public string ImplementerFIO { get; set; } = string.Empty;
+
+        [DisplayName("Пароль")]
+        public string Password { get; set; } = string.Empty;
+
+        [DisplayName("Стаж работы")]
+        public int WorkExperience { get; set; }
+
+        [DisplayName("Квалификация")]
+        public int Qualification { get; set; }
+    }
+}

Pizzeria/PizzeriaContracts/ViewModels/OrderViewModel.cs

@@ -19,6 +19,10 @@ namespace PizzeriaContracts.ViewModels
         [DisplayName("ФИО клиента")]
         public string ClientFIO { get; set; } = string.Empty;
 
+        public int? ImplementerId { get; set; }
+        [DisplayName("Исполнитель")]
+        public string? ImplementerFIO { get; set; } = null;
+
         public int PizzaId { get; set; }
 
         [DisplayName("Пицца")]

Pizzeria/PizzeriaContracts/ViewModels/PizzaCount.cs

@@ -1,8 +0,0 @@
-namespace PizzeriaContracts.ViewModels
-{
-    public class PizzaCount
-    {
-        public PizzaViewModel Pizza { get; set; }
-        public int Count { get; set; } = new();
-    }
-}

Pizzeria/PizzeriaContracts/ViewModels/ReportGroupOrdersViewModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.ViewModels
-{
-    public class ReportGroupOrdersViewModel
-    {
-        public DateTime Date { get; set; } = DateTime.Now;
-        public int OrdersCount { get; set; }
-        public double OrdersSum { get; set; }
-    }
-}

Pizzeria/PizzeriaContracts/ViewModels/ReportShopsViewModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.ViewModels
-{
-    public class ReportShopsViewModel
-    {
-        public string ShopName { get; set; } = string.Empty;
-        public int TotalCount { get; set; }
-        public List<(string Pizza, int count)> Pizzas { get; set; } = new();
-    }
-}

Pizzeria/PizzeriaContracts/ViewModels/ShopPizzaViewModel.cs

@@ -1,8 +0,0 @@
-namespace PizzeriaContracts.ViewModels
-{
-    public class ShopPizzaViewModel
-    {
-        public ShopViewModel Shop { get; set; } = new();
-        public Dictionary<int, PizzaCount> ShopPizza { get; set; } = new();
-    }
-}

Pizzeria/PizzeriaContracts/ViewModels/ShopViewModel.cs

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

Pizzeria/PizzeriaDataModels/Models/IImplementerModel.cs

@@ -0,0 +1,13 @@
+namespace PizzeriaDataModels.Models
+{
+    public interface IImplementerModel : IId
+    {
+        string ImplementerFIO { get; }
+
+        string Password { get; }
+
+        int WorkExperience { get; }
+
+        int Qualification { get; }
+    }
+}

Pizzeria/PizzeriaDataModels/Models/IOrderModel.cs

@@ -11,6 +11,7 @@ namespace PizzeriaDataModels.Models
     {
         int PizzaId { get; }
         int ClientId { get; }
+        int? ImplementerId { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

Pizzeria/PizzeriaDataModels/Models/IShopModel.cs

@@ -1,19 +0,0 @@
-using PizzeriaDataModels;
-using PizzeriaDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        string ShopName { get; }
-        string Adress { get; }
-        DateTime OpeningDate { get; }
-        Dictionary<int, (IPizzaModel, int)> ShopPizzas { get; }
-        public int PizzaMaxCount { get; }
-    }
-}

Pizzeria/PizzeriaDataModels/Models/ISupplyModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaDataModels.Models
-{
-    public interface ISupplyModel
-    {
-        int ShopId { get; }
-        int PizzaId { get; }
-        int Count { get; }
-    }
-}

Pizzeria/PizzeriaDatabaseImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,79 @@
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.SearchModels;
+using PizzeriaContracts.StoragesContracts;
+using PizzeriaContracts.ViewModels;
+using PizzeriaDatabaseImplement.Models;
+
+namespace PizzeriaDatabaseImplement.Implements
+{
+    public class ImplementerStorage : IImplementerStorage
+    {
+        public List<ImplementerViewModel> GetFullList()
+        {
+            using var context = new PizzeriaDatabase();
+            return context.Implementers.Select(x => x.GetViewModel).ToList();
+        }
+
+        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ImplementerFIO))
+            {
+                return new();
+            }
+            using var context = new PizzeriaDatabase();
+            return context.Implementers.Where(x => x.ImplementerFIO.Contains(model.ImplementerFIO)).Select(x => x.GetViewModel).ToList();
+        }
+
+        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ImplementerFIO) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new PizzeriaDatabase();
+            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 PizzeriaDatabase();
+            context.Implementers.Add(newImplementer);
+            context.SaveChanges();
+            return newImplementer.GetViewModel;
+        }
+
+        public ImplementerViewModel? Update(ImplementerBindingModel model)
+        {
+            using var context = new PizzeriaDatabase();
+            var implementer = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
+            if (implementer == null)
+            {
+                return null;
+            }
+            implementer.Update(model);
+            context.SaveChanges();
+            return implementer.GetViewModel;
+        }
+
+        public ImplementerViewModel? Delete(ImplementerBindingModel model)
+        {
+            using var context = new PizzeriaDatabase();
+            var implementer = context.Implementers.FirstOrDefault(rec => rec.Id == model.Id);
+            if (implementer != null)
+            {
+                context.Implementers.Remove(implementer);
+                context.SaveChanges();
+                return implementer.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

Pizzeria/PizzeriaDatabaseImplement/Implements/OrderStorage.cs

@@ -12,31 +12,34 @@ namespace PizzeriaDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new PizzeriaDatabase();
-            return context.Orders.Include(x => x.Pizza).Include(x => x.Client).Select(x => x.GetViewModel).ToList();
+            return context.Orders.Include(x => x.Pizza).Include(x => x.Client).Include(y => y.Implementer).Select(x => x.GetViewModel).ToList();
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             using var context = new PizzeriaDatabase();
-            if (model.DateFrom.HasValue)
+            if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue && !model.Status.HasValue)
             {
-                return context.Orders.Include(x => x.Pizza).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
+                return new();
             }
-            if (model.ClientId.HasValue)
-            {
-                return context.Orders.Include(x => x.Pizza).Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
-            }
-            return context.Orders.Include(x => x.Pizza).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
+            return context.Orders.Include(x => x.Pizza).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 PizzeriaDatabase();
-            return context.Orders.Include(x => x.Pizza).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+            return context.Orders.Include(x => x.Pizza).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x =>
+                (model.Id.HasValue && x.Id == model.Id) ||
+                (model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId && x.Status == model.Status))
+                ?.GetViewModel;
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -62,7 +65,7 @@ namespace PizzeriaDatabaseImplement.Implements
             {
                 return null;
             }
-            order.Update(model);
+            order.Update(context, model);
             context.SaveChanges();
             return order.GetViewModel;
         }

Pizzeria/PizzeriaDatabaseImplement/Implements/ShopStorage.cs

@@ -1,185 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.SearchModels;
-using PizzeriaContracts.StoragesContracts;
-using PizzeriaContracts.ViewModels;
-using PizzeriaDatabaseImplement.Models;
-
-namespace PizzeriaDatabaseImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        public List<ShopViewModel> GetFullList()
-        {
-            using var context = new PizzeriaDatabase();
-            return context.Shops.Include(x => x.Pizzas).ThenInclude(x => x.Pizza).ToList().
-                Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return new();
-            }
-            using var context = new PizzeriaDatabase();
-            return context.Shops.Include(x => x.Pizzas).ThenInclude(x => x.Pizza).Where(x => x.ShopName.Contains(model.ShopName)).
-                ToList().Select(x => x.GetViewModel).ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return new();
-            }
-            using var context = new PizzeriaDatabase();
-            return context.Shops.Include(x => x.Pizzas).ThenInclude(x => x.Pizza)
-                .FirstOrDefault(x =>
-                (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
-                (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            using var context = new PizzeriaDatabase();
-            var newShop = Shop.Create(context, model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            context.Shops.Add(newShop);
-            context.SaveChanges();
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            using var context = new PizzeriaDatabase();
-            using var transaction = context.Database.BeginTransaction();
-            try
-            {
-                var shop = context.Shops.FirstOrDefault(x => x.Id == model.Id);
-                if (shop == null)
-                {
-                    return null;
-                }
-                shop.Update(model);
-                context.SaveChanges();
-                shop.UpdatePizzas(context, model);
-                transaction.Commit();
-                return shop.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            using var context = new PizzeriaDatabase();
-            var shop = context.Shops.Include(x => x.Pizzas).FirstOrDefault(x => x.Id == model.Id);
-            if (shop != null)
-            {
-                context.Shops.Remove(shop);
-                context.SaveChanges();
-                return shop.GetViewModel;
-            }
-            return null;
-        }
-
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            using var context = new PizzeriaDatabase();
-            var transaction = context.Database.BeginTransaction();
-            var Shops = context.Shops.Include(x => x.Pizzas).ThenInclude(x => x.Pizza).ToList().
-                Where(x => x.PizzaMaxCount > x.ShopPizzas.Select(x => x.Value.Item2).Sum()).ToList();
-            if (model == null)
-            {
-                return false;
-            }
-            try
-            {
-                foreach (Shop shop in Shops)
-                {
-                    int difference = shop.PizzaMaxCount - shop.ShopPizzas.Select(x => x.Value.Item2).Sum();
-                    int refill = Math.Min(difference, model.Count);
-                    model.Count -= refill;
-                    if (shop.ShopPizzas.ContainsKey(model.PizzaId))
-                    {
-                        var datePair = shop.ShopPizzas[model.PizzaId];
-                        datePair.Item2 += refill;
-                        shop.ShopPizzas[model.PizzaId] = datePair;
-                    }
-                    else
-                    {
-                        var pizza = context.Pizzas.First(x => x.Id == model.PizzaId);
-                        shop.ShopPizzas.Add(model.PizzaId, (pizza, refill));
-                    }
-                    shop.PizzasDictionatyUpdate(context);
-                    if (model.Count == 0)
-                    {
-                        transaction.Commit();
-                        return true;
-                    }
-                }
-                transaction.Rollback();
-                return false;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-
-        public bool Sale(SupplySearchModel model)
-        {
-            using var context = new PizzeriaDatabase();
-            var transaction = context.Database.BeginTransaction();
-            try
-            {
-                var shops = context.Shops.Include(x => x.Pizzas).ThenInclude(x => x.Pizza).ToList().
-                    Where(x => x.ShopPizzas.ContainsKey(model.PizzaId.Value)).OrderByDescending(x => x.ShopPizzas[model.PizzaId.Value].Item2).ToList();
-
-                foreach (var shop in shops)
-                {
-                    int residue = model.Count.Value - shop.ShopPizzas[model.PizzaId.Value].Item2;
-                    if (residue > 0)
-                    {
-                        shop.ShopPizzas.Remove(model.PizzaId.Value);
-                        shop.PizzasDictionatyUpdate(context);
-                        context.SaveChanges();
-                        model.Count = residue;
-
-                    }
-                    else
-                    {
-                        if (residue == 0)
-                            shop.ShopPizzas.Remove(model.PizzaId.Value);
-                        else
-                        {
-                            var dataPair = shop.ShopPizzas[model.PizzaId.Value];
-                            dataPair.Item2 = -residue;
-                            shop.ShopPizzas[model.PizzaId.Value] = dataPair;
-                        }
-
-                        shop.PizzasDictionatyUpdate(context);
-                        transaction.Commit();
-                        return true;
-                    }
-                }
-                transaction.Rollback();
-                return false;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-
-    }
-}

Pizzeria/PizzeriaDatabaseImplement/Migrations/20240305050232_Hard_init.cs

@@ -1,78 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace PizzeriaDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class Hard_init : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Shops",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ShopName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Adress = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    OpeningDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    PizzaMaxCount = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Shops", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ShopPizzas",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    PizzaId = table.Column<int>(type: "int", nullable: false),
-                    ShopId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ShopPizzas", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_ShopPizzas_Pizzas_PizzaId",
-                        column: x => x.PizzaId,
-                        principalTable: "Pizzas",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ShopPizzas_Shops_ShopId",
-                        column: x => x.ShopId,
-                        principalTable: "Shops",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopPizzas_PizzaId",
-                table: "ShopPizzas",
-                column: "PizzaId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopPizzas_ShopId",
-                table: "ShopPizzas",
-                column: "ShopId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "ShopPizzas");
-
-            migrationBuilder.DropTable(
-                name: "Shops");
-        }
-    }
-}

Pizzeria/PizzeriaDatabaseImplement/Migrations/20240328173346_implementors.Designer.cs

@@ -12,8 +12,8 @@ using PizzeriaDatabaseImplement;
 namespace PizzeriaDatabaseImplement.Migrations
 {
     [DbContext(typeof(PizzeriaDatabase))]
-    [Migration("20240305050232_Hard_init")]
-    partial class Hard_init
+    [Migration("20240328173346_implementors")]
+    partial class implementors
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -25,6 +25,31 @@ namespace PizzeriaDatabaseImplement.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
+            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b =>
                 {
                     b.Property<int>("Id")
@@ -45,6 +70,33 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
+            modelBuilder.Entity("PizzeriaDatabaseImplement.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("PizzeriaDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -53,6 +105,9 @@ namespace PizzeriaDatabaseImplement.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
                     b.Property<int>("Count")
                         .HasColumnType("int");
 
@@ -62,6 +117,9 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("int");
+
                     b.Property<int>("PizzaId")
                         .HasColumnType("int");
 
@@ -73,6 +131,10 @@ namespace PizzeriaDatabaseImplement.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ImplementerId");
+
                     b.HasIndex("PizzaId");
 
                     b.ToTable("Orders");
@@ -124,67 +186,28 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.ToTable("PizzaComponents");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("PizzaMaxCount")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PizzaId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PizzaId");
-
-                    b.HasIndex("ShopId");
-
-                    b.ToTable("ShopPizzas");
-                });
-
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b =>
                 {
+                    b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("PizzeriaDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Order")
+                        .HasForeignKey("ImplementerId");
+
                     b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
                         .WithMany("Orders")
                         .HasForeignKey("PizzaId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.Navigation("Client");
+
+                    b.Navigation("Implementer");
+
                     b.Navigation("Pizza");
                 });
 
@@ -207,23 +230,9 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.Navigation("Pizza");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b =>
+            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b =>
                 {
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
-                        .WithMany("ShopPizzas")
-                        .HasForeignKey("PizzaId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Pizzas")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Pizza");
-
-                    b.Navigation("Shop");
+                    b.Navigation("Orders");
                 });
 
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b =>
@@ -231,17 +240,17 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.Navigation("PizzaComponents");
                 });
 
+            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Order");
+                });
+
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Pizza", b =>
                 {
                     b.Navigation("Components");
 
                     b.Navigation("Orders");
                 });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Pizzas");
-                });
 #pragma warning restore 612, 618
         }
     }

Pizzeria/PizzeriaDatabaseImplement/Migrations/20240328173346_implementors.cs

@@ -0,0 +1,67 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PizzeriaDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class implementors : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ImplementerId",
+                table: "Orders",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "Implementers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    ImplementerFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    WorkExperience = table.Column<int>(type: "int", nullable: false),
+                    Qualification = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Implementers", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Orders_Implementers_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId",
+                principalTable: "Implementers",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Orders_Implementers_ImplementerId",
+                table: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "Implementers");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders");
+
+            migrationBuilder.DropColumn(
+                name: "ImplementerId",
+                table: "Orders");
+        }
+    }
+}

Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs

@@ -67,6 +67,33 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
+            modelBuilder.Entity("PizzeriaDatabaseImplement.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("PizzeriaDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -87,6 +114,9 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("int");
+
                     b.Property<int>("PizzaId")
                         .HasColumnType("int");
 
@@ -100,6 +130,8 @@ namespace PizzeriaDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
+                    b.HasIndex("ImplementerId");
+
                     b.HasIndex("PizzaId");
 
                     b.ToTable("Orders");
@@ -151,59 +183,6 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.ToTable("PizzaComponents");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("PizzaMaxCount")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PizzaId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PizzaId");
-
-                    b.HasIndex("ShopId");
-
-                    b.ToTable("ShopPizzas");
-                });
-
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client")
@@ -212,6 +191,10 @@ namespace PizzeriaDatabaseImplement.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("PizzeriaDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Order")
+                        .HasForeignKey("ImplementerId");
+
                     b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
                         .WithMany("Orders")
                         .HasForeignKey("PizzaId")
@@ -220,6 +203,8 @@ namespace PizzeriaDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
+                    b.Navigation("Implementer");
+
                     b.Navigation("Pizza");
                 });
 
@@ -242,25 +227,6 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.Navigation("Pizza");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b =>
-                {
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
-                        .WithMany("ShopPizzas")
-                        .HasForeignKey("PizzaId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Pizzas")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Pizza");
-
-                    b.Navigation("Shop");
-                });
-
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b =>
                 {
                     b.Navigation("Orders");
@@ -271,17 +237,17 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.Navigation("PizzaComponents");
                 });
 
+            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Order");
+                });
+
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Pizza", b =>
                 {
                     b.Navigation("Components");
 
                     b.Navigation("Orders");
                 });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Pizzas");
-                });
 #pragma warning restore 612, 618
         }
     }

Pizzeria/PizzeriaDatabaseImplement/Models/Implementer.cs

@@ -0,0 +1,65 @@
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.ViewModels;
+using PizzeriaDataModels.Models;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace PizzeriaDatabaseImplement.Models
+{
+    public class Implementer : IImplementerModel
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string ImplementerFIO { get; set; } = string.Empty;
+
+        [Required]
+        public string Password { get; set; } = string.Empty;
+
+        [Required]
+        public int WorkExperience { get; set; }
+
+        [Required]
+        public int Qualification { get; set; }
+
+        [ForeignKey("ImplementerId")]
+        public virtual List<Order> Order { get; set; } = new();
+
+        public static Implementer? Create(ImplementerBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Implementer()
+            {
+                Id = model.Id,
+                ImplementerFIO = model.ImplementerFIO,
+                Password = model.Password,
+                WorkExperience = model.WorkExperience,
+                Qualification = model.Qualification
+            };
+        }
+
+        public void Update(ImplementerBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ImplementerFIO = model.ImplementerFIO;
+            Password = model.Password;
+            WorkExperience = model.WorkExperience;
+            Qualification = model.Qualification;
+        }
+
+        public ImplementerViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ImplementerFIO = ImplementerFIO,
+            Password = Password,
+            WorkExperience = WorkExperience,
+            Qualification = Qualification
+        };
+    }
+}

Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs

@@ -20,6 +20,10 @@ namespace PizzeriaDatabaseImplement.Models
 
         public virtual Pizza Pizza { get; set; } = new();
 
+        public int? ImplementerId { get; private set; }
+
+        public virtual Implementer? Implementer { get; set; } = new();
+
         [Required]
         public int Count { get; private set; }
 
@@ -43,6 +47,8 @@ namespace PizzeriaDatabaseImplement.Models
                 Client = context.Clients.First(x => x.Id == model.ClientId),
                 PizzaId = model.PizzaId,
                 Pizza = context.Pizzas.First(x => x.Id == model.PizzaId),
+                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,
@@ -51,7 +57,7 @@ namespace PizzeriaDatabaseImplement.Models
             };
         }
 
-        public void Update(OrderBindingModel? model)
+        public void Update(PizzeriaDatabase context, OrderBindingModel? model)
         {
             if (model == null)
             {
@@ -59,6 +65,8 @@ namespace PizzeriaDatabaseImplement.Models
             }
             Status = model.Status;
             DateImplement = model.DateImplement;
+            ImplementerId = model.ImplementerId;
+            Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null;
         }
 
         public OrderViewModel GetViewModel => new()
@@ -68,6 +76,8 @@ namespace PizzeriaDatabaseImplement.Models
             ClientFIO = Client.ClientFIO,
             PizzaId = PizzaId,
             PizzaName = Pizza.PizzaName,
+            ImplementerId = ImplementerId,
+            ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null,
             Count = Count,
             Sum = Sum,
             Status = Status,

Pizzeria/PizzeriaDatabaseImplement/Models/Pizza.cs

@@ -28,7 +28,6 @@ namespace PizzeriaDatabaseImplement.Models
                 return _pizzaComponents;
             }
         }
-
         [ForeignKey("PizzaId")]
         public virtual List<PizzaComponent> Components { get; set; } = new();
         [ForeignKey("PizzaId")]

Pizzeria/PizzeriaDatabaseImplement/Models/Shop.cs

@@ -1,114 +0,0 @@
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.ViewModels;
-using PizzeriaDataModels.Models;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace PizzeriaDatabaseImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; set; }
-        public string ShopName { get; set; } = string.Empty;
-
-        public string Adress { get; set; } = string.Empty;
-
-        public DateTime OpeningDate { get; set; }
-
-        public int PizzaMaxCount { get; set; }
-
-        private Dictionary<int, (IPizzaModel, int)>? _shopPizzas = null;
-
-        public Dictionary<int, (IPizzaModel, int)> ShopPizzas
-        {
-            get
-            {
-                if (_shopPizzas == null)
-                {
-                    if (_shopPizzas == null)
-                    {
-                        _shopPizzas = Pizzas
-                                .ToDictionary(recSP => recSP.PizzaId, recSP => (recSP.Pizza as IPizzaModel, recSP.Count));
-                    }
-                    return _shopPizzas;
-                }
-                return _shopPizzas;
-            }
-        }
-
-        [ForeignKey("ShopId")]
-        public List<ShopPizzas> Pizzas { get; set; } = new();
-
-        public static Shop Create(PizzeriaDatabase context, ShopBindingModel model)
-        {
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Adress = model.Adress,
-                OpeningDate = model.OpeningDate,
-                Pizzas = model.ShopPizzas.Select(x => new ShopPizzas
-                {
-                    Pizza = context.Pizzas.First(y => y.Id == x.Key),
-                    Count = x.Value.Item2
-                }).ToList(),
-                PizzaMaxCount = model.PizzaMaxCount
-            };
-        }
-
-        public void Update(ShopBindingModel model)
-        {
-            ShopName = model.ShopName;
-            Adress = model.Adress;
-            OpeningDate = model.OpeningDate;
-            PizzaMaxCount = model.PizzaMaxCount;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Adress = Adress,
-            OpeningDate = OpeningDate,
-            ShopPizzas = ShopPizzas,
-            PizzaMaxCount = PizzaMaxCount
-        };
-
-        public void UpdatePizzas(PizzeriaDatabase context, ShopBindingModel model)
-        {
-            var ShopPizzas = context.ShopPizzas.Where(rec => rec.ShopId == model.Id).ToList();
-            if (ShopPizzas != null && ShopPizzas.Count > 0)
-            {
-                context.ShopPizzas.RemoveRange(ShopPizzas.Where(rec => !model.ShopPizzas.ContainsKey(rec.PizzaId)));
-                context.SaveChanges();
-                ShopPizzas = context.ShopPizzas.Where(rec => rec.ShopId == model.Id).ToList();
-                foreach (var updatePizza in ShopPizzas)
-                {
-                    updatePizza.Count = model.ShopPizzas[updatePizza.PizzaId].Item2;
-                    model.ShopPizzas.Remove(updatePizza.PizzaId);
-                }
-                context.SaveChanges();
-            }
-            var shop = context.Shops.First(x => x.Id == Id);
-            foreach (var ar in model.ShopPizzas)
-            {
-                context.ShopPizzas.Add(new ShopPizzas
-                {
-                    Shop = shop,
-                    Pizza = context.Pizzas.First(x => x.Id == ar.Key),
-                    Count = ar.Value.Item2
-                });
-                context.SaveChanges();
-            }
-            _shopPizzas = null;
-        }
-
-        public void PizzasDictionatyUpdate(PizzeriaDatabase context)
-        {
-            UpdatePizzas(context, new ShopBindingModel
-            {
-                Id = Id,
-                ShopPizzas = ShopPizzas,
-            });
-        }
-    }
-}

Pizzeria/PizzeriaDatabaseImplement/Models/ShopPizzas.cs

@@ -1,22 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace PizzeriaDatabaseImplement.Models
-{
-    public class ShopPizzas
-    {
-        public int Id { get; set; }
-
-        [Required]
-        public int PizzaId { get; set; }
-
-        [Required]
-        public int ShopId { get; set; }
-
-        [Required]
-        public int Count { get; set; }
-
-        public virtual Shop Shop { get; set; } = new();
-
-        public virtual Pizza Pizza { get; set; } = new();
-    }
-}

Pizzeria/PizzeriaDatabaseImplement/PizzeriaDatabase.cs

@@ -1,5 +1,5 @@
-using PizzeriaDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using PizzeriaDatabaseImplement.Models;
 
 namespace PizzeriaDatabaseImplement
 {
@@ -18,7 +18,6 @@ namespace PizzeriaDatabaseImplement
         public virtual DbSet<PizzaComponent> PizzaComponents { set; get; }
         public virtual DbSet<Order> Orders { set; get; }
         public virtual DbSet<Client> Clients { set; get; }
-        public virtual DbSet<Shop> Shops { set; get; }
-        public virtual DbSet<ShopPizzas> ShopPizzas { set; get; }
+        public virtual DbSet<Implementer> Implementers { set; get; }
     }
 }

Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs

@@ -1,4 +1,9 @@
-using PizzeriaFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using PizzeriaFileImplement.Models;
 using System.Xml.Linq;
 
 namespace PizzeriaFileImplement
@@ -10,12 +15,13 @@ namespace PizzeriaFileImplement
         private readonly string OrderFileName = "Order.xml";
         private readonly string PizzaFileName = "Pizza.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<Pizza> Pizzas { get; private set; }
         public List<Client> Clients { get; private set; }
-        public List<Shop> Shops { get; private set; }
+        public List<Implementer> Implementers { get; private set; }
+
 
         public static DataFileSingleton GetInstance()
         {
@@ -30,7 +36,7 @@ namespace PizzeriaFileImplement
         public void SavePizzas() => SaveData(Pizzas, PizzaFileName, "Pizzas", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, ClientFileName, "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()
         {
@@ -38,7 +44,7 @@ namespace PizzeriaFileImplement
             Pizzas = LoadData(PizzaFileName, "Pizza", x => Pizza.Create(x)!)!;
             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)
@@ -58,4 +64,4 @@ namespace PizzeriaFileImplement
             }
         }
     }
-}
+}

Pizzeria/PizzeriaFileImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,94 @@
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.SearchModels;
+using PizzeriaContracts.StoragesContracts;
+using PizzeriaContracts.ViewModels;
+using PizzeriaFileImplement.Models;
+
+namespace PizzeriaFileImplement.Implements
+{
+    public class ImplementerStorage : IImplementerStorage
+    {
+        private readonly DataFileSingleton _source;
+        public ImplementerStorage()
+        {
+            _source = DataFileSingleton.GetInstance();
+        }
+
+        public List<ImplementerViewModel> GetFullList()
+        {
+            return _source.Implementers.Select(x => x.GetViewModel).ToList();
+        }
+
+        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)
+            {
+                return _source.Implementers
+                    .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+            return new();
+        }
+
+        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 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;
+        }
+    }
+}

Pizzeria/PizzeriaFileImplement/Implements/OrderStorage.cs

@@ -30,6 +30,12 @@ namespace PizzeriaFileImplement.Implements
                 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();
@@ -39,6 +45,10 @@ namespace PizzeriaFileImplement.Implements
 
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
+            if (model.ImplementerId.HasValue)
+            {
+                return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
+            }
             if (!model.Id.HasValue)
             {
                 return new();

Pizzeria/PizzeriaFileImplement/Implements/ShopStorage.cs

@@ -1,154 +0,0 @@
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.SearchModels;
-using PizzeriaContracts.StoragesContracts;
-using PizzeriaContracts.ViewModels;
-using PizzeriaFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaFileImplement.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 shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop != null)
-            {
-                source.Shops.Remove(shop);
-                source.SaveShops();
-                return shop.GetViewModel;
-            }
-            return null;
-        }
-
-        public bool Sale(SupplySearchModel model)
-        {
-            if (model == null || !model.PizzaId.HasValue || !model.Count.HasValue)
-                return false;
-            int remainingSpace = source.Shops.Select(x => x.Pizzas.ContainsKey(model.PizzaId.Value) ? x.Pizzas[model.PizzaId.Value] : 0).Sum();
-            if (remainingSpace < model.Count)
-            {
-                return false;
-            }
-            var shops = source.Shops.Where(x => x.Pizzas.ContainsKey(model.PizzaId.Value)).OrderByDescending(x => x.Pizzas[model.PizzaId.Value]).ToList();
-            foreach (var shop in shops)
-            {
-                int residue = model.Count.Value - shop.Pizzas[model.PizzaId.Value];
-                if (residue > 0)
-                {
-                    shop.Pizzas.Remove(model.PizzaId.Value);
-                    shop.PizzasUpdate();
-                    model.Count = residue;
-                }
-                else
-                {
-                    if (residue == 0)
-                    {
-                        shop.Pizzas.Remove(model.PizzaId.Value);
-                    }
-                    else
-                    {
-                        shop.Pizzas[model.PizzaId.Value] = -residue;
-                    }
-                    shop.PizzasUpdate();
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            source.SaveShops();
-            return false;
-        }
-
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            if (model == null || source.Shops.Select(x => x.PizzaMaxCount - x.ShopPizzas.Select(y => y.Value.Item2).Sum()).Sum() < model.Count)
-            {
-                return false;
-            }
-            foreach (Shop shop in source.Shops)
-            {
-                int free_places = shop.PizzaMaxCount - shop.ShopPizzas.Select(x => x.Value.Item2).Sum();
-                if (free_places <= 0)
-                    continue;
-                free_places = Math.Min(free_places, model.Count);
-                model.Count -= free_places;
-                if (shop.Pizzas.ContainsKey(model.PizzaId))
-                {
-                    shop.Pizzas[model.PizzaId] += free_places;
-                }
-                else
-                {
-                    shop.Pizzas.Add(model.PizzaId, free_places);
-                }
-                shop.PizzasUpdate();
-                if (model.Count == 0)
-                {
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}

Pizzeria/PizzeriaFileImplement/Models/Implementer.cs

@@ -0,0 +1,87 @@
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.ViewModels;
+using PizzeriaDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace PizzeriaFileImplement.Models
+{
+    public class Implementer : IImplementerModel
+    {
+        public int Id { get; private set; }
+
+        public string ImplementerFIO { get; private set; } = string.Empty;
+
+        public string Password { get; private set; } = string.Empty;
+
+        public int WorkExperience { get; private set; }
+
+        public int Qualification { get; private set; }
+
+        public static Implementer? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                ImplementerFIO = element.Element("FIO")!.Value,
+                Password = element.Element("Password")!.Value,
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                Qualification = Convert.ToInt32(element.Element("Qualification")!.Value),
+                WorkExperience = Convert.ToInt32(element.Element("WorkExperience")!.Value),
+            };
+        }
+
+        public static Implementer? Create(ImplementerBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                Id = model.Id,
+                Password = model.Password,
+                Qualification = model.Qualification,
+                ImplementerFIO = model.ImplementerFIO,
+                WorkExperience = model.WorkExperience,
+            };
+        }
+
+
+
+        public void Update(ImplementerBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Password = model.Password;
+            Qualification = model.Qualification;
+            ImplementerFIO = model.ImplementerFIO;
+            WorkExperience = model.WorkExperience;
+        }
+
+        public ImplementerViewModel GetViewModel => new()
+        {
+            Id = Id,
+            Password = Password,
+            Qualification = Qualification,
+            ImplementerFIO = ImplementerFIO,
+        };
+
+        public XElement GetXElement => new("Client",
+            new XAttribute("Id", Id),
+            new XElement("Password", Password),
+            new XElement("FIO", ImplementerFIO),
+            new XElement("Qualification", Qualification),
+            new XElement("WorkExperience", WorkExperience)
+            );
+    }
+}

Pizzeria/PizzeriaFileImplement/Models/Order.cs

@@ -10,6 +10,7 @@ namespace PizzeriaFileImplement.Models
     {
         public int Id { get; private set; }
         public int ClientId { get; private set; }
+        public int? ImplementerId { get; set; }
         public int PizzaId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
@@ -28,6 +29,7 @@ namespace PizzeriaFileImplement.Models
                 Id = model.Id,
                 PizzaId = model.PizzaId,
                 ClientId = model.ClientId,
+                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -48,6 +50,7 @@ namespace PizzeriaFileImplement.Models
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 PizzaId = Convert.ToInt32(element.Element("PizzaId")!.Value),
                 ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
+                ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.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)),
@@ -72,6 +75,7 @@ namespace PizzeriaFileImplement.Models
             Id = Id,
             PizzaId = PizzaId,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,
@@ -83,6 +87,7 @@ namespace PizzeriaFileImplement.Models
            new XAttribute("Id", Id),
            new XElement("PizzaId", PizzaId.ToString()),
            new XElement("ClientId", ClientId.ToString()),
+           new XElement("ImplementerId", ImplementerId),
            new XElement("Count", Count.ToString()),
            new XElement("Sum", Sum.ToString()),
            new XElement("Status", Status.ToString()),

Pizzeria/PizzeriaFileImplement/Models/Shop.cs

@@ -1,111 +0,0 @@
-using PizzeriaDataModels.Models;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace PizzeriaFileImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string ShopName { get; private set; } = string.Empty;
-        public string Adress { get; private set; } = string.Empty;
-        public DateTime OpeningDate { get; private set; }
-        public Dictionary<int, int> Pizzas { get; private set; } = new();
-        private Dictionary<int, (IPizzaModel, int)>? _shopPizzas = null;
-
-        public Dictionary<int, (IPizzaModel, int)> ShopPizzas
-        {
-            get
-            {
-                if (_shopPizzas == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _shopPizzas = Pizzas.ToDictionary(x => x.Key, y => ((source.Pizzas.FirstOrDefault(z => z.Id == y.Key) as IPizzaModel)!, y.Value));
-                }
-                return _shopPizzas;
-            }
-        }
-
-        public int PizzaMaxCount { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Adress = model.Adress,
-                OpeningDate = model.OpeningDate,
-                Pizzas = model.ShopPizzas.ToDictionary(x => x.Key, x => x.Value.Item2),
-                PizzaMaxCount = model.PizzaMaxCount
-            };
-        }
-
-        public static Shop? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ShopName = element.Element("ShopName")!.Value,
-                Adress = element.Element("Adress")!.Value,
-                OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
-                Pizzas = element.Element("ShopPizzas")!.Elements("ShopPizza")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
-                x => Convert.ToInt32(x.Element("Value")?.Value)),
-                PizzaMaxCount = Convert.ToInt32(element.Element("PizzaMaxCount")!.Value)
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Adress = model.Adress;
-            OpeningDate = model.OpeningDate;
-            PizzaMaxCount = model.PizzaMaxCount;
-            Pizzas = model.ShopPizzas.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _shopPizzas = null;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Adress = Adress,
-            OpeningDate = OpeningDate,
-            ShopPizzas = ShopPizzas,
-            PizzaMaxCount = PizzaMaxCount
-        };
-
-        public XElement GetXElement => new("Shop",
-            new XAttribute("Id", Id),
-            new XElement("ShopName", ShopName),
-            new XElement("Adress", Adress),
-            new XElement("OpeningDate", OpeningDate.ToString()),
-            new XElement("ShopPizzas", Pizzas.Select(
-                x => new XElement("ShopPizza", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()),
-            new XElement("PizzaMaxCount", PizzaMaxCount.ToString())
-            );
-
-        public void PizzasUpdate()
-        {
-            _shopPizzas = null;
-        }
-    }
-}

Pizzeria/PizzeriaListImplement/DataListSingleton.cs

@@ -14,7 +14,7 @@ namespace PizzeriaListImplement
         public List<Order> Orders { get; set; }
         public List<Pizza> Pizzas { get; set; }
         public List<Client> Clients { get; set; }
-        public List<Shop> Shops { get; set; }
+        public List<Implementer> Implementers { get; set; }
 
         private DataListSingleton()
         {
@@ -22,7 +22,7 @@ namespace PizzeriaListImplement
             Orders = new List<Order>();
             Pizzas = new List<Pizza>();
             Clients = new List<Client>();
-            Shops = new List<Shop>();
+            Implementers = new List<Implementer>();
         }
 
         public static DataListSingleton GetInstance()

Pizzeria/PizzeriaListImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,118 @@
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.SearchModels;
+using PizzeriaContracts.StoragesContracts;
+using PizzeriaContracts.ViewModels;
+using PizzeriaListImplement.Models;
+
+namespace PizzeriaListImplement.Implements
+{
+    public class ImplementerStorage : IImplementerStorage
+    {
+        private readonly DataListSingleton _source;
+        public ImplementerStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+
+        public ImplementerViewModel? Delete(ImplementerBindingModel model)
+        {
+            for (int i = 0; i < _source.Implementers.Count; ++i)
+            {
+                if (_source.Implementers[i].Id == model.Id)
+                {
+                    var element = _source.Implementers[i];
+                    _source.Implementers.RemoveAt(i);
+                    return element.GetViewModel;
+                }
+            }
+            return null;
+        }
+
+        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+        {
+            foreach (var x in _source.Implementers)
+            {
+                if (model.Id.HasValue && x.Id == model.Id)
+                {
+                    return x.GetViewModel;
+                }
+                if (model.ImplementerFIO != null && model.Password != null && 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;
+        }
+
+        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();
+            }
+
+            List<ImplementerViewModel> result = new();
+            if (model.ImplementerFIO != null)
+            {
+                foreach (var implementer in _source.Implementers)
+                {
+                    if (implementer.ImplementerFIO.Equals(model.ImplementerFIO))
+                    {
+                        result.Add(implementer.GetViewModel);
+                    }
+                }
+            }
+            return result;
+        }
+
+        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)
+                {
+                    model.Id = implementer.Id + 1;
+                }
+            }
+            var res = Implementer.Create(model);
+            if (res != null)
+            {
+                _source.Implementers.Add(res);
+            }
+            return res?.GetViewModel;
+        }
+
+        public ImplementerViewModel? Update(ImplementerBindingModel model)
+        {
+            foreach (var implementer in _source.Implementers)
+            {
+                if (implementer.Id == model.Id)
+                {
+                    implementer.Update(model);
+                    return implementer.GetViewModel;
+                }
+            }
+            return null;
+        }
+    }
+}

Pizzeria/PizzeriaListImplement/Implements/OrderStorage.cs

@@ -53,6 +53,16 @@ namespace PizzeriaListImplement.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)
@@ -100,6 +110,10 @@ namespace PizzeriaListImplement.Implements
                 {
                     return AttachPizzaName(order.GetViewModel);
                 }
+                else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId)
+                {
+                    return GetViewModel(order);
+                }
             }
             return null;
         }

Pizzeria/PizzeriaListImplement/Implements/ShopStorage.cs

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

Pizzeria/PizzeriaListImplement/Models/Implementer.cs

@@ -0,0 +1,60 @@
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.ViewModels;
+using PizzeriaDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PizzeriaListImplement.Models
+{
+    public class Implementer : IImplementerModel
+    {
+        public int Id { get; private set; }
+
+        public string ImplementerFIO { get; private set; } = string.Empty;
+
+        public string Password { get; private set; } = string.Empty;
+
+        public int WorkExperience { get; private set; }
+
+        public int Qualification { get; private set; }
+
+        public static Implementer? Create(ImplementerBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                Id = model.Id,
+                Password = model.Password,
+                Qualification = model.Qualification,
+                ImplementerFIO = model.ImplementerFIO,
+                WorkExperience = model.WorkExperience,
+            };
+        }
+
+        public void Update(ImplementerBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Password = model.Password;
+            Qualification = model.Qualification;
+            ImplementerFIO = model.ImplementerFIO;
+            WorkExperience = model.WorkExperience;
+        }
+
+        public ImplementerViewModel GetViewModel => new()
+        {
+            Id = Id,
+            Password = Password,
+            Qualification = Qualification,
+            ImplementerFIO = ImplementerFIO,
+        };
+    }
+}

Pizzeria/PizzeriaListImplement/Models/Order.cs

@@ -15,6 +15,7 @@ namespace PizzeriaListImplement.Models
         public int Id { get; private set; }
         public int PizzaId { get; private set; }
         public int ClientId { get; private set; }
+        public int? ImplementerId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
@@ -32,6 +33,7 @@ namespace PizzeriaListImplement.Models
                 Id = model.Id,
                 PizzaId = model.PizzaId,
                 ClientId = model.ClientId,
+                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -55,6 +57,7 @@ namespace PizzeriaListImplement.Models
             Id = Id,
             PizzaId = PizzaId,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,

Pizzeria/PizzeriaListImplement/Models/Shop.cs

@@ -1,59 +0,0 @@
-using PizzeriaDataModels.Models;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaListImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string ShopName { get; private set; } = string.Empty;
-        public string Adress { get; private set; } = string.Empty;
-        public DateTime OpeningDate { get; private set; }
-        public Dictionary<int, (IPizzaModel, int)> ShopPizzas { get; private set; } = new();
-        public int PizzaMaxCount { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Adress = model.Adress,
-                OpeningDate = model.OpeningDate,
-                PizzaMaxCount = model.PizzaMaxCount,
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Adress = model.Adress;
-            OpeningDate = model.OpeningDate;
-            PizzaMaxCount = model.PizzaMaxCount;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Adress = Adress,
-            OpeningDate = OpeningDate,
-            ShopPizzas = ShopPizzas,
-            PizzaMaxCount = PizzaMaxCount,
-        };
-    }
-}

Pizzeria/PizzeriaRestApi/APIConfig.cs

@@ -1,13 +0,0 @@
-namespace PizzeriaRestApi
-{
-    public class APIConfig
-    {
-        public static string? ShopPassword;
-
-        public static void LoadData(IConfiguration configuration)
-        {
-            ShopPassword = configuration["ShopAPIPassword"];
-        }
-    }
-}
-    

Pizzeria/PizzeriaRestApi/Controllers/ImplementerController.cs

@@ -0,0 +1,107 @@
+using Microsoft.AspNetCore.Mvc;
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.BusinessLogicsContracts;
+using PizzeriaContracts.SearchModels;
+using PizzeriaContracts.ViewModels;
+using PizzeriaDataModels.Enums;
+
+namespace PizzeriaRestApi.Controllers
+{
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class ImplementerController : Controller
+    {
+        private readonly ILogger _logger;
+
+        private readonly IOrderLogic _order;
+
+        private readonly IImplementerLogic _logic;
+
+        public ImplementerController(IOrderLogic order, IImplementerLogic logic, ILogger<ImplementerController> logger)
+        {
+            _logger = logger;
+            _order = order;
+            _logic = logic;
+        }
+
+        [HttpGet]
+        public ImplementerViewModel? Login(string login, string password)
+        {
+            try
+            {
+                return _logic.ReadElement(new ImplementerSearchModel
+                {
+                    ImplementerFIO = login,
+                    Password = password
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка авторизации сотрудника");
+                throw;
+            }
+        }
+
+        [HttpGet]
+        public List<OrderViewModel>? GetNewOrders()
+        {
+            try
+            {
+                return _order.ReadList(new OrderSearchModel
+                {
+                    Status = OrderStatus.Принят
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения новых заказов");
+                throw;
+            }
+        }
+
+        [HttpGet]
+        public OrderViewModel? GetImplementerOrder(int implementerId)
+        {
+            try
+            {
+                return _order.ReadElement(new OrderSearchModel
+                {
+                    ImplementerId = implementerId
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения текущего заказа исполнителя");
+                throw;
+            }
+        }
+
+        [HttpPost]
+        public void TakeOrderInWork(OrderBindingModel model)
+        {
+            try
+            {
+                _order.TakeOrderInWork(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу", model.Id);
+                throw;
+            }
+        }
+
+        [HttpPost]
+        public void FinishOrder(OrderBindingModel model)
+        {
+            try
+            {
+                _order.FinishOrder(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка отметки о готовности заказа с №{Id}", model.Id);
+                throw;
+            }
+        }
+    }
+}

Pizzeria/PizzeriaRestApi/Controllers/ShopController.cs

@@ -1,156 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using PizzeriaContracts.SearchModels;
-using PizzeriaContracts.ViewModels;
-
-namespace PizzeriaRestApi.Controllers
-{
-    [Route("api/[controller]/[action]")]
-    [ApiController]
-    public class ShopController : Controller
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _shopLogic;
-
-        public ShopController(ILogger<ShopController> logger, IShopLogic shopLogic)
-        {
-            _logger = logger;
-            _shopLogic = shopLogic;
-        }
-
-        [HttpGet]
-        public bool Authentication(string password)
-        {
-            return CheckPassword(password);
-        }
-
-        [HttpGet]
-        public List<ShopViewModel>? GetShopList(string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return null;
-            }
-            try
-            {
-                return _shopLogic.ReadList(null);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения списка магазинов");
-                throw;
-            }
-        }
-
-        [HttpGet]
-        public ShopPizzaViewModel? GetShop(int shopId, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return null;
-            }
-            try
-            {
-                var shop = _shopLogic.ReadElement(new ShopSearchModel { Id = shopId });
-                return new ShopPizzaViewModel
-                {
-                    Shop = shop,
-                    ShopPizza = shop.ShopPizzas.ToDictionary(x => x.Key, x => new PizzaCount
-                    {
-                        Pizza = new PizzaViewModel()
-                        {
-                            Id = x.Value.Item1.Id,
-                            PizzaName = x.Value.Item1.PizzaName,
-                            PizzaComponents = x.Value.Item1.PizzaComponents,
-                            Price = x.Value.Item1.Price,
-                        },
-                        Count = x.Value.Item2
-                    })
-                };
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void CreateShop(ShopBindingModel model, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return;
-            }
-            try
-            {
-                _shopLogic.Create(model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void UpdateShop(ShopBindingModel model, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return;
-            }
-            try
-            {
-                _shopLogic.Update(model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка обновления магазина");
-                throw;
-            }
-        }
-
-        [HttpDelete]
-        public void DeleteShop(int shopId, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return;
-            }
-            try
-            {
-                _shopLogic.Delete(new ShopBindingModel { Id = shopId });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка удаления магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void MakeSypply(SupplyBindingModel model, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return;
-            }
-            try
-            {
-                _shopLogic.MakeSupply(model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания поставки в магазин");
-                throw;
-            }
-        }
-
-        private bool CheckPassword(string password)
-        {
-            return APIConfig.ShopPassword == password;
-        }
-    }
-}

Pizzeria/PizzeriaRestApi/Program.cs

@@ -3,7 +3,6 @@ using PizzeriaContracts.BusinessLogicsContracts;
 using PizzeriaContracts.StoragesContracts;
 using PizzeriaDatabaseImplement.Implements;
 using Microsoft.OpenApi.Models;
-using PizzeriaRestApi;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -12,14 +11,14 @@ builder.Logging.AddLog4Net("log4net.config");
 
 // Add services to the container.
 builder.Services.AddTransient<IClientStorage, ClientStorage>();
+builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IPizzaStorage, PizzaStorage>();
-builder.Services.AddTransient<IShopStorage, ShopStorage>();
 
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
+builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IPizzaLogic, PizzaLogic>();
-builder.Services.AddTransient<IShopLogic, ShopLogic>();
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -30,7 +29,6 @@ builder.Services.AddSwaggerGen(c =>
 });
 
 var app = builder.Build();
-APIConfig.LoadData(builder.Configuration);
 
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())

Pizzeria/PizzeriaRestApi/appsettings.json

@@ -5,6 +5,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-  "ShopAPIPassword": "123456"
+  "AllowedHosts": "*"
 }

Pizzeria/PizzeriaShopApp/APIClient.cs

@@ -1,59 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-using System.Net.Http.Headers;
-using System.Text;
-
-namespace PizzeriaShopApp
-{
-    public class APIClient
-    {
-        private static readonly HttpClient _client = new();
-
-        public static string? Password { get; set; }
-
-        public static void Connect(IConfiguration configuration)
-        {
-            _client.BaseAddress = new Uri(configuration["IPAddress"]);
-            _client.DefaultRequestHeaders.Accept.Clear();
-            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-        }
-
-        public static T? GetRequest<T>(string requestUrl)
-        {
-            var response = _client.GetAsync(requestUrl);
-            var result = response.Result.Content.ReadAsStringAsync().Result;
-            if (response.Result.IsSuccessStatusCode)
-            {
-                return JsonConvert.DeserializeObject<T>(result);
-            }
-            else
-            {
-                throw new Exception(result);
-            }
-        }
-
-        public static void PostRequest<T>(string requestUrl, T model)
-        {
-            var json = JsonConvert.SerializeObject(model);
-            var data = new StringContent(json, Encoding.UTF8, "application/json");
-
-            var response = _client.PostAsync(requestUrl, data);
-
-            var result = response.Result.Content.ReadAsStringAsync().Result;
-            if (!response.Result.IsSuccessStatusCode)
-            {
-                throw new Exception(result);
-            }
-        }
-
-        public static void DeleteRequest(string requestUrl)
-        {
-            var response = _client.DeleteAsync(requestUrl);
-            var result = response.Result.Content.ReadAsStringAsync().Result;
-            if (!response.Result.IsSuccessStatusCode)
-            {
-                throw new Exception(result);
-            }
-        }
-    }
-}

Pizzeria/PizzeriaShopApp/Controllers/HomeController.cs

@@ -1,149 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.ViewModels;
-using PizzeriaShopApp.Models;
-using System.Diagnostics;
-
-namespace PizzeriaShopApp.Controllers
-{
-    public class HomeController : Controller
-    {
-        private readonly ILogger<HomeController> _logger;
-
-        public HomeController(ILogger<HomeController> logger)
-        {
-            _logger = logger;
-        }
-
-        public IActionResult Index()
-        {
-            if (APIClient.Password == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View(APIClient.GetRequest<List<ShopViewModel>>($"api/shop/getshoplist?password={APIClient.Password}"));
-        }
-
-        [HttpGet]
-        public IActionResult Enter()
-        {
-            return View();
-        }
-
-        [HttpPost]
-        public void Enter(string password)
-        {
-            bool resout = APIClient.GetRequest<bool>($"/api/shop/authentication?password={password}");
-            if (!resout)
-            {
-                Response.Redirect("../Home/Enter");
-                return;
-            }
-            APIClient.Password = password;
-            Response.Redirect("Index");
-        }
-
-        [HttpGet]
-        public IActionResult Create()
-        {
-            if (APIClient.Password == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View("Shop");
-        }
-
-        [HttpPost]
-        public void Create(int id, string shopname, string adress, DateTime openingdate, int maxcount)
-        {
-            if (string.IsNullOrEmpty(shopname) || string.IsNullOrEmpty(adress))
-            {
-                throw new Exception("Название или адрес не может быть пустым");
-            }
-            if (openingdate == default(DateTime))
-            {
-                throw new Exception("Дата открытия не может быть пустой");
-            }
-
-            APIClient.PostRequest($"api/shop/createshop?password={APIClient.Password}", new ShopBindingModel
-            {
-                Id = id,
-                ShopName = shopname,
-                Adress = adress,
-                OpeningDate = openingdate,
-                PizzaMaxCount = maxcount
-            });
-            Response.Redirect("Index");
-        }
-
-        [HttpGet]
-        public IActionResult Update(int Id)
-        {
-            if (APIClient.Password == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View("Shop", APIClient.GetRequest<ShopPizzaViewModel>($"api/shop/getshop?shopId={Id}&password={APIClient.Password}"));
-        }
-
-        [HttpPost]
-        public void Update(int id, string shopname, string adress, DateTime openingdate, int maxcount)
-        {
-            if (string.IsNullOrEmpty(shopname) || string.IsNullOrEmpty(adress))
-            {
-                throw new Exception("Название или адрес не может быть пустым");
-            }
-            if (openingdate == default(DateTime))
-            {
-                throw new Exception("Дата открытия не может быть пустой");
-            }
-            APIClient.PostRequest($"api/shop/updateshop?password={APIClient.Password}", new ShopBindingModel
-            {
-                Id = id,
-                ShopName = shopname,
-                Adress = adress,
-                OpeningDate = openingdate,
-                PizzaMaxCount = maxcount
-            });
-            Response.Redirect("../Index");
-        }
-
-        [HttpPost]
-        public void Delete(int Id)
-        {
-            APIClient.DeleteRequest($"api/shop/deleteshop?shopId={Id}&password={APIClient.Password}");
-            Response.Redirect("../Index");
-        }
-
-        [HttpGet]
-        public IActionResult Supply()
-        {
-            if (APIClient.Password == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            ViewBag.Shops = APIClient.GetRequest<List<ShopViewModel>>($"api/shop/getshoplist?password={APIClient.Password}");
-            ViewBag.Pizzas = APIClient.GetRequest<List<PizzaViewModel>>($"api/main/getpizzalist");
-            return View();
-        }
-
-        [HttpPost]
-        public void Supply(int shop, int pizza, int count)
-        {
-            APIClient.PostRequest($"api/shop/makesypply?password={APIClient.Password}", new SupplyBindingModel
-            {
-                ShopId = shop,
-                PizzaId = pizza,
-                Count = count
-            });
-            Response.Redirect("Index");
-        }
-
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Error()
-        {
-            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
-        }
-    }
-}

Pizzeria/PizzeriaShopApp/Models/ErrorViewModel.cs

@@ -1,9 +0,0 @@
-namespace PizzeriaShopApp.Models
-{
-    public class ErrorViewModel
-    {
-        public string? RequestId { get; set; }
-
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-    }
-}

Pizzeria/PizzeriaShopApp/PizzeriaShopApp.csproj

@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\PizzeriaContracts\PizzeriaContracts.csproj" />
-    <ProjectReference Include="..\PizzeriaDataModels\PizzeriaDataModels.csproj" />
-  </ItemGroup>
-
-</Project>

Pizzeria/PizzeriaShopApp/Program.cs

@@ -1,30 +0,0 @@
-using PizzeriaShopApp;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-builder.Services.AddControllersWithViews();
-
-var app = builder.Build();
-APIClient.Connect(builder.Configuration);
-
-// Configure the HTTP request pipeline.
-if (!app.Environment.IsDevelopment())
-{
-    app.UseExceptionHandler("/Home/Error");
-    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-    app.UseHsts();
-}
-
-app.UseHttpsRedirection();
-app.UseStaticFiles();
-
-app.UseRouting();
-
-app.UseAuthorization();
-
-app.MapControllerRoute(
-    name: "default",
-    pattern: "{controller=Home}/{action=Index}/{id?}");
-
-app.Run();

Pizzeria/PizzeriaShopApp/Properties/launchSettings.json

@@ -1,28 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:9856",
-      "sslPort": 44377
-    }
-  },
-  "profiles": {
-    "PizzeriaShopApp": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:7002;http://localhost:5279",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

Pizzeria/PizzeriaShopApp/Views/Home/Enter.cshtml

@@ -1,15 +0,0 @@
-@{
-	ViewData["Title"] = "Enter";
-}
-
-<div class="text-center">
-	<h2 class="display-4">Вход в систему</h2>
-</div>
-
-<form method="post">
-	<div class="mb-3">
-		<label class="form-label">Пароль</label>
-		<input class="form-control" type="password" name="password">
-	</div>
-	<input type="submit" value="Вход" class="btn btn-primary" />
-</form>

Pizzeria/PizzeriaShopApp/Views/Home/Index.cshtml

@@ -1,68 +0,0 @@
-@using PizzeriaContracts.ViewModels
-
-@model List<ShopViewModel>
-
-@{
-    ViewData["Title"] = "Home Page";
-}
-
-<div class="text-center">
-    <h1 class="display-4">Магазины</h1>
-</div>
-
-
-<div class="text-center ">
-    <p>
-        <a asp-action="Create">Создать магазин</a>
-    </p>
-
-    <table class="table">
-        <thead>
-            <tr>
-                <th>
-                    Номер
-                </th>
-                <th>
-                    Название
-                </th>
-                <th>
-                    Адрес
-                </th>
-                <th>
-                    Дата открытия
-                </th>
-                <th>
-                    Максимальная вместимость
-                </th>
-                <th>
-
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var item in Model)
-            {
-                <tr>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.Id)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.ShopName)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.Adress)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.OpeningDate)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.PizzaMaxCount)
-                    </td>
-                    <td>
-                        <a class="btn btn-primary" asp-action="Update" asp-route-Id="@(item.Id)" role="button">Изменить</a>
-                    </td>
-                </tr>
-            }
-        </tbody>
-    </table>
-</div>

Pizzeria/PizzeriaShopApp/Views/Home/Shop.cshtml

@@ -1,75 +0,0 @@
-@using PizzeriaDataModels.Models;
-@using PizzeriaContracts.ViewModels;
-
-@model ShopPizzaViewModel
-
-@{
-	ViewData["Title"] = "Shop";
-}
-
-<div class="text-center">
-	@{
-		if (Model == null)
-		{
-			<h2 class="display-4">Создание магазина</h2>
-		}
-		else
-		{
-			<h2 class="display-4">Изменение магазина</h2>
-		}
-	}
-</div>
-
-<form method="post">
-	<div class="mb-3">
-		<label class="form-label">Название</label>
-		<input type="text" class="form-control" name="shopname" id="shopname" value="@(Model==null ? "" : Model.Shop?.ShopName)" />
-	</div>
-	<div class="mb-3">
-		<label class="form-label">Адрес</label>
-		<input type="text" class="form-control" name="adress" id="adress" value="@(Model==null ? "" : Model.Shop?.Adress)" />
-	</div>
-	<div class="mb-3">
-		<label for="startDate">Дата открытия</label>
-		<input class="form-control" type="date" name="openingdate" id="openingdate" value="@(Model==null ? "" : Model.Shop?.OpeningDate.ToString("yyyy-MM-dd"))" />
-	</div>
-	<div class="mb-3">
-		<label class="form-label">Вместимость</label>
-		<input type="number" min="0" step="1" pattern="[0-9]" class="form-control" name="maxcount" id="maxcount" value="@(Model==null ? "" : Model.Shop?.PizzaMaxCount)" />
-	</div>
-	<div class="mb-3 ">
-		<input class="btn btn-primary" type="submit" value="Сохранить">
-		@{
-			if (Model != null && Model.Shop != null)
-			{
-				<input class="btn btn-danger" asp-action="Delete" type="submit" value="Удалить" asp-route-Id="@(Model==null ? 0 : Model.Shop.Id.ToString())">
-			}
-		}
-	</div>
-</form>
-@{
-	if (Model != null && Model.Shop != null)
-	{
-		<div>
-			<h6>Содержимое магазина</h6>
-		</div>
-		<table class="table">
-			<thead>
-				<tr>
-					<th>Название</th>
-					<th>Количество</th>
-				</tr>
-			</thead>
-			<tbody>
-				@foreach (var item in Model.ShopPizza)
-				{
-					<tr>
-						<td>@Html.DisplayFor(modelItem => item.Value.Pizza.PizzaName)</td>
-						<td>@Html.DisplayFor(modelItem => item.Value.Count)</td>
-					</tr>
-				}
-			</tbody>
-
-		</table>
-	}
-}

Pizzeria/PizzeriaShopApp/Views/Home/Supply.cshtml

@@ -1,22 +0,0 @@
-@{
-    ViewData["Title"] = "Supply";
-}
-<div class="text-center">
-    <h2 class="display-4">Создание поставки</h2>
-</div>
-<form method="post">
-    <div class="mb-3">
-        <label class="form-label">Магазин</label>
-        <select class="form-select form-select-lg" id="shop" name="shop" asp-items="@(new SelectList(@ViewBag.Shops,"Id", "ShopName"))"></select>
-    </div>
-    <div class="mb-3">
-        <label class="form-label">Пицца</label>
-        <select class="form-select form-select-lg" id="pizza" name="pizza" asp-items="@(new SelectList(@ViewBag.Pizzas,"Id", "PizzaName"))"></select>
-    </div>
-    <div class="mb-3">
-        <label class="form-label">Колличество</label>
-        <input type="number" min="0" step="1" pattern="[0-9]" class="form-control" name="count" id="count">
-    </div>
-    <input class="btn btn-success" type="submit" value="Создать поставку">
-    <a class="btn btn-primary" href="./Index" role="button">Отмена</a>
-</form>

Pizzeria/PizzeriaShopApp/Views/Shared/Error.cshtml

@@ -1,25 +0,0 @@
-@model ErrorViewModel
-@{
-    ViewData["Title"] = "Error";
-}
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
-
-@if (Model.ShowRequestId)
-{
-    <p>
-        <strong>Request ID:</strong> <code>@Model.RequestId</code>
-    </p>
-}
-
-<h3>Development Mode</h3>
-<p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
-</p>
-<p>
-    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
-    It can result in displaying sensitive information from exceptions to end users.
-    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
-    and restarting the app.
-</p>

Pizzeria/PizzeriaShopApp/Views/Shared/_Layout.cshtml

@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - PizzeriaShopApp</title>
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
-    <link rel="stylesheet" href="~/PizzeriaShopApp.styles.css" asp-append-version="true" />
-</head>
-<body>
-    <header>
-        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
-            <div class="container-fluid">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">PizzeriaShopsApi</a>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
-                        aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Supply">Поставка</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </nav>
-    </header>
-    <div class="container">
-        <main role="main" class="pb-3">
-            @RenderBody()
-        </main>
-    </div>
-
-    <footer class="border-top footer text-muted">
-        <div class="container">
-            &copy; 2024 - PizzeriaShopApp - <a asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
-        </div>
-    </footer>
-    <script src="~/lib/jquery/dist/jquery.min.js"></script>
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="~/js/site.js" asp-append-version="true"></script>
-    @await RenderSectionAsync("Scripts", required: false)
-</body>
-</html>

Pizzeria/PizzeriaShopApp/Views/Shared/_Layout.cshtml.css

@@ -1,48 +0,0 @@
-/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
-for details on configuring this project to bundle and minify static web assets. */
-
-a.navbar-brand {
-  white-space: normal;
-  text-align: center;
-  word-break: break-all;
-}
-
-a {
-  color: #0077cc;
-}
-
-.btn-primary {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-.border-top {
-  border-top: 1px solid #e5e5e5;
-}
-.border-bottom {
-  border-bottom: 1px solid #e5e5e5;
-}
-
-.box-shadow {
-  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
-}
-
-button.accept-policy {
-  font-size: 1rem;
-  line-height: inherit;
-}
-
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  white-space: nowrap;
-  line-height: 60px;
-}

Pizzeria/PizzeriaShopApp/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -1,2 +0,0 @@
-<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>

Pizzeria/PizzeriaShopApp/Views/_ViewImports.cshtml

@@ -1,3 +0,0 @@
-@using PizzeriaShopApp
-@using PizzeriaShopApp.Models
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

Pizzeria/PizzeriaShopApp/Views/_ViewStart.cshtml

@@ -1,3 +0,0 @@
-@{
-    Layout = "_Layout";
-}

Pizzeria/PizzeriaShopApp/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

Pizzeria/PizzeriaShopApp/appsettings.json

@@ -1,10 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-  "IPAddress": "http://localhost:5175/"
-}

Pizzeria/PizzeriaShopApp/wwwroot/css/site.css

@@ -1,18 +0,0 @@
-html {
-  font-size: 14px;
-}
-
-@media (min-width: 768px) {
-  html {
-    font-size: 16px;
-  }
-}
-
-html {
-  position: relative;
-  min-height: 100%;
-}
-
-body {
-  margin-bottom: 60px;
-}

Pizzeria/PizzeriaShopApp/wwwroot/js/site.js

@@ -1,4 +0,0 @@
-// Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
-// for details on configuring this project to bundle and minify static web assets.
-
-// Write your JavaScript code.