fix

.gitignore

@@ -14,11 +14,6 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
-# dll файлы
-*.dll
-
-/Pizzeria/ImplementationExtensions
-
 # Mono auto generated files
 mono_crash.*
 

Pizzeria/Pizzeria.sln

@@ -19,7 +19,9 @@ 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaClientApp", "PizzeriaClientApp\PizzeriaClientApp.csproj", "{7B233638-1F47-4A91-B483-7FFD9F5A4608}"
+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}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -63,6 +65,10 @@ 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/BackUpLogic.cs

@@ -1,97 +0,0 @@
-using Microsoft.Extensions.Logging;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using PizzeriaContracts.StoragesContracts;
-using PizzeriaDataModels;
-using System.IO.Compression;
-using System.Reflection;
-using System.Runtime.Serialization.Json;
-
-namespace PizzeriaBusinessLogic.BusinessLogics
-{
-    public class BackUpLogic : IBackUpLogic
-    {
-        private readonly ILogger _logger;
-
-        private readonly IBackUpInfo _backUpInfo;
-
-        public BackUpLogic(ILogger<BackUpLogic> logger, IBackUpInfo backUpInfo)
-        {
-            _logger = logger;
-            _backUpInfo = backUpInfo;
-        }
-
-        public void CreateBackUp(BackUpSaveBinidngModel model)
-        {
-            if (_backUpInfo == null)
-            {
-                return;
-            }
-            try
-            {
-                _logger.LogDebug("Clear folder");
-                var dirInfo = new DirectoryInfo(model.FolderName);
-                if (dirInfo.Exists)
-                {
-                    foreach (var file in dirInfo.GetFiles())
-                    {
-                        file.Delete();
-                    }
-                }
-                _logger.LogDebug("Delete archive");
-                string fileName = $"{model.FolderName}.zip";
-                if (File.Exists(fileName))
-                {
-                    File.Delete(fileName);
-                }
-                // берем метод для сохранения
-                _logger.LogDebug("Get assembly");
-                var typeIId = typeof(IId);
-                var assembly = typeIId.Assembly;
-                if (assembly == null)
-                {
-                    throw new ArgumentNullException("Сборка не найдена", nameof(assembly));
-                }
-                var types = assembly.GetTypes();
-                var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance);
-                _logger.LogDebug("Find {count} types", types.Length);
-                foreach (var type in types)
-                {
-                    if (type.IsInterface && type.GetInterface(typeIId.Name) != null)
-                    {
-                        var modelType = _backUpInfo.GetTypeByModelInterface(type.Name);
-                        if (modelType == null)
-                        {
-                            throw new InvalidOperationException($"Не найден класс-модель для {type.Name}");
-                        }
-                        _logger.LogDebug("Call SaveToFile method for {name} type", type.Name);
-                        // вызываем метод на выполнение
-                        method?.MakeGenericMethod(modelType).Invoke(this, new object[] { model.FolderName });
-                    }
-                }
-                _logger.LogDebug("Create zip and remove folder");
-                // архивируем
-                ZipFile.CreateFromDirectory(model.FolderName, fileName);
-                // удаляем папку
-                dirInfo.Delete(true);
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-
-        private void SaveToFile<T>(string folderName) where T : class, new()
-        {
-            var records = _backUpInfo.GetList<T>();
-            if (records == null)
-            {
-                _logger.LogWarning("{type} type get null list", typeof(T).Name);
-                return;
-            }
-            var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
-            using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate);
-            jsonFormatter.WriteObject(fs, records);
-        }
-    }
-}

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -4,7 +4,6 @@ using PizzeriaContracts.BusinessLogicsContracts;
 using PizzeriaContracts.SearchModels;
 using PizzeriaContracts.StoragesContracts;
 using PizzeriaContracts.ViewModels;
-using System.Text.RegularExpressions;
 
 namespace PizzeriaBusinessLogic.BusinessLogics
 {
@@ -97,16 +96,16 @@ namespace PizzeriaBusinessLogic.BusinessLogics
             {
                 throw new ArgumentNullException("Нет ФИО пользователя", nameof(model.ClientFIO));
             }
-            if (string.IsNullOrEmpty(model.Email) || !Regex.IsMatch(model.Email, @"^[a-z0-9._%+-]+\@([a-z0-9-]+\.)+[a-z]{2,4}$"))
+            if (string.IsNullOrEmpty(model.Email))
             {
-                throw new ArgumentNullException("Не указана валидная почта", nameof(model.Email));
+                throw new ArgumentNullException("Нет почты пользователя", nameof(model.Email));
             }
-            if (string.IsNullOrEmpty(model.Password) || !Regex.IsMatch(model.Password, @"^(?=.*[A-Za-z])(?=.*\d)(?=.*[^A-Za-z0-9\n]).{10,50}$"))
+            if (string.IsNullOrEmpty(model.Password))
             {
-                throw new ArgumentNullException("Не указан правильный пароль", nameof(model.Password));
+                throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password));
             }
-            _logger.LogInformation("Client. ClientFIO:{ClientFIO}.Email:{Email}.Id:{Id}",
-                model.ClientFIO, model.Email, model.Id);
+            _logger.LogInformation("Client. ClientFIO:{ClientFIO}.Email:{Email}.Password:{Password}.Id:{Id}",
+                model.ClientFIO, model.Email, model.Password, model.Id);
             var element = _clientStorage.GetElement(new ClientSearchModel
             {
                 ClientFIO = model.ClientFIO

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -1,90 +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 MessageInfoLogic : IMessageInfoLogic
-	{
-		private readonly ILogger _logger;
-		private readonly IMessageInfoStorage _messageInfoStorage;
-		private readonly IClientStorage _clientStorage;
-		public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage messageInfoStorage, IClientStorage clientStorage)
-		{
-			_logger = logger;
-			_messageInfoStorage = messageInfoStorage;
-			_clientStorage = clientStorage;
-		}
-		public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
-		{
-			_logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId}", model?.MessageId, model?.ClientId);
-			var list = model == null ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model);
-			if (list == null)
-			{
-				_logger.LogWarning("ReadList return null list");
-				return null;
-			}
-			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
-			return list;
-		}
-		public bool Create(MessageInfoBindingModel model)
-		{
-			CheckModel(model);
-			if (_messageInfoStorage.Insert(model) == null)
-			{
-				_logger.LogWarning("Insert operation failed");
-				return false;
-			}
-			return true;
-		}
-		private void CheckModel(MessageInfoBindingModel model, bool withParams = true)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-			if (!withParams)
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(model.MessageId))
-			{
-				throw new ArgumentNullException("Не указан id сообщения", nameof(model.MessageId));
-			}
-			if (string.IsNullOrEmpty(model.SenderName))
-			{
-				throw new ArgumentNullException("Не указао почта", nameof(model.SenderName));
-			}
-			if (string.IsNullOrEmpty(model.Subject))
-			{
-				throw new ArgumentNullException("Не указана тема", nameof(model.Subject));
-			}
-			if (string.IsNullOrEmpty(model.Body))
-			{
-				throw new ArgumentNullException("Не указан текст сообщения", nameof(model.Subject));
-			}
-
-			_logger.LogInformation("MessageInfo. MessageId:{MessageId}.SenderName:{SenderName}.Subject:{Subject}.Body:{Body}", model.MessageId, model.SenderName, model.Subject, model.Body);
-			var element = _clientStorage.GetElement(new ClientSearchModel
-			{
-				Email = model.SenderName
-			});
-			if (element == null)
-			{
-				_logger.LogWarning("Не удалоссь найти клиента, отправившего письмо с адреса Email:{Email}", model.SenderName);
-			}
-			else
-			{
-				model.ClientId = element.Id;
-			}
-		}
-	}
-}

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -5,8 +5,6 @@ using PizzeriaContracts.BusinessLogicsContracts;
 using PizzeriaContracts.SearchModels;
 using PizzeriaContracts.StoragesContracts;
 using PizzeriaContracts.ViewModels;
-using MigraDoc.Rendering;
-using PizzeriaBusinessLogic.MailWorker;
 
 namespace PizzeriaBusinessLogic.BusinessLogics
 {
@@ -14,13 +12,14 @@ namespace PizzeriaBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly AbstractMailWorker _mailWorker;
         static readonly object _locker = new object();
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker)
+        private readonly IShopStorage _shopStorage;
+
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _mailWorker = mailWorker;
+            _shopStorage = shopStorage;
         }
 
         public OrderViewModel? ReadElement(OrderSearchModel model)
@@ -44,7 +43,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
             _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);
