миграции и редактирование представлений

.gitignore

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

SushiBar/SushiBarBusinessLogic_/BackUpLogic.cs

@@ -1,102 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.StoragesContracts;
-using SushiBarDataModels;
-using System;
-using System.Collections.Generic;
-using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Serialization.Json;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic
-{
-	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);
-		}
-	}
-}

SushiBar/SushiBarBusinessLogic_/BusinessLogics/OrderLogic.cs

@@ -10,8 +10,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MigraDoc.Rendering;
-using SushiBarBusinessLogic.MailWorker;
 
 namespace SushiBarBusinessLogic.BusinessLogics
 {
@@ -19,18 +17,17 @@ namespace SushiBarBusinessLogic.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 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);
+            _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id);
             var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
             if (list == null)
             {
@@ -46,27 +43,17 @@ namespace SushiBarBusinessLogic.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.SushiName} от {element.DateCreate} на сумму {element.Sum} принят."
-			}));
-			return true;
+            return true;
         }
 
         public bool TakeOrderInWork(OrderBindingModel model)
         {
-            lock (_locker)
-            {
-                return ChangeStatus(model, OrderStatus.Выполняется);
-            }
+            return ChangeStatus(model, OrderStatus.Выполняется);
         }
 
         public bool FinishOrder(OrderBindingModel model)
@@ -76,6 +63,22 @@ namespace SushiBarBusinessLogic.BusinessLogics
 
         public bool DeliveryOrder(OrderBindingModel model)
         {
+            var order = _orderStorage.GetElement(new OrderSearchModel
+            {
+                Id = model.Id,
+            });
+            if (order == null)
+            {
+                throw new ArgumentNullException(nameof(order));
+            }
+            if (!_shopStorage.RestockingShops(new SupplyBindingModel
+            {
+                SushiId = order.SushiId,
+                Count = order.Count
+            }))
+            {
+                throw new ArgumentException("Недостаточно места");
+            }
             return ChangeStatus(model, OrderStatus.Выдан);
         }
 
@@ -91,7 +94,7 @@ namespace SushiBarBusinessLogic.BusinessLogics
             }
             if (model.Count <= 0)
             {
-                throw new ArgumentException("Колличество пиццы в заказе не может быть меньше 1", nameof(model.Count));
+                throw new ArgumentException("Колличество суши в заказе не может быть меньше 1", nameof(model.Count));
             }
             if (model.Sum <= 0)
             {
@@ -114,61 +117,28 @@ namespace SushiBarBusinessLogic.BusinessLogics
             });
             if (element == null)
             {
-                throw new InvalidOperationException(nameof(element));
+                throw new ArgumentNullException(nameof(element));
             }
             model.DateCreate = element.DateCreate;
             model.SushiId = element.SushiId;
             model.DateImplement = element.DateImplement;
-            model.ClientId = element.ClientId;
-            if (!model.ImplementerId.HasValue)
-            {
-                model.ImplementerId = element.ImplementerId;
-            }
             model.Status = element.Status;
             model.Count = element.Count;
             model.Sum = element.Sum;
             if (requiredStatus - model.Status == 1)
             {
                 model.Status = requiredStatus;
-                if (model.Status == OrderStatus.Готов)
-                {
+                if (model.Status == OrderStatus.Выдан)
                     model.DateImplement = DateTime.Now;
-                }
                 if (_orderStorage.Update(model) == null)
                 {
                     _logger.LogWarning("Update operation failed");
                     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.SushiName} от {element.DateCreate} на сумму {element.Sum} {model.Status}. {DateInfo}"
-				}));
-				return true;
+                return true;
             }
             _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
-            throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
-        
-        }
-
-        public OrderViewModel? ReadElement(OrderSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
-                model.ClientId, model.Status, model.ImplementerId, model.DateFrom, model.DateTo, model.Id);
-            var element = _orderStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
+            throw new ArgumentException($"Невозможно присвоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
         }
     }
 }

SushiBar/SushiBarBusinessLogic_/BusinessLogics/ReportLogic.cs

@@ -11,24 +11,25 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SushiBarBusinessLogic
+namespace SushiBarBusinessLogic.BusinessLogics
 {
     public class ReportLogic : IReportLogic
     {
         private readonly IComponentStorage _componentStorage;
         private readonly ISushiStorage _SushiStorage;
         private readonly IOrderStorage _orderStorage;
+        private readonly IShopStorage _shopStorage;
         private readonly AbstractSaveToExcel _saveToExcel;
         private readonly AbstractSaveToWord _saveToWord;
         private readonly AbstractSaveToPdf _saveToPdf;
 
-        public ReportLogic(ISushiStorage SushiStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
+        public ReportLogic(ISushiStorage SushiStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, IShopStorage shopStorage,
             AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
             _SushiStorage = SushiStorage;
             _componentStorage = componentStorage;
             _orderStorage = orderStorage;
-
+            _shopStorage = shopStorage;
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
             _saveToPdf = saveToPdf;
@@ -89,5 +90,55 @@ namespace SushiBarBusinessLogic
                 Orders = GetOrders(model)
             });
         }
+
+        public List<ReportShopsViewModel> GetShops()
+        {
+            return _shopStorage.GetFullList().Select(x => new ReportShopsViewModel
+            {
+                ShopName = x.ShopName,
+                Sushis = x.ShopSushis.Select(x => (x.Value.Item1.SushiName, x.Value.Item2)).ToList(),
+                TotalCount = x.ShopSushis.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.CreateShopSushisReport(new ExcelShop
+            {
+                FileName = model.FileName,
+                Title = "Наполненость магазинов",
+                ShopSushis = GetShops()
+            });
+        }
+
+        public void SaveGroupedOrdersToPdfFile(ReportBindingModel model)
+        {
+            _saveToPdf.CreateGroupedOrdersDoc(new PdfGroupedOrdersInfo
+            {
+                FileName = model.FileName,
+                Title = "Список заказов сгруппированных по дате заказов",
+                GroupedOrders = GetGroupedOrders()
+            });
+        }
     }
 }

SushiBar/SushiBarBusinessLogic_/BusinessLogics/ShopLogic.cs

@@ -0,0 +1,186 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+
+namespace SushiBarBusinessLogic.BusinessLogics
+{
+    public class ShopLogic : IShopLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IShopStorage _shopStorage;
+        private readonly ISushiStorage _sushiStorage;
+
+        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, ISushiStorage sushiStorage)
+        {
+            _logger = logger;
+            _shopStorage = shopStorage;
+            _sushiStorage = sushiStorage;
+        }
+
+        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.ShopSushis.ContainsKey(model.SushiId))
+            {
+                var oldValue = shop.ShopSushis[model.SushiId];
+                oldValue.Item2 += model.Count;
+                shop.ShopSushis[model.SushiId] = oldValue;
+            }
+            else
+            {
+                var sushi = _sushiStorage.GetElement(new SushiSearchModel
+                {
+                    Id = model.SushiId
+                });
+                if (sushi == null)
+                {
+                    throw new ArgumentException($"Поставка: Товар с id:{model.SushiId} не найденн");
+                }
+                shop.ShopSushis.Add(model.SushiId, (sushi, model.Count));
+            }
+
+            _shopStorage.Update(new ShopBindingModel()
+            {
+                Id = shop.Id,
+                ShopName = shop.ShopName,
+                Adress = shop.Adress,
+                OpeningDate = shop.OpeningDate,
+                ShopSushis = shop.ShopSushis,
+                SushiMaxCount = shop.SushiMaxCount,
+            });
+            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.SushiId.HasValue || !model.Count.HasValue)
+            {
+                return false;
+            }
+            _logger.LogInformation("Check sushi count in all shops");
+            if (_shopStorage.Sale(model))
+            {
+                _logger.LogInformation("Selling sucsess");
+                return true;
+            }
+            _logger.LogInformation("Selling failed");
+            return false;
+        }
+    }
+}

SushiBar/SushiBarBusinessLogic_/BusinessLogics/SushiLogic.cs

@@ -92,11 +92,11 @@ namespace SushiBarBusinessLogic.BusinessLogics
             }
             if (string.IsNullOrEmpty(model.SushiName))
             {
-                throw new ArgumentNullException("Нет названия пиццы", nameof(model.SushiName));
+                throw new ArgumentNullException("Нет названия суши", nameof(model.SushiName));
             }
             if (model.Price <= 0)
             {
-                throw new ArgumentNullException("Цена пиццы должна быть больше 0", nameof(model.Price));
+                throw new ArgumentNullException("Цена суши должна быть больше 0", nameof(model.Price));
             }
             if (model.SushiComponents == null || model.SushiComponents.Count == 0)
             {
@@ -109,7 +109,7 @@ namespace SushiBarBusinessLogic.BusinessLogics
             });
             if (element != null && element.Id != model.Id)
             {
-                throw new InvalidOperationException("Пицца с таким названием уже есть");
+                throw new InvalidOperationException("Суши с таким названием уже есть");
             }
         }
     }

SushiBar/SushiBarBusinessLogic_/ClientLogic.cs

@@ -4,7 +4,6 @@ using SushiBar.BusinessLogicsContracts;
 using SushiBar.SearchModels;
 using SushiBar.StoragesContracts;
 using SushiBar.ViewModels;
-using System.Text.RegularExpressions;
 
 namespace SushiBarBusinessLogic.BusinessLogics
 {
@@ -97,18 +96,17 @@ namespace SushiBarBusinessLogic.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}$"))
-			{
-                throw new ArgumentNullException("Нет указана валидная почта", nameof(model.Email));
+            if (string.IsNullOrEmpty(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}$"))
-			{
-                throw new ArgumentNullException("Не указан правильный пароль", nameof(model.Password));
-
-			}
-			_logger.LogInformation("Client. ClientFIO:{ClientFIO}.Email:{Email}.Id:{Id}",
-			model.ClientFIO, model.Email, model.Id);
-			var element = _clientStorage.GetElement(new ClientSearchModel
+            if (string.IsNullOrEmpty(model.Password))
+            {
+                throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password));
+            }
+            _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
             });

SushiBar/SushiBarBusinessLogic_/ImplementerLogic.cs

