Pizzeria/Pizzeria.sln

@@ -13,9 +13,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaDataModels", "Pizze
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaListImplement", "PizzeriaListImplement\PizzeriaListImplement.csproj", "{190E2EDD-BFA6-4213-9F8A-1B1D4FBBB8E4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaFileImplement", "PizzeriaFileImplement\PizzeriaFileImplement.csproj", "{4B58D113-7C25-4795-8242-814C8288D30C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaFileImplement", "PizzeriaFileImplement\PizzeriaFileImplement.csproj", "{357BD3B9-6100-469F-814F-7DABB2DDA33B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaDatabaseImplement", "PizzeriaDatabaseImplement\PizzeriaDatabaseImplement.csproj", "{DAE2ED2F-B064-40FA-B594-A360E041B485}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaDatabaseImplement", "PizzeriaDatabaseImplement\PizzeriaDatabaseImplement.csproj", "{DAE2ED2F-B064-40FA-B594-A360E041B485}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,10 +43,10 @@ Global
 		{190E2EDD-BFA6-4213-9F8A-1B1D4FBBB8E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{190E2EDD-BFA6-4213-9F8A-1B1D4FBBB8E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{190E2EDD-BFA6-4213-9F8A-1B1D4FBBB8E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B58D113-7C25-4795-8242-814C8288D30C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{357BD3B9-6100-469F-814F-7DABB2DDA33B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B58D113-7C25-4795-8242-814C8288D30C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{357BD3B9-6100-469F-814F-7DABB2DDA33B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B58D113-7C25-4795-8242-814C8288D30C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{357BD3B9-6100-469F-814F-7DABB2DDA33B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B58D113-7C25-4795-8242-814C8288D30C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{357BD3B9-6100-469F-814F-7DABB2DDA33B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DAE2ED2F-B064-40FA-B594-A360E041B485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DAE2ED2F-B064-40FA-B594-A360E041B485}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DAE2ED2F-B064-40FA-B594-A360E041B485}.Release|Any CPU.ActiveCfg = Release|Any CPU

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -17,13 +17,10 @@ namespace PizzeriaBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
-
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _shopStorage = shopStorage;
         }
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
@@ -63,23 +60,6 @@ namespace PizzeriaBusinessLogic.BusinessLogics
 
         public bool DeliveryOrder(OrderBindingModel model)
         {
-            var order = _orderStorage.GetElement(new OrderSearchModel
-            {
-                Id = model.Id,
-            });
-            if (order == null)
-            {
-                throw new ArgumentNullException(nameof(order));
-            }
-            if (!_shopStorage.RestockingShops(new SupplyBindingModel
-            {
-                PizzaId = order.PizzaId,
-                Count = order.Count
-            }))
-            {
-                throw new ArgumentException("Недостаточно места");
-            }
-
             return ChangeStatus(model, OrderStatus.Выдан);
         }
 

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ReportLogic.cs

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

Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ShopLogic.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToWord.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/ExcelShop.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/WordRowParameters.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/HelperModels/WordShopInfo.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/IDocument.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

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

Pizzeria/PizzeriaBusinessLogic/OfficePackage/Implements/SaveToWord.cs

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

Pizzeria/PizzeriaContracts/BindingModels/ShopBindingModel.cs

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

Pizzeria/PizzeriaContracts/BindingModels/SupplyBindingModel.cs

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

Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IReportLogic.cs

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

Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IShopLogic.cs

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

Pizzeria/PizzeriaContracts/SearchModels/ShopSearchModel.cs

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

Pizzeria/PizzeriaContracts/SearchModels/SupplySearchModel.cs

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

Pizzeria/PizzeriaContracts/StoragesContracts/IShopStorage.cs

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

Pizzeria/PizzeriaContracts/ViewModels/ReportGroupOrdersViewModel.cs

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

Pizzeria/PizzeriaContracts/ViewModels/ReportShopsViewModel.cs

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

Pizzeria/PizzeriaContracts/ViewModels/ShopViewModel.cs

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

Pizzeria/PizzeriaDataModels/Models/IShopModel.cs

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

Pizzeria/PizzeriaDataModels/Models/ISupplyModel.cs

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

Pizzeria/PizzeriaDatabaseImplement/Implements/ShopStorage.cs

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

Pizzeria/PizzeriaDatabaseImplement/Migrations/20240305050232_Hard_init.Designer.cs

@@ -1,248 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using PizzeriaDatabaseImplement;
-
-#nullable disable
-
-namespace PizzeriaDatabaseImplement.Migrations
-{
-    [DbContext(typeof(PizzeriaDatabase))]
-    [Migration("20240305050232_Hard_init")]
-    partial class Hard_init
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.3")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("PizzaId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PizzaId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Pizza", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("PizzaName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Pizzas");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.PizzaComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PizzaId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("PizzaId");
-
-                    b.ToTable("PizzaComponents");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("PizzaMaxCount")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PizzaId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PizzaId");
-
-                    b.HasIndex("ShopId");
-
-                    b.ToTable("ShopPizzas");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
-                        .WithMany("Orders")
-                        .HasForeignKey("PizzaId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Pizza");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.PizzaComponent", b =>
-                {
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Component", "Component")
-                        .WithMany("PizzaComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
-                        .WithMany("Components")
-                        .HasForeignKey("PizzaId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Pizza");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b =>
-                {
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
-                        .WithMany("ShopPizzas")
-                        .HasForeignKey("PizzaId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Pizzas")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Pizza");
-
-                    b.Navigation("Shop");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("PizzaComponents");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Pizza", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Pizzas");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Pizzeria/PizzeriaDatabaseImplement/Migrations/20240305050232_Hard_init.cs

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

Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs

@@ -121,59 +121,6 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.ToTable("PizzaComponents");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("PizzaMaxCount")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PizzaId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PizzaId");
-
-                    b.HasIndex("ShopId");
-
-                    b.ToTable("ShopPizzas");
-                });
-
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
@@ -204,25 +151,6 @@ namespace PizzeriaDatabaseImplement.Migrations
                     b.Navigation("Pizza");
                 });
 
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b =>
-                {
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza")
-                        .WithMany("ShopPizzas")
-                        .HasForeignKey("PizzaId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("PizzeriaDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Pizzas")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Pizza");
-
-                    b.Navigation("Shop");
-                });
-
             modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b =>
                 {
                     b.Navigation("PizzaComponents");
@@ -234,11 +162,6 @@ namespace PizzeriaDatabaseImplement.Migrations
 
                     b.Navigation("Orders");
                 });
-
-            modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Pizzas");
-                });
 #pragma warning restore 612, 618
         }
     }

Pizzeria/PizzeriaDatabaseImplement/Models/Pizza.cs

@@ -33,9 +33,6 @@ namespace PizzeriaDatabaseImplement.Models
         [ForeignKey("PizzaId")]
         public virtual List<Order> Orders { get; set; } = new();
 