+            model?.ClientId, model?.Status, model?.ImplementerId, model?.DateFrom, model?.DateTo, model?.Id);
             var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
             if (list == null)
             {
@@ -61,18 +60,11 @@ namespace PizzeriaBusinessLogic.BusinessLogics
             if (model.Status != OrderStatus.Неизвестен)
                 return false;
             model.Status = OrderStatus.Принят;
-            var element = _orderStorage.Insert(model);
-            if (element == null)
+            if (_orderStorage.Insert(model) == null)
             {
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
-            Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel
-            {
-                MailAddress = element.ClientEmail,
-                Subject = $"Изменение статуса заказа номер {element.Id}",
-                Text = $"Ваш заказ номер {element.Id} на пиццу {element.PizzaName} от {element.DateCreate} на сумму {element.Sum} принят."
-            }));
             return true;
         }
 
@@ -91,7 +83,29 @@ namespace PizzeriaBusinessLogic.BusinessLogics
 
         public bool DeliveryOrder(OrderBindingModel model)
         {
-            return ChangeStatus(model, OrderStatus.Выдан);
+            lock (_locker)
+            {
+                model = FillOrderBindingModel(model);
+                if (model.Status != OrderStatus.Готов && model.Status != OrderStatus.Ожидает)
+                {
+                    _logger.LogWarning("Changing status operation faled: Current-{Status}:required-Выдан.", model.Status);
+                    throw new InvalidOperationException($"Невозможно приствоить статус выдан заказу с текущим статусом {model.Status}");
+                }
+                if (!_shopStorage.RestockingShops(new SupplyBindingModel
+                {
+                    PizzaId = model.PizzaId,
+                    Count = model.Count
+                }))
+                {
+                    if (model.Status == OrderStatus.Готов || model.Status == OrderStatus.Ожидает)
+                    {
+                        model.Status = OrderStatus.Ожидает;
+                        return UpdateOrder(model);
+                    }
+                }
+                model.Status = OrderStatus.Выдан;
+                return UpdateOrder(model);
+            }
         }
 
         private void CheckModel(OrderBindingModel model, bool withParams = true)
@@ -119,8 +133,22 @@ namespace PizzeriaBusinessLogic.BusinessLogics
             _logger.LogInformation("Pizza. PizzaId:{PizzaId}.Count:{Count}.Sum:{Sum}Id:{Id}",
                 model.PizzaId, model.Count, model.Sum, model.Id);
         }
-
         private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus)
+        {
+            model = FillOrderBindingModel(model);
+
+            if (requiredStatus - model.Status == 1)
+            {
+                model.Status = requiredStatus;
+                if (model.Status == OrderStatus.Готов)
+                    model.DateImplement = DateTime.Now;
+                return UpdateOrder(model);
+            }
+            _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
+            throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+        }
+
+        private OrderBindingModel FillOrderBindingModel(OrderBindingModel model)
         {
             CheckModel(model, false);
             var element = _orderStorage.GetElement(new OrderSearchModel()
@@ -131,40 +159,30 @@ namespace PizzeriaBusinessLogic.BusinessLogics
             {
                 throw new InvalidOperationException(nameof(element));
             }
+            model.Id = element.Id;
             model.DateCreate = element.DateCreate;
             model.PizzaId = element.PizzaId;
             model.DateImplement = element.DateImplement;
             model.ClientId = element.ClientId;
+            model.Status = element.Status;
+            model.Count = element.Count;
+            model.Sum = element.Sum;
             if (!model.ImplementerId.HasValue)
             {
                 model.ImplementerId = element.ImplementerId;
             }
-            model.Status = element.Status;
-            model.Count = element.Count;
-            model.Sum = element.Sum;
-            if (requiredStatus - model.Status == 1)
+            return model;
+        }
+
+        private bool UpdateOrder(OrderBindingModel model)
+        {
+            if (_orderStorage.Update(model) == null)
             {
-                model.Status = requiredStatus;
-                if (model.Status == OrderStatus.Готов)
-                {
-                    model.DateImplement = DateTime.Now;
-                }
-                if (_orderStorage.Update(model) == null)
-                {
-                    _logger.LogWarning("Update operation failed");
-                    return false;
-                }
-                string DateInfo = model.DateImplement.HasValue ? $"Дата выполнения {model.DateImplement}" : "";
-                Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel
-                {
-                    MailAddress = element.ClientEmail,
-                    Subject = $"Изменение статуса заказа номер {element.Id}",
-                    Text = $"Ваш заказ номер {element.Id} на пиццу {element.PizzaName} от {element.DateCreate} на сумму {element.Sum} {model.Status}. {DateInfo}"
-                }));
-                return true;
+                _logger.LogWarning("Update operation failed");
+                return false;
             }
-            _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
-            throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+            _logger.LogWarning("Update operation sucsess");
+            return true;
         }
     }
 }

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ReportLogic.cs

@@ -13,16 +13,18 @@ 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,
+        public ReportLogic(IPizzaStorage pizzaStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, IShopStorage shopStorage,
             AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
             _pizzaStorage = pizzaStorage;
             _componentStorage = componentStorage;
             _orderStorage = orderStorage;
+            _shopStorage = shopStorage;
 
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
@@ -55,7 +57,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
 
         public void SavePizzasToWordFile(ReportBindingModel model)
         {
-            _saveToWord.CreateDoc(new WordInfo
+            _saveToWord.CreatePizzaDoc(new WordInfo
             {
                 FileName = model.FileName,
                 Title = "Список пицц",
@@ -84,5 +86,55 @@ 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

@@ -0,0 +1,187 @@
+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

@@ -30,12 +30,14 @@ namespace PizzeriaBusinessLogic.BusinessLogics
                 _logger.LogWarning("DoWork. Implementers is null");
                 return;
             }
-            var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
-            if (orders == null || orders.Count == 0)
+            var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Выдан });
+            int count = _orderLogic.ReadList(null).Count;
+            if (orders == null || count == orders.Count)
             {
                 _logger.LogWarning("DoWork. Orders is null or empty");
                 return;
             }
+            orders = _orderLogic.ReadList(null);
             _logger.LogDebug("DoWork for {Count} orders", orders.Count);
             foreach (var implementer in implementers)
             {
@@ -49,6 +51,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
             {
                 return;
             }
+            await DeliverWaitingOrder(implementer);
             await RunOrderInWork(implementer);
 
             await Task.Run(() =>
@@ -71,6 +74,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
                         {
                             Id = order.Id
                         });
+                        _orderLogic.DeliveryOrder(new OrderBindingModel { Id = order.Id });
                     }
                     // кто-то мог уже перехватить заказ, игнорируем ошибку
                     catch (InvalidOperationException ex)
@@ -115,6 +119,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
                 {
                     Id = runOrder.Id
                 });
+                _orderLogic.DeliveryOrder(new OrderBindingModel { Id = runOrder.Id });
                 // отдыхаем
                 Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
             }
@@ -130,5 +135,47 @@ namespace PizzeriaBusinessLogic.BusinessLogics
                 throw;
             }
         }
+
+        private async Task DeliverWaitingOrder(ImplementerViewModel implementer)
+        {
+            if (_orderLogic == null || implementer == null)
+            {
+                return;
+            }
+            var waitingOrders = await Task.Run(() => _orderLogic.ReadList(new OrderSearchModel
+            {
+                ImplementerId = implementer.Id,
+                Status = OrderStatus.Ожидает
+            }));
+            if (waitingOrders == null || waitingOrders.Count == 0)
+            {
+                return;
+            }
+            _logger.LogInformation("DeliverWaitingOrder. Find some waitig order for implementer:{id}.Count:{count}", implementer.Id, waitingOrders.Count);
+            foreach (var waitingOrder in waitingOrders)
+            {
+                try
+                {
+                    _logger.LogInformation("DeliverWaitingOrder. Trying to deliver order id:{id}", waitingOrder.Id);
+                    var res = _orderLogic.DeliveryOrder(new OrderBindingModel
+                    {
+                        Id = waitingOrder.Id
+                    });
+                }
+                catch (ArgumentException ex)
+                {
+                    _logger.LogWarning(ex, "DeliverWaitingOrder. Fault");
+                }
+                catch (InvalidOperationException ex)
+                {
+                    _logger.LogWarning(ex, "Error try deliver order");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Error while do work");
+                    throw;
+                }
+            }
+        }
     }
 }

Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -1,85 +0,0 @@
-using Microsoft.Extensions.Logging;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaBusinessLogic.MailWorker
-{
-	public abstract class AbstractMailWorker
-	{
-		protected string _mailLogin = string.Empty;
-		protected string _mailPassword = string.Empty;
-		protected string _smtpClientHost = string.Empty;
-		protected int _smtpClientPort;
-		protected string _popHost = string.Empty;
-		protected int _popPort;
-		private readonly IMessageInfoLogic _messageInfoLogic;
-		private readonly ILogger _logger;
-
-		public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic)
-		{
-			_logger = logger;
-			_messageInfoLogic = messageInfoLogic;
-		}
-		public void MailConfig(MailConfigBindingModel config)
-		{
-			_mailLogin = config.MailLogin;
-			_mailPassword = config.MailPassword;
-			_smtpClientHost = config.SmtpClientHost;
-			_smtpClientPort = config.SmtpClientPort;
-			_popHost = config.PopHost;
-			_popPort = config.PopPort;
-			_logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, {popHost}, {popPort}", _mailLogin, _mailPassword.Length, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
-		}
-		public async void MailSendAsync(MailSendInfoBindingModel info)
-		{
-			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-			{
-				return;
-			}
-
-			if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0)
-			{
-				return;
-			}
-
-			if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
-			{
-				return;
-			}
-
-			_logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject);
-			await SendMailAsync(info);
-		}
-		public async void MailCheck()
-		{
-			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-			{
-				return;
-			}
-
-			if (string.IsNullOrEmpty(_popHost) || _popPort == 0)
-			{
-				return;
-			}
-
-			if (_messageInfoLogic == null)
-			{
-				return;
-			}
-
-			var list = await ReceiveMailAsync();
-			_logger.LogDebug("Check Mail: {Count} new mails", list.Count);
-			foreach (var mail in list)
-			{
-				_messageInfoLogic.Create(mail);
-			}
-		}
-		protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
-		protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
-	}
-}

Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs

@@ -1,82 +0,0 @@
-using MailKit.Net.Pop3;
-using MailKit.Security;
-using Microsoft.Extensions.Logging;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaBusinessLogic.MailWorker
-{
-	public class MailKitWorker : AbstractMailWorker
-	{
-		public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { }
-
-		protected override async Task SendMailAsync(MailSendInfoBindingModel info)
-		{
-			using var objMailMessage = new MailMessage();
-			using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
-			try
-			{
-				objMailMessage.From = new MailAddress(_mailLogin);
-				objMailMessage.To.Add(new MailAddress(info.MailAddress));
-				objMailMessage.Subject = info.Subject;
-				objMailMessage.Body = info.Text;
-				objMailMessage.SubjectEncoding = Encoding.UTF8;
-				objMailMessage.BodyEncoding = Encoding.UTF8;
-
-				objSmtpClient.UseDefaultCredentials = false;
-				objSmtpClient.EnableSsl = true;
-				objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
-				objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
-
-				await Task.Run(() => objSmtpClient.Send(objMailMessage));
-			}
-			catch (Exception)
-			{
-				throw;
-			}
-		}
-
-		protected override async Task<List<MessageInfoBindingModel>> ReceiveMailAsync()
-		{
-			var list = new List<MessageInfoBindingModel>();
-			using var client = new Pop3Client();
-			await Task.Run(() =>
-			{
-				try
-				{
-					client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
-					client.Authenticate(_mailLogin, _mailPassword);
-					for (int i = 0; i < client.Count; i++)
-					{
-						var message = client.GetMessage(i);
-						foreach (var mail in message.From.Mailboxes)
-						{
-							list.Add(new MessageInfoBindingModel
-							{
-								DateDelivery = message.Date.DateTime,
-								MessageId = message.MessageId,
-								SenderName = mail.Address,
-								Subject = message.Subject,
-								Body = message.TextBody
-							});
-						}
-					}
-				}
-				catch (MailKit.Security.AuthenticationException)
-				{ }
-				finally
-				{
-					client.Disconnect(true);
-				}
-			});
-			return list;
-		}
-	}
-}

Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -75,9 +75,82 @@ namespace PizzeriaBusinessLogic.OfficePackage
 
             SaveExcel(info);
         }
-        protected abstract void CreateExcel(ExcelInfo 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 InsertCellInWorksheet(ExcelCellParameters excelParams);
         protected abstract void MergeCells(ExcelMergeParameters excelParams);
-        protected abstract void SaveExcel(ExcelInfo info);
+        protected abstract void SaveExcel(IDocument info);
     }
 }

Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -33,10 +33,40 @@ namespace PizzeriaBusinessLogic.OfficePackage
 
             SavePdf(info);
         }
-        protected abstract void CreatePdf(PdfInfo 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 CreateParagraph(PdfParagraph paragraph);
         protected abstract void CreateTable(List<string> columns);
         protected abstract void CreateRow(PdfRowParameters rowParameters);
-        protected abstract void SavePdf(PdfInfo info);
+        protected abstract void SavePdf(IDocument info);
     }
 }

Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -10,7 +10,7 @@ namespace PizzeriaBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToWord
     {
-        public void CreateDoc(WordInfo info)
+        public void CreatePizzaDoc(WordInfo info)
         {
             CreateWord(info);
 
@@ -42,8 +42,52 @@ namespace PizzeriaBusinessLogic.OfficePackage
 
             SaveWord(info);
         }
-        protected abstract void CreateWord(WordInfo 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 CreateParagraph(WordParagraph paragraph);
-        protected abstract void SaveWord(WordInfo info);
+        protected abstract void SaveWord(IDocument info);
+        protected abstract void CreateTable(List<string> colums);
+        protected abstract void CreateRow(WordRowParameters rowParameters);
     }
 }

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/ExcelShop.cs

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,18 @@
+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
+    public class PdfInfo : IDocument
     {
         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
+    public class WordInfo : IDocument
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/WordRowParameters.cs

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,14 @@
+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(ExcelInfo info)
+        protected override void CreateExcel(IDocument info)
         {
             _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
             // Создаем книгу (в ней хранятся листы)
@@ -269,7 +269,7 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
             mergeCells.Append(mergeCell);
         }
 
-        protected override void SaveExcel(ExcelInfo info)
+        protected override void SaveExcel(IDocument 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(PdfInfo info)
+        protected override void CreatePdf(IDocument info)
         {
             _document = new Document();
             DefineStyles(_document);
@@ -96,7 +96,7 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
             }
         }
 
-        protected override void SavePdf(PdfInfo info)
+        protected override void SavePdf(IDocument info)
         {
             var renderer = new PdfDocumentRenderer(true)
             {

Pizzeria/PizzeriaBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -21,6 +21,7 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
                 _ => JustificationValues.Left,
             };
         }
+
         private static SectionProperties CreateSectionProperties()
         {
             var properties = new SectionProperties();
@@ -34,6 +35,7 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
 
             return properties;
         }
+
         private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
         {
             if (paragraphProperties == null)
@@ -64,13 +66,15 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
 
             return properties;
         }
-        protected override void CreateWord(WordInfo info)
+
+        protected override void CreateWord(IDocument 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)
@@ -100,7 +104,8 @@ namespace PizzeriaBusinessLogic.OfficePackage.Implements
 
             _docBody.AppendChild(docParagraph);
         }
-        protected override void SaveWord(WordInfo info)
+
+        protected override void SaveWord(IDocument info)
         {
             if (_docBody == null || _wordDocument == null)
             {
@@ -112,5 +117,77 @@ 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/PizzeriaBusinessLogic/PizzeriaBusinessLogic.csproj

@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
-    <PackageReference Include="MailKit" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
   </ItemGroup>

Pizzeria/PizzeriaClientApp/Controllers/HomeController.cs

@@ -143,15 +143,5 @@ namespace PizzeriaClientApp.Controllers
             var piz = APIClient.GetRequest<PizzaViewModel>($"api/main/getpizza?pizzaId={pizza}");
             return count * (piz?.Price ?? 1);
         }
-
-        [HttpGet]
-        public IActionResult Mails()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
-        }
     }
 }

Pizzeria/PizzeriaClientApp/Views/Home/Create.cshtml

@@ -6,7 +6,7 @@
 </div>
 <form method="post">
 	<div class="row">
-		<div class="col-4">Пицца:</div>
+		<div class="col-4">Изделие:</div>
 		<div class="col-8">
 			<select id="pizza" name="pizza" class="form-control" asp-items="@(new SelectList(@ViewBag.Pizzas,"Id", "PizzaName"))"></select>
 		</div>

Pizzeria/PizzeriaClientApp/Views/Home/Mails.cshtml