@@ -1,130 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
-using SushiBarBusinessLogic.BusinessLogics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic
-{
-    public class ImplementerLogic : IImplementerLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IImplementerStorage _implementerStorage;
-
-        public ImplementerLogic(ILogger<IImplementerLogic> logger, IImplementerStorage implementerStorage)
-        {
-            _logger = logger;
-            _implementerStorage = implementerStorage;
-        }
-
-        public List<ImplementerViewModel>? ReadList(ImplementerSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ImplementerFIO:{ImplementerFIO}.Password:{Password}.Id:{ Id}", model?.ImplementerFIO, model?.Password?.Length, model?.Id);
-            var list = model == null ? _implementerStorage.GetFullList() : _implementerStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        public ImplementerViewModel? ReadElement(ImplementerSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ImplementerFIO:{ImplementerFIO}.Password:{Password}.Id:{ Id}", model?.ImplementerFIO, model?.Password?.Length, model?.Id);
-            var element = _implementerStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-        public bool Create(ImplementerBindingModel model)
-        {
-            CheckModel(model);
-            if (_implementerStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ImplementerBindingModel model)
-        {
-            CheckModel(model);
-            if (_implementerStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ImplementerBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_implementerStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        private void CheckModel(ImplementerBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.ImplementerFIO))
-            {
-                throw new ArgumentNullException("Нет ФИО исполнителя", nameof(model.ImplementerFIO));
-            }
-            if (string.IsNullOrEmpty(model.Password))
-            {
-                throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.Password));
-            }
-            if (model.WorkExperience < 0)
-            {
-                throw new ArgumentNullException("Стаж должен быть больше 0", nameof(model.WorkExperience));
-            }
-            if (model.Qualification < 0)
-            {
-                throw new ArgumentNullException("Квалификация должна быть положительной", nameof(model.Qualification));
-            }
-            _logger.LogInformation("Implementer. ImplementerFIO:{ImplementerFIO}.Password:{Password}.WorkExperience:{WorkExperience}.Qualification:{Qualification}.Id: { Id}",
-                model.ImplementerFIO, model.Password, model.WorkExperience, model.Qualification, model.Id);
-            var element = _implementerStorage.GetElement(new ImplementerSearchModel
-            {
-                ImplementerFIO = model.ImplementerFIO
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Исполнитель с таким ФИО уже есть");
-            }
-        }
-    }
-}

SushiBar/SushiBarBusinessLogic_/MailWorker/AbstractMailWorker.cs

@@ -1,89 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBar.StoragesContracts;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-
-namespace SushiBarBusinessLogic.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();
-	}
-}

SushiBar/SushiBarBusinessLogic_/MailWorker/MailKitWorker.cs

@@ -1,83 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarContracts.BindingModels;
-using MailKit.Security;
-using MailKit.Net.Pop3;
-using SushiBarContracts.BusinessLogicsContracts;
-
-namespace SushiBarBusinessLogic.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;
-		}
-	}
-}

SushiBar/SushiBarBusinessLogic_/MessageInfoLogic.cs

@@ -1,93 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBar.SearchModels;
-using SushiBar.StoragesContracts;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic
-{
-	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;
-			}
-		}
-	}
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/AbstractSaveToExcel.cs

@@ -13,6 +13,7 @@ namespace SushiBarBusinessLogic.OfficePackage
         public void CreateReport(ExcelInfo info)
         {
             CreateExcel(info);
+
             InsertCellInWorksheet(new ExcelCellParameters
             {
                 ColumnName = "A",
@@ -20,40 +21,46 @@ namespace SushiBarBusinessLogic.OfficePackage
                 Text = info.Title,
                 StyleInfo = ExcelStyleInfoType.Title
             });
+
             MergeCells(new ExcelMergeParameters
             {
                 CellFromName = "A1",
                 CellToName = "C1"
             });
+
             uint rowIndex = 2;
-            foreach (var sc in info.SushiComponents)
+            foreach (var pc in info.SushiComponents)
             {
                 InsertCellInWorksheet(new ExcelCellParameters
                 {
                     ColumnName = "A",
                     RowIndex = rowIndex,
-                    Text = sc.SushiName,
+                    Text = pc.SushiName,
                     StyleInfo = ExcelStyleInfoType.Text
                 });
                 rowIndex++;
-                foreach (var component in sc.Components)
+
+                foreach (var (Component, Count) in pc.Components)
                 {
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "B",
                         RowIndex = rowIndex,
-                        Text = component.Item1,
+                        Text = Component,
                         StyleInfo = ExcelStyleInfoType.TextWithBroder
                     });
+
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "C",
                         RowIndex = rowIndex,
-                        Text = component.Item2.ToString(),
+                        Text = Count.ToString(),
                         StyleInfo = ExcelStyleInfoType.TextWithBroder
                     });
+
                     rowIndex++;
                 }
+
                 InsertCellInWorksheet(new ExcelCellParameters
                 {
                     ColumnName = "A",
@@ -65,33 +72,90 @@ namespace SushiBarBusinessLogic.OfficePackage
                 {
                     ColumnName = "C",
                     RowIndex = rowIndex,
-                    Text = sc.TotalCount.ToString(),
+                    Text = pc.TotalCount.ToString(),
                     StyleInfo = ExcelStyleInfoType.Text
                 });
                 rowIndex++;
             }
+
             SaveExcel(info);
         }
-        /// <summary>
-        /// Создание excel-файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void CreateExcel(ExcelInfo info);
-        /// <summary>
-        /// Добавляем новую ячейку в лист
-        /// </summary>
-        /// <param name="cellParameters"></param>
-        protected abstract void InsertCellInWorksheet(ExcelCellParameters
-        excelParams);
-        /// <summary>
-        /// Объединение ячеек
-        /// </summary>
-        /// <param name="mergeParameters"></param>
+
+        public void CreateShopSushisReport(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.ShopSushis)
+            {
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = sr.ShopName,
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+
+                foreach (var (Sushi, Count) in sr.Sushis)
+                {
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "B",
+                        RowIndex = rowIndex,
+                        Text = Sushi,
+                        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);
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void SaveExcel(ExcelInfo info);
+        protected abstract void SaveExcel(IDocument info);
     }
 }

SushiBar/SushiBarBusinessLogic_/OfficePackage/AbstractSaveToPdf.cs

@@ -13,67 +13,65 @@ namespace SushiBarBusinessLogic.OfficePackage
         public void CreateDoc(PdfInfo info)
         {
             CreatePdf(info);
-            CreateParagraph(new PdfParagraph
-            {
-                Text = info.Title,
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-            CreateParagraph(new PdfParagraph
-            {
-                Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style = "Normal",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-            CreateTable(new List<string> { "1cm", "3cm", "4cm", "6cm", "3cm" });
+            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+            CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+
+            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
+
             CreateRow(new PdfRowParameters
             {
-                Texts = new List<string> { "Номер", "Дата заказа", "Статус", "Изделие", "Сумма" },
+                Texts = new List<string> { "Номер", "Дата заказа", "Пицца", "Статус", "Сумма" },
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
+
             foreach (var order in info.Orders)
             {
                 CreateRow(new PdfRowParameters
                 {
-                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.Status.ToString(), order.SushiName, order.Sum.ToString() },
+                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.SushiName, order.Status.ToString(), order.Sum.ToString() },
                     Style = "Normal",
                     ParagraphAlignment = PdfParagraphAlignmentType.Left
                 });
             }
-            CreateParagraph(new PdfParagraph
-            {
-                Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t",
-                Style = "Normal",
-                ParagraphAlignment = PdfParagraphAlignmentType.Rigth
-            });
+            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Rigth });
+
             SavePdf(info);
         }
-        /// <summary>
-        /// Создание doc-файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void CreatePdf(PdfInfo info);
-        /// <summary>
-        /// Создание параграфа с текстом
-        /// </summary>
-        /// <param name="title"></param>
-        /// <param name="style"></param>
+
+        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);
-        /// <summary>
-        /// Создание таблицы
-        /// </summary>
-        /// <param name="title"></param>
-        /// <param name="style"></param>
         protected abstract void CreateTable(List<string> columns);
-        /// <summary>
-        /// Создание и заполнение строки
-        /// </summary>
-        /// <param name="rowParameters"></param>
         protected abstract void CreateRow(PdfRowParameters rowParameters);
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void SavePdf(PdfInfo info);
+        protected abstract void SavePdf(IDocument info);
     }
 }

SushiBar/SushiBarBusinessLogic_/OfficePackage/AbstractSaveToWord.cs

@@ -38,21 +38,52 @@ namespace SushiBarBusinessLogic.OfficePackage
             }
             SaveWord(info);
         }
-        /// <summary>
-        /// Создание doc-файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void CreateWord(WordInfo info);
-        /// <summary>
-        /// Создание абзаца с текстом
-        /// </summary>
-        /// <param name="paragraph"></param>
-        /// <returns></returns>
+
+        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);
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        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);
     }
 }

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/ExcelInfo.cs

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

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/ExcelShop.cs

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

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs

@@ -0,0 +1,18 @@
+using SushiBarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarBusinessLogic.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();
+    }
+}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/PdfInfo.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace SushiBarBusinessLogic.OfficePackage.HelperModels
 {
-    public class PdfInfo
+    public class PdfInfo : IDocument
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/WordInfo.cs

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

SushiBar/SushiBarBusinessLogic_/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 SushiBarBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordRowParameters
+    {
+        public List<string> Texts { get; set; } = new();
+        public WordTextProperties TextProperties { get; set; } = new();
+    }
+}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/WordShopInfo.cs

@@ -0,0 +1,16 @@
+using SushiBarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarBusinessLogic.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();
+    }
+}

SushiBar/SushiBarBusinessLogic_/OfficePackage/IDocument.cs

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

SushiBar/SushiBarBusinessLogic_/OfficePackage/Implements/SaveToExcel.cs

@@ -14,167 +14,110 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
         private SpreadsheetDocument? _spreadsheetDocument;
         private SharedStringTablePart? _shareStringPart;
         private Worksheet? _worksheet;
-        /// <summary>
-        /// Настройка стилей для файла
-        /// </summary>
-        /// <param name="workbookpart"></param>
+
         private static void CreateStyles(WorkbookPart workbookpart)
         {
             var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
             sp.Stylesheet = new Stylesheet();
+
             var fonts = new Fonts() { Count = 2U, KnownFonts = true };
+
             var fontUsual = new Font();
             fontUsual.Append(new FontSize() { Val = 12D });
-            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Theme = 1U });
+            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
             fontUsual.Append(new FontName() { Val = "Times New Roman" });
             fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
             fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
             var fontTitle = new Font();
             fontTitle.Append(new Bold());
             fontTitle.Append(new FontSize() { Val = 14D });
-            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Theme = 1U });
+            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
             fontTitle.Append(new FontName() { Val = "Times New Roman" });
             fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
             fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
             fonts.Append(fontUsual);
             fonts.Append(fontTitle);
+
             var fills = new Fills() { Count = 2U };
+
             var fill1 = new Fill();
             fill1.Append(new PatternFill() { PatternType = PatternValues.None });
+
             var fill2 = new Fill();
-            fill2.Append(new PatternFill()
-            {
-                PatternType = PatternValues.Gray125
-            });
+            fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 });
+
             fills.Append(fill1);
             fills.Append(fill2);
+
             var borders = new Borders() { Count = 2U };