-        [ForeignKey("PizzaId")]
-        public virtual List<ShopPizzas> ShopPizzas { get; set; } = new();
-
         public static Pizza
             Create(PizzeriaDatabase context, PizzaBindingModel model)
         {

Pizzeria/PizzeriaDatabaseImplement/Models/Shop.cs

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

Pizzeria/PizzeriaDatabaseImplement/Models/ShopPizzas.cs

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

Pizzeria/PizzeriaDatabaseImplement/PizzeriaDatabase.cs

@@ -14,11 +14,9 @@ namespace PizzeriaDatabaseImplement
             }
             base.OnConfiguring(optionsBuilder);
         }
-        public virtual DbSet<Component> Components { get; set; }
+        public virtual DbSet<Component> Components { set; get; }
-        public virtual DbSet<Pizza> Pizzas { get; set; }
+        public virtual DbSet<Pizza> Pizzas { set; get; }
-        public virtual DbSet<PizzaComponent> PizzaComponents { get; set; }
+        public virtual DbSet<PizzaComponent> PizzaComponents { set; get; }
-        public virtual DbSet<Order> Orders { get; set; }
+        public virtual DbSet<Order> Orders { set; get; }
-        public virtual DbSet<Shop> Shops { get; set; }
-        public virtual DbSet<ShopPizzas> ShopPizzas { get; set; }
     }
 }

Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs

@@ -1,4 +1,9 @@
-using PizzeriaFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using PizzeriaFileImplement.Models;
 using System.Xml.Linq;
 
 namespace PizzeriaFileImplement
