дон

SushiBar/SushiBar.sln

@@ -13,11 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarView", "SushiBarVie
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarListImplement", "SushiBarListImplement_\SushiBarListImplement.csproj", "{AF2B4854-10FE-45CC-BA64-0C0B93BF41C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarBusinessLogic", "SushiBarBusinessLogic_\SushiBarBusinessLogic.csproj", "{D7936C41-351B-43FD-B90B-5477375EEC1E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarFileImplement", "SushiBarFileImplement\SushiBarFileImplement.csproj", "{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarDatabaseImplement", "SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj", "{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarBusinessLogic", "SushiBarBusinessLogic_\SushiBarBusinessLogic.csproj", "{D7936C41-351B-43FD-B90B-5477375EEC1E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -101,30 +97,6 @@ Global
 		{D7936C41-351B-43FD-B90B-5477375EEC1E}.Release|x64.Build.0 = Release|Any CPU
 		{D7936C41-351B-43FD-B90B-5477375EEC1E}.Release|x86.ActiveCfg = Release|Any CPU
 		{D7936C41-351B-43FD-B90B-5477375EEC1E}.Release|x86.Build.0 = Release|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Debug|x64.Build.0 = Debug|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Debug|x86.Build.0 = Debug|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Release|x64.ActiveCfg = Release|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Release|x64.Build.0 = Release|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Release|x86.ActiveCfg = Release|Any CPU
-		{3FDA8B7A-9E62-4A1B-B926-DC71C6C5812F}.Release|x86.Build.0 = Release|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Debug|x64.Build.0 = Debug|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Debug|x86.Build.0 = Debug|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Release|x64.ActiveCfg = Release|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Release|x64.Build.0 = Release|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Release|x86.ActiveCfg = Release|Any CPU
-		{B8DE57BC-14B3-47A9-93E9-F668D3F10A21}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

SushiBar/SushiBar/SushiBar.csproj

@@ -8,13 +8,4 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>

SushiBar/SushiBarBusinessLogic_/OfficePackage/AbstractSaveToExcel.cs

@@ -1,97 +0,0 @@
-using SushiBarBusinessLogic.OfficePackage.HelperEnums;
-using SushiBarBusinessLogic.OfficePackage.HelperModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToExcel
-    {
-        public void CreateReport(ExcelInfo 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 sc in info.SushiComponents)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = sc.SushiName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-                foreach (var component in sc.Components)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = rowIndex,
-                        Text = component.Item1,
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "C",
-                        RowIndex = rowIndex,
-                        Text = component.Item2.ToString(),
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-                    rowIndex++;
-                }
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Итого",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = sc.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-            }
-            SaveExcel(info);
-        }
-        /// <summary>
-        /// Создание excel-файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void CreateExcel(ExcelInfo info);
-        /// <summary>
-        /// Добавляем новую ячейку в лист
-        /// </summary>
-        /// <param name="cellParameters"></param>
-        protected abstract void InsertCellInWorksheet(ExcelCellParameters
-        excelParams);
-        /// <summary>
-        /// Объединение ячеек
-        /// </summary>
-        /// <param name="mergeParameters"></param>
-        protected abstract void MergeCells(ExcelMergeParameters excelParams);
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void SaveExcel(ExcelInfo info);
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/AbstractSaveToPdf.cs

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

SushiBar/SushiBarBusinessLogic_/OfficePackage/AbstractSaveToWord.cs

@@ -1,58 +0,0 @@
-using SushiBarBusinessLogic.OfficePackage.HelperEnums;
-using SushiBarBusinessLogic.OfficePackage.HelperModels;
-
-namespace SushiBarBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToWord
-    {
-        public void CreateDoc(WordInfo 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
-                }
-            });
-            foreach (var sushi in info.Sushis)
-            {
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> {
-                        (sushi.SushiName, new WordTextProperties { Bold = true, Size = "24", }),
-                        (" цена: " + sushi.Price.ToString() + " рублей", new WordTextProperties { Size = "24", })
-                    },
-                    
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
-            SaveWord(info);
-        }
-        /// <summary>
-        /// Создание doc-файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void CreateWord(WordInfo info);
-        /// <summary>
-        /// Создание абзаца с текстом
-        /// </summary>
-        /// <param name="paragraph"></param>
-        /// <returns></returns>
-        protected abstract void CreateParagraph(WordParagraph paragraph);
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void SaveWord(WordInfo info);
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperEnums/ExcelStyleInfoType.cs

@@ -1,9 +0,0 @@
-namespace SushiBarBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum ExcelStyleInfoType
-    {
-        Title,
-        Text,
-        TextWithBroder
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum PdfParagraphAlignmentType
-    {
-        Center,
-        Left,
-        Rigth
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperEnums/WordJustificationType.cs

@@ -1,8 +0,0 @@
-namespace SushiBarBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum WordJustificationType
-    {
-        Center,
-        Both
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/ExcelCellParameters.cs

@@ -1,14 +0,0 @@
-using SushiBarBusinessLogic.OfficePackage.HelperEnums;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelCellParameters
-    {
-        public string ColumnName { get; set; } = string.Empty;
-        public uint RowIndex { get; set; }
-        public string Text { get; set; } = string.Empty;
-        public string CellReference => $"{ColumnName}{RowIndex}";
-        public ExcelStyleInfoType StyleInfo { get; set; }
-
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/ExcelInfo.cs

@@ -1,16 +0,0 @@
-using SushiBarContracts.ViewModels;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ReportSushiComponentViewModel> SushiComponents
-        {
-            get;
-            set;
-        } = new();
-
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/ExcelMergeParameters.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelMergeParameters
-    {
-        public string CellFromName { get; set; } = string.Empty;
-        public string CellToName { get; set; } = string.Empty;
-        public string Merge => $"{CellFromName}:{CellToName}";
-
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/PdfInfo.cs

@@ -1,21 +0,0 @@
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfInfo
-    {
-        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 OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        public List<ReportOrdersViewModel> Orders { get; set; } = new();
-
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/PdfParagraph.cs

@@ -1,17 +0,0 @@
-using SushiBarBusinessLogic.OfficePackage.HelperEnums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfParagraph
-    {
-        public string Text { get; set; } = string.Empty;
-        public string Style { get; set; } = string.Empty;
-        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/PdfRowParameters.cs

@@ -1,16 +0,0 @@
-using SushiBarBusinessLogic.OfficePackage.HelperEnums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfRowParameters
-    {
-        public List<string> Texts { get; set; } = new();
-        public string Style { get; set; } = string.Empty;
-        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/WordInfo.cs

@@ -1,12 +0,0 @@
-using SushiBarContracts.ViewModels;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<SushiViewModel> Sushis { get; set; } = new();
-
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/WordParagraph.cs

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

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/WordTextProperties.cs

@@ -1,12 +0,0 @@
-using SushiBarBusinessLogic.OfficePackage.HelperEnums;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordTextProperties
-    {
-        public string Size { get; set; } = string.Empty;
-        public bool Bold { get; set; }
-        public WordJustificationType JustificationType { get; set; }
-
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/Implements/SaveToExcel.cs

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

SushiBar/SushiBarBusinessLogic_/OfficePackage/Implements/SaveToPdf.cs

@@ -1,98 +0,0 @@
-using MigraDoc.DocumentObjectModel;
-using MigraDoc.DocumentObjectModel.Tables;
-using MigraDoc.Rendering;
-using SushiBarBusinessLogic.OfficePackage.HelperEnums;
-using SushiBarBusinessLogic.OfficePackage.HelperModels;
-
-namespace SushiBarBusinessLogic.OfficePackage.Implements
-{
-    public class SaveToPdf : AbstractSaveToPdf
-    {
-        private Document? _document;
-        private Section? _section;
-        private Table? _table;
-        private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
-        {
-            return type switch
-            {
-                PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
-                PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
-                PdfParagraphAlignmentType.Rigth => ParagraphAlignment.Right,
-                _ => ParagraphAlignment.Justify,
-            };
-        }
-        /// <summary>
-        /// Создание стилей для документа
-        /// </summary>
-        /// <param name="document"></param>
-        private static void DefineStyles(Document document)
-        {
-            var style = document.Styles["Normal"];
-            style.Font.Name = "Times New Roman";
-            style.Font.Size = 14;
-            style = document.Styles.AddStyle("NormalTitle", "Normal");
-            style.Font.Bold = true;
-        }
-        protected override void CreatePdf(PdfInfo info)
-        {
-            _document = new Document();
-            DefineStyles(_document);
-            _section = _document.AddSection();
-        }
-        protected override void CreateParagraph(PdfParagraph pdfParagraph)
-        {
-            if (_section == null)
-            {
-                return;
-            }
-            var paragraph = _section.AddParagraph(pdfParagraph.Text);
-            paragraph.Format.SpaceAfter = "1cm";
-            paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
-            paragraph.Style = pdfParagraph.Style;
-        }
-        protected override void CreateTable(List<string> columns)
-        {
-            if (_document == null)
-            {
-                return;
-            }
-            _table = _document.LastSection.AddTable();
-            foreach (var elem in columns)
-            {
-                _table.AddColumn(elem);
-            }
-        }
-        protected override void CreateRow(PdfRowParameters rowParameters)
-        {
-            if (_table == null)
-            {
-                return;
-            }
-            var row = _table.AddRow();
-            for (int i = 0; i < rowParameters.Texts.Count; ++i)
-            {
-                row.Cells[i].AddParagraph(rowParameters.Texts[i]);
-                if (!string.IsNullOrEmpty(rowParameters.Style))
-                {
-                    row.Cells[i].Style = rowParameters.Style;
-                }
-                Unit borderWidth = 0.5;
-                row.Cells[i].Borders.Left.Width = borderWidth;
-                row.Cells[i].Borders.Right.Width = borderWidth;
-                row.Cells[i].Borders.Top.Width = borderWidth;
-                row.Cells[i].Borders.Bottom.Width = borderWidth;
-                row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
-                row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
-            }
-        }
-        protected override void SavePdf(PdfInfo info)
-        {
-            var renderer = new PdfDocumentRenderer(true)
-            {
-                Document = _document
-            };
-            renderer.RenderDocument();
-            renderer.PdfDocument.Save(info.FileName);
-        }
-    }
-} 

SushiBar/SushiBarBusinessLogic_/OfficePackage/Implements/SaveToWord.cs

@@ -1,121 +0,0 @@
-using SushiBarBusinessLogic.OfficePackage.HelperEnums;
-using SushiBarBusinessLogic.OfficePackage.HelperModels;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-
-
-namespace SushiBarBusinessLogic.OfficePackage.Implements
-{
-    public class SaveToWord : AbstractSaveToWord
-    {
-        private WordprocessingDocument? _wordDocument;
-        private Body? _docBody;
-        /// <summary>
-        /// Получение типа выравнивания
-        /// </summary>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        private static JustificationValues
-       GetJustificationValues(WordJustificationType type)
-        {
-            return type switch
-            {
-                WordJustificationType.Both => JustificationValues.Both,
-                WordJustificationType.Center => JustificationValues.Center,
-                _ => JustificationValues.Left,
-            };
-        }
-        /// <summary>
-        /// Настройки страницы
-        /// </summary>
-        /// <returns></returns>
-        private static SectionProperties CreateSectionProperties()
-        {
-            var properties = new SectionProperties();
-            var pageSize = new PageSize
-            {
-                Orient = PageOrientationValues.Portrait
-            };
-            properties.AppendChild(pageSize);
-            return properties;
-        }
-        /// <summary>
-        /// Задание форматирования для абзаца
-        /// </summary>
-        /// <param name="paragraphProperties"></param>
-        /// <returns></returns>
-        private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
-        {
-            if (paragraphProperties == null)
-            {
-                return null;
-            }
-            var properties = new ParagraphProperties();
-            properties.AppendChild(new Justification()
-            {
-                Val = GetJustificationValues(paragraphProperties.JustificationType)
-            });
-            properties.AppendChild(new SpacingBetweenLines
-            {
-                LineRule = LineSpacingRuleValues.Auto
-            });
-            properties.AppendChild(new Indentation());
-            var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
-            if (!string.IsNullOrEmpty(paragraphProperties.Size))
-            {
-                paragraphMarkRunProperties.AppendChild(new FontSize
-                {
-                    Val = paragraphProperties.Size
-                });
-            }
-            properties.AppendChild(paragraphMarkRunProperties);
-            return properties;
-        }
-        protected override void CreateWord(WordInfo info)
-        {
-            _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
-            MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
-            mainPart.Document = new Document();
-            _docBody = mainPart.Document.AppendChild(new Body());
-        }
-        protected override void CreateParagraph(WordParagraph paragraph)
-        {
-            if (_docBody == null || paragraph == null)
-            {
-                return;
-            }
-            var docParagraph = new Paragraph();
-
-            docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
-            foreach (var run in paragraph.Texts)
-            {
-                var docRun = new Run();
-                var properties = new RunProperties();
-                properties.AppendChild(new FontSize { Val = run.Item2.Size });
-                if (run.Item2.Bold)
-                {
-                    properties.AppendChild(new Bold());
-                }
-                docRun.AppendChild(properties);
-                docRun.AppendChild(new Text
-                {
-                    Text = run.Item1, 
-                    Space = SpaceProcessingModeValues.Preserve
-                });
-                docParagraph.AppendChild(docRun);
-            }
-            _docBody.AppendChild(docParagraph);
-        }
-        protected override void SaveWord(WordInfo info)
-        {
-            if (_docBody == null || _wordDocument == null)
-            {
-                return;
-            }
-            _docBody.AppendChild(CreateSectionProperties());
-            _wordDocument.MainDocumentPart!.Document.Save();
-            _wordDocument.Dispose();
-        }
-    }
-}

SushiBar/SushiBarBusinessLogic_/ReportLogic.cs

@@ -1,93 +0,0 @@
-using SushiBarBusinessLogic.OfficePackage;
-using SushiBarBusinessLogic.OfficePackage.HelperModels;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic
-{
-    public class ReportLogic : IReportLogic
-    {
-        private readonly IComponentStorage _componentStorage;
-        private readonly ISushiStorage _SushiStorage;
-        private readonly IOrderStorage _orderStorage;
-        private readonly AbstractSaveToExcel _saveToExcel;
-        private readonly AbstractSaveToWord _saveToWord;
-        private readonly AbstractSaveToPdf _saveToPdf;
-
-        public ReportLogic(ISushiStorage SushiStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
-            AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
-        {
-            _SushiStorage = SushiStorage;
-            _componentStorage = componentStorage;
-            _orderStorage = orderStorage;
-
-            _saveToExcel = saveToExcel;
-            _saveToWord = saveToWord;
-            _saveToPdf = saveToPdf;
-        }
-
-        public List<ReportSushiComponentViewModel> GetSushiComponents()
-        {
-            return _SushiStorage.GetFullList().Select(x => new ReportSushiComponentViewModel
-            {
-                SushiName = x.SushiName,
-                Components = x.SushiComponents.Select(x => (x.Value.Item1.ComponentName, x.Value.Item2)).ToList(),
-                TotalCount = x.SushiComponents.Select(x => x.Value.Item2).Sum()
-            }).ToList();
-        }
-
-        public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
-        {
-            return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo })
-                    .Select(x => new ReportOrdersViewModel
-                    {
-                        Id = x.Id,
-                        DateCreate = x.DateCreate,
-                        SushiName = x.SushiName,
-                        Sum = x.Sum,
-                        Status = x.Status.ToString()
-                    })
-                    .ToList();
-        }
-
-        public void SaveSushisToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateDoc(new WordInfo
-            {
-                FileName = model.FileName,
-                Title = "Список суши",
-                Sushis = _SushiStorage.GetFullList()
-            });
-        }
-
-        public void SaveSushiComponentToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateReport(new ExcelInfo
-            {
-                FileName = model.FileName,
-                Title = "Список суши",
-                SushiComponents = GetSushiComponents()
-            });
-        }
-
-        public void SaveOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateDoc(new PdfInfo
-            {
-                FileName = model.FileName,
-                Title = "Список заказов",
-                DateFrom = model.DateFrom!.Value,
-                DateTo = model.DateTo!.Value,
-                Orders = GetOrders(model)
-            });
-        }
-    }
-}

SushiBar/SushiBarBusinessLogic_/ShopLogic.cs

@@ -0,0 +1,160 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarContracts.BusinessLogicsContracts;
+
+namespace SushiBarBusinessLogic.BusinessLogics
+{
+    public class ShopLogic : IShopLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IShopStorage _shopStorage;
+        private readonly ISushiStorage _sushiStorage;
+
+        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, ISushiStorage sushiStorage)
+        {
+            _logger = logger;
+            _shopStorage = shopStorage;
+            _sushiStorage = sushiStorage;
+        }
+
+        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
+        {
+            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id);
+            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
+            if (list == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+            return list;
+        }
+
+        public ShopViewModel? ReadElement(ShopSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
+            var element = _shopStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
+
+        public bool Create(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool Update(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool Delete(ShopBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_shopStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool MakeSupply(SupplyBindingModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (model.Count <= 0)
+            {
+                throw new ArgumentException("Количество изделий должно быть больше 0");
+            }
+            var shop = _shopStorage.GetElement(new ShopSearchModel
+            {
+                Id = model.ShopId
+            });
+            if (shop == null)
+            {
+                throw new ArgumentException("Магазина не существует");
+            }
+            if (shop.ShopSushis.ContainsKey(model.SushiId))
+            {
+                var oldValue = shop.ShopSushis[model.SushiId];
+                oldValue.Item2 += model.Count;
+                shop.ShopSushis[model.SushiId] = oldValue;
+            }
+            else
+            {
+                var sushi = _sushiStorage.GetElement(new SushiSearchModel
+                {
+                    Id = model.SushiId
+                });
+                if (sushi == null)
+                {
+                    throw new ArgumentException($"Поставка: Товар с id:{model.SushiId} не найденн");
+                }
+                shop.ShopSushis.Add(model.SushiId, (sushi, model.Count));
+            }
+            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("Магазин с таким названием уже есть");
+            }
+        }
+    }
+}

SushiBar/SushiBarBusinessLogic_/SushiBarBusinessLogic.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -7,15 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.9" />
   </ItemGroup>
 
   <ItemGroup>

SushiBar/SushiBarBusinessLogic_/SushiLogic.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.SearchModels;
 using SushiBarContracts.StoragesContracts;
 using SushiBarContracts.ViewModels;

SushiBar/SushiBarContracts/BindingModels/ReportBindingModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.BindingModels
-{
-    public class ReportBindingModel
-    {
-        public string FileName { get; set; } = string.Empty;
-        public DateTime? DateFrom { get; set; }
-        public DateTime? DateTo { get; set; }
-    }
-}

SushiBar/SushiBarContracts/BindingModels/ShopBindingModel.cs

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

SushiBar/SushiBarContracts/BindingModels/SupplyBindingModel.cs

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

SushiBar/SushiBarContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -1,14 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-
-namespace SushiBarContracts.BusinessLogicsContracts
-{
-    public interface IReportLogic
-    {
-        List<ReportSushiComponentViewModel> GetSushiComponents();
-        List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
-        void SaveSushisToWordFile(ReportBindingModel model);
-        void SaveSushiComponentToExcelFile(ReportBindingModel model);
-        void SaveOrdersToPdfFile(ReportBindingModel model);
-    }
-}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IShopLogic.cs

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

SushiBar/SushiBarContracts/SearchModels/OrderSearchModel.cs

@@ -9,7 +9,5 @@ namespace SushiBarContracts.SearchModels
     public class OrderSearchModel
     {
         public int? Id { get; set; }
-        public DateTime? DateFrom { get; set; }
-        public DateTime? DateTo { get; set; }
     }
 }

SushiBar/SushiBarContracts/SearchModels/ShopSearchModel.cs

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

SushiBar/SushiBarContracts/StoragesContracts/IShopStorage.cs

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

SushiBar/SushiBarContracts/SushiBarContracts.csproj

@@ -6,15 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
   </ItemGroup>

SushiBar/SushiBarContracts/ViewModels/ReportOrdersViewModel.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.ViewModels
-{
-    public class ReportOrdersViewModel
-    {
-        public int Id { get; set; }
-        public DateTime DateCreate { get; set; }
-        public string SushiName { get; set; } = string.Empty;
-        public double Sum { get; set; }
-        public string Status { get; set; } = string.Empty;
-    }
-}

SushiBar/SushiBarContracts/ViewModels/ReportPizzaComponentViewModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.ViewModels
-{
-    public class ReportSushiComponentViewModel
-    {
-        public string SushiName { get; set; } = string.Empty;
-        public int TotalCount { get; set; }
-        public List<(string Component, int Count)> Components { get; set; } = new();
-    }
-}

SushiBar/SushiBarContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarDataModels.Models;
+
+namespace SushiBarContracts.ViewModels
+{
+    public class ShopViewModel
+    {
+        public int Id { get; set; }
+        [DisplayName("Название")]
+        public string ShopName { get; set; } = string.Empty;
+        [DisplayName("Адрес")]
+        public string Adress { get; set; } = string.Empty;
+        [DisplayName("Дата открытия")]
+        public DateTime OpeningDate { get; set; }
+        public Dictionary<int, (ISushiModel, int)> ShopSushis { get; set; } = new();
+    }
+}

SushiBar/SushiBarDataModels/Models/IShopModel.cs

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

SushiBar/SushiBarDataModels/Models/ISupplyModel.cs

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

SushiBar/SushiBarDataModels/SushiBarDataModels.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -6,13 +6,4 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>

SushiBar/SushiBarDatabaseImplement/Implements/ComponentStorage.cs

@@ -1,84 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDatabaseImplement.Implements
-{
-    public class ComponentStorage : IComponentStorage
-    {
-        public List<ComponentViewModel> GetFullList()
-        {
-            using var context = new SushiBarDatabase();
-            return context.Components.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName))
-            {
-                return new();
-            }
-            using var context = new SushiBarDatabase();
-            return context.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
-        }
-
-        public ComponentViewModel? GetElement(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new SushiBarDatabase();
-            return context.Components.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) ||
-            (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-
-        public ComponentViewModel? Insert(ComponentBindingModel model)
-        {
-            var newComponent = Component.Create(model);
-            if (newComponent == null)
-            {
-                return null;
-            }
-            using var context = new SushiBarDatabase();
-            context.Components.Add(newComponent);
-            context.SaveChanges();
-            return newComponent.GetViewModel;
-        }
-
-        public ComponentViewModel? Update(ComponentBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var component = context.Components.FirstOrDefault(x => x.Id == model.Id);
-            if (component == null)
-            {
-                return null;
-            }
-            component.Update(model);
-            context.SaveChanges();
-            return component.GetViewModel;
-        }
-
-        public ComponentViewModel? Delete(ComponentBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id);
-            if (element != null)
-            {
-                context.Components.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs

@@ -1,88 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDatabaseImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        public List<OrderViewModel> GetFullList()
-        {
-            using var context = new SushiBarDatabase();
-            return context.Orders.Include(x => x.Sushi).Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
-            {
-                return new();
-            }
-            using var context = new SushiBarDatabase();
-            if (model.DateFrom.HasValue)
-            {
-                return context.Orders.Include(x => x.Sushi).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
-            }
-            return context.Orders.Include(x => x.Sushi).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
-        }
-
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            using var context = new SushiBarDatabase();
-            return context.Orders.Include(x => x.Sushi).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
-        }
-
-        public OrderViewModel? Insert(OrderBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            if (model == null)
-                return null;
-            var newOrder = Order.Create(context, model);
-            if (newOrder == null)
-            {
-                return null;
-            }
-            context.Orders.Add(newOrder);
-            context.SaveChanges();
-            return newOrder.GetViewModel;
-        }
-
-        public OrderViewModel? Update(OrderBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            order.Update(model);
-            context.SaveChanges();
-            return order.GetViewModel;
-        }
-
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var order = context.Orders.FirstOrDefault(rec => rec.Id == model.Id);
-            if (order != null)
-            {
-                context.Orders.Remove(order);
-                context.SaveChanges();
-                return order.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Implements/SushiStorage.cs

@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDatabaseImplement.Models;
-
-namespace SushiBarDatabaseImplement.Implements
-{
-    public class SushiStorage : ISushiStorage
-    {
-        public List<SushiViewModel> GetFullList()
-        {
-            using var context = new SushiBarDatabase();
-            return context.Sushis.Include(x => x.Components).ThenInclude(x => x.Component).ToList()
-                    .Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<SushiViewModel> GetFilteredList(SushiSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.SushiName))
-            {
-                return new();
-            }
-            using var context = new SushiBarDatabase();
-            return context.Sushis.Include(x => x.Components).ThenInclude(x => x.Component)
-                    .Where(x => x.SushiName.Contains(model.SushiName)).ToList().Select(x => x.GetViewModel).ToList();
-        }
-
-        public SushiViewModel? GetElement(SushiSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.SushiName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new SushiBarDatabase();
-            return context.Sushis.Include(x => x.Components).ThenInclude(x => x.Component)
-                .FirstOrDefault(x =>
-                (!string.IsNullOrEmpty(model.SushiName) && x.SushiName == model.SushiName) ||
-                (model.Id.HasValue && x.Id == model.Id))
-                    ?.GetViewModel;
-        }
-
-        public SushiViewModel? Insert(SushiBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var newSushi = Sushi.Create(context, model);
-            if (newSushi == null)
-            {
-                return null;
-            }
-            context.Sushis.Add(newSushi);
-            context.SaveChanges();
-            return newSushi.GetViewModel;
-        }
-
-        public SushiViewModel? Update(SushiBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            using var transaction = context.Database.BeginTransaction();
-            try
-            {
-                var Sushi = context.Sushis.FirstOrDefault(rec => rec.Id == model.Id);
-                if (Sushi == null)
-                {
-                    return null;
-                }
-                Sushi.Update(model);
-                context.SaveChanges();
-                Sushi.UpdateComponents(context, model);
-                transaction.Commit();
-                return Sushi.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-
-        public SushiViewModel? Delete(SushiBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var element = context.Sushis.Include(x => x.Components).FirstOrDefault(rec => rec.Id == model.Id);
-            if (element != null)
-            {
-                context.Sushis.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/20240313082356_InitialCreate.Designer.cs

@@ -1,171 +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 SushiBarDatabaseImplement;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    [DbContext(typeof(SushiBarDatabase))]
-    [Migration("20240313082356_InitialCreate")]
-    partial class InitialCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.17")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.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("SushiBarDatabaseImplement.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>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.Property<string>("SushiName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", 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>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Orders")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
-                        .WithMany("SushiComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Components")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/20240313082356_InitialCreate.cs

@@ -1,125 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitialCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Components",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ComponentName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Cost = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Components", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Sushis",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Price = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Sushis", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Orders",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    Status = table.Column<int>(type: "int", nullable: false),
-                    DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Orders", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Orders_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "SushiComponents",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    ComponentId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SushiComponents", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Components_ComponentId",
-                        column: x => x.ComponentId,
-                        principalTable: "Components",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_SushiId",
-                table: "Orders",
-                column: "SushiId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_ComponentId",
-                table: "SushiComponents",
-                column: "ComponentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_SushiId",
-                table: "SushiComponents",
-                column: "SushiId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Orders");
-
-            migrationBuilder.DropTable(
-                name: "SushiComponents");
-
-            migrationBuilder.DropTable(
-                name: "Components");
-
-            migrationBuilder.DropTable(
-                name: "Sushis");
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -1,168 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SushiBarDatabaseImplement;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    [DbContext(typeof(SushiBarDatabase))]
-    partial class SushiBarDatabaseModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.17")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.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("SushiBarDatabaseImplement.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>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.Property<string>("SushiName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", 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>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Orders")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
-                        .WithMany("SushiComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Components")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Models/Component.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
-
-namespace SushiBarDatabaseImplement.Models
-{
-    public class Component : IComponentModel
-    {
-        public int Id { get; private set; }
-        [Required]
-        public string ComponentName { get; private set; } = string.Empty;
-        [Required]
-        public double Cost { get; set; }
-        [ForeignKey("ComponentId")]
-        public virtual List<SushiComponent> SushiComponents { get; set; } = new();
-
-        public static Component? Create(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Component()
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-
-        public static Component Create(ComponentViewModel model)
-        {
-            return new Component
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-
-        public void Update(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ComponentName = model.ComponentName;
-            Cost = model.Cost;
-        }
-
-        public ComponentViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ComponentName = ComponentName,
-            Cost = Cost
-        };
-    }
-}

SushiBar/SushiBarDatabaseImplement/Models/Order.cs

@@ -1,74 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Enums;
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDatabaseImplement.Models
-{
-    public class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-
-        [Required]
-        public int SushiId { get; private set; }
-
-        public virtual Sushi Sushi { get; set; } = new();
-
-        [Required]
-        public int Count { get; private set; }
-
-        [Required]
-        public double Sum { get; private set; }
-
-        [Required]
-        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-
-        [Required]
-        public DateTime DateCreate { get; private set; } = DateTime.Now;
-
-        public DateTime? DateImplement { get; private set; }
-
-        public static Order Create(SushiBarDatabase context, OrderBindingModel model)
-        {
-            return new Order()
-            {
-                Id = model.Id,
-                SushiId = model.SushiId,
-                Sushi = context.Sushis.First(x => x.Id == model.SushiId),
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
-            };
-        }
-
-        public void Update(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Status = model.Status;
-            DateImplement = model.DateImplement;
-        }
-
-        public OrderViewModel GetViewModel => new()
-        {
-            Id = Id,
-            SushiId = SushiId,
-            SushiName = Sushi.SushiName,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-        };
-    }
-}

SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs

@@ -1,101 +0,0 @@
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-
-namespace SushiBarDatabaseImplement.Models
-{
-    public class Sushi : ISushiModel
-    {
-        public int Id { get; set; }
-        [Required]
-        public string SushiName { get; set; } = string.Empty;
-        [Required]
-        public double Price { get; set; }
-
-        private Dictionary<int, (IComponentModel, int)>? _sushiComponents = null;
-        [NotMapped]
-        public Dictionary<int, (IComponentModel, int)> SushiComponents
-        {
-            get
-            {
-                if (_sushiComponents == null)
-                {
-                    _sushiComponents = Components.ToDictionary(recPC => recPC.ComponentId, recPC =>
-                    (recPC.Component as IComponentModel, recPC.Count));
-                }
-                return _sushiComponents;
-            }
-        }
-        [ForeignKey("SushiId")]
-        public virtual List<SushiComponent> Components { get; set; } = new();
-        [ForeignKey("SushiId")]
-        public virtual List<Order> Orders { get; set; } = new();
-
-        public static Sushi
-            Create(SushiBarDatabase context, SushiBindingModel model)
-        {
-            return new Sushi()
-            {
-                Id = model.Id,
-                SushiName = model.SushiName,
-                Price = model.Price,
-                Components = model.SushiComponents.Select(x => new SushiComponent
-                {
-                    Component = context.Components.First(y => y.Id == x.Key),
-                    Count = x.Value.Item2
-                }).ToList()
-            };
-        }
-
-        public void Update(SushiBindingModel model)
-        {
-            SushiName = model.SushiName;
-            Price = model.Price;
-        }
-
-        public SushiViewModel GetViewModel => new()
-        {
-            Id = Id,
-            SushiName = SushiName,
-            Price = Price,
-            SushiComponents = SushiComponents
-        };
-
-        public void UpdateComponents(SushiBarDatabase context, SushiBindingModel model)
-        {
-            var sushiComponents = context.SushiComponents.Where(rec => rec.SushiId == model.Id).ToList();
-
-            if (sushiComponents != null && sushiComponents.Count > 0)
-            {
-                context.SushiComponents.RemoveRange(sushiComponents.Where(rec => !model.SushiComponents.ContainsKey(rec.ComponentId)));
-                context.SaveChanges();
-                foreach (var updateComponent in sushiComponents)
-                {
-                    updateComponent.Count = model.SushiComponents[updateComponent.ComponentId].Item2;
-                    model.SushiComponents.Remove(updateComponent.ComponentId);
-                }
-                context.SaveChanges();
-            }
-
-            var sushi = context.Sushis.First(x => x.Id == Id);
-            foreach (var pc in model.SushiComponents)
-            {
-                context.SushiComponents.Add(new SushiComponent
-                {
-                    Sushi = sushi,
-                    Component = context.Components.First(x => x.Id == pc.Key),
-                    Count = pc.Value.Item2
-                });
-                context.SaveChanges();
-            }
-            _sushiComponents = null;
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Models/SushiComponent.cs

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

SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
-    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
-  </ItemGroup>
-
-</Project>

SushiBar/SushiBarDatabaseImplement/SushiBarDatatbase.cs

@@ -1,26 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarDatabaseImplement.Models;
-
-namespace SushiBarDatabaseImplement
-{
-    public class SushiBarDatabase : DbContext
-    {
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            if (!optionsBuilder.IsConfigured)
-            {
-                optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=SushiBarDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
-            }
-            base.OnConfiguring(optionsBuilder);
-        }
-        public virtual DbSet<Component> Components { set; get; }
-        public virtual DbSet<Sushi> Sushis { set; get; }
-        public virtual DbSet<SushiComponent> SushiComponents { set; get; }
-        public virtual DbSet<Order> Orders { set; get; }
-    }
-}

SushiBar/SushiBarFileImplement/DataFileSingleton.cs

@@ -1,58 +0,0 @@
-using SushiBarFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace SushiBarFileImplement
-{
-    internal class DataFileSingleton
-    {
-        private static DataFileSingleton? instance;
-        private readonly string ComponentFileName = "Component.xml";
-        private readonly string OrderFileName = "Order.xml";
-        private readonly string SushiFileName = "Sushi.xml";
-        public List<Component> Components { get; private set; }
-        public List<Order> Orders { get; private set; }
-        public List<Sushi> Sushis { get; private set; }
-
-        public static DataFileSingleton GetInstance()
-        {
-            if (instance == null)
-            {
-                instance = new DataFileSingleton();
-            }
-            return instance;
-        }
-
-        public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
-        public void SaveSushis() => SaveData(Sushis, SushiFileName, "Sushis", x => x.GetXElement);
-        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-
-        private DataFileSingleton()
-        {
-            Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
-            Sushis = LoadData(SushiFileName, "Sushi", x => Sushi.Create(x)!)!;
-            Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-        }
-
-        private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
-        {
-            if (File.Exists(filename))
-            {
-                return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
-            }
-            return new List<T>();
-        }
-
-        private static void SaveData<T>(List<T> data, string filename, string xmlNodeName, Func<T, XElement> selectFunction)
-        {
-            if (data != null)
-            {
-                new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
-            }
-        }
-    }
-}

SushiBar/SushiBarFileImplement/Implements/ComponentStorage.cs

@@ -1,86 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarFileImplement.Implements
-{
-    public class ComponentStorage : IComponentStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public ComponentStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<ComponentViewModel> GetFullList()
-        {
-            return source.Components.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName))
-            {
-                return new();
-            }
-            return source.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
-        }
-
-        public ComponentViewModel? GetElement(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Components.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) ||
-            (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-
-        public ComponentViewModel? Insert(ComponentBindingModel model)
-        {
-            model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1;
-            var newComponent = Component.Create(model);
-            if (newComponent == null)
-            {
-                return null;
-            }
-            source.Components.Add(newComponent);
-            source.SaveComponents();
-            return newComponent.GetViewModel;
-        }
-
-        public ComponentViewModel? Update(ComponentBindingModel model)
-        {
-            var component = source.Components.FirstOrDefault(x => x.Id == model.Id);
-            if (component == null)
-            {
-                return null;
-            }
-            component.Update(model);
-            source.SaveComponents();
-            return component.GetViewModel;
-        }
-
-        public ComponentViewModel? Delete(ComponentBindingModel model)
-        {
-            var element = source.Components.FirstOrDefault(x => x.Id == model.Id);
-            if (element != null)
-            {
-                source.Components.Remove(element);
-                source.SaveComponents();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs

@@ -1,94 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarFileImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public OrderStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<OrderViewModel> GetFullList() => source.Orders.Select(x => AttachSushiName(x.GetViewModel)).ToList();
-
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
-            {
-                return new();
-            }
-            return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => AttachSushiName(x.GetViewModel)).ToList();
-        }
-
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            return AttachSushiName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
-        }
-
-        public OrderViewModel? Insert(OrderBindingModel model)
-        {
-            model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
-            var newOrder = Order.Create(model);
-            if (newOrder == null)
-            {
-                return null;
-            }
-            source.Orders.Add(newOrder);
-            source.SaveOrders();
-            return AttachSushiName(newOrder.GetViewModel);
-        }
-
-        public OrderViewModel? Update(OrderBindingModel model)
-        {
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            order.Update(model);
-            source.SaveOrders();
-            return AttachSushiName(order.GetViewModel);
-        }
-
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order != null)
-            {
-                source.Orders.Remove(order);
-                source.SaveOrders();
-                return AttachSushiName(order.GetViewModel);
-            }
-            return null;
-        }
-
-        private OrderViewModel? AttachSushiName(OrderViewModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            var sushi = source.Sushis.FirstOrDefault(x => x.Id == model.SushiId);
-            if (sushi != null)
-            {
-                model.SushiName = sushi.SushiName;
-            }
-            return model;
-        }
-    }
-}

SushiBar/SushiBarFileImplement/Implements/SushiStorage.cs

@@ -1,86 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarFileImplement.Implements
-{
-    public class SushiStorage : ISushiStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public SushiStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<SushiViewModel> GetFullList()
-        {
-            return source.Sushis.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<SushiViewModel> GetFilteredList(SushiSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.SushiName))
-            {
-                return new();
-            }
-            return source.Sushis.Where(x => x.SushiName.Contains(model.SushiName)).Select(x => x.GetViewModel).ToList();
-        }
-
-        public SushiViewModel? GetElement(SushiSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.SushiName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Sushis.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.SushiName) && x.SushiName == model.SushiName) ||
-            (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-
-        public SushiViewModel? Insert(SushiBindingModel model)
-        {
-            model.Id = source.Sushis.Count > 0 ? source.Sushis.Max(x => x.Id) + 1 : 1;
-            var newSushi = Sushi.Create(model);
-            if (newSushi == null)
-            {
-                return null;
-            }
-            source.Sushis.Add(newSushi);
-            source.SaveSushis();
-            return newSushi.GetViewModel;
-        }
-
-        public SushiViewModel? Update(SushiBindingModel model)
-        {
-            var Sushi = source.Sushis.FirstOrDefault(x => x.Id == model.Id);
-            if (Sushi == null)
-            {
-                return null;
-            }
-            Sushi.Update(model);
-            source.SaveSushis();
-            return Sushi.GetViewModel;
-        }
-
-        public SushiViewModel? Delete(SushiBindingModel model)
-        {
-            var Sushi = source.Sushis.FirstOrDefault(x => x.Id == model.Id);
-            if (Sushi != null)
-            {
-                source.Sushis.Remove(Sushi);
-                source.SaveSushis();
-                return Sushi.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

SushiBar/SushiBarFileImplement/Models/Component.cs

@@ -1,70 +0,0 @@
-
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace SushiBarFileImplement.Models
-{
-    internal class Component : IComponentModel
-    {
-        public int Id { get; private set; }
-        public string ComponentName { get; private set; } = string.Empty;
-        public double Cost { get; set; }
-
-        public static Component? Create(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Component()
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-
-        public static Component? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Component()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ComponentName = element.Element("ComponentName")!.Value,
-                Cost = Convert.ToDouble(element.Element("Cost")!.Value)
-            };
-        }
-
-        public void Update(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ComponentName = model.ComponentName;
-            Cost = model.Cost;
-        }
-
-        public ComponentViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ComponentName = ComponentName,
-            Cost = Cost
-        };
-
-        public XElement GetXElement => new("Component",
-                    new XAttribute("Id", Id),
-                    new XElement("ComponentName", ComponentName),
-                    new XElement("Cost", Cost.ToString()));
-    }
-}

SushiBar/SushiBarFileImplement/Models/Order.cs

@@ -1,92 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Enums;
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace SushiBarFileImplement.Models
-{
-    internal class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-        public int SushiId { get; private set; }
-        public int Count { get; private set; }
-        public double Sum { get; private set; }
-        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-        public DateTime DateCreate { get; private set; } = DateTime.Now;
-        public DateTime? DateImplement { get; private set; }
-
-        public static Order? Create(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Order()
-            {
-                Id = model.Id,
-                SushiId = model.SushiId,
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
-            };
-        }
-
-        public static Order? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            string dateImplement = element.Element("DateImplement")!.Value;
-            return new Order()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                SushiId = Convert.ToInt32(element.Element("SushiId")!.Value),
-                Count = Convert.ToInt32(element.Element("Count")!.Value),
-                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
-                Status = (OrderStatus)(Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value)),
-                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
-                DateImplement = (dateImplement == "" || dateImplement is null) ? Convert.ToDateTime(null) : Convert.ToDateTime(dateImplement)
-            };
-
-        }
-
-        public void Update(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Status = model.Status;
-            if (model.Status == OrderStatus.Выдан) DateImplement = model.DateImplement;
-        }
-
-        public OrderViewModel GetViewModel => new()
-        {
-            Id = Id,
-            SushiId = SushiId,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-        };
-
-        public XElement GetXElement => new("Order",
-           new XAttribute("Id", Id),
-           new XElement("SushiId", SushiId.ToString()),
-           new XElement("Count", Count.ToString()),
-           new XElement("Sum", Sum.ToString()),
-           new XElement("Status", Status.ToString()),
-           new XElement("DateCreate", DateCreate.ToString()),
-           new XElement("DateImplement", DateImplement.ToString()));
-    }
-}

SushiBar/SushiBarFileImplement/Models/Sushi.cs

@@ -1,86 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace SushiBarFileImplement.Models
-{
-    public class Sushi : ISushiModel
-    {
-        public int Id { get; private set; }
-        public string SushiName { get; private set; } = string.Empty;
-        public double Price { get; private set; }
-        public Dictionary<int, int> Components { get; private set; } = new();
-        private Dictionary<int, (IComponentModel, int)>? _SushiComponents = null;
-        public Dictionary<int, (IComponentModel, int)> SushiComponents
-        {
-            get
-            {
-                if (_SushiComponents == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _SushiComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
-                }
-                return _SushiComponents;
-            }
-        }
-        public static Sushi? Create(SushiBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Sushi()
-            {
-                Id = model.Id,
-                SushiName = model.SushiName,
-                Price = model.Price,
-                Components = model.SushiComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
-            };
-        }
-        public static Sushi? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Sushi()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                SushiName = element.Element("SushiName")!.Value,
-                Price = Convert.ToDouble(element.Element("Price")!.Value),
-                Components = element.Element("SushiComponents")!.Elements("SushiComponent").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
-                x => Convert.ToInt32(x.Element("Value")?.Value))
-            };
-        }
-        public void Update(SushiBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            SushiName = model.SushiName;
-            Price = model.Price;
-            Components = model.SushiComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _SushiComponents = null;
-        }
-        public SushiViewModel GetViewModel => new()
-        {
-            Id = Id,
-            SushiName = SushiName,
-            Price = Price,
-            SushiComponents = SushiComponents
-        };
-        public XElement GetXElement => new("Sushi",
-                new XAttribute("Id", Id),
-                new XElement("SushiName", SushiName),
-                new XElement("Price", Price.ToString()),
-                new XElement("SushiComponents", Components.Select(
-                    x => new XElement("SushiComponent", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()));
-    }
-}

SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
-    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
-  </ItemGroup>
-
-</Project>

SushiBar/SushiBarListImplement_/DataListSingleton.cs

@@ -13,11 +13,13 @@ namespace SushiBarListImplement
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Sushi> Sushis { get; set; }
+        public List<Shop> Shops { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Sushis = new List<Sushi>();
+            Shops = new List<Shop>();
         }
         public static DataListSingleton GetInstance()
         {

SushiBar/SushiBarListImplement_/Implements/OrderStorage.cs

@@ -33,19 +33,18 @@ namespace SushiBarListImplement.Implements
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             var result = new List<OrderViewModel>();
-            if (model == null || !model.DateFrom.HasValue || !model.DateFrom.HasValue)
-            
-                {
-                    return result;
-                }
-                foreach (var order in _source.Orders)
-                {
-                    if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
-                    {
-                        result.Add(AttachSushiName(order.GetViewModel));
-                    }
-                }
+            if (model == null || !model.Id.HasValue)
+            {
                 return result;
+            }
+            foreach (var order in _source.Orders)
+            {
+                if (order.Id == model.Id)
+                {
+                    result.Add(AttachSushiName(order.GetViewModel));
+                }
+            }
+            return result;
         }
 
         public OrderViewModel? GetElement(OrderSearchModel model)

SushiBar/SushiBarListImplement_/Implements/ShopStorage.cs

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

SushiBar/SushiBarListImplement_/Models/Shop.cs

@@ -0,0 +1,59 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarDataModels.Enums;
+
+namespace SushiBarListImplement.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, (ISushiModel, int)> ShopSushis { get; private set; } = new();
+
+        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
+            };
+        }
+
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ShopName = model.ShopName;
+            Adress = model.Adress;
+            OpeningDate = model.OpeningDate;
+        }
+
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Adress = Adress,
+            OpeningDate = OpeningDate,
+            ShopSushis = ShopSushis
+        };
+    }
+}

SushiBar/SushiBarListImplement_/SushiBarListImplement.csproj

@@ -6,15 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
     <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />

SushiBar/SushiBarView/FormCreateSupply.Designer.cs

@@ -0,0 +1,149 @@
+namespace SushiBarView
+{
+    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.labelSushi = new System.Windows.Forms.Label();
+            this.comboBoxSushi = 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(101, 9);
+            this.comboBoxShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.comboBoxShop.Name = "comboBoxShop";
+            this.comboBoxShop.Size = new System.Drawing.Size(302, 23);
+            this.comboBoxShop.TabIndex = 0;
+            // 
+            // labelShop
+            // 
+            this.labelShop.AutoSize = true;
+            this.labelShop.Location = new System.Drawing.Point(10, 11);
+            this.labelShop.Name = "labelShop";
+            this.labelShop.Size = new System.Drawing.Size(60, 15);
+            this.labelShop.TabIndex = 1;
+            this.labelShop.Text = "Магазин: ";
+            // 
+            // labelSushi
+            // 
+            this.labelSushi.AutoSize = true;
+            this.labelSushi.Location = new System.Drawing.Point(10, 37);
+            this.labelSushi.Name = "labelSushi";
+            this.labelSushi.Size = new System.Drawing.Size(59, 15);
+            this.labelSushi.TabIndex = 2;
+            this.labelSushi.Text = "Изделие: ";
+            // 
+            // comboBoxSushi
+            // 
+            this.comboBoxSushi.FormattingEnabled = true;
+            this.comboBoxSushi.Location = new System.Drawing.Point(101, 34);
+            this.comboBoxSushi.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.comboBoxSushi.Name = "comboBoxSushi";
+            this.comboBoxSushi.Size = new System.Drawing.Size(302, 23);
+            this.comboBoxSushi.TabIndex = 3;
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(10, 62);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(78, 15);
+            this.labelCount.TabIndex = 4;
+            this.labelCount.Text = "Количество: ";
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(101, 60);
+            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(302, 23);
+            this.textBoxCount.TabIndex = 5;
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(262, 85);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(102, 29);
+            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(147, 85);
+            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(102, 29);
+            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(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(412, 123);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.comboBoxSushi);
+            this.Controls.Add(this.labelSushi);
+            this.Controls.Add(this.labelShop);
+            this.Controls.Add(this.comboBoxShop);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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 labelSushi;
+        private ComboBox comboBoxSushi;
+        private Label labelCount;
+        private TextBox textBoxCount;
+        private Button buttonCancel;
+        private Button buttonSave;
+    }
+}

SushiBar/SushiBarView/FormCreateSupply.cs

@@ -0,0 +1,99 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.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 SushiBarView
+{
+    public partial class FormCreateSupply : Form
+    {
+        private readonly ILogger _logger;
+        private readonly ISushiLogic _logicP;
+        private readonly IShopLogic _logicS;
+        private List<ShopViewModel> _shopList = new List<ShopViewModel>();
+        private List<SushiViewModel> _sushiList = new List<SushiViewModel>();
+
+        public FormCreateSupply(ILogger<FormCreateSupply> logger, ISushiLogic logicP, IShopLogic logicS)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicP = logicP;
+            _logicS = logicS;
+        }
+
+        private void FormCreateSupply_Load(object sender, EventArgs e)
+        {
+            _shopList = _logicS.ReadList(null);
+            _sushiList = _logicP.ReadList(null);
+            if (_shopList != null)
+            {
+                comboBoxShop.DisplayMember = "ShopName";
+                comboBoxShop.ValueMember = "Id";
+                comboBoxShop.DataSource = _shopList;
+                comboBoxShop.SelectedItem = null;
+                _logger.LogInformation("Загрузка магазинов для поставок");
+            }
+            if (_sushiList != null)
+            {
+                comboBoxSushi.DisplayMember = "SushiName";
+                comboBoxSushi.ValueMember = "Id";
+                comboBoxSushi.DataSource = _sushiList;
+                comboBoxSushi.SelectedItem = null;
+                _logger.LogInformation("Загрузка пиццы для поставок");
+            }
+        }
+
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (comboBoxShop.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxSushi.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Создание поставки");
+            try
+            {
+                var operationResult = _logicS.MakeSupply(new SupplyBindingModel
+                {
+                    ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
+                    SushiId = Convert.ToInt32(comboBoxSushi.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();
+        }
+    }
+}

SushiBar/SushiBarView/FormCreateSupply.resx

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

SushiBar/SushiBarView/FormMain.Designer.cs

@@ -37,11 +37,9 @@
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.componentsToolStripMenuItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.sushiToolStripMenuItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.shopsToolStripMenuItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.пополнениеМагазинаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.отчётыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.componentsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.componentSushiToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.SuspendLayout();
@@ -99,7 +97,8 @@
             // menuStrip
             // 
             this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItem1, this.отчётыToolStripMenuItem});
+            this.toolStripMenuItem1,
+            this.пополнениеМагазинаToolStripMenuItem});
             this.menuStrip.Location = new System.Drawing.Point(0, 0);
             this.menuStrip.Name = "menuStrip";
             this.menuStrip.Size = new System.Drawing.Size(922, 24);