+
             var borderNoBorder = new Border();
             borderNoBorder.Append(new LeftBorder());
             borderNoBorder.Append(new RightBorder());
             borderNoBorder.Append(new TopBorder());
             borderNoBorder.Append(new BottomBorder());
             borderNoBorder.Append(new DiagonalBorder());
+
             var borderThin = new Border();
+
             var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
-            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Indexed = 64U });
-            var rightBorder = new RightBorder()
-            {
-                Style = BorderStyleValues.Thin
-            };
-            rightBorder.Append(new
-           DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Indexed = 64U });
+            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin };
+            rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
             var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
-            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Indexed = 64U });
-            var bottomBorder = new BottomBorder()
-            {
-                Style =
-           BorderStyleValues.Thin
-            };
-            bottomBorder.Append(new
-           DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Indexed = 64U });
+            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin };
+            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
             borderThin.Append(leftBorder);
             borderThin.Append(rightBorder);
             borderThin.Append(topBorder);
             borderThin.Append(bottomBorder);
             borderThin.Append(new DiagonalBorder());
+
             borders.Append(borderNoBorder);
             borders.Append(borderThin);
+
             var cellStyleFormats = new CellStyleFormats() { Count = 1U };
-            var cellFormatStyle = new CellFormat()
-            {
-                NumberFormatId = 0U,
-                FontId
-           = 0U,
-                FillId = 0U,
-                BorderId = 0U
-            };
+            var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U };
+
             cellStyleFormats.Append(cellFormatStyle);
+
             var cellFormats = new CellFormats() { Count = 3U };
-            var cellFormatFont = new CellFormat()
-            {
-                NumberFormatId = 0U,
-                FontId =
-           0U,
-                FillId = 0U,
-                BorderId = 0U,
-                FormatId = 0U,
-                ApplyFont = true
-            };
-            var cellFormatFontAndBorder = new CellFormat()
-            {
-                NumberFormatId = 0U,
-                FontId = 0U,
-                FillId = 0U,
-                BorderId = 1U,
-                FormatId = 0U,
-                ApplyFont = true,
-                ApplyBorder = true
-            };
-            var cellFormatTitle = new CellFormat()
-            {
-                NumberFormatId = 0U,
-                FontId
-           = 1U,
-                FillId = 0U,
-                BorderId = 0U,
-                FormatId = 0U,
-                Alignment = new Alignment()
-                {
-                    Vertical = VerticalAlignmentValues.Center,
-                    WrapText = true,
-                    Horizontal =
-           HorizontalAlignmentValues.Center
-                },
-                ApplyFont = true
-            };
+            var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true };
+            var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true };
+            var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true };
+
             cellFormats.Append(cellFormatFont);
             cellFormats.Append(cellFormatFontAndBorder);
             cellFormats.Append(cellFormatTitle);
-            var cellStyles = new CellStyles() { Count = 1U };
-            cellStyles.Append(new CellStyle()
-            {
-                Name = "Normal",
-                FormatId = 0U,
-                BuiltinId = 0U
-            });
-            var differentialFormats = new
-           DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats()
-            { Count = 0U };
 
-            var tableStyles = new TableStyles()
-            {
-                Count = 0U,
-                DefaultTableStyle = "TableStyleMedium2",
-                DefaultPivotStyle = "PivotStyleLight16"
-            };
+            var cellStyles = new CellStyles() { Count = 1U };
+
+            cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U });
+
+            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U };
+
+            var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" };
+
             var stylesheetExtensionList = new StylesheetExtensionList();
-            var stylesheetExtension1 = new StylesheetExtension()
-            {
-                Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
-            };
+
+            var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" };
             stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
-            stylesheetExtension1.Append(new SlicerStyles()
-            {
-                DefaultSlicerStyle = "SlicerStyleLight1"
-            });
-            var stylesheetExtension2 = new StylesheetExtension()
-            {
-                Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}"
-            };
+            stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" });
+
+            var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" };
             stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
-            stylesheetExtension2.Append(new TimelineStyles()
-            {
-                DefaultTimelineStyle = "TimeSlicerStyleLight1"
-            });
+            stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" });
+
             stylesheetExtensionList.Append(stylesheetExtension1);
             stylesheetExtensionList.Append(stylesheetExtension2);
+
             sp.Stylesheet.Append(fonts);
             sp.Stylesheet.Append(fills);
             sp.Stylesheet.Append(borders);
@@ -185,11 +128,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             sp.Stylesheet.Append(tableStyles);
             sp.Stylesheet.Append(stylesheetExtensionList);
         }
-        /// <summary>
-        /// Получение номера стиля из типа
-        /// </summary>
-        /// <param name="styleInfo"></param>
-        /// <returns></returns>
+
         private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
         {
             return styleInfo switch
@@ -200,40 +139,44 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 _ => 0U,
             };
         }
-        protected override void CreateExcel(ExcelInfo info)
+
+        protected override void CreateExcel(IDocument info)
         {
-            _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName,
-           SpreadsheetDocumentType.Workbook);
+            _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
+            // Создаем книгу (в ней хранятся листы)
             var workbookpart = _spreadsheetDocument.AddWorkbookPart();
             workbookpart.Workbook = new Workbook();
+
             CreateStyles(workbookpart);
-            _shareStringPart =
-           _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
-            ?
-           _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
-            :
-           _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
+
+            // Получаем/создаем хранилище текстов для книги
+            _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
+                ? _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
+                : _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
+
             // Создаем SharedStringTable, если его нет
             if (_shareStringPart.SharedStringTable == null)
             {
                 _shareStringPart.SharedStringTable = new SharedStringTable();
             }
+
             // Создаем лист в книгу
             var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
             worksheetPart.Worksheet = new Worksheet(new SheetData());
+
             // Добавляем лист в книгу
-            var sheets =
-           _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
+            var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
             var sheet = new Sheet()
             {
-                Id =
-           _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+                Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
                 SheetId = 1,
                 Name = "Лист"
             };
             sheets.Append(sheet);
+
             _worksheet = worksheetPart.Worksheet;
         }
+
         protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
         {
             if (_worksheet == null || _shareStringPart == null)
@@ -245,6 +188,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             {
                 return;
             }
+
             // Ищем строку, либо добавляем ее
             Row row;
             if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
@@ -256,7 +200,8 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 row = new Row() { RowIndex = excelParams.RowIndex };
                 sheetData.Append(row);
             }
-            // Ищем нужную ячейку 
+
+            // Ищем нужную ячейку  
             Cell cell;
             if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
             {
@@ -275,20 +220,22 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                         break;
                     }
                 }
-                var newCell = new Cell()
-                {
-                    CellReference = excelParams.CellReference
-                };
+
+                var newCell = new Cell() { CellReference = excelParams.CellReference };
                 row.InsertBefore(newCell, refCell);
+
                 cell = newCell;
             }
+
             // вставляем новый текст
             _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
             _shareStringPart.SharedStringTable.Save();
+
             cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
             cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
             cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
         }
+
         protected override void MergeCells(ExcelMergeParameters excelParams)
         {
             if (_worksheet == null)
@@ -296,6 +243,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 return;
             }
             MergeCells mergeCells;
+
             if (_worksheet.Elements<MergeCells>().Any())
             {
                 mergeCells = _worksheet.Elements<MergeCells>().First();
@@ -303,24 +251,25 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             else
             {
                 mergeCells = new MergeCells();
+
                 if (_worksheet.Elements<CustomSheetView>().Any())
                 {
-                    _worksheet.InsertAfter(mergeCells,
-                   _worksheet.Elements<CustomSheetView>().First());
+                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<CustomSheetView>().First());
                 }
                 else
                 {
-                    _worksheet.InsertAfter(mergeCells,
-                   _worksheet.Elements<SheetData>().First());
+                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<SheetData>().First());
                 }
             }
+
             var mergeCell = new MergeCell()
             {
                 Reference = new StringValue(excelParams.Merge)
             };
             mergeCells.Append(mergeCell);
         }
-        protected override void SaveExcel(ExcelInfo info)
+
+        protected override void SaveExcel(IDocument info)
         {
             if (_spreadsheetDocument == null)
             {

SushiBar/SushiBarBusinessLogic_/OfficePackage/Implements/SaveToPdf.cs

@@ -11,6 +11,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
         private Document? _document;
         private Section? _section;
         private Table? _table;
+
         private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
         {
             return type switch
@@ -21,24 +22,25 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 _ => ParagraphAlignment.Justify,
             };
         }
-        /// <summary>
-        /// Создание стилей для документа
-        /// </summary>
-        /// <param name="document"></param>
+
         private static void DefineStyles(Document document)
         {
             var style = document.Styles["Normal"];
             style.Font.Name = "Times New Roman";
             style.Font.Size = 14;
+
             style = document.Styles.AddStyle("NormalTitle", "Normal");
             style.Font.Bold = true;
         }
-        protected override void CreatePdf(PdfInfo info)
+
+        protected override void CreatePdf(IDocument info)
         {
             _document = new Document();
             DefineStyles(_document);
+
             _section = _document.AddSection();
         }
+
         protected override void CreateParagraph(PdfParagraph pdfParagraph)
         {
             if (_section == null)
@@ -50,6 +52,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
             paragraph.Style = pdfParagraph.Style;
         }
+
         protected override void CreateTable(List<string> columns)
         {
             if (_document == null)
@@ -57,11 +60,13 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 return;
             }
             _table = _document.LastSection.AddTable();
+
             foreach (var elem in columns)
             {
                 _table.AddColumn(elem);
             }
         }
+
         protected override void CreateRow(PdfRowParameters rowParameters)
         {
             if (_table == null)
@@ -72,20 +77,25 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             for (int i = 0; i < rowParameters.Texts.Count; ++i)
             {
                 row.Cells[i].AddParagraph(rowParameters.Texts[i]);
+
                 if (!string.IsNullOrEmpty(rowParameters.Style))
                 {
                     row.Cells[i].Style = rowParameters.Style;
                 }
+
                 Unit borderWidth = 0.5;
+
                 row.Cells[i].Borders.Left.Width = borderWidth;
                 row.Cells[i].Borders.Right.Width = borderWidth;
                 row.Cells[i].Borders.Top.Width = borderWidth;
                 row.Cells[i].Borders.Bottom.Width = borderWidth;
+
                 row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
                 row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
             }
         }
-        protected override void SavePdf(PdfInfo info)
+
+        protected override void SavePdf(IDocument info)
         {
             var renderer = new PdfDocumentRenderer(true)
             {
@@ -95,4 +105,4 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             renderer.PdfDocument.Save(info.FileName);
         }
     }
-} 
+}

SushiBar/SushiBarBusinessLogic_/OfficePackage/Implements/SaveToWord.cs