@@ -9,11 +14,9 @@ namespace PizzeriaFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string PizzaFileName = "Pizza.xml";
-        private readonly string ShopFileName = "Shop.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Pizza> Pizzas { get; private set; }
-        public List<Shop> Shops { get; private set; }
 
         public static DataFileSingleton GetInstance()
         {
@@ -27,14 +30,12 @@ namespace PizzeriaFileImplement
         public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
         public void SavePizzas() => SaveData(Pizzas, PizzaFileName, "Pizzas", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
 
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
             Pizzas = LoadData(PizzaFileName, "Pizza", x => Pizza.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
         }
 
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)

Pizzeria/PizzeriaFileImplement/Implements/ShopStorage.cs

@@ -1,154 +0,0 @@
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.SearchModels;
-using PizzeriaContracts.StoragesContracts;
-using PizzeriaContracts.ViewModels;
-using PizzeriaFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PizzeriaFileImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public ShopStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return source.Shops.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return new();
-            }
-            return source.Shops.Where(x => x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Shops.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
-            (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            source.Shops.Add(newShop);
-            source.SaveShops();
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop == null)
-            {
-                return null;
-            }
-            shop.Update(model);
-            source.SaveShops();
-            return shop.GetViewModel;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop != null)
-            {
-                source.Shops.Remove(shop);
-                source.SaveShops();
-                return shop.GetViewModel;
-            }
-            return null;
-        }
-
-        public bool Sale(SupplySearchModel model)
-        {
-            if (model == null || !model.PizzaId.HasValue || !model.Count.HasValue)
-                return false;
-            int remainingSpace = source.Shops.Select(x => x.Pizzas.ContainsKey(model.PizzaId.Value) ? x.Pizzas[model.PizzaId.Value] : 0).Sum();
-            if (remainingSpace < model.Count)
-            {
-                return false;
-            }
-            var shops = source.Shops.Where(x => x.Pizzas.ContainsKey(model.PizzaId.Value)).OrderByDescending(x => x.Pizzas[model.PizzaId.Value]).ToList();
-            foreach (var shop in shops)
-            {
-                int residue = model.Count.Value - shop.Pizzas[model.PizzaId.Value];
-                if (residue > 0)
-                {
-                    shop.Pizzas.Remove(model.PizzaId.Value);
-                    shop.PizzasUpdate();
-                    model.Count = residue;
-                }
-                else
-                {
-                    if (residue == 0)
-                    {
-                        shop.Pizzas.Remove(model.PizzaId.Value);
-                    }
-                    else
-                    {
-                        shop.Pizzas[model.PizzaId.Value] = -residue;
-                    }
-                    shop.PizzasUpdate();
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            source.SaveShops();
-            return false;
-        }
-
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            if (model == null || source.Shops.Select(x => x.PizzaMaxCount - x.ShopPizzas.Select(y => y.Value.Item2).Sum()).Sum() < model.Count)
-            {
-                return false;
-            }
-            foreach (Shop shop in source.Shops)
-            {
-                int free_places = shop.PizzaMaxCount - shop.ShopPizzas.Select(x => x.Value.Item2).Sum();
-                if (free_places <= 0)
-                    continue;
-                free_places = Math.Min(free_places, model.Count);
-                model.Count -= free_places;
-                if (shop.Pizzas.ContainsKey(model.PizzaId))
-                {
-                    shop.Pizzas[model.PizzaId] += free_places;
-                }
-                else
-                {
-                    shop.Pizzas.Add(model.PizzaId, free_places);
-                }
-                shop.PizzasUpdate();
-                if (model.Count == 0)
-                {
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}

Pizzeria/PizzeriaFileImplement/Models/Shop.cs

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

Pizzeria/PizzeriaListImplement/DataListSingleton.cs

@@ -13,14 +13,12 @@ namespace PizzeriaListImplement
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Pizza> Pizzas { get; set; }
-        public List<Shop> Shops { get; set; }
 
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Pizzas = new List<Pizza>();
-            Shops = new List<Shop>();
         }
 
         public static DataListSingleton GetInstance()

Pizzeria/PizzeriaListImplement/Implements/ShopStorage.cs

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

Pizzeria/PizzeriaListImplement/Models/Shop.cs

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

Pizzeria/PizzeriaView/FormCreateSupply.Designer.cs

@@ -1,143 +0,0 @@
-namespace PizzeriaView
-{
-    partial class FormCreateSupply
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.comboBoxShop = new System.Windows.Forms.ComboBox();
-            this.labelShop = new System.Windows.Forms.Label();
-            this.labelPizza = new System.Windows.Forms.Label();
-            this.comboBoxPizza = new System.Windows.Forms.ComboBox();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // comboBoxShop
-            // 
-            this.comboBoxShop.FormattingEnabled = true;
-            this.comboBoxShop.Location = new System.Drawing.Point(115, 12);
-            this.comboBoxShop.Name = "comboBoxShop";
-            this.comboBoxShop.Size = new System.Drawing.Size(344, 28);
-            this.comboBoxShop.TabIndex = 0;
-            // 
-            // labelShop
-            // 
-            this.labelShop.AutoSize = true;
-            this.labelShop.Location = new System.Drawing.Point(12, 15);
-            this.labelShop.Name = "labelShop";
-            this.labelShop.Size = new System.Drawing.Size(76, 20);
-            this.labelShop.TabIndex = 1;
-            this.labelShop.Text = "Магазин: ";
-            // 
-            // labelPizza
-            // 
-            this.labelPizza.AutoSize = true;
-            this.labelPizza.Location = new System.Drawing.Point(12, 49);
-            this.labelPizza.Name = "labelPizza";
-            this.labelPizza.Size = new System.Drawing.Size(75, 20);
-            this.labelPizza.TabIndex = 2;
-            this.labelPizza.Text = "Пицца: ";
-            // 
-            // comboBoxPizza
-            // 
-            this.comboBoxPizza.FormattingEnabled = true;
-            this.comboBoxPizza.Location = new System.Drawing.Point(115, 46);
-            this.comboBoxPizza.Name = "comboBoxPizza";
-            this.comboBoxPizza.Size = new System.Drawing.Size(344, 28);
-            this.comboBoxPizza.TabIndex = 3;
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(12, 83);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(97, 20);
-            this.labelCount.TabIndex = 4;
-            this.labelCount.Text = "Количество: ";
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(115, 80);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(344, 27);
-            this.textBoxCount.TabIndex = 5;
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(300, 113);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(116, 39);
-            this.buttonCancel.TabIndex = 6;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(168, 113);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(116, 39);
-            this.buttonSave.TabIndex = 7;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // FormCreateSupply
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(471, 164);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.comboBoxPizza);
-            this.Controls.Add(this.labelPizza);
-            this.Controls.Add(this.labelShop);
-            this.Controls.Add(this.comboBoxShop);
-            this.Name = "FormCreateSupply";
-            this.Text = "Создание поставки";
-            this.Load += new System.EventHandler(this.FormCreateSupply_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private ComboBox comboBoxShop;
-        private Label labelShop;
-        private Label labelPizza;
-        private ComboBox comboBoxPizza;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonCancel;
-        private Button buttonSave;
-    }
-}

Pizzeria/PizzeriaView/FormCreateSupply.cs

@@ -1,99 +0,0 @@
-using Microsoft.Extensions.Logging;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using PizzeriaContracts.ViewModels;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-namespace PizzeriaView
-{
-    public partial class FormCreateSupply : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IPizzaLogic _logicP;
-        private readonly IShopLogic _logicS;
-        private List<ShopViewModel> _shopList = new List<ShopViewModel>();
-        private List<PizzaViewModel> _pizzaList = new List<PizzaViewModel>();
-
-        public FormCreateSupply(ILogger<FormCreateSupply> logger, IPizzaLogic logicP, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicP = logicP;
-            _logicS = logicS;
-        }
-
-        private void FormCreateSupply_Load(object sender, EventArgs e)
-        {
-            _shopList = _logicS.ReadList(null);
-            _pizzaList = _logicP.ReadList(null);
-            if (_shopList != null)
-            {
-                comboBoxShop.DisplayMember = "ShopName";
-                comboBoxShop.ValueMember = "Id";
-                comboBoxShop.DataSource = _shopList;
-                comboBoxShop.SelectedItem = null;
-                _logger.LogInformation("Загрузка магазинов для поставок");
-            }
-            if (_pizzaList != null)
-            {
-                comboBoxPizza.DisplayMember = "PizzaName";
-                comboBoxPizza.ValueMember = "Id";
-                comboBoxPizza.DataSource = _pizzaList;
-                comboBoxPizza.SelectedItem = null;
-                _logger.LogInformation("Загрузка пиццы для поставок");
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (comboBoxShop.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxPizza.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите пиццу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание поставки");
-            try
-            {
-                var operationResult = _logicS.MakeSupply(new SupplyBindingModel
-                {
-                    ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
-                    PizzaId = Convert.ToInt32(comboBoxPizza.SelectedValue),
-                    Count = Convert.ToInt32(textBoxCount.Text)
-                });
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания поставки");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

Pizzeria/PizzeriaView/FormCreateSupply.resx

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

Pizzeria/PizzeriaView/FormMain.Designer.cs

@@ -32,20 +32,10 @@
             this.bookToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ingridientsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.pizzasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.shopsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.operationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.transactionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.продажаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.отчётыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.componentsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.списокИзделийToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.componentPizzaToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.пиццаСИнгридиентамиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.магазинToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.информацияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.загруженностьToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.заказыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.заказыToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.заказыПоГруппамToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.dataGridView = new System.Windows.Forms.DataGridView();
             this.buttonCreateOrder = new System.Windows.Forms.Button();
             this.buttonTakeOrderInWork = new System.Windows.Forms.Button();
@@ -61,7 +51,6 @@
             this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.bookToolStripMenuItem,
-            this.operationToolStripMenuItem,
             this.отчётыToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
@@ -74,8 +63,7 @@
             // 
             this.bookToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ingridientsToolStripMenuItem,
-            this.pizzasToolStripMenuItem,
+            this.pizzasToolStripMenuItem});
-            this.shopsToolStripMenuItem});
             this.bookToolStripMenuItem.Name = "bookToolStripMenuItem";
             this.bookToolStripMenuItem.Size = new System.Drawing.Size(87, 20);
             this.bookToolStripMenuItem.Text = "Справочник";
@@ -94,114 +82,36 @@
             this.pizzasToolStripMenuItem.Text = "Пиццы";
             this.pizzasToolStripMenuItem.Click += new System.EventHandler(this.PizzasToolStripMenuItem_Click);
             // 
-            // shopsToolStripMenuItem
-            // 
-            this.shopsToolStripMenuItem.Name = "shopsToolStripMenuItem";
-            this.shopsToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
-            this.shopsToolStripMenuItem.Text = "Магазины";
-            this.shopsToolStripMenuItem.Click += new System.EventHandler(this.shopsToolStripMenuItem_Click);
-            // 
-            // operationToolStripMenuItem
-            // 
-            this.operationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.transactionToolStripMenuItem,
-            this.продажаToolStripMenuItem});
-            this.operationToolStripMenuItem.Name = "operationToolStripMenuItem";
-            this.operationToolStripMenuItem.Size = new System.Drawing.Size(75, 20);
-            this.operationToolStripMenuItem.Text = "Операции";
-            // 
-            // transactionToolStripMenuItem
-            // 
-            this.transactionToolStripMenuItem.Name = "transactionToolStripMenuItem";
-            this.transactionToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.transactionToolStripMenuItem.Text = "Поставка";
-            this.transactionToolStripMenuItem.Click += new System.EventHandler(this.transactionToolStripMenuItem_Click);
-            // 
-            // продажаToolStripMenuItem
-            // 
-            this.продажаToolStripMenuItem.Name = "продажаToolStripMenuItem";
-            this.продажаToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.продажаToolStripMenuItem.Text = "Продажа";
-            this.продажаToolStripMenuItem.Click += new System.EventHandler(this.SellToolStripMenuItem_Click);
-            // 
             // отчётыToolStripMenuItem
             // 
             this.отчётыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.изделияToolStripMenuItem,
+            this.componentsToolStripMenuItem1,
-            this.магазинToolStripMenuItem,
+            this.componentPizzaToolStripMenuItem1,
-            this.заказыToolStripMenuItem});
+            this.ordersToolStripMenuItem});
             this.отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
             this.отчётыToolStripMenuItem.Size = new System.Drawing.Size(60, 20);
             this.отчётыToolStripMenuItem.Text = "Отчёты";
             // 