@@ -1,55 +0,0 @@
-@using PizzeriaContracts.ViewModels
-
-@model List<MessageInfoViewModel>
-
-@{
-	ViewData["Title"] = "Mails";
-}
-
-
-<div class="text-center">
-	<h1 class="display-4">Заказы</h1>
-</div>
-
-
-<div class="text-center">
-	@{
-		if (Model == null)
-		{
-			<h3 class="display-4">Авторизируйтесь</h3>
-			return;
-		}
-
-		<table class="table">
-			<thead>
-				<tr>
-					<th>
-						Дата письма
-					</th>
-					<th>
-						Заголовок
-					</th>
-					<th>
-						Текст
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				@foreach (var item in Model)
-				{
-					<tr>
-						<td>
-							@Html.DisplayFor(modelItem => item.DateDelivery)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Subject)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Body)
-						</td>
-					</tr>
-				}
-			</tbody>
-		</table>
-	}
-</div>

Pizzeria/PizzeriaClientApp/Views/Shared/_Layout.cshtml

@@ -25,9 +25,6 @@
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Mails">Письма</a>
-                        </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a>
                         </li>
@@ -47,7 +44,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2023 - PizzeriaClientApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+            &copy; 2024 - 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/Attributes/ColumnAttribute.cs

@@ -1,25 +0,0 @@
-namespace PizzeriaContracts.Attributes
-{
-    [AttributeUsage(AttributeTargets.Property)]
-    public class ColumnAttribute : Attribute
-    {
-        public string Title { get; private set; }
-
-        public bool Visible { get; private set; }
-
-        public int Width { get; private set; }
-
-        public GridViewAutoSize GridViewAutoSize { get; private set; }
-
-        public bool IsUseAutoSize { get; private set; }
-
-        public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false)
-        {
-            Title = title;
-            Visible = visible;
-            Width = width;
-            GridViewAutoSize = gridViewAutoSize;
-            IsUseAutoSize = isUseAutoSize;
-        }
-    }
-}

Pizzeria/PizzeriaContracts/Attributes/GridViewAutoSize.cs

@@ -1,21 +0,0 @@
-namespace PizzeriaContracts.Attributes
-{
-    public enum GridViewAutoSize
-    {
-        NotSet = 0,
-
-        None = 1,
-
-        ColumnHeader = 2,
-
-        AllCellsExceptHeader = 4,
-
-        AllCells = 6,
-
-        DisplayedCellsExceptHeader = 8,
-
-        DisplayedCells = 10,
-
-        Fill = 16
-    }
-}

Pizzeria/PizzeriaContracts/BindingModels/BackUpSaveBinidngModel.cs

@@ -1,7 +0,0 @@
-namespace PizzeriaContracts.BindingModels
-{
-    public class BackUpSaveBinidngModel
-    {
-        public string FolderName { get; set; } = string.Empty;
-    }
-}

Pizzeria/PizzeriaContracts/BindingModels/MailConfigBindingModel.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.BindingModels
-{
-	public class MailConfigBindingModel
-	{
-		public string MailLogin { get; set; } = string.Empty;
-		public string MailPassword { get; set; } = string.Empty;
-		public string SmtpClientHost { get; set; } = string.Empty;
-		public int SmtpClientPort { get; set; }
-		public string PopHost { get; set; } = string.Empty;
-		public int PopPort { get; set; }
-	}
-}

Pizzeria/PizzeriaContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.BindingModels
-{
-	public class MailSendInfoBindingModel
-	{
-		public string MailAddress { get; set; } = string.Empty;
-		public string Subject { get; set; } = string.Empty;
-		public string Text { get; set; } = string.Empty;
-	}
-}

Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs

@@ -1,15 +0,0 @@
-using PizzeriaDataModels.Models;
-
-namespace PizzeriaContracts.BindingModels
-{
-	public class MessageInfoBindingModel : IMessageInfoModel
-	{
-		public string MessageId { get; set; } = string.Empty;
-		public int? ClientId { get; set; }
-		public string SenderName { get; set; } = string.Empty;
-		public string Subject { get; set; } = string.Empty;
-		public string Body { get; set; } = string.Empty;
-		public DateTime DateDelivery { get; set; }
-        public int Id => throw new NotImplementedException();
-    }
-}

Pizzeria/PizzeriaContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,16 @@
+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/IBackUpLogic.cs

@@ -1,9 +0,0 @@
-using PizzeriaContracts.BindingModels;
-
-namespace PizzeriaContracts.BusinessLogicsContracts
-{
-    public interface IBackUpLogic
-    {
-        void CreateBackUp(BackUpSaveBinidngModel model);
-    }
-}

Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

@@ -1,17 +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 IMessageInfoLogic
-	{
-		List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model);
-		bool Create(MessageInfoBindingModel model);
-	}
-}

Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -7,8 +7,13 @@ 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

@@ -0,0 +1,22 @@
+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/DI/DependencyManager.cs

@@ -1,61 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace PizzeriaContracts.DI
-{
-    public class DependencyManager
-    {
-        private readonly IDependencyContainer _dependencyManager;
-
-        private static DependencyManager? _manager;
-
-        private static readonly object _locjObject = new();
-
-        private DependencyManager()
-        {
-            _dependencyManager = new ServiceDependencyContainer();
-        }
-
-        public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } } return _manager; } }
-
-        /// <summary>
-        /// Иницализация библиотек, в которых идут установки зависомстей
-        /// </summary>
-        public static void InitDependency()
-        {
-            var ext = ServiceProviderLoader.GetImplementationExtensions();
-            if (ext == null)
-            {
-                throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
-            }
-            // регистрируем зависимости
-            ext.RegisterServices();
-        }
-
-        /// <summary>
-        /// Регистрация логгера
-        /// </summary>
-        /// <param name="configure"></param>
-        public void AddLogging(Action<ILoggingBuilder> configure) => _dependencyManager.AddLogging(configure);
-
-        /// <summary>
-        /// Добавление зависимости
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="U"></typeparam>
-        public void RegisterType<T, U>(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType<T, U>(isSingle);
-
-        /// <summary>
-        /// Добавление зависимости
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="U"></typeparam>
-        public void RegisterType<T>(bool isSingle = false) where T : class => _dependencyManager.RegisterType<T>(isSingle);
-
-        /// <summary>
-        /// Получение класса со всеми зависмостями
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        public T Resolve<T>() => _dependencyManager.Resolve<T>();
-    }
-}

Pizzeria/PizzeriaContracts/DI/IDependencyContainer.cs

@@ -1,35 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace PizzeriaContracts.DI
-{
-    public interface IDependencyContainer
-    {
-        /// <summary>
-        /// Регистрация логгера
-        /// </summary>
-        /// <param name="configure"></param>
-        void AddLogging(Action<ILoggingBuilder> configure);
-
-        /// <summary>
-        /// Добавление зависимости
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="U"></typeparam>
-        /// <param name="isSingle"></param>
-        void RegisterType<T, U>(bool isSingle) where U : class, T where T : class;
-
-        /// <summary>
-        /// Добавление зависимости
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="isSingle"></param>
-        void RegisterType<T>(bool isSingle) where T : class;
-
-        /// <summary>
-        /// Получение класса со всеми зависмостями
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        T Resolve<T>();
-    }
-}

Pizzeria/PizzeriaContracts/DI/IImplementationExtension.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.DI
-{
-    public interface IImplementationExtension
-    {
-        public int Priority { get; }
-        /// <summary>
-        /// Регистрация сервисов
-        /// </summary>
-        public void RegisterServices();
-    }
-}

Pizzeria/PizzeriaContracts/DI/ServiceDependencyContainer.cs

@@ -1,57 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace PizzeriaContracts.DI
-{
-    public class ServiceDependencyContainer : IDependencyContainer
-    {
-        private ServiceProvider? _serviceProvider;
-
-        private readonly ServiceCollection _serviceCollection;
-
-        public ServiceDependencyContainer()
-        {
-            _serviceCollection = new ServiceCollection();
-        }
-
-        public void AddLogging(Action<ILoggingBuilder> configure)
-        {
-            _serviceCollection.AddLogging(configure);
-        }
-
-        public void RegisterType<T, U>(bool isSingle) where U : class, T where T : class
-        {
-            if (isSingle)
-            {
-                _serviceCollection.AddSingleton<T, U>();
-            }
-            else
-            {
-                _serviceCollection.AddTransient<T, U>();
-            }
-            _serviceProvider = null;
-        }
-
-        public void RegisterType<T>(bool isSingle) where T : class
-        {
-            if (isSingle)
-            {
-                _serviceCollection.AddSingleton<T>();
-            }
-            else
-            {
-                _serviceCollection.AddTransient<T>();
-            }
-            _serviceProvider = null;
-        }
-
-        public T Resolve<T>()
-        {
-            if (_serviceProvider == null)
-            {
-                _serviceProvider = _serviceCollection.BuildServiceProvider();
-            }
-            return _serviceProvider.GetService<T>()!;
-        }
-    }
-}