@@ -110,7 +109,8 @@
             // 
             this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.componentsToolStripMenuItemToolStripMenuItem,
-            this.sushiToolStripMenuItemToolStripMenuItem});
+            this.sushiToolStripMenuItemToolStripMenuItem,
+            this.shopsToolStripMenuItemToolStripMenuItem});
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
             this.toolStripMenuItem1.Size = new System.Drawing.Size(94, 20);
             this.toolStripMenuItem1.Text = "Справочники";
@@ -129,6 +129,20 @@
             this.sushiToolStripMenuItemToolStripMenuItem.Text = "Суши";
             this.sushiToolStripMenuItemToolStripMenuItem.Click += new System.EventHandler(this.sushiToolStripMenuItem_Click);
             // 
+            // shopsToolStripMenuItemToolStripMenuItem
+            // 
+            this.shopsToolStripMenuItemToolStripMenuItem.Name = "shopsToolStripMenuItemToolStripMenuItem";
+            this.shopsToolStripMenuItemToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.shopsToolStripMenuItemToolStripMenuItem.Text = "Магазины";
+            this.shopsToolStripMenuItemToolStripMenuItem.Click += new System.EventHandler(this.shopsToolStripMenuItem_Click);
+            // 
+            // пополнениеМагазинаToolStripMenuItem
+            // 
+            this.пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem";
+            this.пополнениеМагазинаToolStripMenuItem.Size = new System.Drawing.Size(143, 20);
+            this.пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина";
+            this.пополнениеМагазинаToolStripMenuItem.Click += new System.EventHandler(this.transactionToolStripMenuItem_Click);
+            // 
             // dataGridView
             // 
             this.dataGridView.BackgroundColor = System.Drawing.Color.White;