@@ -11,13 +11,8 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
     {
         private WordprocessingDocument? _wordDocument;
         private Body? _docBody;
-        /// <summary>
-        /// Получение типа выравнивания
-        /// </summary>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        private static JustificationValues
-       GetJustificationValues(WordJustificationType type)
+
+        private static JustificationValues GetJustificationValues(WordJustificationType type)
         {
             return type switch
             {
@@ -26,59 +21,60 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 _ => JustificationValues.Left,
             };
         }
-        /// <summary>
-        /// Настройки страницы
-        /// </summary>
-        /// <returns></returns>
+
         private static SectionProperties CreateSectionProperties()
         {
             var properties = new SectionProperties();
+
             var pageSize = new PageSize
             {
                 Orient = PageOrientationValues.Portrait
             };
+
             properties.AppendChild(pageSize);
+
             return properties;
         }
-        /// <summary>
-        /// Задание форматирования для абзаца
-        /// </summary>
-        /// <param name="paragraphProperties"></param>
-        /// <returns></returns>
+
         private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
         {
             if (paragraphProperties == null)
             {
                 return null;
             }
+
             var properties = new ParagraphProperties();
+
             properties.AppendChild(new Justification()
             {
                 Val = GetJustificationValues(paragraphProperties.JustificationType)
             });
+
             properties.AppendChild(new SpacingBetweenLines
             {
                 LineRule = LineSpacingRuleValues.Auto
             });
+
             properties.AppendChild(new Indentation());
+
             var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
             if (!string.IsNullOrEmpty(paragraphProperties.Size))
             {
-                paragraphMarkRunProperties.AppendChild(new FontSize
-                {
-                    Val = paragraphProperties.Size
-                });
+                paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size });
             }
             properties.AppendChild(paragraphMarkRunProperties);
+
             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)
@@ -88,9 +84,11 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             var docParagraph = new Paragraph();
 
             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)
@@ -98,24 +96,97 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                     properties.AppendChild(new Bold());
                 }
                 docRun.AppendChild(properties);
-                docRun.AppendChild(new Text
-                {
-                    Text = run.Item1, 
-                    Space = SpaceProcessingModeValues.Preserve
-                });
+
+                docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
+
                 docParagraph.AppendChild(docRun);
             }
+
             _docBody.AppendChild(docParagraph);
         }
-        protected override void SaveWord(WordInfo info)
+
+        protected override void SaveWord(IDocument info)
         {
             if (_docBody == null || _wordDocument == null)
             {
                 return;
             }
             _docBody.AppendChild(CreateSectionProperties());
+
             _wordDocument.MainDocumentPart!.Document.Save();
             _wordDocument.Dispose();
         }
+
+        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);
+        }
     }
 }

SushiBar/SushiBarBusinessLogic_/SushiBarBusinessLogic.csproj

@@ -16,7 +16,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.9" />
-    <PackageReference Include="MailKit" Version="4.2.0" />
   </ItemGroup>
 
   <ItemGroup>

SushiBar/SushiBarBusinessLogic_/WorkModeling .cs

@@ -1,139 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic
-{
-    public class WorkModeling : IWorkProcess
-    {
-        private readonly ILogger _logger;
-
-        private readonly Random _rnd;
-
-        private IOrderLogic? _orderLogic;
-
-        public WorkModeling(ILogger<WorkModeling> logger)
-        {
-            _logger = logger;
-            _rnd = new Random(1000);
-        }
-
-        public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic)
-        {
-            _orderLogic = orderLogic;
-            var implementers = implementerLogic.ReadList(null);
-            if (implementers == null)
-            {
-                _logger.LogWarning("DoWork. Implementers is null");
-                return;
-            }
-            var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
-            if (orders == null || orders.Count == 0)
-            {
-                _logger.LogWarning("DoWork. Orders is null or empty");
-                return;
-            }
-            _logger.LogDebug("DoWork for {Count} orders", orders.Count);
-            foreach (var implementer in implementers)
-            {
-                Task.Run(() => WorkerWorkAsync(implementer, orders));
-            }
-        }
-
-        private async Task WorkerWorkAsync(ImplementerViewModel implementer, List<OrderViewModel> orders)
-        {
-            if (_orderLogic == null || implementer == null)
-            {
-                return;
-            }
-            await RunOrderInWork(implementer);
-
-            await Task.Run(() =>
-            {
-                foreach (var order in orders)
-                {
-                    try
-                    {
-                        _logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
-                        // пытаемся назначить заказ на исполнителя
-                        _orderLogic.TakeOrderInWork(new OrderBindingModel
-                        {
-                            Id = order.Id,
-                            ImplementerId = implementer.Id
-                        });
-                        // делаем работу
-                        Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
-                        _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
-                        _orderLogic.FinishOrder(new OrderBindingModel
-                        {
-                            Id = order.Id
-                        });
-                    }
-                    // кто-то мог уже перехватить заказ, игнорируем ошибку
-                    catch (InvalidOperationException ex)
-                    {
-                        _logger.LogWarning(ex, "Error try get work");
-                    }
-                    // заканчиваем выполнение имитации в случае иной ошибки
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error while do work");
-                        throw;
-                    }
-                    // отдыхаем
-                    Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
-                }
-            });
-        }
-
-        private async Task RunOrderInWork(ImplementerViewModel implementer)
-        {
-            if (_orderLogic == null || implementer == null)
-            {
-                return;
-            }
-            try
-            {
-                var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
-                {
-                    ImplementerId = implementer.Id,
-                    Status = OrderStatus.Выполняется
-                }));
-                if (runOrder == null)
-                {
-                    return;
-                }
-
-                _logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
-                // доделываем работу
-                Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
-                _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
-                _orderLogic.FinishOrder(new OrderBindingModel
-                {
-                    Id = runOrder.Id
-                });
-                // отдыхаем
-                Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
-            }
-            // заказа может не быть, просто игнорируем ошибку
-            catch (InvalidOperationException ex)
-            {
-                _logger.LogWarning(ex, "Error try get work");
-            }
-            // а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error while do work");
-                throw;
-            }
-        }
-    }
-}

SushiBar/SushiBarClientApp/APIClient.cs

@@ -10,14 +10,16 @@ namespace SushiBarClientApp
     public class APIClient
     {
         private static readonly HttpClient _client = new();
-        public static ClientViewModel? Client { get; set; } = null;
+
+        public static string? Password { get; set; }
+        
         public static void Connect(IConfiguration configuration)
         {
             _client.BaseAddress = new Uri(configuration["IPAddress"]);
             _client.DefaultRequestHeaders.Accept.Clear();
-            _client.DefaultRequestHeaders.Accept.Add(new
-           MediaTypeWithQualityHeaderValue("application/json"));
+            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
         }
+
         public static T? GetRequest<T>(string requestUrl)
         {
             var response = _client.GetAsync(requestUrl);
@@ -31,12 +33,24 @@ namespace SushiBarClientApp
                 throw new Exception(result);
             }
         }
+
         public static void PostRequest<T>(string requestUrl, T model)
         {
             var json = JsonConvert.SerializeObject(model);
-            var data = new StringContent(json, Encoding.UTF8,
-           "application/json");
+            var data = new StringContent(json, Encoding.UTF8, "application/json");
+
             var response = _client.PostAsync(requestUrl, data);
+
+            var result = response.Result.Content.ReadAsStringAsync().Result;
+            if (!response.Result.IsSuccessStatusCode)
+            {
+                throw new Exception(result);
+            }
+        }
+
+        public static void DeleteRequest(string requestUrl)
+        {
+            var response = _client.DeleteAsync(requestUrl);
             var result = response.Result.Content.ReadAsStringAsync().Result;
             if (!response.Result.IsSuccessStatusCode)
             {
@@ -44,5 +58,5 @@ namespace SushiBarClientApp
             }
         }
     }
-
 }
+

SushiBar/SushiBarClientApp/Controllers/HomeController.cs

@@ -11,153 +11,142 @@ namespace SushiBarClientApp.Controllers
     public class HomeController : Controller
     {
         private readonly ILogger<HomeController> _logger;
+
         public HomeController(ILogger<HomeController> logger)
         {
             _logger = logger;
         }
+
         public IActionResult Index()
         {
-            if (APIClient.Client == null)
+            if (APIClient.Password == null)
             {
                 return Redirect("~/Home/Enter");
             }
-            return
-            View(APIClient.GetRequest<List<OrderViewModel>>($"api/main/getorders?clientId={APIClient.Client.Id}"));
-        }
-        [HttpGet]
-        public IActionResult Privacy()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View(APIClient.Client);
-        }
-        [HttpPost]
-        public void Privacy(string login, string password, string fio)
-        {
-            if (APIClient.Client == null)
-            {
-                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
-            }
-            if (string.IsNullOrEmpty(login) ||
-            string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
-            {
-                throw new Exception("Введите логин, пароль и ФИО");
-            }
-            APIClient.PostRequest("api/client/updatedata", new
-            ClientBindingModel
-            {
-                Id = APIClient.Client.Id,
-                ClientFIO = fio,
-                Email = login,
-                Password = password
-            });
-            APIClient.Client.ClientFIO = fio;
-            APIClient.Client.Email = login;
-            APIClient.Client.Password = password;
-            Response.Redirect("Index");
-        }
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None,
-        NoStore = true)]
-        public IActionResult Error()
-        {
-            return View(new ErrorViewModel
-            {
-                RequestId =
-            Activity.Current?.Id ?? HttpContext.TraceIdentifier
-            });
+            return View(APIClient.GetRequest<List<ShopViewModel>>($"api/shop/getshoplist?password={APIClient.Password}"));
         }
+
         [HttpGet]
         public IActionResult Enter()
         {
             return View();
         }
+
         [HttpPost]
-        public void Enter(string login, string password)
+        public void Enter(string password)
         {
-            if (string.IsNullOrEmpty(login) ||
-            string.IsNullOrEmpty(password))
+            bool resout = APIClient.GetRequest<bool>($"/api/shop/authentication?password={password}");
+            if (!resout)
             {
-                throw new Exception("Введите логин и пароль");
-            }
-            APIClient.Client =
-            APIClient.GetRequest<ClientViewModel>($"api/client/login?login={login}&password={password}");
-            if (APIClient.Client == null)
-            {
-                throw new Exception("Неверный логин/пароль");
+                Response.Redirect("../Home/Enter");
+                return;
             }
+            APIClient.Password = password;
             Response.Redirect("Index");
         }