-            // изделияToolStripMenuItem
+            // componentsToolStripMenuItem1
             // 
-            this.изделияToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.componentsToolStripMenuItem1.Name = "componentsToolStripMenuItem1";
-            this.списокИзделийToolStripMenuItem,
+            this.componentsToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
-            this.пиццаСИнгридиентамиToolStripMenuItem});
+            this.componentsToolStripMenuItem1.Text = "Пиццы";
-            this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
+            this.componentsToolStripMenuItem1.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click);
-            this.изделияToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.изделияToolStripMenuItem.Text = "Пицца";
             // 
-            // списокИзделийToolStripMenuItem
+            // componentPizzaToolStripMenuItem1
             // 
-            this.списокИзделийToolStripMenuItem.Name = "списокИзделийToolStripMenuItem";
+            this.componentPizzaToolStripMenuItem1.Name = "componentPizzaToolStripMenuItem1";
-            this.списокИзделийToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
+            this.componentPizzaToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
-            this.списокИзделийToolStripMenuItem.Text = "Список пицц";
+            this.componentPizzaToolStripMenuItem1.Text = "Пицца с компонентами";
-            this.списокИзделийToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click);
+            this.componentPizzaToolStripMenuItem1.Click += new System.EventHandler(this.ComponentPizzaToolStripMenuItem_Click);
             // 
-            // пиццаСИнгридиентамиToolStripMenuItem
+            // ordersToolStripMenuItem
             // 
-            this.пиццаСИнгридиентамиToolStripMenuItem.Name = "пиццаСИнгридиентамиToolStripMenuItem";
+            this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
-            this.пиццаСИнгридиентамиToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
+            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
-            this.пиццаСИнгридиентамиToolStripMenuItem.Text = "Пицца с ингридиентами";
+            this.ordersToolStripMenuItem.Text = "Заказы";
-            this.пиццаСИнгридиентамиToolStripMenuItem.Click += new System.EventHandler(this.ComponentPizzaToolStripMenuItem_Click);
+            this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
-            // 
-            // магазинToolStripMenuItem
-            // 
-            this.магазинToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.информацияToolStripMenuItem,
-            this.загруженностьToolStripMenuItem});
-            this.магазинToolStripMenuItem.Name = "магазинToolStripMenuItem";
-            this.магазинToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.магазинToolStripMenuItem.Text = "Магазин";
-            // 
-            // информацияToolStripMenuItem
-            // 
-            this.информацияToolStripMenuItem.Name = "информацияToolStripMenuItem";
-            this.информацияToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.информацияToolStripMenuItem.Text = "Информация";
-            this.информацияToolStripMenuItem.Click += new System.EventHandler(this.InfoToolStripMenuItem_Click);
-            // 
-            // загруженностьToolStripMenuItem
-            // 
-            this.загруженностьToolStripMenuItem.Name = "загруженностьToolStripMenuItem";
-            this.загруженностьToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.загруженностьToolStripMenuItem.Text = "Загруженность";
-            this.загруженностьToolStripMenuItem.Click += new System.EventHandler(this.BusyShopsToolStripMenuItem_Click);
-            // 
-            // заказыToolStripMenuItem
-            // 
-            this.заказыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.заказыToolStripMenuItem1,
-            this.заказыПоГруппамToolStripMenuItem});
-            this.заказыToolStripMenuItem.Name = "заказыToolStripMenuItem";
-            this.заказыToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.заказыToolStripMenuItem.Text = "Заказы";
-            // 
-            // заказыToolStripMenuItem1
-            // 
-            this.заказыToolStripMenuItem1.Name = "заказыToolStripMenuItem1";
-            this.заказыToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
-            this.заказыToolStripMenuItem1.Text = "Заказы";
-            this.заказыToolStripMenuItem1.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
-            // 
-            // заказыПоГруппамToolStripMenuItem
-            // 
-            this.заказыПоГруппамToolStripMenuItem.Name = "заказыПоГруппамToolStripMenuItem";
-            this.заказыПоГруппамToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.заказыПоГруппамToolStripMenuItem.Text = "Заказы по группам";
-            this.заказыПоГруппамToolStripMenuItem.Click += new System.EventHandler(this.GroupOrdersToolStripMenuItem_Click);
             // 
             // dataGridView
             // 
@@ -310,18 +220,8 @@
         private Button buttonIssuedOrder;
         private Button buttonRef;
         private ToolStripMenuItem отчётыToolStripMenuItem;
-        private ToolStripMenuItem shopsToolStripMenuItem;
+        private ToolStripMenuItem componentsToolStripMenuItem1;
-        private ToolStripMenuItem operationToolStripMenuItem;
+        private ToolStripMenuItem componentPizzaToolStripMenuItem1;
-        private ToolStripMenuItem transactionToolStripMenuItem;
+        private ToolStripMenuItem ordersToolStripMenuItem;
-        private ToolStripMenuItem продажаToolStripMenuItem;
-        private ToolStripMenuItem изделияToolStripMenuItem;
-        private ToolStripMenuItem списокИзделийToolStripMenuItem;
-        private ToolStripMenuItem пиццаСИнгридиентамиToolStripMenuItem;
-        private ToolStripMenuItem магазинToolStripMenuItem;
-        private ToolStripMenuItem информацияToolStripMenuItem;
-        private ToolStripMenuItem загруженностьToolStripMenuItem;
-        private ToolStripMenuItem заказыToolStripMenuItem;
-        private ToolStripMenuItem заказыToolStripMenuItem1;
-        private ToolStripMenuItem заказыПоГруппамToolStripMenuItem;
     }
 }

Pizzeria/PizzeriaView/FormMain.cs

@@ -157,33 +157,6 @@ namespace PizzeriaView
             LoadData();
         }
 
-        private void shopsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void transactionToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormCreateSupply));
-            if (service is FormCreateSupply form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void SellToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSellPizza));
-            if (service is FormSellPizza form)
-            {
-                form.ShowDialog();
-            }
-        }
-
         private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e)
         {
             using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
@@ -211,33 +184,5 @@ namespace PizzeriaView
                 form.ShowDialog();
             }
         }