@@ -139,37 +153,6 @@
             this.dataGridView.Size = new System.Drawing.Size(647, 344);
             this.dataGridView.TabIndex = 6;
             // 
-            // отчётыToolStripMenuItem
-            // 
-            this.отчётыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.componentsToolStripMenuItem1,
-            this.componentSushiToolStripMenuItem1,
-            this.ordersToolStripMenuItem});
-            this.отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
-            this.отчётыToolStripMenuItem.Size = new System.Drawing.Size(60, 20);
-            this.отчётыToolStripMenuItem.Text = "Отчёты";
-            // 
-            // componentsToolStripMenuItem1
-            // 
-            this.componentsToolStripMenuItem1.Name = "componentsToolStripMenuItem1";
-            this.componentsToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
-            this.componentsToolStripMenuItem1.Text = "Суши";
-            this.componentsToolStripMenuItem1.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click);
-            // 
-            // componentSushiToolStripMenuItem1
-            // 
-            this.componentSushiToolStripMenuItem1.Name = "componentSushiToolStripMenuItem1";
-            this.componentSushiToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
-            this.componentSushiToolStripMenuItem1.Text = "Суши с компонентами";
-            this.componentSushiToolStripMenuItem1.Click += new System.EventHandler(this.ComponentSushiToolStripMenuItem_Click);
-            // 
-            // ordersToolStripMenuItem
-            // 
-            this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
-            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
-            this.ordersToolStripMenuItem.Text = "Заказы";
-            this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
-            // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -206,9 +189,7 @@
         private ToolStripMenuItem componentsToolStripMenuItemToolStripMenuItem;
         private ToolStripMenuItem sushiToolStripMenuItemToolStripMenuItem;
         private DataGridView dataGridView;