-        [HttpGet]
-        public IActionResult Register()
-        {
-            return View();
-        }
-        [HttpPost]
-        public void Register(string login, string password, string fio)
-        {
-            if (string.IsNullOrEmpty(login) ||
-            string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
-            {
-                throw new Exception("Введите логин, пароль и ФИО");
-            }
-            APIClient.PostRequest("api/client/register", new
-            ClientBindingModel
-            {
-                ClientFIO = fio,
-                Email = login,
-                Password = password
-            });
-            Response.Redirect("Enter");
-            return;
-        }
+
         [HttpGet]
         public IActionResult Create()
         {
-            ViewBag.Sushis =
-            APIClient.GetRequest<List<SushiViewModel>>("api/main/getsushilist");
-            return View();
-        }
-        [HttpPost]
-        public void Create(int sushi, int count)
-        {
-            if (APIClient.Client == null)
-            {
-                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
-            }
-            if (count <= 0)
-            {
-                throw new Exception("Количество и сумма должны быть больше 0");
-            }
-            APIClient.PostRequest("api/main/createorder", new OrderBindingModel
-            {
-                ClientId = APIClient.Client.Id,
-                SushiId = sushi,
-                Count = count,
-                Sum = Calc(count, sushi)
-            });
-            Response.Redirect("Index");
-        }
-        [HttpPost]
-        public double Calc(int count, int sushi)
-        {
-            var prod =
-            APIClient.GetRequest<SushiViewModel>($"api/main/getsushi?sushiId={sushi}"
-            );
-            return count * (prod?.Price ?? 1);
-        }
-
-        [HttpGet]
-        public IActionResult Mails()
-        {
-            if (APIClient.Client == null)
+            if (APIClient.Password == null)
             {
                 return Redirect("~/Home/Enter");
             }
-            return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
+            return View("Shop");
         }
 
+        [HttpPost]
+        public void Create(int id, string shopname, string adress, DateTime openingdate, int maxcount)
+        {
+            if (string.IsNullOrEmpty(shopname) || string.IsNullOrEmpty(adress))
+            {
+                throw new Exception("Название или адрес не может быть пустым");
+            }
+            if (openingdate == default(DateTime))
+            {
+                throw new Exception("Дата открытия не может быть пустой");
+            }
+
+            APIClient.PostRequest($"api/shop/createshop?password={APIClient.Password}", new ShopBindingModel
+            {
+                Id = id,
+                ShopName = shopname,
+                Adress = adress,
+                OpeningDate = openingdate,
+                SushiMaxCount = maxcount
+            });
+            Response.Redirect("Index");
+        }
+
+        [HttpGet]
+        public IActionResult Update(int Id)
+        {
+            if (APIClient.Password == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            return View("Shop", APIClient.GetRequest<ShopSushiViewModel>($"api/shop/getshop?shopId={Id}&password={APIClient.Password}"));
+        }
+
+        [HttpPost]
+        public void Update(int id, string shopname, string adress, DateTime openingdate, int maxcount)
+        {
+            if (string.IsNullOrEmpty(shopname) || string.IsNullOrEmpty(adress))
+            {
+                throw new Exception("Название или адрес не может быть пустым");
+            }
+            if (openingdate == default(DateTime))
+            {
+                throw new Exception("Дата открытия не может быть пустой");
+            }
+            APIClient.PostRequest($"api/shop/updateshop?password={APIClient.Password}", new ShopBindingModel
+            {
+                Id = id,
+                ShopName = shopname,
+                Adress = adress,
+                OpeningDate = openingdate,
+                SushiMaxCount = maxcount
+            });
+            Response.Redirect("../Index");
+        }
+
+        [HttpPost]
+        public void Delete(int Id)
+        {
+            APIClient.DeleteRequest($"api/shop/deleteshop?shopId={Id}&password={APIClient.Password}");
+            Response.Redirect("../Index");
+        }
+
+        [HttpGet]
+        public IActionResult Supply()
+        {
+            if (APIClient.Password == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+
+            ViewBag.Shops = APIClient.GetRequest<List<ShopViewModel>>($"api/shop/getshoplist?password={APIClient.Password}");
+            ViewBag.Sushis = APIClient.GetRequest<List<SushiViewModel>>($"api/main/getsushilist");
+            return View();
+        }
+
+        [HttpPost]
+        public void Supply(int shop, int sushi, int count)
+        {
+            APIClient.PostRequest($"api/shop/makesypply?password={APIClient.Password}", new SupplyBindingModel
+            {
+                ShopId = shop,
+                SushiId = sushi,
+                Count = count
+            });
+            Response.Redirect("Index");
+        }
+
+        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+        public IActionResult Error()
+        {
+            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+        }
     }
 }
 

SushiBar/SushiBarClientApp/Views/Home/Index.cshtml

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

SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml

@@ -1,55 +0,0 @@
-@using SushiBarContracts.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>

SushiBar/SushiBarClientApp/Views/Home/Shop.cshtml

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

SushiBar/SushiBarClientApp/Views/Home/Supply.cshtml

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

SushiBar/SushiBarClientApp/Views/Shared/_Layout.cshtml

@@ -14,27 +14,18 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container-fluid">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Суши-Бар</a>
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">PizzeriaShopsApi</a>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
+                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Заказы</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="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>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Register">Регистрация</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Supply">Поставка</a>
                         </li>
                     </ul>
                 </div>
@@ -49,7 +40,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2024 - SushiBarClientApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+            &copy; 2024 - SushiBarShopApp - <a asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
         </div>
     </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>

SushiBar/SushiBarContracts/Attributes/ColumnAttribute.cs

@@ -1,25 +0,0 @@
-namespace SushiBarContracts.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;
-		}
-	}
-}

SushiBar/SushiBarContracts/Attributes/GridViewAutoSize.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.Attributes
-{
-	public enum GridViewAutoSize
-	{
-		NotSet = 0,
-
-		None = 1,
-
-		ColumnHeader = 2,
-
-		AllCellsExceptHeader = 4,
-
-		AllCells = 6,
-
-		DisplayedCellsExceptHeader = 8,
-
-		DisplayedCells = 10,
-
-		Fill = 16
-	}
-}

SushiBar/SushiBarContracts/BindingModels/BackUpSaveBinidngModel.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.BindingModels
-{
-	public class BackUpSaveBinidngModel
-	{
-		public string FolderName { get; set; } = string.Empty;
-	}
-}

SushiBar/SushiBarContracts/BindingModels/ImplementerBindingModel.cs

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

SushiBar/SushiBarContracts/BindingModels/MailConfigBindingModel.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.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; }
-	}
-}

SushiBar/SushiBarContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.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;
-	}
-}

SushiBar/SushiBarContracts/BindingModels/MessageInfoBindingModel.cs

@@ -1,21 +0,0 @@
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.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();
-	}
-}
-

SushiBar/SushiBarContracts/BindingModels/OrderBindingModel.cs

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

SushiBar/SushiBarContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarDataModels.Models;
+
+namespace SushiBarContracts.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, (ISushiModel, int)> ShopSushis { get; set; } = new();
+        public int SushiMaxCount { get; set; }
+    }
+}

SushiBar/SushiBarContracts/BindingModels/SupplyBindingModel.cs

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

SushiBar/SushiBarContracts/BusinessLogicsContracts/IBackUpLogic.cs

@@ -1,14 +0,0 @@
-using SushiBarContracts.BindingModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.BusinessLogicsContracts
-{
-	public interface IBackUpLogic
-	{
-		void CreateBackUp(BackUpSaveBinidngModel model);
-	}
-}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IImplementerLogic.cs

@@ -1,20 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.BusinessLogicsContracts
-{
-    public interface IImplementerLogic
-    {
-        List<ImplementerViewModel>? ReadList(ImplementerSearchModel? model);
-        ImplementerViewModel? ReadElement(ImplementerSearchModel model);
-        bool Create(ImplementerBindingModel model);
-        bool Update(ImplementerBindingModel model);
-        bool Delete(ImplementerBindingModel model);
-    }
-}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

@@ -1,17 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.BusinessLogicsContracts
-{
-	public interface IMessageInfoLogic
-	{
-		List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model);
-		bool Create(MessageInfoBindingModel model);
-	}
-}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IOrderLogic.cs

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

SushiBar/SushiBarContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -7,8 +7,13 @@ namespace SushiBarContracts.BusinessLogicsContracts
     {
         List<ReportSushiComponentViewModel> GetSushiComponents();
         List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
+        List<ReportShopsViewModel> GetShops();
+        List<ReportGroupOrdersViewModel> GetGroupedOrders();
         void SaveSushisToWordFile(ReportBindingModel model);
         void SaveSushiComponentToExcelFile(ReportBindingModel model);
         void SaveOrdersToPdfFile(ReportBindingModel model);
+        void SaveShopsToWordFile(ReportBindingModel model);
+        void SaveShopsToExcelFile(ReportBindingModel model);
+        void SaveGroupedOrdersToPdfFile(ReportBindingModel model);
     }
 }

SushiBar/SushiBarContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,22 @@
+using SushiBarContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+
+namespace SushiBarContracts.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);
+    }
+}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IWorkProcess.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.BusinessLogicsContracts
-{
-    public interface IWorkProcess
-    {
-        void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
-    }
-}

SushiBar/SushiBarContracts/DI/DependencyManager.cs

@@ -1,66 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.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>();
-	}
-}

SushiBar/SushiBarContracts/DI/IDependencyContainer.cs

@@ -1,40 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.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>();
-	}
-}

SushiBar/SushiBarContracts/DI/IImplementationExtension.cs

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

SushiBar/SushiBarContracts/DI/ServiceDependencyContainer.cs

@@ -1,62 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.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>()!;
-		}
-	}
-}

SushiBar/SushiBarContracts/DI/ServiceProviderLoader.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.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";
-		}
-	}
-}
-

SushiBar/SushiBarContracts/SearchModels/OrderSearchModel.cs

@@ -1,5 +1,4 @@
-using SushiBarDataModels.Enums;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -13,7 +12,5 @@ namespace SushiBarContracts.SearchModels
         public int? ClientId { get; set; }
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set; }
-        public OrderStatus? Status { get; set; }
-        public int? ImplementerId { get; set; }
     }
 }

SushiBar/SushiBarContracts/SearchModels/ShopSearchModel.cs

@@ -6,10 +6,9 @@ using System.Threading.Tasks;
 
 namespace SushiBarContracts.SearchModels
 {
-    public class ImplementerSearchModel
+    public class ShopSearchModel
     {
         public int? Id { get; set; }
-        public string? ImplementerFIO { get; set; }
-        public string? Password { get; set; }
+        public string? ShopName { get; set; }
     }
 }

SushiBar/SushiBarContracts/SearchModels/SupplySearchModel.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace SushiBarContracts.SearchModels
 {
-	public class MessageInfoSearchModel
-	{
-		public int? ClientId { get; set; }
-		public string? MessageId { get; set; }
-	}
+    public class SupplySearchModel
+    {
+        public int? SushiId { get; set; }
+        public int? Count { get; set; }
+    }
 }

SushiBar/SushiBarContracts/StoragesContracts/IBackUpInfo.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.StoragesContracts
-{
-	public interface IBackUpInfo
-	{
-		List<T>? GetList<T>() where T : class, new();
-
-		Type? GetTypeByModelInterface(string modelInterfaceName);
-	}
-}