-
-        private void InfoToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
-                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-        }
-
-        private void BusyShopsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportShop));
-            if (service is FormReportShop form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders));
-            if (service is FormReportGroupedOrders form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

Pizzeria/PizzeriaView/FormPizza.cs

@@ -179,7 +179,8 @@ namespace PizzeriaView
                     Price = Convert.ToDouble(textBoxPrice.Text),
                     PizzaComponents = _PizzaComponents
                 };
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
+                var operationResult = _id.HasValue ? _logic.Update(model) :
+                _logic.Create(model);
                 if (!operationResult)
                 {
                     throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");

Pizzeria/PizzeriaView/FormReportGroupedOrders.Designer.cs

@@ -1,86 +0,0 @@
-namespace PizzeriaView
-{
-    partial class FormReportGroupedOrders
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.panel = new System.Windows.Forms.Panel();
-            this.buttonToPDF = new System.Windows.Forms.Button();
-            this.buttonMake = new System.Windows.Forms.Button();
-            this.panel.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel
-            // 
-            this.panel.Controls.Add(this.buttonToPDF);
-            this.panel.Controls.Add(this.buttonMake);
-            this.panel.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel.Location = new System.Drawing.Point(0, 0);
-            this.panel.Name = "panel";
-            this.panel.Size = new System.Drawing.Size(970, 52);
-            this.panel.TabIndex = 1;
-            // 
-            // buttonToPDF
-            // 
-            this.buttonToPDF.Location = new System.Drawing.Point(486, 12);
-            this.buttonToPDF.Name = "buttonToPDF";
-            this.buttonToPDF.Size = new System.Drawing.Size(411, 29);
-            this.buttonToPDF.TabIndex = 5;
-            this.buttonToPDF.Text = "В PDF";
-            this.buttonToPDF.UseVisualStyleBackColor = true;
-            this.buttonToPDF.Click += new System.EventHandler(this.buttonToPDF_Click);
-            // 
-            // buttonMake
-            // 
-            this.buttonMake.Location = new System.Drawing.Point(49, 12);
-            this.buttonMake.Name = "buttonMake";
-            this.buttonMake.Size = new System.Drawing.Size(377, 29);
-            this.buttonMake.TabIndex = 4;
-            this.buttonMake.Text = "Сформировать";
-            this.buttonMake.UseVisualStyleBackColor = true;
-            this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
-            // 
-            // FormReportGroupedOrders
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(970, 450);
-            this.Controls.Add(this.panel);
-            this.Name = "FormReportGroupedOrders";
-            this.Text = "Отчёт по группированным заказам ";
-            this.panel.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Panel panel;
-        private Button buttonToPDF;
-        private Button buttonMake;
-    }
-}

Pizzeria/PizzeriaView/FormReportGroupedOrders.cs

@@ -1,80 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Reporting.WinForms;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace PizzeriaView
-{
-    public partial class FormReportGroupedOrders : Form
-    {
-        private readonly ReportViewer reportViewer;
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-
-        public FormReportGroupedOrders(ILogger<FormReportGroupedOrders> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            reportViewer = new ReportViewer
-            {
-                Dock = DockStyle.Fill
-            };
-            reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportGroupedOrders.rdlc", FileMode.Open));
-            Controls.Clear();
-            Controls.Add(reportViewer);
-            Controls.Add(panel);
-        }
-
-        private void ButtonMake_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                var dataSource = _logic.GetGroupedOrders();
-                var source = new ReportDataSource("DataSetGroupedOrders", dataSource);
-                reportViewer.LocalReport.DataSources.Clear();
-                reportViewer.LocalReport.DataSources.Add(source);
-
-                reportViewer.RefreshReport();
-                _logger.LogInformation("Загрузка списка группированных заказов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка группированных заказов на период");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-
-        private void buttonToPDF_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveGroupedOrdersToPdfFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName,
-                    });
-                    _logger.LogInformation("Сохранение списка группированных заказов");
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка группированных заказов");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

Pizzeria/PizzeriaView/FormReportGroupedOrders.resx

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

Pizzeria/PizzeriaView/FormReportShop.Designer.cs

@@ -1,116 +0,0 @@
-namespace PizzeriaView
-{
-    partial class FormReportShop
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.buttonSaveToExcel = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ColumnShop = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnPizza = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // buttonSaveToExcel
-            // 
-            this.buttonSaveToExcel.Location = new System.Drawing.Point(0, 6);
-            this.buttonSaveToExcel.Name = "buttonSaveToExcel";
-            this.buttonSaveToExcel.Size = new System.Drawing.Size(223, 29);
-            this.buttonSaveToExcel.TabIndex = 3;
-            this.buttonSaveToExcel.Text = "Сохранить в Excel";
-            this.buttonSaveToExcel.UseVisualStyleBackColor = true;
-            this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.AllowUserToOrderColumns = true;
-            this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.ColumnShop,
-            this.ColumnPizza,
-            this.ColumnCount});
-            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.dataGridView.Location = new System.Drawing.Point(0, 47);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(598, 403);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // ColumnShop
-            // 
-            this.ColumnShop.FillWeight = 130F;
-            this.ColumnShop.HeaderText = "Магазин";
-            this.ColumnShop.MinimumWidth = 6;
-            this.ColumnShop.Name = "ColumnShop";
-            this.ColumnShop.ReadOnly = true;
-            // 
-            // ColumnPizza
-            // 
-            this.ColumnPizza.FillWeight = 140F;
-            this.ColumnPizza.HeaderText = "Пицца";
-            this.ColumnPizza.MinimumWidth = 6;
-            this.ColumnPizza.Name = "ColumnPizza";
-            this.ColumnPizza.ReadOnly = true;
-            // 
-            // ColumnCount
-            // 
-            this.ColumnCount.FillWeight = 90F;
-            this.ColumnCount.HeaderText = "Количество";
-            this.ColumnCount.MinimumWidth = 6;
-            this.ColumnCount.Name = "ColumnCount";
-            this.ColumnCount.ReadOnly = true;
-            // 
-            // FormReportShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(598, 450);
-            this.Controls.Add(this.buttonSaveToExcel);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormReportShop";
-            this.Text = "Наполненость магазинов";
-            this.Load += new System.EventHandler(this.FormReportShop_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Button buttonSaveToExcel;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn ColumnShop;
-        private DataGridViewTextBoxColumn ColumnPizza;
-        private DataGridViewTextBoxColumn ColumnCount;
-    }
-}

Pizzeria/PizzeriaView/FormReportShop.cs

@@ -1,78 +0,0 @@
-using Microsoft.Extensions.Logging;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace PizzeriaView
-{
-    public partial class FormReportShop : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-
-        public FormReportShop(ILogger<FormReportShop> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormReportShop_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                var dict = _logic.GetShops();
-                if (dict != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var elem in dict)
-                    {
-                        dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
-                        foreach (var listElem in elem.Pizzas)
-                        {
-                            dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
-                        }
-                        dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
-                        dataGridView.Rows.Add(Array.Empty<object>());
-                    }
-                }
-                _logger.LogInformation("Загрузка списка пицц по магазинам");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка пицц по магазинам");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSaveToExcel_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveShopsToExcelFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName
-                    });
-                    _logger.LogInformation("Сохранение списка пицц по магазинам");
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка пицц по магазинам");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

Pizzeria/PizzeriaView/FormReportShop.resx

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

Pizzeria/PizzeriaView/FormSellPizza.Designer.cs