-        private ToolStripMenuItem отчётыToolStripMenuItem;
-        private ToolStripMenuItem componentsToolStripMenuItem1;
-        private ToolStripMenuItem componentSushiToolStripMenuItem1;
-        private ToolStripMenuItem ordersToolStripMenuItem;
+        private ToolStripMenuItem shopsToolStripMenuItemToolStripMenuItem;
+        private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem;
     }
 }

SushiBar/SushiBarView/FormMain.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
-using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,8 +10,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Microsoft.Extensions.DependencyInjection;
-using SushiBarView.Reports;
 
 namespace SushiBarView
 {
@@ -35,13 +33,11 @@ namespace SushiBarView
 
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
-        private readonly IReportLogic _reportLogic;
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
-            _reportLogic = reportLogic;
         }
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -57,7 +53,8 @@ namespace SushiBarView
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["SushiId"].Visible = false;
-                    
+                    dataGridView.Columns["SushiName"].AutoSizeMode =
+                    DataGridViewAutoSizeColumnMode.Fill;
                 }
                 _logger.LogInformation("Загрузка заказов");
             }
@@ -170,31 +167,19 @@ MessageBoxIcon.Error);
             LoadData();
         }
 
-        private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e)
+        private void shopsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                _reportLogic.SaveSushisToWordFile(new ReportBindingModel { FileName = dialog.FileName });
-                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-        }
-
-        private void ComponentSushiToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportSushiComponents));
-            if (service is FormReportSushiComponents form)
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            if (service is FormShops form)
             {
                 form.ShowDialog();
             }