SushiBar/SushiBarContracts/StoragesContracts/IImplementerStorage.cs

@@ -1,21 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.StoragesContracts
-{
-    public interface IImplementerStorage
-    {
-        List<ImplementerViewModel> GetFullList();
-        List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model);
-        ImplementerViewModel? GetElement(ImplementerSearchModel model);
-        ImplementerViewModel? Insert(ImplementerBindingModel model);
-        ImplementerViewModel? Update(ImplementerBindingModel model);
-        ImplementerViewModel? Delete(ImplementerBindingModel model);
-    }
-}

SushiBar/SushiBarContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -1,19 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.StoragesContracts
-{
-	public interface IMessageInfoStorage
-	{
-		List<MessageInfoViewModel> GetFullList();
-		List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model);
-		MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
-		MessageInfoViewModel? Insert(MessageInfoBindingModel model);
-	}
-}

SushiBar/SushiBarContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,23 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.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);
+    }
+}

SushiBar/SushiBarContracts/ViewModels/ClientViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/ComponentViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/ImplementerViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,35 +0,0 @@
-using SushiBarContracts.Attributes;
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.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;
-	}
-}

SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs

@@ -1,5 +1,4 @@
-using SushiBarContracts.Attributes;
-using SushiBarDataModels.Enums;
+using SushiBarDataModels.Enums;
 using SushiBarDataModels.Models;
 using System;
 using System.Collections.Generic;
@@ -12,43 +11,31 @@ namespace SushiBarContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
-		[Column(title: "Номер", width: 90)]
-		public int Id { get; set; }
+        [DisplayName("Номер")]
+        public int Id { get; set; }
 
-		[Column(visible: false)]
-		public int ClientId { get; set; }
+        public int SushiId { get; set; }
+        public int ClientId { get; set; }
 
-		[Column(title: "Имя клиента", width: 190)]
-		public string ClientFIO { get; set; } = string.Empty;
+        [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)]
-		public string? ImplementerFIO { get; set; } = null;
-
-		[Column(visible: false)]
-		public int SushiId { get; set; }
-
-		[Column(title: "Суши", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
-		public string SushiName { get; set; } = string.Empty;
-
-		[Column(title: "Количество", width: 100)]
-		public int Count { get; set; }
-
-		[Column(title: "Сумма", width: 120)]
-		public double Sum { get; set; }
-
-		[Column(title: "Статус", width: 70)]
-		public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-
-		[Column(title: "Дата создания", width: 120)]
-		public DateTime DateCreate { get; set; } = DateTime.Now;
-
-		[Column(title: "Дата выполнения", width: 120)]
-		public DateTime? DateImplement { get; set; }
-	}
+        [DisplayName("Изделие")]
+        public string SushiName { get; set; } = string.Empty;
+        
+        [DisplayName("Количество")]
+        public int Count { get; set; }
+        
+        [DisplayName("Сумма")]
+        public double Sum { get; set; }
+        
+        [DisplayName("Статус")]
+        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+        
+        [DisplayName("Дата создания")]
+        public DateTime DateCreate { get; set; } = DateTime.Now;
+        
+        [DisplayName("Дата выполнения")]
+        public DateTime? DateImplement { get; set; }
+    }
 }

SushiBar/SushiBarContracts/ViewModels/ReportGroupOrdersViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/ReportShopsViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/ShopSushiViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.ViewModels
+{
+    public class ShopSushiViewModel
+    {
+        public ShopViewModel Shop { get; set; } = new();
+        public Dictionary<int, SushiCount> ShopSushi { get; set; } = new();
+    }
+}

SushiBar/SushiBarContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarDataModels.Models;
+using SushiBarContracts.ViewModels;
+
+namespace SushiBarContracts.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, (ISushiModel, int)> ShopSushis { get; set; } = new();
+        [DisplayName("Вместимость")]
+        public int SushiMaxCount { get; set; }
+    }
+}

SushiBar/SushiBarContracts/ViewModels/SushiCount.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.ViewModels
+{
+    public class SushiCount
+    {
+        public SushiViewModel Sushi { get; set; }
+        public int Count { get; set; } = new();
+    }
+}

SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs

@@ -1,5 +1,4 @@
-using SushiBarContracts.Attributes;
-using SushiBarDataModels.Models;
+using SushiBarDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,14 +10,12 @@ namespace SushiBarContracts.ViewModels
 {
     public class SushiViewModel : ISushiModel
     {
-		[Column(visible: false)]
-		public int Id { get; set; }
-		[Column(title: "Название сущи", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
-		public string SushiName { get; set; } = string.Empty;
-		[Column(title: "Цена", width: 70)]
-		public double Price { get; set; }
-		[Column(visible: false)]
-		public Dictionary<int, (IComponentModel, int)> SushiComponents
+        public int Id { get; set; }
+        [DisplayName("Название изделия")]
+        public string SushiName { get; set; } = string.Empty;
+        [DisplayName("Цена")]
+        public double Price { get; set; }
+        public Dictionary<int, (IComponentModel, int)> SushiComponents
         {
             get;
             set;

SushiBar/SushiBarDataModels/Models/IImplementerModel.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDataModels.Models
-{
-    public interface IImplementerModel : IId
-    {
-        string ImplementerFIO { get; }
-
-        string Password { get; }
-
-        int WorkExperience { get; }
-
-        int Qualification { get; }
-    }
-}

SushiBar/SushiBarDataModels/Models/IMessageInfoModel.cs

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

SushiBar/SushiBarDataModels/Models/IOrderModel.cs

@@ -16,6 +16,5 @@ namespace SushiBarDataModels.Models
         OrderStatus Status { get; }
         DateTime DateCreate { get; }
         DateTime? DateImplement { get; }
-        int? ImplementerId { get; }
     }
 }

SushiBar/SushiBarDataModels/Models/IShopModel.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarDataModels.Models
+{
+    public interface IShopModel : IId
+    {
+        string ShopName { get; }
+        string Adress { get; }
+        DateTime OpeningDate { get; }
+        Dictionary<int, (ISushiModel, int)> ShopSushis { get; }
+        public int SushiMaxCount { get; }
+    }
+}

SushiBar/SushiBarDataModels/Models/ISupplyModel.cs

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

SushiBar/SushiBarDatabaseImplement/ImplementationExtension.cs

@@ -1,28 +0,0 @@
-using SushiBar.StoragesContracts;
-using SushiBarContracts.DI;
-using SushiBarContracts.StoragesContracts;
-using SushiBarDatabaseImplement.Implements;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDatabaseImplement
-{
-	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<ISushiStorage, SushiStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

SushiBar/SushiBarDatabaseImplement/Implements/BackUpInfo.cs

@@ -1,32 +0,0 @@
-using SushiBarContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDatabaseImplement.Implements
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			using var context = new SushiBarDatabase();
-			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;
-		}
-	}
-}

SushiBar/SushiBarDatabaseImplement/Implements/ClientStorage.cs

@@ -36,9 +36,10 @@ namespace SushiBarDatabaseImplement.Implements
                 return null;
             }
             using var context = new SushiBarDatabase();
-            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)

SushiBar/SushiBarDatabaseImplement/Implements/ImplementerStorage.cs