Pizzeria/PizzeriaContracts/DI/ServiceProviderLoader.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaContracts.DI
-{
-    public class ServiceProviderLoader
-    {
-        /// <summary>
-        /// Загрузка всех классов-реализаций IImplementationExtension
-        /// </summary>
-        /// <returns></returns>
-        public static IImplementationExtension? GetImplementationExtensions()
-        {
-            IImplementationExtension? source = null;
-            var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories);
-            foreach (var file in files.Distinct())
-            {
-                Assembly asm = Assembly.LoadFrom(file);
-                foreach (var t in asm.GetExportedTypes())
-                {
-                    if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t))
-                    {
-                        if (source == null)
-                        {
-                            source = (IImplementationExtension)Activator.CreateInstance(t)!;
-                        }
-                        else
-                        {
-                            var newSource = (IImplementationExtension)Activator.CreateInstance(t)!;
-                            if (newSource.Priority > source.Priority)
-                            {
-                                source = newSource;
-                            }
-                        }
-                    }
-                }
-            }
-            return source;
-        }
-
-        private static string TryGetImplementationExtensionsFolder()
-        {
-            var directory = new DirectoryInfo(Directory.GetCurrentDirectory());
-            while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions"))
-            {
-                directory = directory.Parent;
-            }
-            return $"{directory?.FullName}\\ImplementationExtensions";
-        }
-    }
-}

Pizzeria/PizzeriaContracts/PizzeriaContracts.csproj

@@ -6,10 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\PizzeriaDataModels\PizzeriaDataModels.csproj" />
   </ItemGroup>

Pizzeria/PizzeriaContracts/SearchModels/ShopSearchModel.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace PizzeriaContracts.SearchModels
 {
-	public class MessageInfoSearchModel
-	{
-		public int? ClientId { get; set; }
-		public string? MessageId { get; set; }
-	}
-}
+    public class ShopSearchModel
+    {
+        public int? Id { get; set; }
+        public string? ShopName { get; set; }
+    }
+}

Pizzeria/PizzeriaContracts/SearchModels/SupplySearchModel.cs

@@ -0,0 +1,14 @@
+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/IBackUpInfo.cs

@@ -1,9 +0,0 @@
-namespace PizzeriaContracts.StoragesContracts
-{
-    public interface IBackUpInfo
-    {
-        List<T>? GetList<T>() where T : class, new();
-
-        Type? GetTypeByModelInterface(string modelInterfaceName);
-    }
-}

Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -1,19 +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 IMessageInfoStorage
-	{
-		List<MessageInfoViewModel> GetFullList();
-		List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model);
-		MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
-		MessageInfoViewModel? Insert(MessageInfoBindingModel model);
-	}
-}

Pizzeria/PizzeriaContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,23 @@
+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/ClientViewModel.cs

@@ -1,18 +1,16 @@
-using PizzeriaContracts.Attributes;
-using PizzeriaDataModels.Models;
+using PizzeriaDataModels.Models;
 using System.ComponentModel;
 
 namespace PizzeriaContracts.ViewModels
 {
     public class ClientViewModel : IClientModel
     {
-        [Column(visible: false)]
         public int Id { get; set; }
-        [Column(title: "ФИО клиента", width: 150)]
+        [DisplayName("ФИО клиента")]
         public string ClientFIO { get; set; } = string.Empty;
-        [Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Логин (эл. почта)")]
         public string Email { get; set; } = string.Empty;
-        [Column(title: "Пароль", width: 150)]
+        [DisplayName("Пароль")]
         public string Password { get; set; } = string.Empty;
     }
 }

Pizzeria/PizzeriaContracts/ViewModels/ComponentViewModel.cs

@@ -1,5 +1,4 @@
-using PizzeriaContracts.Attributes;
-using PizzeriaDataModels.Models;
+using PizzeriaDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,13 +10,12 @@ namespace PizzeriaContracts.ViewModels
 {
     public class ComponentViewModel : IComponentModel
     {
-        [Column(visible: false)]
         public int Id { get; set; }
 
-        [Column(title: "Название ингридиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Название ингредиента")]
         public string ComponentName { get; set; } = string.Empty;
 
-        [Column(title: "Цена", width: 150)]
+        [DisplayName("Цена")]
         public double Cost { get; set; }
     }
 }

Pizzeria/PizzeriaContracts/ViewModels/ImplementerViewModel.cs

@@ -1,5 +1,4 @@
-using PizzeriaContracts.Attributes;
-using PizzeriaDataModels.Models;
+using PizzeriaDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,19 +10,18 @@ namespace PizzeriaContracts.ViewModels
 {
     public class ImplementerViewModel : IImplementerModel
     {
-        [Column(visible: false)]
         public int Id { get; set; }
 
-        [Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("ФИО исполнителя")]
         public string ImplementerFIO { get; set; } = string.Empty;
 
-        [Column(title: "Пароль", width: 100)]
+        [DisplayName("Пароль")]
         public string Password { get; set; } = string.Empty;
 
-        [Column(title: "Стаж работы", width: 60)]
+        [DisplayName("Стаж работы")]
         public int WorkExperience { get; set; }
 
-        [Column(title: "Квалификация", width: 60)]
+        [DisplayName("Квалификация")]
         public int Qualification { get; set; }
     }
 }

Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,29 +0,0 @@
-using PizzeriaContracts.Attributes;
-using PizzeriaDataModels.Models;
-
-namespace PizzeriaContracts.ViewModels
-{
-	public class MessageInfoViewModel : IMessageInfoModel
-	{
-        [Column(visible: false)]
-        public int Id { get; set; }
-
-        [Column(visible: false)]
-        public string MessageId { get; set; } = string.Empty;
-
-        [Column(visible: false)]
-        public int? ClientId { get; set; }
-
-        [Column(title: "Отправитель", width: 150)]
-        public string SenderName { get; set; } = string.Empty;
-
-        [Column(title: "Дата письма", width: 120)]
-        public DateTime DateDelivery { get; set; }
-
-        [Column(title: "Заголовок", width: 120)]
-        public string Subject { get; set; } = string.Empty;
-
-        [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
-        public string Body { get; set; } = string.Empty;
-	}
-}

Pizzeria/PizzeriaContracts/ViewModels/OrderViewModel.cs

@@ -1,5 +1,4 @@
-using PizzeriaContracts.Attributes;
-using PizzeriaDataModels.Enums;
+using PizzeriaDataModels.Enums;
 using PizzeriaDataModels.Models;
 using System;
 using System.Collections.Generic;
@@ -12,43 +11,36 @@ namespace PizzeriaContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
-        [Column(title: "Номер", width: 90)]
+        [DisplayName("Номер")]
         public int Id { get; set; }
 
-        [Column(visible: false)]
         public int ClientId { get; set; }
 
-        [Column(title: "Имя клиента", width: 190)]
+        [DisplayName("ФИО клиента")]
         public string ClientFIO { get; set; } = string.Empty;
 
-        [Column(visible: false)]
-        public string ClientEmail { get; set; } = string.Empty;
-
-        [Column(visible: false)]
         public int? ImplementerId { get; set; }
-
-        [Column(title: "Исполнитель", width: 150)]
+        [DisplayName("Исполнитель")]
         public string? ImplementerFIO { get; set; } = null;
 
-        [Column(visible: false)]
         public int PizzaId { get; set; }
 
-        [Column(title: "Пицца", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Пицца")]
         public string PizzaName { get; set; } = string.Empty;
 
-        [Column(title: "Количество", width: 100)]
+        [DisplayName("Количество")]
         public int Count { get; set; }
 
-        [Column(title: "Сумма", width: 120)]
+        [DisplayName("Сумма")]
         public double Sum { get; set; }
 
-        [Column(title: "Статус", width: 70)]
+        [DisplayName("Статус")]
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
 
-        [Column(title: "Дата создания", width: 120)]
+        [DisplayName("Дата создания")]
         public DateTime DateCreate { get; set; } = DateTime.Now;
 
-        [Column(title: "Дата выполнения", width: 120)]
+        [DisplayName("Дата выполнения")]
         public DateTime? DateImplement { get; set; }
     }
 }

Pizzeria/PizzeriaContracts/ViewModels/PizzaCount.cs

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

Pizzeria/PizzeriaContracts/ViewModels/PizzaViewModel.cs

@@ -1,5 +1,4 @@
-using PizzeriaContracts.Attributes;
-using PizzeriaDataModels.Models;
+using PizzeriaDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,16 +10,14 @@ namespace PizzeriaContracts.ViewModels
 {
     public class PizzaViewModel : IPizzaModel
     {
-        [Column(visible: false)]
         public int Id { get; set; }
 
-        [Column(title: "Название пиццы", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Название пиццы")]
         public string PizzaName { get; set; } = string.Empty;
 
-        [Column(title: "Цена", width: 70)]
+        [DisplayName("Цена")]
         public double Price { get; set; }
 
-        [Column(visible: false)]
         public Dictionary<int, (IComponentModel, int)> PizzaComponents { get; set; } = new();
     }
 }

Pizzeria/PizzeriaContracts/ViewModels/ReportGroupOrdersViewModel.cs

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,24 @@
+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/Enums/OrderStatus.cs

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

Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaDataModels.Models
-{
-	public interface IMessageInfoModel : IId
-    {
-		string MessageId { get; }
-		int? ClientId { get; }
-		string SenderName { get; }
-		DateTime DateDelivery { get; }
-		string Subject { get; }
-		string Body { get; }
-	}
-}

Pizzeria/PizzeriaDataModels/Models/IShopModel.cs

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,15 @@
+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/ImplementationExtension.cs

@@ -1,22 +0,0 @@
-using PizzeriaContracts.DI;
-using PizzeriaContracts.StoragesContracts;
-using PizzeriaDatabaseImplement.Implements;
-
-namespace PizzeriaDatabaseImplement
-{
-    public class ImplementationExtension : IImplementationExtension
-    {
-        public int Priority => 3;
-
-        public void RegisterServices()
-        {
-            DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-            DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
-            DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
-            DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-            DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-            DependencyManager.Instance.RegisterType<IPizzaStorage, PizzaStorage>();
-            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-        }
-    }
-}

Pizzeria/PizzeriaDatabaseImplement/Implements/BackUpInfo.cs

@@ -1,27 +0,0 @@
-using PizzeriaContracts.StoragesContracts;
-
-namespace PizzeriaDatabaseImplement.Implements
-{
-    public class BackUpInfo : IBackUpInfo
-    {
-        public List<T>? GetList<T>() where T : class, new()
-        {
-            using var context = new PizzeriaDatabase();
-            return context.Set<T>().ToList();
-        }
-
-        public Type? GetTypeByModelInterface(string modelInterfaceName)
-        {
-            var assembly = typeof(BackUpInfo).Assembly;
-            var types = assembly.GetTypes();
-            foreach (var type in types)
-            {
-                if (type.IsClass && type.GetInterface(modelInterfaceName) != null)
-                {
-                    return type;
-                }
-            }
-            return null;
-        }
-    }
-}

Pizzeria/PizzeriaDatabaseImplement/Implements/ClientStorage.cs

@@ -31,9 +31,10 @@ namespace PizzeriaDatabaseImplement.Implements
                 return null;
             }
             using var context = new PizzeriaDatabase();
-            return context.Clients.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) ||
-                 (!string.IsNullOrEmpty(model.ClientFIO) && x.ClientFIO == model.ClientFIO) ||
-                 (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && (string.IsNullOrEmpty(model.Password) || x.Password == model.Password)))?.GetViewModel;
+            return context.Clients.FirstOrDefault(x =>
+            (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) ||
+            (model.Id.HasValue && x.Id == model.Id))
+                ?.GetViewModel;
         }
 
         public ClientViewModel? Insert(ClientBindingModel model)

Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -1,52 +0,0 @@
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.SearchModels;
-using PizzeriaContracts.StoragesContracts;
-using PizzeriaContracts.ViewModels;
-using PizzeriaDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaDatabaseImplement.Implements
-{
-	public class MessageInfoStorage : IMessageInfoStorage
-	{
-		public List<MessageInfoViewModel> GetFullList()
-		{
-			using var context = new PizzeriaDatabase();
-			return context.MessageInfos.Select(x => x.GetViewModel).ToList();
-		}
-		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-		{
-			if (!model.ClientId.HasValue)
-			{
-				return new();
-			}
-			using var context = new PizzeriaDatabase();
-			return context.MessageInfos.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
-		}
-		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-		{
-			if (string.IsNullOrEmpty(model.MessageId))
-			{
-				return new();
-			}
-			using var context = new PizzeriaDatabase();
-			return context.MessageInfos.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
-		}
-		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-		{
-			var newMessage = MessageInfo.Create(model);
-			if (newMessage == null)
-			{
-				return null;
-			}
-			using var context = new PizzeriaDatabase();
-			context.MessageInfos.Add(newMessage);
-			context.SaveChanges();
-			return newMessage.GetViewModel;
-		}
-	}
-}