-
         }
 
-        private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
+        private void transactionToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service =
-           Program.ServiceProvider?.GetService(typeof(FormReportOrders));
-            if (service is FormReportOrders form)
+            var service = Program.ServiceProvider?.GetService(typeof(FormCreateSupply));
+            if (service is FormCreateSupply form)
             {
                 form.ShowDialog();
             }

SushiBar/SushiBarView/FormReportOrders.Designer.cs

@@ -1,129 +0,0 @@
-namespace SushiBarView.Reports
-{
-    partial class FormReportOrders
-    {
-        /// <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()
-        {
-            panel = new Panel();
-            labelFrom = new Label();
-            buttonToPdf = new Button();
-            dateTimePickerDateFrom = new DateTimePicker();
-            labelTo = new Label();
-            dateTimePickerDateTo = new DateTimePicker();
-            buttonMake = new Button();
-            panel.SuspendLayout();
-            SuspendLayout();
-            // 
-            // panel
-            // 
-            panel.Controls.Add(labelFrom);
-            panel.Controls.Add(buttonToPdf);
-            panel.Controls.Add(dateTimePickerDateFrom);
-            panel.Controls.Add(labelTo);
-            panel.Controls.Add(dateTimePickerDateTo);
-            panel.Controls.Add(buttonMake);
-            panel.Dock = DockStyle.Top;
-            panel.Location = new Point(0, 0);
-            panel.Name = "panel";
-            panel.Size = new Size(1321, 71);
-            panel.TabIndex = 3;
-            // 
-            // labelFrom
-            // 
-            labelFrom.AutoSize = true;
-            labelFrom.Location = new Point(16, 31);
-            labelFrom.Name = "labelFrom";
-            labelFrom.Size = new Size(18, 20);
-            labelFrom.TabIndex = 3;
-            labelFrom.Text = "С";
-            // 
-            // buttonToPdf
-            // 
-            buttonToPdf.Location = new Point(1200, 27);
-            buttonToPdf.Name = "buttonToPdf";
-            buttonToPdf.Size = new Size(94, 29);
-            buttonToPdf.TabIndex = 4;
-            buttonToPdf.Text = "В PDF";
-            buttonToPdf.UseVisualStyleBackColor = true;
-            buttonToPdf.Click += ButtonToPdf_Click;
-            // 
-            // dateTimePickerDateFrom
-            // 
-            dateTimePickerDateFrom.Location = new Point(51, 27);
-            dateTimePickerDateFrom.Name = "dateTimePickerDateFrom";
-            dateTimePickerDateFrom.Size = new Size(250, 27);
-            dateTimePickerDateFrom.TabIndex = 0;
-            // 
-            // labelTo
-            // 
-            labelTo.AutoSize = true;
-            labelTo.Location = new Point(317, 31);
-            labelTo.Name = "labelTo";
-            labelTo.Size = new Size(29, 20);
-            labelTo.TabIndex = 4;
-            labelTo.Text = "По";
-            // 
-            // dateTimePickerDateTo
-            // 
-            dateTimePickerDateTo.Location = new Point(365, 27);
-            dateTimePickerDateTo.Name = "dateTimePickerDateTo";
-            dateTimePickerDateTo.Size = new Size(250, 27);
-            dateTimePickerDateTo.TabIndex = 1;
-            // 
-            // buttonMake
-            // 
-            buttonMake.Location = new Point(677, 27);
-            buttonMake.Name = "buttonMake";
-            buttonMake.Size = new Size(132, 29);
-            buttonMake.TabIndex = 3;
-            buttonMake.Text = "Сформировать";
-            buttonMake.UseVisualStyleBackColor = true;
-            buttonMake.Click += ButtonMake_Click;
-            // 
-            // FormReportOrders
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1321, 450);
-            Controls.Add(panel);
-            Name = "FormReportOrders";
-            Text = "FormReportOrders";
-            panel.ResumeLayout(false);
-            panel.PerformLayout();
-            ResumeLayout(false);
-        }
-
-        #endregion
-        private Panel panel;
-        private DateTimePicker dateTimePickerDateTo;
-        private DateTimePicker dateTimePickerDateFrom;
-        private Button buttonMake;
-        private Button buttonToPdf;
-        private Label labelTo;
-        private Label labelFrom;
-    }
-}