@@ -1,84 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDatabaseImplement.Implements
-{
-    public class ImplementerStorage : IImplementerStorage
-    {
-        public List<ImplementerViewModel> GetFullList()
-        {
-            using var context = new SushiBarDatabase();
-            return context.Implementers.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ImplementerFIO))
-            {
-                return new();
-            }
-            using var context = new SushiBarDatabase();
-            return context.Implementers.Where(x => x.ImplementerFIO.Contains(model.ImplementerFIO)).Select(x => x.GetViewModel).ToList();
-        }
-
-        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ImplementerFIO) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new SushiBarDatabase();
-            return context.Implementers.FirstOrDefault(x =>
-                (!string.IsNullOrEmpty(model.ImplementerFIO) && x.ImplementerFIO == model.ImplementerFIO && (!string.IsNullOrEmpty(model.Password) ? x.Password == model.Password : true)) ||
-                (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-
-        public ImplementerViewModel? Insert(ImplementerBindingModel model)
-        {
-            var newImplementer = Implementer.Create(model);
-            if (newImplementer == null)
-            {
-                return null;
-            }
-            using var context = new SushiBarDatabase();
-            context.Implementers.Add(newImplementer);
-            context.SaveChanges();
-            return newImplementer.GetViewModel;
-        }
-
-        public ImplementerViewModel? Update(ImplementerBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var implementer = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
-            if (implementer == null)
-            {
-                return null;
-            }
-            implementer.Update(model);
-            context.SaveChanges();
-            return implementer.GetViewModel;
-        }
-
-        public ImplementerViewModel? Delete(ImplementerBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var implementer = context.Implementers.FirstOrDefault(rec => rec.Id == model.Id);
-            if (implementer != null)
-            {
-                context.Implementers.Remove(implementer);
-                context.SaveChanges();
-                return implementer.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -1,52 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDatabaseImplement.Implements
-{
-    public class MessageInfoStorage : IMessageInfoStorage
-    {
-        public List<MessageInfoViewModel> GetFullList()
-        {
-            using var context = new SushiBarDatabase();
-            return context.MessageInfos.Select(x => x.GetViewModel).ToList();
-        }
-        public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-        {
-            if (!model.ClientId.HasValue)
-            {
-                return new();
-            }
-            using var context = new SushiBarDatabase();
-            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 SushiBarDatabase();
-            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 SushiBarDatabase();
-            context.MessageInfos.Add(newMessage);
-            context.SaveChanges();
-            return newMessage.GetViewModel;
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs

@@ -17,34 +17,35 @@ namespace SushiBarDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new SushiBarDatabase();
-            return context.Orders.Include(x => x.Sushi).Include(x => x.Client).Include(y => y.Implementer).Select(x => x.GetViewModel).ToList();
+            return context.Orders.Include(x => x.Sushi).Include(x => x.Client).Select(x => x.GetViewModel).ToList();
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             using var context = new SushiBarDatabase();
-            if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue && !model.Status.HasValue)
+            if (model.DateFrom.HasValue)
             {
-                return new();
+                return context.Orders.Include(x => x.Sushi).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
             }
-                return context.Orders.Include(x => x.Sushi).Include(x => x.Client).Include(x => x.Implementer).Where(x =>
-                 (model.DateFrom.HasValue && model.DateTo.HasValue && x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) ||
-                 (model.ClientId.HasValue && x.ClientId == model.ClientId) ||
-                 (model.Status.HasValue && x.Status == model.Status))
-                 .Select(x => x.GetViewModel).ToList();
+            if (model.ClientId.HasValue)
+            {
+                return context.Orders.Include(x => x.Sushi).Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
+            }
+            if (model.ClientId.HasValue)
+            {
+                return context.Orders.Include(x => x.Sushi).Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
+            }
+            return context.Orders.Include(x => x.Sushi).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
         }
 
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
-            if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue))
+            if (!model.Id.HasValue)
             {
                 return new();
             }
             using var context = new SushiBarDatabase();
-            return context.Orders.Include(x => x.Sushi).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x =>
-                (model.Id.HasValue && x.Id == model.Id) ||
-                (model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId && x.Status == model.Status))
-                ?.GetViewModel;
+            return context.Orders.Include(x => x.Sushi).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -70,7 +71,7 @@ namespace SushiBarDatabaseImplement.Implements
             {
                 return null;
             }
-            order.Update(context, model);
+            order.Update(model);
             context.SaveChanges();
             return order.GetViewModel;
         }

SushiBar/SushiBarDatabaseImplement/Implements/ShopStorage.cs

@@ -0,0 +1,186 @@
+using Microsoft.EntityFrameworkCore;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
+
+
+namespace SushiBarDatabaseImplement.Implements
+{
+    public class ShopStorage : IShopStorage
+    {
+        public List<ShopViewModel> GetFullList()
+        {
+            using var context = new SushiBarDatabase();
+            return context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi).ToList().
+                Select(x => x.GetViewModel).ToList();
+        }
+
+        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                return new();
+            }
+            using var context = new SushiBarDatabase();
+            return context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi).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 SushiBarDatabase();
+            return context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi)
+                .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 SushiBarDatabase();
+            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 SushiBarDatabase();
+            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.UpdateSushis(context, model);
+                transaction.Commit();
+                return shop.GetViewModel;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+
+        public ShopViewModel? Delete(ShopBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var shop = context.Shops.Include(x => x.Sushis).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 SushiBarDatabase();
+            var transaction = context.Database.BeginTransaction();
+            var Shops = context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi).ToList().
+                Where(x => x.SushiMaxCount > x.ShopSushis.Select(x => x.Value.Item2).Sum()).ToList();
+            if (model == null)
+            {
+                return false;
+            }
+            try
+            {
+                foreach (Shop shop in Shops)
+                {
+                    int difference = shop.SushiMaxCount - shop.ShopSushis.Select(x => x.Value.Item2).Sum();
+                    int refill = Math.Min(difference, model.Count);
+                    model.Count -= refill;
+                    if (shop.ShopSushis.ContainsKey(model.SushiId))
+                    {
+                        var datePair = shop.ShopSushis[model.SushiId];
+                        datePair.Item2 += refill;
+                        shop.ShopSushis[model.SushiId] = datePair;
+                    }
+                    else
+                    {
+                        var sushi = context.Sushis.First(x => x.Id == model.SushiId);
+                        shop.ShopSushis.Add(model.SushiId, (sushi, refill));
+                    }
+                    shop.SushisDictionatyUpdate(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 SushiBarDatabase();
+            var transaction = context.Database.BeginTransaction();
+            try
+            {
+                var shops = context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi).ToList().
+                    Where(x => x.ShopSushis.ContainsKey(model.SushiId.Value)).OrderByDescending(x => x.ShopSushis[model.SushiId.Value].Item2).ToList();
+
+                foreach (var shop in shops)
+                {
+                    int residue = model.Count.Value - shop.ShopSushis[model.SushiId.Value].Item2;
+                    if (residue > 0)
+                    {
+                        shop.ShopSushis.Remove(model.SushiId.Value);
+                        shop.SushisDictionatyUpdate(context);
+                        context.SaveChanges();
+                        model.Count = residue;
+
+                    }
+                    else
+                    {
+                        if (residue == 0)
+                            shop.ShopSushis.Remove(model.SushiId.Value);
+                        else
+                        {
+                            var dataPair = shop.ShopSushis[model.SushiId.Value];
+                            dataPair.Item2 = -residue;
+                            shop.ShopSushis[model.SushiId.Value] = dataPair;
+                        }
+
+                        shop.SushisDictionatyUpdate(context);
+                        transaction.Commit();
+                        return true;
+                    }
+                }
+                transaction.Rollback();
+                return false;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/20240508132013_InitCreate.Designer.cs

@@ -12,7 +12,7 @@ using SushiBarDatabaseImplement;
 namespace SushiBarDatabaseImplement.Migrations
 {
     [DbContext(typeof(SushiBarDatabase))]
-    [Migration("20240522110209_InitCreate")]
+    [Migration("20240508132013_InitCreate")]
     partial class InitCreate
     {
         /// <inheritdoc />
@@ -25,33 +25,6 @@ namespace SushiBarDatabaseImplement.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("SushiBarDataModels.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("SushiBarDatabaseImplement.Models.Client", b =>
                 {
                     b.Property<int>("Id")
@@ -97,36 +70,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.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("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -147,9 +90,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -163,13 +103,64 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
-                    b.HasIndex("ImplementerId");
-
                     b.HasIndex("SushiId");
 
                     b.ToTable("Orders");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Adress")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("OpeningDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ShopName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("SushiMaxCount")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shops");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ShopId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ShopId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("ShopSushis");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Property<int>("Id")
@@ -216,27 +207,14 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("SushiComponents");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("ClientMessages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("ClientOrders")
+                        .WithMany("Orders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("SushiBarDataModels.Models.Implementer", "Implementer")
-                        .WithMany("Order")
-                        .HasForeignKey("ImplementerId");
-
                     b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
                         .WithMany("Orders")
                         .HasForeignKey("SushiId")
@@ -245,7 +223,24 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
-                    b.Navigation("Implementer");
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("Sushis")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany()
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Shop");
 
                     b.Navigation("Sushi");
                 });
@@ -269,16 +264,9 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
-            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("ClientMessages");
-
-                    b.Navigation("ClientOrders");
+                    b.Navigation("Orders");
                 });
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
@@ -286,6 +274,11 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("SushiComponents");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("Sushis");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Navigation("Components");

SushiBar/SushiBarDatabaseImplement/Migrations/20240508132013_InitCreate.cs

@@ -41,19 +41,19 @@ namespace SushiBarDatabaseImplement.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "Implementers",
+                name: "Shops",
                 columns: table => new
                 {
                     Id = table.Column<int>(type: "int", nullable: false)
                         .Annotation("SqlServer:Identity", "1, 1"),
-                    ImplementerFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    WorkExperience = table.Column<int>(type: "int", nullable: false),
-                    Qualification = table.Column<int>(type: "int", nullable: false)
+                    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),
+                    SushiMaxCount = table.Column<int>(type: "int", nullable: false)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_Implementers", x => x.Id);
+                    table.PrimaryKey("PK_Shops", x => x.Id);
                 });
 
             migrationBuilder.CreateTable(
@@ -70,27 +70,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Sushis", x => x.Id);
                 });
 
-            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.CreateTable(
                 name: "Orders",
                 columns: table => new
@@ -103,8 +82,7 @@ namespace SushiBarDatabaseImplement.Migrations
                     Sum = table.Column<double>(type: "float", nullable: false),
                     Status = table.Column<int>(type: "int", nullable: false),
                     DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    ImplementerId = table.Column<int>(type: "int", nullable: true)
+                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true)
                 },
                 constraints: table =>
                 {
@@ -115,11 +93,6 @@ namespace SushiBarDatabaseImplement.Migrations
                         principalTable: "Clients",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Orders_Implementers_ImplementerId",
-                        column: x => x.ImplementerId,
-                        principalTable: "Implementers",
-                        principalColumn: "Id");
                     table.ForeignKey(
                         name: "FK_Orders_Sushis_SushiId",
                         column: x => x.SushiId,
@@ -128,6 +101,33 @@ namespace SushiBarDatabaseImplement.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "ShopSushis",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SushiId = 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_ShopSushis", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ShopSushis_Shops_ShopId",
+                        column: x => x.ShopId,
+                        principalTable: "Shops",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ShopSushis_Sushis_SushiId",
+                        column: x => x.SushiId,
+                        principalTable: "Sushis",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
             migrationBuilder.CreateTable(
                 name: "SushiComponents",
                 columns: table => new
@@ -155,26 +155,26 @@ namespace SushiBarDatabaseImplement.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
-            migrationBuilder.CreateIndex(
-                name: "IX_MessageInfos_ClientId",
-                table: "MessageInfos",
-                column: "ClientId");
-
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_ClientId",
                 table: "Orders",
                 column: "ClientId");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_ImplementerId",
-                table: "Orders",
-                column: "ImplementerId");
-
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_SushiId",
                 table: "Orders",
                 column: "SushiId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_ShopSushis_ShopId",
+                table: "ShopSushis",
+                column: "ShopId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ShopSushis_SushiId",
+                table: "ShopSushis",
+                column: "SushiId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_SushiComponents_ComponentId",
                 table: "SushiComponents",
@@ -190,10 +190,10 @@ namespace SushiBarDatabaseImplement.Migrations
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
-                name: "MessageInfos");
+                name: "Orders");
 
             migrationBuilder.DropTable(
-                name: "Orders");
+                name: "ShopSushis");
 
             migrationBuilder.DropTable(
                 name: "SushiComponents");
@@ -202,7 +202,7 @@ namespace SushiBarDatabaseImplement.Migrations
                 name: "Clients");
 
             migrationBuilder.DropTable(
-                name: "Implementers");
+                name: "Shops");
 
             migrationBuilder.DropTable(
                 name: "Components");

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -22,33 +22,6 @@ namespace SushiBarDatabaseImplement.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("SushiBarDataModels.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("SushiBarDatabaseImplement.Models.Client", b =>
                 {
                     b.Property<int>("Id")
@@ -94,36 +67,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.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("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -144,9 +87,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -160,13 +100,64 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
-                    b.HasIndex("ImplementerId");
-
                     b.HasIndex("SushiId");
 
                     b.ToTable("Orders");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Adress")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("OpeningDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ShopName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("SushiMaxCount")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shops");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ShopId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ShopId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("ShopSushis");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Property<int>("Id")
@@ -213,27 +204,14 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("SushiComponents");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("ClientMessages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("ClientOrders")
+                        .WithMany("Orders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("SushiBarDataModels.Models.Implementer", "Implementer")
-                        .WithMany("Order")
-                        .HasForeignKey("ImplementerId");
-
                     b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
                         .WithMany("Orders")
                         .HasForeignKey("SushiId")
@@ -242,7 +220,24 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
-                    b.Navigation("Implementer");
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("Sushis")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany()
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Shop");
 
                     b.Navigation("Sushi");
                 });
@@ -266,16 +261,9 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
-            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("ClientMessages");
-
-                    b.Navigation("ClientOrders");
+                    b.Navigation("Orders");
                 });
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
@@ -283,6 +271,11 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("SushiComponents");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("Sushis");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Navigation("Components");

SushiBar/SushiBarDatabaseImplement/Models/Client.cs

@@ -9,35 +9,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 SushiBarDatabaseImplement.Models
 {
-	[DataContract]
 	public class Client : IClientModel
 	{
-		[DataMember]
 		public int Id { get; private set; }
 
-		[DataMember]
 		[Required]
 		public string ClientFIO { get; set; } = string.Empty;
-
-		[DataMember]
 		[Required]
 		public string Email { get; set; } = string.Empty;
-
-		[DataMember]
 		[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)
 		{
@@ -84,4 +73,4 @@ namespace SushiBarDatabaseImplement.Models
 			Password = Password
 		};
 	}
-}
+}