@@ -1,120 +0,0 @@
-namespace PizzeriaView
-{
-    partial class FormSellPizza
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelPizza = new System.Windows.Forms.Label();
-            this.comboBoxPizza = new System.Windows.Forms.ComboBox();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonSell = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // labelPizza
-            // 
-            this.labelPizza.AutoSize = true;
-            this.labelPizza.Location = new System.Drawing.Point(12, 14);
-            this.labelPizza.Name = "labelPizza";
-            this.labelPizza.Size = new System.Drawing.Size(75, 20);
-            this.labelPizza.TabIndex = 0;
-            this.labelPizza.Text = "Пицца: ";
-            // 
-            // comboBoxPizza
-            // 
-            this.comboBoxPizza.FormattingEnabled = true;
-            this.comboBoxPizza.Location = new System.Drawing.Point(115, 11);
-            this.comboBoxPizza.Name = "comboBoxPizza";
-            this.comboBoxPizza.Size = new System.Drawing.Size(239, 28);
-            this.comboBoxPizza.TabIndex = 1;
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(12, 55);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(97, 20);
-            this.labelCount.TabIndex = 2;
-            this.labelCount.Text = "Количество: ";
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(115, 52);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(239, 27);
-            this.textBoxCount.TabIndex = 3;
-            // 
-            // buttonSell
-            // 
-            this.buttonSell.Location = new System.Drawing.Point(128, 99);
-            this.buttonSell.Name = "buttonSell";
-            this.buttonSell.Size = new System.Drawing.Size(94, 29);
-            this.buttonSell.TabIndex = 4;
-            this.buttonSell.Text = "Продать";
-            this.buttonSell.UseVisualStyleBackColor = true;
-            this.buttonSell.Click += new System.EventHandler(this.ButtonSell_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(242, 99);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(94, 29);
-            this.buttonCancel.TabIndex = 5;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // FormSellPizza
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(366, 140);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSell);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.comboBoxPizza);
-            this.Controls.Add(this.labelPizza);
-            this.Name = "FormSellPizza";
-            this.Text = "Продажа пиццы";
-            this.Load += new System.EventHandler(this.FormSellingPizza_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelPizza;
-        private ComboBox comboBoxPizza;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonSell;
-        private Button buttonCancel;
-    }
-}

Pizzeria/PizzeriaView/FormSellPizza.cs

@@ -1,88 +0,0 @@
-using Microsoft.Extensions.Logging;
-using PizzeriaContracts.BusinessLogicsContracts;
-using PizzeriaContracts.SearchModels;
-using PizzeriaContracts.StoragesContracts;
-using PizzeriaContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace PizzeriaView
-{
-    public partial class FormSellPizza : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IPizzaLogic _logicP;
-        private readonly IShopLogic _logicS;
-        private List<PizzaViewModel> _pizzaList = new List<PizzaViewModel>();
-
-        public FormSellPizza(ILogger<FormSellPizza> logger, IPizzaLogic logicP, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicP = logicP;
-            _logicS = logicS;
-        }
-
-        private void FormSellingPizza_Load(object sender, EventArgs e)
-        {
-            _pizzaList = _logicP.ReadList(null);
-            if (_pizzaList != null)
-            {
-                comboBoxPizza.DisplayMember = "PizzaName";
-                comboBoxPizza.ValueMember = "Id";
-                comboBoxPizza.DataSource = _pizzaList;
-                comboBoxPizza.SelectedItem = null;
-                _logger.LogInformation("Загрузка пиццы для продажи");
-            }
-        }
-
-        private void ButtonSell_Click(object sender, EventArgs e)
-        {
-            if (comboBoxPizza.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите пиццу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание покупки");
-            try
-            {
-                bool resout = _logicS.Sale(new SupplySearchModel
-                {
-                    PizzaId = Convert.ToInt32(comboBoxPizza.SelectedValue),
-                    Count = Convert.ToInt32(textBoxCount.Text)
-                });
-                if (resout)
-                {
-                    _logger.LogInformation("Проверка пройдена, продажа  проведена");
-                    MessageBox.Show("Продажа проведена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    DialogResult = DialogResult.OK;
-                    Close();
-                }
-                else
-                {
-                    _logger.LogInformation("Проверка не пройдена");
-                    MessageBox.Show("Продажа не может быть создана.", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания покупки");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

Pizzeria/PizzeriaView/FormShop.Designer.cs

@@ -1,222 +0,0 @@
-namespace PizzeriaView
-{
-    partial class FormShop
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelName = new System.Windows.Forms.Label();
-            this.textBoxName = new System.Windows.Forms.TextBox();
-            this.textBoxAdress = new System.Windows.Forms.TextBox();
-            this.labelAdress = new System.Windows.Forms.Label();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.PizzaName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.label1 = new System.Windows.Forms.Label();
-            this.dateTimeOpen = new System.Windows.Forms.DateTimePicker();
-            this.label2 = new System.Windows.Forms.Label();
-            this.numericUpPizzaMaxCount = new System.Windows.Forms.NumericUpDown();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpPizzaMaxCount)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // labelName
-            // 
-            this.labelName.AutoSize = true;
-            this.labelName.Location = new System.Drawing.Point(11, 15);
-            this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(84, 20);
-            this.labelName.TabIndex = 0;
-            this.labelName.Text = "Название: ";
-            // 
-            // textBoxName
-            // 
-            this.textBoxName.Location = new System.Drawing.Point(102, 12);
-            this.textBoxName.Name = "textBoxName";
-            this.textBoxName.Size = new System.Drawing.Size(276, 27);
-            this.textBoxName.TabIndex = 1;
-            // 
-            // textBoxAdress
-            // 
-            this.textBoxAdress.Location = new System.Drawing.Point(102, 59);
-            this.textBoxAdress.Name = "textBoxAdress";
-            this.textBoxAdress.Size = new System.Drawing.Size(427, 27);
-            this.textBoxAdress.TabIndex = 3;
-            // 
-            // labelAdress
-            // 
-            this.labelAdress.AutoSize = true;
-            this.labelAdress.Location = new System.Drawing.Point(11, 61);
-            this.labelAdress.Name = "labelAdress";
-            this.labelAdress.Size = new System.Drawing.Size(58, 20);
-            this.labelAdress.TabIndex = 2;
-            this.labelAdress.Text = "Адрес: ";
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(451, 457);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(130, 44);
-            this.buttonCancel.TabIndex = 5;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(315, 457);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(130, 44);
-            this.buttonSave.TabIndex = 6;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.id,
-            this.PizzaName,
-            this.Count});
-            this.dataGridView.Location = new System.Drawing.Point(12, 185);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
-            this.dataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(569, 266);
-            this.dataGridView.TabIndex = 7;
-            // 
-            // id
-            // 
-            this.id.HeaderText = "id";
-            this.id.MinimumWidth = 6;
-            this.id.Name = "id";
-            this.id.ReadOnly = true;
-            this.id.Visible = false;
-            // 
-            // PizzaName
-            // 
-            this.PizzaName.HeaderText = "Пицца";
-            this.PizzaName.MinimumWidth = 6;
-            this.PizzaName.Name = "PizzaName";
-            this.PizzaName.ReadOnly = true;
-            // 
-            // Count
-            // 
-            this.Count.HeaderText = "Количество";
-            this.Count.MinimumWidth = 6;
-            this.Count.Name = "Count";
-            this.Count.ReadOnly = true;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 103);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 20);
-            this.label1.TabIndex = 8;
-            this.label1.Text = "Дата открытия";
-            // 
-            // dateTimeOpen
-            // 
-            this.dateTimeOpen.Location = new System.Drawing.Point(128, 103);
-            this.dateTimeOpen.Name = "dateTimeOpen";
-            this.dateTimeOpen.Size = new System.Drawing.Size(401, 27);
-            this.dateTimeOpen.TabIndex = 9;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(12, 148);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(100, 20);
-            this.label2.TabIndex = 10;
-            this.label2.Text = "Вместимость";
-            // 
-            // numericUpPizzaMaxCount
-            // 
-            this.numericUpPizzaMaxCount.Location = new System.Drawing.Point(128, 146);
-            this.numericUpPizzaMaxCount.Maximum = new decimal(new int[] {
-            10000,
-            0,
-            0,
-            0});
-            this.numericUpPizzaMaxCount.Name = "numericUpPizzaMaxCount";
-            this.numericUpPizzaMaxCount.Size = new System.Drawing.Size(401, 27);
-            this.numericUpPizzaMaxCount.TabIndex = 11;
-            // 
-            // FormShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(593, 513);
-            this.Controls.Add(this.numericUpPizzaMaxCount);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.dateTimeOpen);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.dataGridView);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.textBoxAdress);
-            this.Controls.Add(this.labelAdress);
-            this.Controls.Add(this.textBoxName);
-            this.Controls.Add(this.labelName);
-            this.Name = "FormShop";
-            this.Text = "Магазин";
-            this.Load += new System.EventHandler(this.FormShop_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpPizzaMaxCount)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelName;
-        private TextBox textBoxName;
-        private TextBox textBoxAdress;
-        private Label labelAdress;
-        private Button buttonCancel;
-        private Button buttonSave;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn id;
-        private DataGridViewTextBoxColumn PizzaName;
-        private DataGridViewTextBoxColumn Count;
-        private Label label1;
-        private DateTimePicker dateTimeOpen;
-        private Label label2;
-        private NumericUpDown numericUpPizzaMaxCount;
-    }
-}