SushiBar/SushiBarView/FormReportOrders.cs

@@ -1,92 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Reporting.WinForms;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-
-namespace SushiBarView.Reports
-{
-    public partial class FormReportOrders : Form
-    {
-        private readonly ReportViewer reportViewer;
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-        public FormReportOrders(ILogger<FormReportOrders> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            reportViewer = new ReportViewer
-            {
-                Dock = DockStyle.Fill
-            };
-            var path = Directory.GetParent(Directory.GetCurrentDirectory())?.Parent?.Parent?.ToString() + "\\ReportOrders.rdlc";
-            reportViewer.LocalReport.LoadReportDefinition(new FileStream(path, FileMode.Open));
-            //reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open));
-            Controls.Clear();
-            Controls.Add(reportViewer);
-            Controls.Add(panel);
-        }
-        private void ButtonMake_Click(object sender, EventArgs e)
-        {
-            if (dateTimePickerDateFrom.Value.Date >= dateTimePickerDateTo.Value.Date)
-            {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания", 
-                    "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            try
-            {
-                var dataSource = _logic.GetOrders(new ReportBindingModel
-                {
-                    DateFrom = dateTimePickerDateFrom.Value,
-                    DateTo = dateTimePickerDateTo.Value
-                });
-                var source = new ReportDataSource("DataSetOrders", dataSource);
-                reportViewer.LocalReport.DataSources.Clear();
-                reportViewer.LocalReport.DataSources.Add(source);
-                var parameters = new[] { new ReportParameter("ReportParameterPeriod", $"c {dateTimePickerDateFrom.Value.ToShortDateString()} по {dateTimePickerDateTo.Value.ToShortDateString()}") };
-                reportViewer.LocalReport.SetParameters(parameters);
-                reportViewer.RefreshReport();
-                _logger.LogInformation("Загрузка списка заказов на период {From}-{To}", 
-                    dateTimePickerDateFrom.Value.ToShortDateString(), dateTimePickerDateTo.Value.ToShortDateString());
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка заказов на период");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonToPdf_Click(object sender, EventArgs e)
-        {
-            if (dateTimePickerDateFrom.Value.Date >= dateTimePickerDateTo.Value.Date)
-            {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            using var dialog = new SaveFileDialog
-            {
-                Filter = "pdf|*.pdf"
-            };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveOrdersToPdfFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName,
-                        DateFrom = dateTimePickerDateFrom.Value,
-                        DateTo = dateTimePickerDateTo.Value
-                    });
-                    _logger.LogInformation("Сохранение списка заказов на период {From}-{To} ", 
-                        dateTimePickerDateFrom.Value.ToShortDateString(), dateTimePickerDateTo.Value.ToShortDateString());
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка заказов на период");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

SushiBar/SushiBarView/FormReportOrders.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>

SushiBar/SushiBarView/FormReportSushiComponents.Designer.cs

@@ -1,119 +0,0 @@
-namespace SushiBarView
-{
-    partial class FormReportSushiComponents
-    {
-        /// <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.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ColumnSushi = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnComponent = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.buttonSaveToExcel = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // 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.ColumnSushi,
-            this.ColumnComponent,
-            this.ColumnCount});
-            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.dataGridView.Location = new System.Drawing.Point(0, 36);
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(494, 302);
-            this.dataGridView.TabIndex = 0;
-            // 
-            // ColumnSushi
-            // 
-            this.ColumnSushi.FillWeight = 130F;
-            this.ColumnSushi.HeaderText = "Пицца";
-            this.ColumnSushi.MinimumWidth = 6;
-            this.ColumnSushi.Name = "ColumnSushi";
-            this.ColumnSushi.ReadOnly = true;
-            // 
-            // ColumnComponent
-            // 
-            this.ColumnComponent.FillWeight = 140F;
-            this.ColumnComponent.HeaderText = "Ингридиент";
-            this.ColumnComponent.MinimumWidth = 6;
-            this.ColumnComponent.Name = "ColumnComponent";
-            this.ColumnComponent.ReadOnly = true;
-            // 
-            // ColumnCount
-            // 
-            this.ColumnCount.FillWeight = 90F;
-            this.ColumnCount.HeaderText = "Количество";
-            this.ColumnCount.MinimumWidth = 6;
-            this.ColumnCount.Name = "ColumnCount";
-            this.ColumnCount.ReadOnly = true;
-            // 
-            // buttonSaveToExcel
-            // 
-            this.buttonSaveToExcel.Location = new System.Drawing.Point(12, 10);
-            this.buttonSaveToExcel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSaveToExcel.Name = "buttonSaveToExcel";
-            this.buttonSaveToExcel.Size = new System.Drawing.Size(470, 22);
-            this.buttonSaveToExcel.TabIndex = 1;
-            this.buttonSaveToExcel.Text = "Сохранить в Excel";
-            this.buttonSaveToExcel.UseVisualStyleBackColor = true;
-            this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
-            // 
-            // FromReportSushiComponents
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(494, 338);
-            this.Controls.Add(this.buttonSaveToExcel);
-            this.Controls.Add(this.dataGridView);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FromReportSushiComponents";
-            this.Text = "Пицца с ингридиентами";
-            this.Load += new System.EventHandler(this.FormReportSushiComponents_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DataGridView dataGridView;
-        private Button buttonSaveToExcel;
-        private DataGridViewTextBoxColumn ColumnSushi;
-        private DataGridViewTextBoxColumn ColumnComponent;
-        private DataGridViewTextBoxColumn ColumnCount;
-    }
-}

SushiBar/SushiBarView/FormReportSushiComponents.cs

@@ -1,69 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-
-namespace SushiBarView
-{
-    public partial class FormReportSushiComponents : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-
-        public FormReportSushiComponents(ILogger<FormReportSushiComponents> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormReportSushiComponents_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                var dict = _logic.GetSushiComponents();
-                if (dict != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var elem in dict)
-                    {
-                        dataGridView.Rows.Add(new object[] { elem.SushiName, "", "" });
-                        foreach (var listElem in elem.Components)
-                        {
-                            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.SaveSushiComponentToExcelFile(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);
-                }
-            }
-        }
-    }
-}

SushiBar/SushiBarView/FormReportSushiComponents.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>

SushiBar/SushiBarView/FormShop.Designer.cs

@@ -0,0 +1,201 @@
+namespace SushiBarView
+{
+    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.SushiName = 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();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // labelName
+            // 
+            this.labelName.AutoSize = true;
+            this.labelName.Location = new System.Drawing.Point(10, 11);
+            this.labelName.Name = "labelName";
+            this.labelName.Size = new System.Drawing.Size(65, 15);
+            this.labelName.TabIndex = 0;
+            this.labelName.Text = "Название: ";
+            // 
+            // textBoxName
+            // 
+            this.textBoxName.Location = new System.Drawing.Point(89, 9);
+            this.textBoxName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.textBoxName.Name = "textBoxName";
+            this.textBoxName.Size = new System.Drawing.Size(242, 23);
+            this.textBoxName.TabIndex = 1;
+            // 
+            // textBoxAdress
+            // 
+            this.textBoxAdress.Location = new System.Drawing.Point(89, 44);
+            this.textBoxAdress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.textBoxAdress.Name = "textBoxAdress";
+            this.textBoxAdress.Size = new System.Drawing.Size(374, 23);
+            this.textBoxAdress.TabIndex = 3;
+            // 
+            // labelAdress
+            // 
+            this.labelAdress.AutoSize = true;
+            this.labelAdress.Location = new System.Drawing.Point(10, 46);
+            this.labelAdress.Name = "labelAdress";
+            this.labelAdress.Size = new System.Drawing.Size(46, 15);
+            this.labelAdress.TabIndex = 2;
+            this.labelAdress.Text = "Адрес: ";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(395, 343);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(114, 33);
+            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(276, 343);
+            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(114, 33);
+            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.BackgroundColor = System.Drawing.Color.White;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.id,
+            this.SushiName,
+            this.Count});
+            this.dataGridView.Location = new System.Drawing.Point(10, 108);
+            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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(498, 230);
+            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;
+            // 
+            // SushiName
+            // 
+            this.SushiName.HeaderText = "Суши";
+            this.SushiName.MinimumWidth = 6;
+            this.SushiName.Name = "SushiName";
+            this.SushiName.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(10, 77);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(87, 15);
+            this.label1.TabIndex = 8;
+            this.label1.Text = "Дата открытия";
+            // 
+            // dateTimeOpen
+            // 
+            this.dateTimeOpen.Location = new System.Drawing.Point(112, 77);
+            this.dateTimeOpen.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.dateTimeOpen.Name = "dateTimeOpen";
+            this.dateTimeOpen.Size = new System.Drawing.Size(351, 23);
+            this.dateTimeOpen.TabIndex = 9;
+            // 
+            // FormShop
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(519, 385);
+            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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Name = "FormShop";
+            this.Text = "Магазин";
+            this.Load += new System.EventHandler(this.FormShop_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).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 SushiName;
+        private DataGridViewTextBoxColumn Count;
+        private Label label1;
+        private DateTimePicker dateTimeOpen;
+    }
+}