SushiBar/SushiBarDatabaseImplement/Models/Component.cs

@@ -8,20 +8,15 @@ using System.Threading.Tasks;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.ViewModels;
 using SushiBarDataModels.Models;
-using System.Runtime.Serialization;
 
 namespace SushiBarDatabaseImplement.Models
 {
-	[DataContract]
-	public class Component : IComponentModel
+    public class Component : IComponentModel
     {
-		[DataMember]
         public int Id { get; private set; }
-		[DataMember]
-		[Required]
+        [Required]
         public string ComponentName { get; private set; } = string.Empty;
-		[DataMember]
-		[Required]
+        [Required]
         public double Cost { get; set; }
         [ForeignKey("ComponentId")]
         public virtual List<SushiComponent> SushiComponents { get; set; } = new();

SushiBar/SushiBarDatabaseImplement/Models/Implementer.cs

@@ -1,73 +0,0 @@
-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 SushiBarContracts.BindingModels;
-using SushiBarDatabaseImplement.Models;
-using SushiBarContracts.ViewModels;
-using System.Runtime.Serialization;
-
-namespace SushiBarDataModels.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; }
-
-        [ForeignKey("ImplementerId")]
-        public virtual List<Order> Order { get; set; } = new();
-
-        public static Implementer? Create(ImplementerBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Implementer()
-            {
-                Id = model.Id,
-                ImplementerFIO = model.ImplementerFIO,
-                Password = model.Password,
-                WorkExperience = model.WorkExperience,
-                Qualification = model.Qualification
-            };
-        }
-
-        public void Update(ImplementerBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ImplementerFIO = model.ImplementerFIO;
-            Password = model.Password;
-            WorkExperience = model.WorkExperience;
-            Qualification = model.Qualification;
-        }
-
-        public ImplementerViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ImplementerFIO = ImplementerFIO,
-            Password = Password,
-            WorkExperience = WorkExperience,
-            Qualification = Qualification
-        };
-    }
-}

SushiBar/SushiBarDatabaseImplement/Models/MessageInfo.cs

@@ -1,74 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.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 SushiBarDatabaseImplement.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
-		};
-	}
-}

SushiBar/SushiBarDatabaseImplement/Models/Order.cs

@@ -6,49 +6,36 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace SushiBarDatabaseImplement.Models
 {
-	[DataContract]
-	public class Order : IOrderModel
+    public class Order : IOrderModel
     {
-		[DataMember]
-		public int Id { get; private set; }
-		[DataMember]
-		[Required]
+        public int Id { get; private set; }
+
+        [Required]
         public int ClientId { get; private set; }
         public virtual Client Client { get; private set; } = new();
-		[DataMember]
-		[Required]
+        [Required]
         public int SushiId { get; private set; }
 
         public virtual Sushi Sushi { get; set; } = new();
 
-		[DataMember]
-		[Required]
+        [Required]
         public int Count { get; private set; }
 
-		[DataMember]
-		[Required]
+        [Required]
         public double Sum { get; private set; }
 
-		[DataMember]
-		[Required]
+        [Required]
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
 
-		[DataMember]
-		[Required]
+        [Required]
         public DateTime DateCreate { get; private set; } = DateTime.Now;
 
-		[DataMember]
-		public DateTime? DateImplement { get; private set; }
-		[DataMember]
-		public int? ImplementerId { get; private set; }
-
-        public virtual Implementer? Implementer { get; set; } = new();
+        public DateTime? DateImplement { get; private set; }
 
         public static Order Create(SushiBarDatabase context, OrderBindingModel model)
         {
@@ -59,8 +46,6 @@ namespace SushiBarDatabaseImplement.Models
                 Client = context.Clients.First(x => x.Id == model.ClientId),
                 SushiId = model.SushiId,
                 Sushi = context.Sushis.First(x => x.Id == model.SushiId),
-                ImplementerId = model.ImplementerId,
-                Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -69,7 +54,7 @@ namespace SushiBarDatabaseImplement.Models
             };
         }
 
-        public void Update(SushiBarDatabase context, OrderBindingModel? model)
+        public void Update(OrderBindingModel? model)
         {
             if (model == null)
             {
@@ -77,8 +62,6 @@ namespace SushiBarDatabaseImplement.Models
             }
             Status = model.Status;
             DateImplement = model.DateImplement;
-            ImplementerId = model.ImplementerId;
-            Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null;
         }
 
         public OrderViewModel GetViewModel => new()
@@ -86,11 +69,8 @@ namespace SushiBarDatabaseImplement.Models
             Id = Id,
             ClientId = ClientId,
             ClientFIO = Client.ClientFIO,
-            ClientEmail = Client.Email,
             SushiId = SushiId,
             SushiName = Sushi.SushiName,
-            ImplementerId = ImplementerId,
-            ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null,
             Count = Count,
             Sum = Sum,
             Status = Status,

SushiBar/SushiBarDatabaseImplement/Models/Shop.cs

@@ -0,0 +1,119 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarDatabaseImplement.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 SushiMaxCount { get; set; }
+
+        private Dictionary<int, (ISushiModel, int)>? _shopSushis = null;
+
+        public Dictionary<int, (ISushiModel, int)> ShopSushis
+        {
+            get
+            {
+                if (_shopSushis == null)
+                {
+                    if (_shopSushis == null)
+                    {
+                        _shopSushis = Sushis
+                                .ToDictionary(recSP => recSP.SushiId, recSP => (recSP.Sushi as ISushiModel, recSP.Count));
+                    }
+                    return _shopSushis;
+                }
+                return _shopSushis;
+            }
+        }
+
+        [ForeignKey("ShopId")]
+        public List<ShopSushis> Sushis { get; set; } = new();
+
+        public static Shop Create(SushiBarDatabase context, ShopBindingModel model)
+        {
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Adress = model.Adress,
+                OpeningDate = model.OpeningDate,
+                Sushis = model.ShopSushis.Select(x => new ShopSushis
+                {
+                    Sushi = context.Sushis.First(y => y.Id == x.Key),
+                    Count = x.Value.Item2
+                }).ToList(),
+                SushiMaxCount = model.SushiMaxCount
+            };
+        }
+
+        public void Update(ShopBindingModel model)
+        {
+            ShopName = model.ShopName;
+            Adress = model.Adress;
+            OpeningDate = model.OpeningDate;
+            SushiMaxCount = model.SushiMaxCount;
+        }
+
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Adress = Adress,
+            OpeningDate = OpeningDate,
+            ShopSushis = ShopSushis,
+            SushiMaxCount = SushiMaxCount
+        };
+
+        public void UpdateSushis(SushiBarDatabase context, ShopBindingModel model)
+        {
+            var ShopSushis = context.ShopSushis.Where(rec => rec.ShopId == model.Id).ToList();
+            if (ShopSushis != null && ShopSushis.Count > 0)
+            {
+                context.ShopSushis.RemoveRange(ShopSushis.Where(rec => !model.ShopSushis.ContainsKey(rec.SushiId)));
+                context.SaveChanges();
+                ShopSushis = context.ShopSushis.Where(rec => rec.ShopId == model.Id).ToList();
+                foreach (var updateSushi in ShopSushis)
+                {
+                    updateSushi.Count = model.ShopSushis[updateSushi.SushiId].Item2;
+                    model.ShopSushis.Remove(updateSushi.SushiId);
+                }
+                context.SaveChanges();
+            }
+            var shop = context.Shops.First(x => x.Id == Id);
+            foreach (var ar in model.ShopSushis)
+            {
+                context.ShopSushis.Add(new ShopSushis
+                {
+                    Shop = shop,
+                    Sushi = context.Sushis.First(x => x.Id == ar.Key),
+                    Count = ar.Value.Item2
+                });
+                context.SaveChanges();
+            }
+            _shopSushis = null;
+        }
+
+        public void SushisDictionatyUpdate(SushiBarDatabase context)
+        {
+            UpdateSushis(context, new ShopBindingModel
+            {
+                Id = Id,
+                ShopSushis = ShopSushis,
+            });
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/ShopSushis.cs

@@ -0,0 +1,28 @@
+using SushiBarDatabaseImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class ShopSushis
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public int SushiId { get; set; }
+
+        [Required]
+        public int ShopId { get; set; }
+
+        [Required]
+        public int Count { get; set; }
+
+        public virtual Shop Shop { get; set; } = new();
+
+        public virtual Sushi Sushi { get; set; } = new();
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs

@@ -8,27 +8,19 @@ using System.Text;
 using System.Threading.Tasks;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.ViewModels;
-using System.Runtime.Serialization;
 
 namespace SushiBarDatabaseImplement.Models
 {
-	[DataContract]
-	public class Sushi : ISushiModel
+    public class Sushi : ISushiModel
     {
-		[DataMember]
-		public int Id { get; set; }
-		[DataMember]
-		[Required]
+        public int Id { get; set; }
+        [Required]
         public string SushiName { get; set; } = string.Empty;
-		[DataMember]
-		[Required]
+        [Required]
         public double Price { get; set; }
 
-
-
         private Dictionary<int, (IComponentModel, int)>? _sushiComponents = null;
-		[DataMember]
-		[NotMapped]
+        [NotMapped]
         public Dictionary<int, (IComponentModel, int)> SushiComponents
         {
             get

SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj

@@ -19,9 +19,7 @@
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
     <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
     <ProjectReference Include="..\SushiBarListImplement_\SushiBarListImplement.csproj" />
+    <ProjectReference Include="..\SushiBarFileImplement\SushiBarFileImplement.csproj" />
   </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-  </Target>
 
 </Project>

SushiBar/SushiBarDatabaseImplement/SushiBarDatatbase.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using SushiBarDatabaseImplement.Models;
-using SushiBarDataModels.Models;
 
 namespace SushiBarDatabaseImplement
 {
@@ -24,7 +23,7 @@ namespace SushiBarDatabaseImplement
         public virtual DbSet<SushiComponent> SushiComponents { set; get; }
         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 { get; set; }
+        public virtual DbSet<ShopSushis> ShopSushis { get; set; }
     }
 }