Pizzeria/PizzeriaDatabaseImplement/Implements/ShopStorage.cs

@@ -0,0 +1,185 @@
+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.Designer.cs

@@ -12,8 +12,8 @@ using PizzeriaDatabaseImplement;
 namespace PizzeriaDatabaseImplement.Migrations
 {
     [DbContext(typeof(PizzeriaDatabase))]
-    [Migration("20240402121349_InitMail")]
-    partial class InitMail
+    [Migration("20240305050232_Hard_init")]
+    partial class Hard_init
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -25,31 +25,6 @@ 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")
@@ -70,63 +45,6 @@ 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.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("MessageInfos");
-                });
-
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -135,9 +53,6 @@ namespace PizzeriaDatabaseImplement.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
                     b.Property<int>("Count")
                         .HasColumnType("int");
 
@@ -147,9 +62,6 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
                     b.Property<int>("PizzaId")
                         .HasColumnType("int");
 
@@ -161,10 +73,6 @@ namespace PizzeriaDatabaseImplement.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
                     b.HasIndex("PizzaId");
 
                     b.ToTable("Orders");
@@ -216,37 +124,67 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.ToTable("PizzaComponents");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b =>
+            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
                 {
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client")
-                        .WithMany("ClientMessages")
-                        .HasForeignKey("ClientId");
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
 
-                    b.Navigation("Client");
+                    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("ClientOrders")
-                        .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");
                 });
 
@@ -269,11 +207,23 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.Navigation("Pizza");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b =>
+            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b =>
                 {
-                    b.Navigation("ClientMessages");
+                    b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
+                        .WithMany("ShopPizzas")
+                        .HasForeignKey("PizzaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
-                    b.Navigation("ClientOrders");
+                    b.HasOne("PizzeriaDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("Pizzas")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Pizza");
+
+                    b.Navigation("Shop");
                 });
 
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b =>
@@ -281,17 +231,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/20240305050232_Hard_init.cs

@@ -0,0 +1,78 @@
+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/20240402121349_InitMail.cs

@@ -1,48 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace PizzeriaDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitMail : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "MessageInfos",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    ClientId = table.Column<int>(type: "int", nullable: true),
-                    SenderName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    Subject = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Body = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
-                    table.ForeignKey(
-                        name: "FK_MessageInfos_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MessageInfos_ClientId",
-                table: "MessageInfos",
-                column: "ClientId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "MessageInfos");
-        }
-    }
-}

Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs

@@ -94,36 +94,6 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.ToTable("Implementers");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("MessageInfos");
-                });
-
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -213,19 +183,63 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.ToTable("PizzaComponents");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b =>
+            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
                 {
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client")
-                        .WithMany("ClientMessages")
-                        .HasForeignKey("ClientId");
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
 
-                    b.Navigation("Client");
+                    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("ClientOrders")
+                        .WithMany("Orders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -266,11 +280,28 @@ 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("ClientMessages");
-
-                    b.Navigation("ClientOrders");
+                    b.Navigation("Orders");
                 });
 
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b =>
@@ -289,6 +320,11 @@ namespace PizzeriaDatabaseImplement.Migrations
 
                     b.Navigation("Orders");
                 });
+
+            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("Pizzas");
+                });
 #pragma warning restore 612, 618
         }
     }

Pizzeria/PizzeriaDatabaseImplement/Models/Client.cs