SushiBar/SushiBarView/FormShop.cs

@@ -0,0 +1,128 @@
+using SushiBarDataModels.Models;
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.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 SushiBarView
+{
+    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, (ISushiModel, int)> _ShopSushis;
+        private DateTime? _openingDate = null;
+
+        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            _ShopSushis = new Dictionary<int, (ISushiModel, 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;
+                        _ShopSushis = view.ShopSushis ?? new Dictionary<int, (ISushiModel, int)>();
+                        LoadData();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка загрузки магазина");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadData()
+        {
+            _logger.LogInformation("Загрузка изделий в магазине");
+            try
+            {
+                if (_ShopSushis != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var sr in _ShopSushis)
+                    {
+                        dataGridView.Rows.Add(new object[] { sr.Key, sr.Value.Item1.SushiName, 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
+                };
+                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();
+        }
+    }
+}

SushiBar/SushiBarView/FormShop.resx

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

SushiBar/SushiBarView/FormShops.Designer.cs

@@ -0,0 +1,138 @@
+namespace SushiBarView
+{
+    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(532, 9);
+            this.ToolsPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ToolsPanel.Name = "ToolsPanel";
+            this.ToolsPanel.Size = new System.Drawing.Size(158, 320);
+            this.ToolsPanel.TabIndex = 3;
+            // 
+            // buttonRef
+            // 
+            this.buttonRef.Location = new System.Drawing.Point(27, 154);
+            this.buttonRef.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonRef.Name = "buttonRef";
+            this.buttonRef.Size = new System.Drawing.Size(110, 27);
+            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(27, 106);
+            this.buttonDel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonDel.Name = "buttonDel";
+            this.buttonDel.Size = new System.Drawing.Size(110, 27);
+            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(27, 57);
+            this.buttonUpd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonUpd.Name = "buttonUpd";
+            this.buttonUpd.Size = new System.Drawing.Size(110, 27);
+            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(27, 12);
+            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(110, 27);
+            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.BackgroundColor = System.Drawing.Color.White;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Location = new System.Drawing.Point(10, 9);
+            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.ReadOnly = true;
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(516, 320);
+            this.dataGridView.TabIndex = 2;
+            // 
+            // FormShops
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(700, 338);
+            this.Controls.Add(this.ToolsPanel);
+            this.Controls.Add(this.dataGridView);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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;
+    }
+}

SushiBar/SushiBarView/FormShops.cs

@@ -0,0 +1,116 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.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 SushiBarView
+{
+    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["ShopSushis"].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();
+        }
+    }
+}