Pizzeria/PizzeriaView/FormShop.cs

@@ -1,127 +0,0 @@
-using PizzeriaDataModels.Models;
-using Microsoft.Extensions.Logging;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using PizzeriaContracts.SearchModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace PizzeriaView
-{
-    public partial class FormShop : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-        private int? _id;
-        public int Id { set { _id = value; } }
-        private Dictionary<int, (IPizzaModel, int)> _ShopPizzas;
-        private DateTime? _openingDate = null;
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            _ShopPizzas = new Dictionary<int, (IPizzaModel, int)>();
-        }
-        private void FormShop_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Загрузка магазина");
-                try
-                {
-                    var view = _logic.ReadElement(new ShopSearchModel
-                    {
-                        Id = _id.Value
-                    });
-                    if (view != null)
-                    {
-                        textBoxName.Text = view.ShopName;
-                        textBoxAdress.Text = view.Adress;
-                        dateTimeOpen.Value = view.OpeningDate;
-                        numericUpPizzaMaxCount.Value = view.PizzaMaxCount;
-                        _ShopPizzas = view.ShopPizzas ?? new Dictionary<int, (IPizzaModel, int)>();
-                        LoadData();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка загрузки магазина");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка пиццы в магазине");
-            try
-            {
-                if (_ShopPizzas != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var sr in _ShopPizzas)
-                    {
-                        dataGridView.Rows.Add(new object[] { sr.Key, sr.Value.Item1.PizzaName, sr.Value.Item2 });
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки пиццы магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxName.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxAdress.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение магазина");
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    ShopName = textBoxName.Text,
-                    Adress = textBoxAdress.Text,
-                    OpeningDate = dateTimeOpen.Value,
-                    PizzaMaxCount = (int)numericUpPizzaMaxCount.Value
-                };
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка сохранения магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

Pizzeria/PizzeriaView/FormShop.resx

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

Pizzeria/PizzeriaView/FormShops.Designer.cs

@@ -1,130 +0,0 @@
-namespace PizzeriaView
-{
-    partial class FormShops
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.ToolsPanel = new System.Windows.Forms.Panel();
-            this.buttonRef = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ToolsPanel.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // ToolsPanel
-            // 
-            this.ToolsPanel.Controls.Add(this.buttonRef);
-            this.ToolsPanel.Controls.Add(this.buttonDel);
-            this.ToolsPanel.Controls.Add(this.buttonUpd);
-            this.ToolsPanel.Controls.Add(this.buttonAdd);
-            this.ToolsPanel.Location = new System.Drawing.Point(608, 12);
-            this.ToolsPanel.Name = "ToolsPanel";
-            this.ToolsPanel.Size = new System.Drawing.Size(180, 426);
-            this.ToolsPanel.TabIndex = 3;
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(31, 206);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(126, 36);
-            this.buttonRef.TabIndex = 3;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(31, 142);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(126, 36);
-            this.buttonDel.TabIndex = 2;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(31, 76);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(126, 36);
-            this.buttonUpd.TabIndex = 1;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(31, 16);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(126, 36);
-            this.buttonAdd.TabIndex = 0;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(12, 12);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(590, 426);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // FormShops
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.ToolsPanel);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormShops";
-            this.Text = "Магазины";
-            this.Load += new System.EventHandler(this.FormShops_Load);
-            this.ToolsPanel.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Panel ToolsPanel;
-        private Button buttonRef;
-        private Button buttonDel;
-        private Button buttonUpd;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-    }
-}

Pizzeria/PizzeriaView/FormShops.cs