@@ -6,35 +6,24 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace PizzeriaDatabaseImplement.Models
 {
-    [DataContract]
-    public class Client : IClientModel
+	public class Client : IClientModel
 	{
-        [DataMember]
-        public int Id { get; private set; }
+		public int Id { get; private set; }
 
-        [DataMember]
-        [Required]
+		[Required]
 		public string ClientFIO { get; set; } = string.Empty;
-
-        [DataMember]
-        [Required]
+		[Required]
 		public string Email { get; set; } = string.Empty;
-
-        [DataMember]
-        [Required]
+		[Required]
 		public string Password { get; set; } = string.Empty;
 
 		[ForeignKey("ClientId")]
-		public virtual List<Order> ClientOrders { get; set; } = new();
-
-		[ForeignKey("ClientId")]
-		public virtual List<MessageInfo> ClientMessages { get; set; } = new();
+		public virtual List<Order> Orders { get; set; } = new();
 
 		public static Client? Create(ClientBindingModel model)
 		{

Pizzeria/PizzeriaDatabaseImplement/Models/Component.cs

@@ -3,24 +3,16 @@ using PizzeriaContracts.ViewModels;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
 using PizzeriaDataModels.Models;
-using System.Runtime.Serialization;
 
 namespace PizzeriaDatabaseImplement.Models
 {
-    [DataContract]
     public class Component : IComponentModel
     {
-        [DataMember]
         public int Id { get; private set; }
-
-        [DataMember]
         [Required]
         public string ComponentName { get; private set; } = string.Empty;
-
-        [DataMember]
         [Required]
         public double Cost { get; set; }
-
         [ForeignKey("ComponentId")]
         public virtual List<PizzaComponent> PizzaComponents { get; set; } = new();
 

Pizzeria/PizzeriaDatabaseImplement/Models/Implementer.cs

@@ -3,29 +3,22 @@ using PizzeriaContracts.ViewModels;
 using PizzeriaDataModels.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace PizzeriaDatabaseImplement.Models
 {
-    [DataContract]
     public class Implementer : IImplementerModel
     {
-        [DataMember]
         public int Id { get; set; }
 
-        [DataMember]
         [Required]
         public string ImplementerFIO { get; set; } = string.Empty;
 
-        [DataMember]
         [Required]
         public string Password { get; set; } = string.Empty;
 
-        [DataMember]
         [Required]
         public int WorkExperience { get; set; }
 
-        [DataMember]
         [Required]
         public int Qualification { get; set; }
 

Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs

@@ -1,74 +0,0 @@
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.ViewModels;
-using PizzeriaDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Runtime.Serialization;
-
-namespace PizzeriaDatabaseImplement.Models
-{
-	public class MessageInfo : IMessageInfoModel
-	{
-        [NotMapped]
-        public int Id { get; private set; }
-
-        [DataMember]
-        [Key]
-		[DatabaseGenerated(DatabaseGeneratedOption.None)]
-		public string MessageId { get; set; } = string.Empty;
-
-        [DataMember]
-        public int? ClientId { get; set; }
-
-		public virtual Client? Client { get; set; }
-
-        [DataMember]
-        [Required]
-		public string SenderName { get; set; } = string.Empty;
-
-        [DataMember]
-        [Required]
-		public DateTime DateDelivery { get; set; }
-
-        [DataMember]
-        [Required]
-		public string Subject { get; set; } = string.Empty;
-
-        [DataMember]
-        [Required]
-		public string Body { get; set; } = string.Empty;
-
-		public static MessageInfo? Create(MessageInfoBindingModel? model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new()
-			{
-				MessageId = model.MessageId,
-				ClientId = model.ClientId,
-				SenderName = model.SenderName,
-				DateDelivery = model.DateDelivery,
-				Subject = model.Subject,
-				Body = model.Body,
-
-			};
-		}
-
-		public MessageInfoViewModel GetViewModel => new()
-		{
-			MessageId = MessageId,
-			ClientId = ClientId,
-			SenderName = SenderName,
-			DateDelivery = DateDelivery,
-			Subject = Subject,
-			Body = Body
-		};
-	}
-}

Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs

@@ -3,50 +3,39 @@ using PizzeriaContracts.ViewModels;
 using PizzeriaDataModels.Enums;
 using PizzeriaDataModels.Models;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace PizzeriaDatabaseImplement.Models
 {
-    [DataContract]
     public class Order : IOrderModel
     {
-        [DataMember]
         public int Id { get; private set; }
 
-        [DataMember]
         [Required]
         public int ClientId { get; private set; }
 
         public virtual Client Client { get; private set; } = new();
 
-        [DataMember]
         [Required]
         public int PizzaId { get; private set; }
 
         public virtual Pizza Pizza { get; set; } = new();
 
-        [DataMember]
         public int? ImplementerId { get; private set; }
 
         public virtual Implementer? Implementer { get; set; } = new();
 
-        [DataMember]
         [Required]
         public int Count { get; private set; }
 
-        [DataMember]
         [Required]
         public double Sum { get; private set; }
 
-        [DataMember]
         [Required]
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
 
-        [DataMember]
         [Required]
         public DateTime DateCreate { get; private set; } = DateTime.Now;
 
-        [DataMember]
         public DateTime? DateImplement { get; private set; }
 
         public static Order Create(PizzeriaDatabase context, OrderBindingModel model)
@@ -85,7 +74,6 @@ namespace PizzeriaDatabaseImplement.Models
             Id = Id,
             ClientId = ClientId,
             ClientFIO = Client.ClientFIO,
-            ClientEmail = Client.Email,
             PizzaId = PizzaId,
             PizzaName = Pizza.PizzaName,
             ImplementerId = ImplementerId,

Pizzeria/PizzeriaDatabaseImplement/Models/Pizza.cs

@@ -3,27 +3,18 @@ using PizzeriaContracts.ViewModels;
 using PizzeriaDataModels.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace PizzeriaDatabaseImplement.Models
 {
-    [DataContract]
     public class Pizza : IPizzaModel
     {
-        [DataMember]
         public int Id { get; set; }
-
-        [DataMember]
         [Required]
         public string PizzaName { get; set; } = string.Empty;
-
-        [DataMember]
         [Required]
         public double Price { get; set; }
 
         private Dictionary<int, (IComponentModel, int)>? _pizzaComponents = null;
-
-        [DataMember]
         [NotMapped]
         public Dictionary<int, (IComponentModel, int)> PizzaComponents
         {
@@ -37,6 +28,7 @@ namespace PizzeriaDatabaseImplement.Models
                 return _pizzaComponents;
             }
         }
+
         [ForeignKey("PizzaId")]
         public virtual List<PizzaComponent> Components { get; set; } = new();
         [ForeignKey("PizzaId")]

Pizzeria/PizzeriaDatabaseImplement/Models/Shop.cs

@@ -0,0 +1,114 @@
+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

@@ -0,0 +1,22 @@
+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 Microsoft.EntityFrameworkCore;
-using PizzeriaDatabaseImplement.Models;
+using PizzeriaDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
 
 namespace PizzeriaDatabaseImplement
 {
@@ -19,6 +19,7 @@ namespace PizzeriaDatabaseImplement
         public virtual DbSet<Order> Orders { set; get; }
         public virtual DbSet<Client> Clients { set; get; }
         public virtual DbSet<Implementer> Implementers { set; get; }
-        public virtual DbSet<MessageInfo> MessageInfos { set; get; }
+        public virtual DbSet<Shop> Shops { set; get; }
+        public virtual DbSet<ShopPizzas> ShopPizzas { set; get; }
     }
 }

Pizzeria/PizzeriaDatabaseImplement/PizzeriaDatabaseImplement.csproj

@@ -24,8 +24,4 @@
 	<Folder Include="Migrations\" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-  </Target>
-
 </Project>

Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using PizzeriaFileImplement.Models;
+using PizzeriaFileImplement.Models;
 using System.Xml.Linq;
 
 namespace PizzeriaFileImplement
@@ -16,14 +11,13 @@ namespace PizzeriaFileImplement
         private readonly string PizzaFileName = "Pizza.xml";
         private readonly string ClientFileName = "Client.xml";
         private readonly string ImplementerFileName = "Implementer.xml";
-        private readonly string MessageInfoFileName = "MessageInfo.xml";
+        private readonly string ShopFileName = "Shop.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<Implementer> Implementers { get; private set; }
-        public List<MessageInfo> Messages { get; private set; }
-
+        public List<Shop> Shops { get; private set; }
 
         public static DataFileSingleton GetInstance()
         {
@@ -39,7 +33,7 @@ namespace PizzeriaFileImplement
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
         public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement);
-        public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement);
+        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
 
         private DataFileSingleton()
         {
@@ -48,7 +42,7 @@ namespace PizzeriaFileImplement
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
             Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
-            Messages = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!;
+            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
         }
 
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
@@ -68,4 +62,4 @@ namespace PizzeriaFileImplement
             }
         }
     }
-}
+}

Pizzeria/PizzeriaFileImplement/ImplementationExtension.cs

@@ -1,22 +0,0 @@
-using PizzeriaContracts.DI;
-using PizzeriaContracts.StoragesContracts;
-using PizzeriaFileImplement.Implements;
-
-namespace PizzeriaFileImplement
-{
-    public class ImplementationExtension : IImplementationExtension
-    {
-        public int Priority => 1;
-
-        public void RegisterServices()
-        {
-            DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-            DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
-            DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
-            DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-            DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-            DependencyManager.Instance.RegisterType<IPizzaStorage, PizzaStorage>();
-            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-        }
-    }
-}

Pizzeria/PizzeriaFileImplement/Implements/BackUpInfo.cs

@@ -1,39 +0,0 @@
-using PizzeriaContracts.StoragesContracts;
-using System.Reflection;
-
-namespace PizzeriaFileImplement.Implements
-{
-    public class BackUpInfo : IBackUpInfo
-    {
-        private readonly DataFileSingleton source;
-        private readonly PropertyInfo[] sourceProperties;
-
-        public BackUpInfo()
-        {
-            source = DataFileSingleton.GetInstance();
-            sourceProperties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
-        }
-
-        public List<T>? GetList<T>() where T : class, new()
-        {
-            var requredType = typeof(T);
-            return (List<T>?)sourceProperties.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == requredType)
-                ?.GetValue(source);
-
-        }
-
-        public Type? GetTypeByModelInterface(string modelInterfaceName)
-        {
-            var assembly = typeof(BackUpInfo).Assembly;
-            var types = assembly.GetTypes();
-            foreach (var type in types)
-            {
-                if (type.IsClass && type.GetInterface(modelInterfaceName) != null)
-                {
-                    return type;
-                }
-            }
-            return null;
-        }
-    }
-}

Pizzeria/PizzeriaFileImplement/Implements/MessageInfoStorage.cs

@@ -1,58 +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 MessageInfoStorage : IMessageInfoStorage
-    {
-        private readonly DataFileSingleton _source;
-        public MessageInfoStorage()
-        {
-            _source = DataFileSingleton.GetInstance();
-        }
-
-        public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-        {
-            if (model.MessageId != null)
-            {
-                return _source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
-            }
-            return null;
-        }
-
-        public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-        {
-            return _source.Messages
-                .Where(x => x.ClientId == model.ClientId)
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-
-        public List<MessageInfoViewModel> GetFullList()
-        {
-            return _source.Messages
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-
-        public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-        {
-            var newMessage = MessageInfo.Create(model);
-            if (newMessage == null)
-            {
-                return null;
-            }
-            _source.Messages.Add(newMessage);
-            _source.SaveMessages();
-            return newMessage.GetViewModel;
-        }
-    }
-}

Pizzeria/PizzeriaFileImplement/Implements/ShopStorage.cs

@@ -0,0 +1,154 @@
+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/Client.cs

@@ -1,22 +1,16 @@
 using PizzeriaContracts.BindingModels;
 using PizzeriaContracts.ViewModels;
 using PizzeriaDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace PizzeriaFileImplement.Models
 {
-    [DataContract]
-    public class Client : IClientModel
+	public class Client : IClientModel
 	{
-        [DataMember]
-        public int Id { get; set; }
-        [DataMember]
-        public string ClientFIO { get; set; } = string.Empty;
-        [DataMember]
-        public string Password { get; set; } = string.Empty;
-        [DataMember]
-        public string Email { get; set; } = string.Empty;
+		public int Id { get; set; }
+		public string ClientFIO { get; set; } = string.Empty;
+		public string Password { get; set; } = string.Empty;
+		public string Email { get; set; } = string.Empty;
 
 		public static Client? Create(ClientBindingModel? model)
 		{

Pizzeria/PizzeriaFileImplement/Models/Component.cs

@@ -1,21 +1,14 @@
 using PizzeriaContracts.BindingModels;
 using PizzeriaContracts.ViewModels;
 using PizzeriaDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace PizzeriaFileImplement.Models
 {
-    [DataContract]
     public class Component : IComponentModel
     {
-        [DataMember]
         public int Id { get; private set; }
-
-        [DataMember]
         public string ComponentName { get; private set; } = string.Empty;
-
-        [DataMember]
         public double Cost { get; set; }
 
         public static Component? Create(ComponentBindingModel model)

Pizzeria/PizzeriaFileImplement/Models/Implementer.cs

@@ -4,29 +4,22 @@ using PizzeriaDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace PizzeriaFileImplement.Models
 {
-    [DataContract]
     public class Implementer : IImplementerModel
     {
-        [DataMember]
         public int Id { get; private set; }
 
-        [DataMember]
         public string ImplementerFIO { get; private set; } = string.Empty;
 
-        [DataMember]
         public string Password { get; private set; } = string.Empty;
 
-        [DataMember]
         public int WorkExperience { get; private set; }
 
-        [DataMember]
         public int Qualification { get; private set; }
 
         public static Implementer? Create(XElement element)

Pizzeria/PizzeriaFileImplement/Models/MessageInfo.cs

@@ -1,91 +0,0 @@
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.ViewModels;
-using PizzeriaDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace PizzeriaFileImplement.Models
-{
-    [DataContract]
-    public class MessageInfo : IMessageInfoModel
-    {
-        [DataMember]
-        public int Id { get; private set; }
-
-        [DataMember]
-        public string MessageId { get; private set; } = string.Empty;
-
-        [DataMember]
-        public int? ClientId { get; private set; }
-
-        [DataMember]
-        public string SenderName { get; private set; } = string.Empty;
-
-        [DataMember]
-        public DateTime DateDelivery { get; private set; } = DateTime.Now;
-
-        [DataMember]
-        public string Subject { get; private set; } = string.Empty;
-
-        [DataMember]
-        public string Body { get; private set; } = string.Empty;
-
-        public static MessageInfo? Create(MessageInfoBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Body = model.Body,
-                Subject = model.Subject,
-                ClientId = model.ClientId,
-                MessageId = model.MessageId,
-                SenderName = model.SenderName,
-                DateDelivery = model.DateDelivery,
-            };
-        }
-
-        public static MessageInfo? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Body = element.Attribute("Body")!.Value,
-                Subject = element.Attribute("Subject")!.Value,
-                ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value),
-                MessageId = element.Attribute("MessageId")!.Value,
-                SenderName = element.Attribute("SenderName")!.Value,
-                DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value),
-            };
-        }
-
-        public MessageInfoViewModel GetViewModel => new()
-        {
-            Body = Body,
-            Subject = Subject,
-            ClientId = ClientId,
-            MessageId = MessageId,
-            SenderName = SenderName,
-            DateDelivery = DateDelivery,
-        };
-
-        public XElement GetXElement => new("MessageInfo",
-            new XAttribute("Body", Body),
-            new XAttribute("Subject", Subject),
-            new XAttribute("ClientId", ClientId),
-            new XAttribute("MessageId", MessageId),
-            new XAttribute("SenderName", SenderName),
-            new XAttribute("DateDelivery", DateDelivery)
-            );
-    }
-}

Pizzeria/PizzeriaFileImplement/Models/Order.cs

@@ -3,38 +3,19 @@ using PizzeriaDataModels.Models;
 using PizzeriaContracts.BindingModels;
 using PizzeriaContracts.ViewModels;
 using System.Xml.Linq;
-using System.Runtime.Serialization;
 
 namespace PizzeriaFileImplement.Models
 {
-    [DataContract]
     public class Order : IOrderModel
     {
-        [DataMember]
         public int Id { get; private set; }
-
-        [DataMember]
         public int ClientId { get; private set; }
-
-        [DataMember]
         public int? ImplementerId { get; set; }
-
-        [DataMember]
         public int PizzaId { get; private set; }
-
-        [DataMember]
         public int Count { get; private set; }
-
-        [DataMember]
         public double Sum { get; private set; }
-
-        [DataMember]
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-
-        [DataMember]
         public DateTime DateCreate { get; private set; } = DateTime.Now;
-
-        [DataMember]
         public DateTime? DateImplement { get; private set; }
 
         public static Order? Create(OrderBindingModel? model)

Pizzeria/PizzeriaFileImplement/Models/Pizza.cs

@@ -1,26 +1,17 @@
 using PizzeriaContracts.BindingModels;
 using PizzeriaContracts.ViewModels;
 using PizzeriaDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace PizzeriaFileImplement.Models
 {
-    [DataContract]
     public class Pizza : IPizzaModel
     {
-        [DataMember]
         public int Id { get; private set; }
-
-        [DataMember]
         public string PizzaName { get; private set; } = string.Empty;
-
-        [DataMember]
         public double Price { get; private set; }
         public Dictionary<int, int> Components { get; private set; } = new();
         private Dictionary<int, (IComponentModel, int)>? _pizzaComponents = null;
-
-        [DataMember]
         public Dictionary<int, (IComponentModel, int)> PizzaComponents
         {
             get

Pizzeria/PizzeriaFileImplement/Models/Shop.cs

@@ -0,0 +1,111 @@
+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/PizzeriaFileImplement/PizzeriaFileImplement.csproj

@@ -15,8 +15,4 @@
     <ProjectReference Include="..\PizzeriaDataModels\PizzeriaDataModels.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-  </Target>
-
 </Project>