SushiBar/SushiBarView/FormShops.resx

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

SushiBar/SushiBarView/Program.cs

@@ -3,14 +3,11 @@ using Microsoft.Extensions.Logging;
 using SushiBarContracts.BusinessLogicsContracts;
 using System;
 using SushiBarBusinessLogic.BusinessLogics;
-using SushiBarDatabaseImplement.Implements;
+using SushiBarListImplement.Implements;
 using SushiBarContracts.StoragesContracts;
 using SushiBarView;
 using NLog.Extensions.Logging;
-using SushiBarBusinessLogic.OfficePackage.Implements;
-using SushiBarBusinessLogic.OfficePackage;
-using SushiBarBusinessLogic;
-using SushiBarView.Reports;
+
 
 namespace SushiBarView
 {
@@ -50,15 +47,12 @@ namespace SushiBarView
             services.AddTransient<FormSushis>();
             services.AddTransient<FormSushiComponent>();
             services.AddTransient<FormSushi>();
-            services.AddTransient<FormReportOrders>();
-            services.AddTransient<FormReportSushiComponents>();
-            services.AddTransient<IReportLogic, ReportLogic>();
-
-            services.AddTransient<AbstractSaveToWord, SaveToWord>();
-            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
-            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
-
-            services.AddTransient<FormMain>();
+            
+            services.AddTransient<IShopStorage, ShopStorage>();
+            services.AddTransient<IShopLogic, ShopLogic>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormCreateSupply>();
         }
     }
 }

SushiBar/SushiBarView/ReportOrders.rdlc

@@ -1,602 +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="SushiBarContractsViewModels">
-      <ConnectionProperties>
-        <DataProvider>System.Data.DataSet</DataProvider>
-        <ConnectString>/* Local Connection */</ConnectString>
-      </ConnectionProperties>
-      <rd:DataSourceID>10791c83-cee8-4a38-bbd0-245fc17cefb3</rd:DataSourceID>
-    </DataSource>
-  </DataSources>
-  <DataSets>
-    <DataSet Name="DataSetOrders">
-      <Query>
-        <DataSourceName>SushiBarContractsViewModels</DataSourceName>
-        <CommandText>/* Local Query */</CommandText>
-      </Query>
-      <Fields>
-        <Field Name="Id">
-          <DataField>Id</DataField>
-          <rd:TypeName>System.Int32</rd:TypeName>
-        </Field>
-        <Field Name="DateCreate">
-          <DataField>DateCreate</DataField>
-          <rd:TypeName>System.DateTime</rd:TypeName>
-        </Field>
-        <Field Name="Status">
-          <DataField>Status</DataField>
-          <rd:TypeName>System.String</rd:TypeName>
-        </Field>
-        <Field Name="SushiName">
-          <DataField>SushiName</DataField>
-          <rd:TypeName>System.String</rd:TypeName>
-        </Field>
-        <Field Name="Sum">
-          <DataField>Sum</DataField>
-          <rd:TypeName>System.Decimal</rd:TypeName>
-        </Field>
-      </Fields>
-      <rd:DataSetInfo>
-        <rd:DataSetName>SushiBarContracts.ViewModels</rd:DataSetName>
-        <rd:TableName>ReportOrdersViewModel</rd:TableName>
-        <rd:ObjectDataSourceType>SushiBarContracts.ViewModels.ReportOrdersViewModel, SushiBarContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</rd:ObjectDataSourceType>
-      </rd:DataSetInfo>
-    </DataSet>
-  </DataSets>
-  <ReportSections>
-    <ReportSection>
-      <Body>
-        <ReportItems>
-          <Textbox Name="ReportParameterPeriod">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Parameters!ReportParameterPeriod.Value</Value>
-                    <Style>
-                      <FontSize>14pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <rd:DefaultName>ReportParameterPeriod</rd:DefaultName>
-            <Top>1cm</Top>
-            <Height>1cm</Height>
-            <Width>21cm</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="TextboxTitle">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Заказы</Value>
-                    <Style>
-                      <FontSize>16pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Height>1cm</Height>
-            <Width>21cm</Width>
-            <ZIndex>1</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <VerticalAlign>Middle</VerticalAlign>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Tablix Name="Tablix1">
-            <TablixBody>
-              <TablixColumns>
-                <TablixColumn>
-                  <Width>2.5cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.21438cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>4.21438cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>7.23317cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>2.5cm</Width>
-                </TablixColumn>
-              </TablixColumns>
-              <TablixRows>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox1">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Номер</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox1</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="Textbox2">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Дата создания</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox2</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="Textbox3">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Статус</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox3</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="Textbox4">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Суши</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox4</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="Textbox5">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Сумма</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox5</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>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Id">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Id.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Id</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="DateCreate">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!DateCreate.Value</Value>
-                                  <Style>
-                                    <Format>d</Format>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>DateCreate</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="Status">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Status.Value.ToString()</Value>
-                                  <Style>
-                                    <Format>d</Format>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Status</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>
-                        <rd:Selected>true</rd:Selected>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="SushiName">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!SushiName.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>SushiName</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="Sum">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Sum.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Sum</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 />
-                <TablixMember />
-                <TablixMember />
-              </TablixMembers>
-            </TablixColumnHierarchy>
-            <TablixRowHierarchy>
-              <TablixMembers>
-                <TablixMember>
-                  <KeepWithGroup>After</KeepWithGroup>
-                </TablixMember>
-                <TablixMember>
-                  <Group Name="Подробности" />
-                </TablixMember>
-              </TablixMembers>
-            </TablixRowHierarchy>
-            <DataSetName>DataSetOrders</DataSetName>
-            <Top>2.48391cm</Top>
-            <Left>0.55245cm</Left>
-            <Height>1.2cm</Height>
-            <Width>20.66193cm</Width>
-            <ZIndex>2</ZIndex>
-            <Style>
-              <Border>
-                <Style>Double</Style>
-              </Border>
-            </Style>
-          </Tablix>
-          <Textbox Name="TextboxTotalSum">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Итого:</Value>
-                    <Style>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>4cm</Top>
-            <Left>12cm</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="SumTotal">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Sum(Fields!Sum.Value, "DataSetOrders")</Value>
-                    <Style>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>4cm</Top>
-            <Left>14.5cm</Left>
-            <Height>0.6cm</Height>
-            <Width>2.5cm</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>5.72875cm</Height>
-        <Style />
-      </Body>
-      <Width>21.21438cm</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>2de0031a-4d17-449d-922d-d9fc54572312</rd:ReportID>
-</Report>

SushiBar/SushiBarView/SushiBarView.csproj

@@ -19,28 +19,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
-    <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.19" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\SushiBarBusinessLogic_\SushiBarBusinessLogic.csproj" />
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
-    <ProjectReference Include="..\SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj" />
-    <ProjectReference Include="..\SushiBarFileImplement\SushiBarFileImplement.csproj" />
     <ProjectReference Include="..\SushiBarListImplement_\SushiBarListImplement.csproj" />
   </ItemGroup>