@@ -1,117 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Pizzeria;
-using PizzeriaContracts.BindingModels;
-using PizzeriaContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace PizzeriaView
-{
-    public partial class FormShops : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-
-        public FormShops(ILogger<FormShops> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormShops_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["ShopPizzas"].Visible = false;
-                    dataGridView.Columns["ShopName"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка магазинов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-            if (service is FormShop form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-                if (service is FormShop form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void ButtonDel_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление магазина");
-                    try
-                    {
-                        if (!_logic.Delete(new ShopBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления магазина");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-
-        private void ButtonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

Pizzeria/PizzeriaView/FormShops.resx

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

Pizzeria/PizzeriaView/PizzeriaView.csproj

@@ -39,9 +39,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="ReportGroupedOrders.rdlc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
 	<None Update="ReportOrder.rdlc">
 	  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	</None>

Pizzeria/PizzeriaView/Program.cs

@@ -41,13 +41,11 @@ namespace Pizzeria
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IPizzaStorage, PizzaStorage>();
-            services.AddTransient<IShopStorage, ShopStorage>();
-
             services.AddTransient<IComponentLogic, ComponentLogic>();
+
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IPizzaLogic, PizzaLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
 
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
@@ -60,14 +58,8 @@ namespace Pizzeria
             services.AddTransient<FormPizza>();
             services.AddTransient<FormPizzaComponent>();
             services.AddTransient<FormPizzas>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormCreateSupply>();
-            services.AddTransient<FormSellPizza>();
             services.AddTransient<FormReportPizzaComponents>();
             services.AddTransient<FormReportOrders>();
-            services.AddTransient<FormReportShop>();
-            services.AddTransient<FormReportGroupedOrders>();
         }
     }
 }

Pizzeria/PizzeriaView/ReportGroupedOrders.rdlc

@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
-  <AutoRefresh>0</AutoRefresh>
-  <DataSources>
-    <DataSource Name="PrecastConcretePlantContractsViewModels">
-      <ConnectionProperties>
-        <DataProvider>System.Data.DataSet</DataProvider>
-        <ConnectString>/* Local Connection */</ConnectString>
-      </ConnectionProperties>
-      <rd:DataSourceID>20791c83-cee8-4a38-bbd0-245fc17cefb3</rd:DataSourceID>
-    </DataSource>
-  </DataSources>
-  <DataSets>
-    <DataSet Name="DataSetGroupedOrders">
-      <Query>
-        <DataSourceName>PrecastConcretePlantContractsViewModels</DataSourceName>
-        <CommandText>/* Local Query */</CommandText>
-      </Query>
-      <Fields>
-        <Field Name="Date">
-          <DataField>Date</DataField>
-          <rd:TypeName>System.DateTime</rd:TypeName>
-        </Field>
-        <Field Name="OrdersCount">
-          <DataField>OrdersCount</DataField>
-          <rd:TypeName>System.Int32</rd:TypeName>
-        </Field>
-        <Field Name="OrdersSum">
-          <DataField>OrdersSum</DataField>
-          <rd:TypeName>System.Decimal</rd:TypeName>
-        </Field>
-      </Fields>
-      <rd:DataSetInfo>
-        <rd:DataSetName>PrecastConcretePlantContracts.ViewModels</rd:DataSetName>
-        <rd:TableName>ReportGroupOrdersViewModel</rd:TableName>
-        <rd:ObjectDataSourceType>PrecastConcretePlantContracts.ViewModels.ReportGroupOrdersViewModel, PrecastConcretePlantContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</rd:ObjectDataSourceType>
-      </rd:DataSetInfo>
-    </DataSet>
-  </DataSets>
-  <ReportSections>
-    <ReportSection>
-      <Body>
-        <ReportItems>
-          <Textbox Name="TextboxTitle">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Отчёт по заказам</Value>
-                    <Style />
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Height>0.6cm</Height>
-            <Width>16.51cm</Width>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <VerticalAlign>Middle</VerticalAlign>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Textbox Name="ReportParameterPeriod">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Parameters!ReportParameterPeriod.Value</Value>
-                    <Style>
-                      <Format>d</Format>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <rd:DefaultName>ReportParameterPeriod</rd:DefaultName>
-            <Top>0.6cm</Top>
-            <Height>0.6cm</Height>
-            <Width>16.51cm</Width>
-            <ZIndex>1</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Tablix Name="Tablix1">
-            <TablixBody>
-              <TablixColumns>
-                <TablixColumn>
-                  <Width>3.90406cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.97461cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.65711cm</Width>
-                </TablixColumn>
-              </TablixColumns>
-              <TablixRows>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="TextboxDate">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Дата создания</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="TextboxCount">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Количество заказов</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="TextboxSum">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Общая сумма заказов</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Date">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Date.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Date</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="OrdersCount">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!OrdersCount.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>OrdersCount</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="OrdersSum">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!OrdersSum.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>OrdersSum</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-              </TablixRows>
-            </TablixBody>
-            <TablixColumnHierarchy>
-              <TablixMembers>
-                <TablixMember />
-                <TablixMember />
-                <TablixMember />
-              </TablixMembers>
-            </TablixColumnHierarchy>
-            <TablixRowHierarchy>
-              <TablixMembers>
-                <TablixMember>
-                  <KeepWithGroup>After</KeepWithGroup>
-                </TablixMember>
-                <TablixMember>
-                  <Group Name="Подробности" />
-                </TablixMember>
-              </TablixMembers>
-            </TablixRowHierarchy>
-            <DataSetName>DataSetGroupedOrders</DataSetName>
-            <Top>1.88242cm</Top>
-            <Left>2.68676cm</Left>
-            <Height>1.2cm</Height>
-            <Width>11.53578cm</Width>
-            <ZIndex>2</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-            </Style>
-          </Tablix>
-          <Textbox Name="TextboxResout">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Итого:</Value>
-                    <Style />
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>3.29409cm</Top>
-            <Left>8.06542cm</Left>
-            <Height>0.6cm</Height>
-            <Width>2.5cm</Width>
-            <ZIndex>3</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Textbox Name="TextboxFullSum">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Sum(Fields!OrdersSum.Value, "DataSetGroupedOrders")</Value>
-                    <Style>
-                      <Format>0.00;(0.00)</Format>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>3.29409cm</Top>
-            <Left>10.70653cm</Left>
-            <Height>0.6cm</Height>
-            <Width>3.48072cm</Width>
-            <ZIndex>4</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-        </ReportItems>
-        <Height>2in</Height>
-        <Style />
-      </Body>
-      <Width>6.5in</Width>
-      <Page>
-        <PageHeight>29.7cm</PageHeight>
-        <PageWidth>21cm</PageWidth>
-        <LeftMargin>2cm</LeftMargin>
-        <RightMargin>2cm</RightMargin>
-        <TopMargin>2cm</TopMargin>
-        <BottomMargin>2cm</BottomMargin>
-        <ColumnSpacing>0.13cm</ColumnSpacing>
-        <Style />
-      </Page>
-    </ReportSection>
-  </ReportSections>
-  <ReportParameters>
-    <ReportParameter Name="ReportParameterPeriod">
-      <DataType>String</DataType>
-      <Nullable>true</Nullable>
-      <Prompt>ReportParameter1</Prompt>
-    </ReportParameter>
-  </ReportParameters>
-  <ReportParametersLayout>
-    <GridLayoutDefinition>
-      <NumberOfColumns>4</NumberOfColumns>
-      <NumberOfRows>2</NumberOfRows>
-      <CellDefinitions>
-        <CellDefinition>
-          <ColumnIndex>0</ColumnIndex>
-          <RowIndex>0</RowIndex>
-          <ParameterName>ReportParameterPeriod</ParameterName>
-        </CellDefinition>
-      </CellDefinitions>
-    </GridLayoutDefinition>
-  </ReportParametersLayout>
-  <rd:ReportUnitType>Cm</rd:ReportUnitType>
-  <rd:ReportID>b5a8ad5e-1151-4687-8576-a5270295c079</rd:ReportID>
-</Report>