Комментарии

SushiBar/SushiBar/FormMain.Designer.cs

@@ -32,16 +32,22 @@
             this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ингредиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.сушиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.shopsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.списокИнгредиентовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ингредиентыПоСушиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.списокМагазиновToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.магазинССушиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.buttonUpdate = new System.Windows.Forms.Button();
             this.buttonSetToFinish = new System.Windows.Forms.Button();
             this.buttonSetToDone = new System.Windows.Forms.Button();
             this.buttonSetToWork = new System.Windows.Forms.Button();
             this.buttonCreateOrder = new System.Windows.Forms.Button();
             this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.buttonAddSushiInShop = new System.Windows.Forms.Button();
+            this.buttonSellSushi = new System.Windows.Forms.Button();
             this.menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.SuspendLayout();
@@ -53,7 +59,7 @@
             this.отчетыToolStripMenuItem});
             this.menuStrip.Location = new System.Drawing.Point(0, 0);
             this.menuStrip.Name = "menuStrip";
-            this.menuStrip.Size = new System.Drawing.Size(975, 24);
+            this.menuStrip.Size = new System.Drawing.Size(974, 24);
             this.menuStrip.TabIndex = 0;
             this.menuStrip.Text = "menuStrip1";
             // 
@@ -61,7 +67,8 @@
             // 
             this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ингредиентыToolStripMenuItem,
-            this.сушиToolStripMenuItem});
+            this.сушиToolStripMenuItem,
+            this.shopsToolStripMenuItem});
             this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
             this.справочникиToolStripMenuItem.Text = "Справочники";
@@ -80,12 +87,22 @@
             this.сушиToolStripMenuItem.Text = "Суши";
             this.сушиToolStripMenuItem.Click += new System.EventHandler(this.SushiToolStripMenuItem_Click);
             // 
+            // shopsToolStripMenuItem
+            // 
+            this.shopsToolStripMenuItem.Name = "shopsToolStripMenuItem";
+            this.shopsToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.shopsToolStripMenuItem.Text = "Магазины";
+            this.shopsToolStripMenuItem.Click += new System.EventHandler(this.ShopsToolStripMenuItem_Click);
+            // 
             // отчетыToolStripMenuItem
             // 
             this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.списокИнгредиентовToolStripMenuItem,
             this.ингредиентыПоСушиToolStripMenuItem,
-            this.списокЗаказовToolStripMenuItem});
+            this.списокЗаказовToolStripMenuItem,
+            this.списокМагазиновToolStripMenuItem,
+            this.магазинССушиToolStripMenuItem,
+            this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem});
             this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
             this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(60, 20);
             this.отчетыToolStripMenuItem.Text = "Отчеты";
@@ -93,30 +110,51 @@
             // списокИнгредиентовToolStripMenuItem
             // 
             this.списокИнгредиентовToolStripMenuItem.Name = "списокИнгредиентовToolStripMenuItem";
-            this.списокИнгредиентовToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
+            this.списокИнгредиентовToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
             this.списокИнгредиентовToolStripMenuItem.Text = "Список суши";
             this.списокИнгредиентовToolStripMenuItem.Click += new System.EventHandler(this.SushiListToolStripMenuItem_Click);
             // 
             // ингредиентыПоСушиToolStripMenuItem
             // 
             this.ингредиентыПоСушиToolStripMenuItem.Name = "ингредиентыПоСушиToolStripMenuItem";
-            this.ингредиентыПоСушиToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
+            this.ингредиентыПоСушиToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
             this.ингредиентыПоСушиToolStripMenuItem.Text = "Суши с ингредиентами";
             this.ингредиентыПоСушиToolStripMenuItem.Click += new System.EventHandler(this.SushiIngredientToolStripMenuItem_Click);
             // 
             // списокЗаказовToolStripMenuItem
             // 
             this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
-            this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
+            this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
             this.списокЗаказовToolStripMenuItem.Text = "Список заказов";
             this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
             // 
+            // списокМагазиновToolStripMenuItem
+            // 
+            this.списокМагазиновToolStripMenuItem.Name = "списокМагазиновToolStripMenuItem";
+            this.списокМагазиновToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
+            this.списокМагазиновToolStripMenuItem.Text = "Список магазинов";
+            this.списокМагазиновToolStripMenuItem.Click += new System.EventHandler(this.ShopsReportToolStripMenuItem_Click);
+            // 
+            // магазинССушиToolStripMenuItem
+            // 
+            this.магазинССушиToolStripMenuItem.Name = "магазинССушиToolStripMenuItem";
+            this.магазинССушиToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
+            this.магазинССушиToolStripMenuItem.Text = "Магазин с суши";
+            this.магазинССушиToolStripMenuItem.Click += new System.EventHandler(this.ShopSushiToolStripMenuItem_Click);
+            // 
+            // списокЗаказовОбъединенныхПоДатамToolStripMenuItem
+            // 
+            this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem.Name = "списокЗаказовОбъединенныхПоДатамToolStripMenuItem";
+            this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
+            this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem.Text = "Список заказов, сгрупированных по датам";
+            this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem.Click += new System.EventHandler(this.OrdersGroupedByDateToolStripMenuItem_Click);
+            // 
             // buttonUpdate
             // 
-            this.buttonUpdate.Location = new System.Drawing.Point(780, 314);
+            this.buttonUpdate.Location = new System.Drawing.Point(778, 212);
             this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonUpdate.Name = "buttonUpdate";
-            this.buttonUpdate.Size = new System.Drawing.Size(170, 58);
+            this.buttonUpdate.Size = new System.Drawing.Size(170, 32);
             this.buttonUpdate.TabIndex = 12;
             this.buttonUpdate.Text = "Обновить";
             this.buttonUpdate.UseVisualStyleBackColor = true;
@@ -124,10 +162,10 @@
             // 
             // buttonSetToFinish
             // 
-            this.buttonSetToFinish.Location = new System.Drawing.Point(780, 252);
+            this.buttonSetToFinish.Location = new System.Drawing.Point(778, 176);
             this.buttonSetToFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonSetToFinish.Name = "buttonSetToFinish";
-            this.buttonSetToFinish.Size = new System.Drawing.Size(170, 58);
+            this.buttonSetToFinish.Size = new System.Drawing.Size(170, 32);
             this.buttonSetToFinish.TabIndex = 11;
             this.buttonSetToFinish.Text = "Заказ выдан";
             this.buttonSetToFinish.UseVisualStyleBackColor = true;
@@ -135,10 +173,10 @@
             // 
             // buttonSetToDone
             // 
-            this.buttonSetToDone.Location = new System.Drawing.Point(780, 190);
+            this.buttonSetToDone.Location = new System.Drawing.Point(778, 140);
             this.buttonSetToDone.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonSetToDone.Name = "buttonSetToDone";
-            this.buttonSetToDone.Size = new System.Drawing.Size(170, 58);
+            this.buttonSetToDone.Size = new System.Drawing.Size(170, 32);
             this.buttonSetToDone.TabIndex = 10;
             this.buttonSetToDone.Text = "Заказ готов";
             this.buttonSetToDone.UseVisualStyleBackColor = true;
@@ -146,10 +184,10 @@
             // 
             // buttonSetToWork
             // 
-            this.buttonSetToWork.Location = new System.Drawing.Point(780, 128);
+            this.buttonSetToWork.Location = new System.Drawing.Point(778, 104);
             this.buttonSetToWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonSetToWork.Name = "buttonSetToWork";
-            this.buttonSetToWork.Size = new System.Drawing.Size(170, 58);
+            this.buttonSetToWork.Size = new System.Drawing.Size(170, 32);
             this.buttonSetToWork.TabIndex = 9;
             this.buttonSetToWork.Text = "Отдать на выполнение";
             this.buttonSetToWork.UseVisualStyleBackColor = true;
@@ -157,10 +195,10 @@
             // 
             // buttonCreateOrder
             // 
-            this.buttonCreateOrder.Location = new System.Drawing.Point(780, 66);
+            this.buttonCreateOrder.Location = new System.Drawing.Point(778, 68);
             this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonCreateOrder.Name = "buttonCreateOrder";
-            this.buttonCreateOrder.Size = new System.Drawing.Size(170, 58);
+            this.buttonCreateOrder.Size = new System.Drawing.Size(170, 32);
             this.buttonCreateOrder.TabIndex = 8;
             this.buttonCreateOrder.Text = "Создать заказ";
             this.buttonCreateOrder.UseVisualStyleBackColor = true;
@@ -175,14 +213,38 @@
             this.dataGridView.Name = "dataGridView";
             this.dataGridView.RowHeadersWidth = 51;
             this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(755, 426);
+            this.dataGridView.Size = new System.Drawing.Size(755, 358);
             this.dataGridView.TabIndex = 7;
             // 
+            // buttonAddSushiInShop
+            // 
+            this.buttonAddSushiInShop.Location = new System.Drawing.Point(778, 248);
+            this.buttonAddSushiInShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonAddSushiInShop.Name = "buttonAddSushiInShop";
+            this.buttonAddSushiInShop.Size = new System.Drawing.Size(170, 32);
+            this.buttonAddSushiInShop.TabIndex = 13;
+            this.buttonAddSushiInShop.Text = "Добавить суши в магазин";
+            this.buttonAddSushiInShop.UseVisualStyleBackColor = true;
+            this.buttonAddSushiInShop.Click += new System.EventHandler(this.ButtonAddSushiInShop_Click);
+            // 
+            // buttonSellSushi
+            // 
+            this.buttonSellSushi.Location = new System.Drawing.Point(778, 284);
+            this.buttonSellSushi.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonSellSushi.Name = "buttonSellSushi";
+            this.buttonSellSushi.Size = new System.Drawing.Size(170, 32);
+            this.buttonSellSushi.TabIndex = 14;
+            this.buttonSellSushi.Text = "Продать суши";
+            this.buttonSellSushi.UseVisualStyleBackColor = true;
+            this.buttonSellSushi.Click += new System.EventHandler(this.ButtonSellSushi_Click);
+            // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(975, 450);
+            this.ClientSize = new System.Drawing.Size(974, 382);
+            this.Controls.Add(this.buttonSellSushi);
+            this.Controls.Add(this.buttonAddSushiInShop);
             this.Controls.Add(this.buttonUpdate);
             this.Controls.Add(this.buttonSetToFinish);
             this.Controls.Add(this.buttonSetToDone);
@@ -218,5 +280,11 @@
         private ToolStripMenuItem списокИнгредиентовToolStripMenuItem;
         private ToolStripMenuItem ингредиентыПоСушиToolStripMenuItem;
         private ToolStripMenuItem списокЗаказовToolStripMenuItem;
+        private ToolStripMenuItem shopsToolStripMenuItem;
+        private Button buttonAddSushiInShop;
+        private Button buttonSellSushi;
+        private ToolStripMenuItem списокМагазиновToolStripMenuItem;
+        private ToolStripMenuItem магазинССушиToolStripMenuItem;
+        private ToolStripMenuItem списокЗаказовОбъединенныхПоДатамToolStripMenuItem;
     }
 }

SushiBar/SushiBar/FormMain.cs

@@ -155,6 +155,16 @@ namespace SushiBarView
             }
         }
 
+        private void ShopsReportToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+        }
+
         private void SushiIngredientToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormReportSushiIngredients));
@@ -164,6 +174,15 @@ namespace SushiBarView
             }
         }
 
+        private void ShopSushiToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportShopListSushi));
+            if (service is FormReportShopListSushi form)
+            {
+                form.ShowDialog();
+            }
+        }
+
         private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
@@ -172,5 +191,42 @@ namespace SushiBarView
                 form.ShowDialog();
             }
         }
+
+        private void OrdersGroupedByDateToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrdersGroupedByDate));
+            if (service is FormReportOrdersGroupedByDate form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            if (service is FormShops form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void ButtonAddSushiInShop_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShopSushi));
+            if (service is FormShopSushi form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void ButtonSellSushi_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormSellSushi));
+            if (service is FormSellSushi form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
+        }
     }
 }

SushiBar/SushiBar/FormReportOrdersGroupedByDate.Designer.cs

@@ -0,0 +1,92 @@
+namespace SushiBarView
+{
+    partial class FormReportOrdersGroupedByDate
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.panel = new System.Windows.Forms.Panel();
+            this.buttonToPdf = new System.Windows.Forms.Button();
+            this.buttonMake = new System.Windows.Forms.Button();
+            this.panel.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panel
+            // 
+            this.panel.Controls.Add(this.buttonToPdf);
+            this.panel.Controls.Add(this.buttonMake);
+            this.panel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel.Location = new System.Drawing.Point(0, 0);
+            this.panel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.panel.Name = "panel";
+            this.panel.Size = new System.Drawing.Size(1031, 40);
+            this.panel.TabIndex = 0;
+            // 
+            // buttonToPdf
+            // 
+            this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonToPdf.Location = new System.Drawing.Point(160, 8);
+            this.buttonToPdf.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.buttonToPdf.Name = "buttonToPdf";
+            this.buttonToPdf.Size = new System.Drawing.Size(139, 27);
+            this.buttonToPdf.TabIndex = 5;
+            this.buttonToPdf.Text = "В Pdf";
+            this.buttonToPdf.UseVisualStyleBackColor = true;
+            this.buttonToPdf.Click += new System.EventHandler(this.ButtonToPdf_Click);
+            // 
+            // buttonMake
+            // 
+            this.buttonMake.Location = new System.Drawing.Point(13, 8);
+            this.buttonMake.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.buttonMake.Name = "buttonMake";
+            this.buttonMake.Size = new System.Drawing.Size(139, 27);
+            this.buttonMake.TabIndex = 4;
+            this.buttonMake.Text = "Сформировать";
+            this.buttonMake.UseVisualStyleBackColor = true;
+            this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
+            // 
+            // FormReportOrdersGroupedByDate
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1031, 647);
+            this.Controls.Add(this.panel);
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Name = "FormReportOrdersGroupedByDate";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "Заказы, сгрупированные по дате";
+            this.panel.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panel;
+        private System.Windows.Forms.Button buttonToPdf;
+        private System.Windows.Forms.Button buttonMake;
+    }
+}

SushiBar/SushiBar/FormReportOrdersGroupedByDate.cs

@@ -0,0 +1,73 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Reporting.WinForms;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+
+namespace SushiBarView
+{
+    public partial class FormReportOrdersGroupedByDate : Form
+    {
+        private readonly ReportViewer reportViewer;
+
+        private readonly ILogger _logger;
+
+        private readonly IReportLogic _logic;
+
+        public FormReportOrdersGroupedByDate(ILogger<FormReportOrdersGroupedByDate> logger, IReportLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            reportViewer = new ReportViewer
+            {
+                Dock = DockStyle.Fill
+            };
+            reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrdersGroupedByDate.rdlc", FileMode.Open));
+            Controls.Clear();
+            Controls.Add(reportViewer);
+            Controls.Add(panel);
+        }
+
+        private void ButtonMake_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                var dataSource = _logic.GetOrdersGroupedByDate();
+
+                var source = new ReportDataSource("DataSetOrders", dataSource);
+                reportViewer.LocalReport.DataSources.Clear();
+                reportViewer.LocalReport.DataSources.Add(source);
+
+                reportViewer.RefreshReport();
+                _logger.LogInformation("Загрузка списка заказов, сгруппированных по дате");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка заказов, сгруппированных по дате");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonToPdf_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveOrdersGroupedByDateToPdfFile(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/SushiBar/FormReportOrdersGroupedByDate.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/SushiBar/FormReportShopListSushi.Designer.cs

@@ -0,0 +1,115 @@
+namespace SushiBarView
+{
+    partial class FormReportShopListSushi
+    {
+        /// <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.ColumnShop = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnSushi = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.button1 = 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.AllowUserToResizeColumns = false;
+            this.dataGridView.AllowUserToResizeRows = false;
+            this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ColumnShop,
+            this.ColumnSushi,
+            this.ColumnCount});
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.dataGridView.Location = new System.Drawing.Point(0, 47);
+            this.dataGridView.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.dataGridView.MultiSelect = false;
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.ReadOnly = true;
+            this.dataGridView.RowHeadersVisible = false;
+            this.dataGridView.Size = new System.Drawing.Size(616, 510);
+            this.dataGridView.TabIndex = 2;
+            // 
+            // ColumnShop
+            // 
+            this.ColumnShop.HeaderText = "Магазин";
+            this.ColumnShop.Name = "ColumnShop";
+            this.ColumnShop.ReadOnly = true;
+            this.ColumnShop.Width = 200;
+            // 
+            // ColumnSushi
+            // 
+            this.ColumnSushi.HeaderText = "Суши";
+            this.ColumnSushi.Name = "ColumnSushi";
+            this.ColumnSushi.ReadOnly = true;
+            this.ColumnSushi.Width = 200;
+            // 
+            // ColumnCount
+            // 
+            this.ColumnCount.HeaderText = "Количество";
+            this.ColumnCount.Name = "ColumnCount";
+            this.ColumnCount.ReadOnly = true;
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(13, 14);
+            this.button1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(186, 27);
+            this.button1.TabIndex = 4;
+            this.button1.Text = "Сохранить в Excel";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
+            // 
+            // FormReportShopListSushi
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(616, 557);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.dataGridView);
+            this.Name = "FormReportShopListSushi";
+            this.Text = "Суши по магазинам";
+            this.Load += new System.EventHandler(this.FormReportShopListSushi_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private DataGridView dataGridView;
+        private DataGridViewTextBoxColumn ColumnShop;
+        private DataGridViewTextBoxColumn ColumnSushi;
+        private DataGridViewTextBoxColumn ColumnCount;
+        private Button button1;
+    }
+}

SushiBar/SushiBar/FormReportShopListSushi.cs

@@ -0,0 +1,70 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+
+namespace SushiBarView
+{
+    public partial class FormReportShopListSushi : Form
+    {
+        private readonly ILogger _logger;
+
+        private readonly IReportLogic _logic;
+
+        public FormReportShopListSushi(ILogger<FormReportShopListSushi> logger, IReportLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+        }
+
+        private void FormReportShopListSushi_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                var dict = _logic.GetShopSushi();
+                if (dict != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var elem in dict)
+                    {
+                        dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
+                        foreach (var listElem in elem.ListSushi)
+                        {
+                            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.SaveShopSushiToExcelFile(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/SushiBar/FormReportShopListSushi.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/SushiBar/FormSellSushi.Designer.cs

@@ -0,0 +1,126 @@
+namespace SushiBarView
+{
+    partial class FormSellSushi
+    {
+        /// <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.labelSushi = new System.Windows.Forms.Label();
+            this.labelCount = new System.Windows.Forms.Label();
+            this.comboBoxSushi = new System.Windows.Forms.ComboBox();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
+            this.buttonSave = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // labelSushi
+            // 
+            this.labelSushi.AutoSize = true;
+            this.labelSushi.Location = new System.Drawing.Point(9, 11);
+            this.labelSushi.Name = "labelSushi";
+            this.labelSushi.Size = new System.Drawing.Size(39, 15);
+            this.labelSushi.TabIndex = 0;
+            this.labelSushi.Text = "Суши";
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(11, 51);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(72, 15);
+            this.labelCount.TabIndex = 1;
+            this.labelCount.Text = "Количество";
+            // 
+            // comboBoxSushi
+            // 
+            this.comboBoxSushi.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSushi.FormattingEnabled = true;
+            this.comboBoxSushi.Location = new System.Drawing.Point(100, 11);
+            this.comboBoxSushi.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.comboBoxSushi.Name = "comboBoxSushi";
+            this.comboBoxSushi.Size = new System.Drawing.Size(230, 23);
+            this.comboBoxSushi.TabIndex = 3;
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(100, 51);
+            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(230, 23);
+            this.textBoxCount.TabIndex = 4;
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Location = new System.Drawing.Point(160, 78);
+            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(82, 22);
+            this.buttonSave.TabIndex = 6;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(248, 78);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(82, 22);
+            this.buttonCancel.TabIndex = 7;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // FormSellSushi
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(349, 119);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.comboBoxSushi);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.labelSushi);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Name = "FormSellSushi";
+            this.Text = "Продажа суши";
+            this.Load += new System.EventHandler(this.FormSellSushi_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Label labelSushi;
+        private Label labelCount;
+        private ComboBox comboBoxSushi;
+        private TextBox textBoxCount;
+        private Button buttonSave;
+        private Button buttonCancel;
+    }
+}

SushiBar/SushiBar/FormSellSushi.cs

@@ -0,0 +1,81 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+
+namespace SushiBarView
+{
+    public partial class FormSellSushi : Form
+    {
+        private readonly ILogger _logger;
+        private readonly ISushiLogic _logicSushi;
+        private readonly IShopLogic _logicShop;
+
+        public FormSellSushi(ILogger<FormSellSushi> logger, ISushiLogic logicSushi, IShopLogic logicShop)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicSushi = logicSushi;
+            _logicShop = logicShop;
+        }
+
+        private void FormSellSushi_Load(object sender, EventArgs e)
+        {
+            _logger.LogInformation("Загрузка списка суши для продажи");
+            try
+            {
+                var list = _logicSushi.ReadList(null);
+                if (list != null)
+                {
+                    comboBoxSushi.DisplayMember = "SushiName";
+                    comboBoxSushi.ValueMember = "Id";
+                    comboBoxSushi.DataSource = list;
+                    comboBoxSushi.SelectedItem = null;
+                }
+            }
+            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(textBoxCount.Text))
+            {
+                MessageBox.Show("Заполните поле 'Количество'", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxSushi.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите суши", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Продажа суши");
+            try
+            {
+                var operationResult = _logicShop.SellSushi(_logicSushi.ReadElement(new SushiSearchModel()
+                {
+                    Id = Convert.ToInt32(comboBoxSushi.SelectedValue)
+                })!, 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/SushiBar/FormSellSushi.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/SushiBar/FormShop.Designer.cs

@@ -0,0 +1,212 @@
+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.buttonSave = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.textBoxAddress = new System.Windows.Forms.TextBox();
+            this.labelTime = new System.Windows.Forms.Label();
+            this.labelAddress = new System.Windows.Forms.Label();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnSushiName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.labelShop = new System.Windows.Forms.Label();
+            this.textBoxShop = new System.Windows.Forms.TextBox();
+            this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
+            this.labelCount = new System.Windows.Forms.Label();
+            this.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonSave.Location = new System.Drawing.Point(364, 303);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(120, 22);
+            this.buttonSave.TabIndex = 17;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonCancel.Location = new System.Drawing.Point(490, 302);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(103, 23);
+            this.buttonCancel.TabIndex = 16;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // textBoxAddress
+            // 
+            this.textBoxAddress.Location = new System.Drawing.Point(159, 27);
+            this.textBoxAddress.Name = "textBoxAddress";
+            this.textBoxAddress.Size = new System.Drawing.Size(141, 23);
+            this.textBoxAddress.TabIndex = 14;
+            // 
+            // labelTime
+            // 
+            this.labelTime.AutoSize = true;
+            this.labelTime.Location = new System.Drawing.Point(306, 9);
+            this.labelTime.Name = "labelTime";
+            this.labelTime.Size = new System.Drawing.Size(87, 15);
+            this.labelTime.TabIndex = 13;
+            this.labelTime.Text = "Дата открытия";
+            // 
+            // labelAddress
+            // 
+            this.labelAddress.AutoSize = true;
+            this.labelAddress.Location = new System.Drawing.Point(159, 9);
+            this.labelAddress.Name = "labelAddress";
+            this.labelAddress.Size = new System.Drawing.Size(40, 15);
+            this.labelAddress.TabIndex = 12;
+            this.labelAddress.Text = "Адрес";
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ColumnID,
+            this.ColumnSushiName,
+            this.ColumnCount});
+            this.dataGridView.Location = new System.Drawing.Point(12, 56);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowTemplate.Height = 25;
+            this.dataGridView.Size = new System.Drawing.Size(581, 240);
+            this.dataGridView.TabIndex = 11;
+            // 
+            // ColumnID
+            // 
+            this.ColumnID.HeaderText = "ID";
+            this.ColumnID.Name = "ColumnID";
+            this.ColumnID.Visible = false;
+            // 
+            // ColumnSushiName
+            // 
+            this.ColumnSushiName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumnSushiName.HeaderText = "Суши";
+            this.ColumnSushiName.Name = "ColumnSushiName";
+            // 
+            // ColumnCount
+            // 
+            this.ColumnCount.HeaderText = "Количество";
+            this.ColumnCount.Name = "ColumnCount";
+            // 
+            // labelShop
+            // 
+            this.labelShop.AutoSize = true;
+            this.labelShop.Location = new System.Drawing.Point(12, 9);
+            this.labelShop.Name = "labelShop";
+            this.labelShop.Size = new System.Drawing.Size(54, 15);
+            this.labelShop.TabIndex = 9;
+            this.labelShop.Text = "Магазин";
+            // 
+            // textBoxShop
+            // 
+            this.textBoxShop.Location = new System.Drawing.Point(12, 27);
+            this.textBoxShop.Name = "textBoxShop";
+            this.textBoxShop.Size = new System.Drawing.Size(141, 23);
+            this.textBoxShop.TabIndex = 18;
+            // 
+            // dateTimePicker
+            // 
+            this.dateTimePicker.Location = new System.Drawing.Point(306, 27);
+            this.dateTimePicker.Name = "dateTimePicker";
+            this.dateTimePicker.Size = new System.Drawing.Size(141, 23);
+            this.dateTimePicker.TabIndex = 19;
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(453, 9);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(134, 15);
+            this.labelCount.TabIndex = 20;
+            this.labelCount.Text = "Вместимость магазина";
+            // 
+            // numericUpDownCount
+            // 
+            this.numericUpDownCount.Location = new System.Drawing.Point(453, 27);
+            this.numericUpDownCount.Name = "numericUpDownCount";
+            this.numericUpDownCount.Size = new System.Drawing.Size(140, 23);
+            this.numericUpDownCount.TabIndex = 21;
+            // 
+            // FormShop
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(605, 337);
+            this.Controls.Add(this.numericUpDownCount);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.dateTimePicker);
+            this.Controls.Add(this.textBoxShop);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.textBoxAddress);
+            this.Controls.Add(this.labelTime);
+            this.Controls.Add(this.labelAddress);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.labelShop);
+            this.Name = "FormShop";
+            this.Text = "Магазин";
+            this.Load += new System.EventHandler(this.FormShop_Load);
+            this.Click += new System.EventHandler(this.FormShop_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Button buttonSave;
+        private Button buttonCancel;
+        private TextBox textBoxAddress;
+        private Label labelTime;
+        private Label labelAddress;
+        private DataGridView dataGridView;
+        private Label labelShop;
+        private TextBox textBoxShop;
+        private DateTimePicker dateTimePicker;
+        private DataGridViewTextBoxColumn ColumnID;
+        private DataGridViewTextBoxColumn ColumnSushiName;
+        private DataGridViewTextBoxColumn ColumnCount;
+        private Label labelCount;
+        private NumericUpDown numericUpDownCount;
+    }
+}

SushiBar/SushiBar/FormShop.cs

@@ -0,0 +1,122 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarDataModels.Models;
+
+namespace SushiBarView
+{
+    public partial class FormShop : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IShopLogic _logic;
+        private int? _id;
+        private Dictionary<int, (ISushiModel, int)> _shopListSushi;
+        public int Id { set { _id = value; } }
+
+        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            _shopListSushi = new();
+        }
+
+        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)
+                    {
+                        textBoxShop.Text = view.ShopName;
+                        textBoxAddress.Text = view.Address;
+                        dateTimePicker.Text = view.DateOpening.ToString();
+                        numericUpDownCount.Value = view.MaxCountSushi;
+                        _shopListSushi = view.ListSushi ?? 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 (_shopListSushi != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var elem in _shopListSushi)
+                    {
+                        dataGridView.Rows.Add(new object[] { elem.Key, elem.Value.Item1.SushiName, elem.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(textBoxShop.Text))
+            {
+                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(textBoxAddress.Text))
+            {
+                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Сохранение магазина");
+            try
+            {
+                var model = new ShopBindingModel
+                {
+                    Id = _id ?? 0,
+                    ShopName = textBoxShop.Text,
+                    Address = textBoxAddress.Text,
+                    DateOpening = dateTimePicker.Value.Date,
+                    MaxCountSushi = (int)numericUpDownCount.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/SushiBar/FormShop.resx

@@ -0,0 +1,69 @@
+<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>
+  <metadata name="ColumnID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumnSushiName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

SushiBar/SushiBar/FormShopSushi.Designer.cs

@@ -0,0 +1,151 @@
+namespace SushiBarView
+{
+    partial class FormShopSushi
+    {
+        /// <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.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
+            this.comboBoxSushi = new System.Windows.Forms.ComboBox();
+            this.labelCount = new System.Windows.Forms.Label();
+            this.labelSushi = new System.Windows.Forms.Label();
+            this.comboBoxShop = new System.Windows.Forms.ComboBox();
+            this.labelShop = new System.Windows.Forms.Label();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonSave = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // numericUpDownCount
+            // 
+            this.numericUpDownCount.Location = new System.Drawing.Point(87, 62);
+            this.numericUpDownCount.Maximum = new decimal(new int[] {
+            1410065408,
+            2,
+            0,
+            0});
+            this.numericUpDownCount.Name = "numericUpDownCount";
+            this.numericUpDownCount.Size = new System.Drawing.Size(344, 23);
+            this.numericUpDownCount.TabIndex = 13;
+            // 
+            // comboBoxSushi
+            // 
+            this.comboBoxSushi.FormattingEnabled = true;
+            this.comboBoxSushi.Location = new System.Drawing.Point(86, 35);
+            this.comboBoxSushi.Name = "comboBoxSushi";
+            this.comboBoxSushi.Size = new System.Drawing.Size(345, 23);
+            this.comboBoxSushi.TabIndex = 12;
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(9, 64);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(72, 15);
+            this.labelCount.TabIndex = 11;
+            this.labelCount.Text = "Количество";
+            // 
+            // labelSushi
+            // 
+            this.labelSushi.AutoSize = true;
+            this.labelSushi.Location = new System.Drawing.Point(41, 38);
+            this.labelSushi.Name = "labelSushi";
+            this.labelSushi.Size = new System.Drawing.Size(39, 15);
+            this.labelSushi.TabIndex = 10;
+            this.labelSushi.Text = "Суши";
+            // 
+            // comboBoxShop
+            // 
+            this.comboBoxShop.FormattingEnabled = true;
+            this.comboBoxShop.Location = new System.Drawing.Point(86, 8);
+            this.comboBoxShop.Name = "comboBoxShop";
+            this.comboBoxShop.Size = new System.Drawing.Size(345, 23);
+            this.comboBoxShop.TabIndex = 9;
+            // 
+            // labelShop
+            // 
+            this.labelShop.AutoSize = true;
+            this.labelShop.Location = new System.Drawing.Point(26, 11);
+            this.labelShop.Name = "labelShop";
+            this.labelShop.Size = new System.Drawing.Size(54, 15);
+            this.labelShop.TabIndex = 8;
+            this.labelShop.Text = "Магазин";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonCancel.Location = new System.Drawing.Point(356, 94);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(75, 23);
+            this.buttonCancel.TabIndex = 15;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonSave.Location = new System.Drawing.Point(275, 94);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(75, 23);
+            this.buttonSave.TabIndex = 14;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // FormShopSushi
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(443, 129);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.numericUpDownCount);
+            this.Controls.Add(this.comboBoxSushi);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.labelSushi);
+            this.Controls.Add(this.comboBoxShop);
+            this.Controls.Add(this.labelShop);
+            this.Name = "FormShopSushi";
+            this.Text = "Поступление суши в суши-бар";
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private NumericUpDown numericUpDownCount;
+        private ComboBox comboBoxSushi;
+        private Label labelCount;
+        private Label labelSushi;
+        private ComboBox comboBoxShop;
+        private Label labelShop;
+        private Button buttonCancel;
+        private Button buttonSave;
+    }
+}

SushiBar/SushiBar/FormShopSushi.cs

@@ -0,0 +1,90 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.ViewModels;
+
+namespace SushiBarView
+{
+    public partial class FormShopSushi : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IShopLogic _shopLogic;
+        private readonly ISushiLogic _sushiLogic;
+        private readonly List<ShopViewModel>? _listShops;
+        private readonly List<SushiViewModel>? _listSushi;
+
+        public FormShopSushi(ILogger<FormShopSushi> logger, IShopLogic shopLogic, ISushiLogic sushiLogic)
+        {
+            InitializeComponent();
+            _shopLogic = shopLogic;
+            _sushiLogic = sushiLogic;
+            _logger = logger;
+            _listShops = shopLogic.ReadList(null);
+            if (_listShops != null)
+            {
+                comboBoxShop.DisplayMember = "ShopName";
+                comboBoxShop.ValueMember = "Id";
+                comboBoxShop.DataSource = _listShops;
+                comboBoxShop.SelectedItem = null;
+            }
+
+            _listSushi = sushiLogic.ReadList(null);
+            if (_listSushi != null)
+            {
+                comboBoxSushi.DisplayMember = "SushiName";
+                comboBoxSushi.ValueMember = "Id";
+                comboBoxSushi.DataSource = _listSushi;
+                comboBoxSushi.SelectedItem = null;
+            }
+        }
+
+        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 sushi = _sushiLogic.ReadElement(new()
+                {
+                    Id = (int)comboBoxSushi.SelectedValue
+                });
+                if (sushi == null)
+                {
+                    throw new Exception("Не найдено суши. Дополнительная информация в логах.");
+                }
+                var resultOperation = _shopLogic.AddSushiInShop(
+                     model: new() { Id = (int)comboBoxShop.SelectedValue }, 
+                     sushi: sushi,
+                     count: (int)numericUpDownCount.Value
+                );
+                if (!resultOperation)
+                {
+                    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/SushiBar/FormShopSushi.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/SushiBar/FormShops.Designer.cs

@@ -0,0 +1,122 @@
+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.dataGridView = new System.Windows.Forms.DataGridView();
+            this.buttonUpdate = new System.Windows.Forms.Button();
+            this.buttonDelete = new System.Windows.Forms.Button();
+            this.buttonEdit = new System.Windows.Forms.Button();
+            this.buttonAdd = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left;
+            this.dataGridView.GridColor = System.Drawing.Color.White;
+            this.dataGridView.Location = new System.Drawing.Point(0, 0);
+            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(426, 333);
+            this.dataGridView.TabIndex = 10;
+            // 
+            // buttonUpdate
+            // 
+            this.buttonUpdate.Location = new System.Drawing.Point(432, 175);
+            this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonUpdate.Name = "buttonUpdate";
+            this.buttonUpdate.Size = new System.Drawing.Size(130, 22);
+            this.buttonUpdate.TabIndex = 14;
+            this.buttonUpdate.Text = "Обновить";
+            this.buttonUpdate.UseVisualStyleBackColor = true;
+            this.buttonUpdate.Click += new System.EventHandler(this.ButtonRef_Click);
+            // 
+            // buttonDelete
+            // 
+            this.buttonDelete.Location = new System.Drawing.Point(432, 149);
+            this.buttonDelete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonDelete.Name = "buttonDelete";
+            this.buttonDelete.Size = new System.Drawing.Size(130, 22);
+            this.buttonDelete.TabIndex = 13;
+            this.buttonDelete.Text = "Удалить";
+            this.buttonDelete.UseVisualStyleBackColor = true;
+            this.buttonDelete.Click += new System.EventHandler(this.ButtonDel_Click);
+            // 
+            // buttonEdit
+            // 
+            this.buttonEdit.Location = new System.Drawing.Point(432, 123);
+            this.buttonEdit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonEdit.Name = "buttonEdit";
+            this.buttonEdit.Size = new System.Drawing.Size(130, 22);
+            this.buttonEdit.TabIndex = 12;
+            this.buttonEdit.Text = "Изменить";
+            this.buttonEdit.UseVisualStyleBackColor = true;
+            this.buttonEdit.Click += new System.EventHandler(this.ButtonUpd_Click);
+            // 
+            // buttonAdd
+            // 
+            this.buttonAdd.Location = new System.Drawing.Point(432, 97);
+            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(130, 22);
+            this.buttonAdd.TabIndex = 11;
+            this.buttonAdd.Text = "Добавить";
+            this.buttonAdd.UseVisualStyleBackColor = true;
+            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
+            // 
+            // FormShops
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(566, 333);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.buttonUpdate);
+            this.Controls.Add(this.buttonDelete);
+            this.Controls.Add(this.buttonEdit);
+            this.Controls.Add(this.buttonAdd);
+            this.Name = "FormShops";
+            this.Text = "Магазины";
+            this.Load += new System.EventHandler(this.FormShops_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DataGridView dataGridView;
+        private Button buttonUpdate;
+        private Button buttonDelete;
+        private Button buttonEdit;
+        private Button buttonAdd;
+    }
+}

SushiBar/SushiBar/FormShops.cs

@@ -0,0 +1,102 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+
+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["ListSushi"].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/SushiBar/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/SushiBar/Program.cs

@@ -42,10 +42,12 @@ namespace SushiBarView
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ISushiStorage, SushiStorage>();
 
+            services.AddTransient<IShopStorage, ShopStorage>();
             services.AddTransient<IIngredientLogic, IngredientLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ISushiLogic, SushiLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
+            services.AddTransient<IShopLogic, ShopLogic>();
 
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
@@ -59,7 +61,13 @@ namespace SushiBarView
             services.AddTransient<FormSushiIngredients>();
             services.AddTransient<FormListSushi>();
             services.AddTransient<FormReportSushiIngredients>();
+            services.AddTransient<FormReportShopListSushi>();
             services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormReportOrdersGroupedByDate>();
+            services.AddTransient<FormShopSushi>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormSellSushi>();
         }
 
     }

SushiBar/SushiBar/ReportOrdersGroupedByDate.rdlc

@@ -0,0 +1,394 @@
+<?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="DateCreate">
+          <DataField>DateCreate</DataField>
+          <rd:TypeName>System.DateTime</rd:TypeName>
+        </Field>
+        <Field Name="Sum">
+          <DataField>Sum</DataField>
+          <rd:TypeName>System.Decimal</rd:TypeName>
+        </Field>
+        <Field Name="Count">
+          <DataField>Count</DataField>
+          <rd:TypeName>System.Int32</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>6.60986cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>6.60986cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>6.60986cm</Width>
+                </TablixColumn>
+              </TablixColumns>
+              <TablixRows>
+                <TablixRow>
+                  <Height>0.61323cm</Height>
+                  <TablixCells>
+                    <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="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="Textbox7">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Сумма</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox7</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.61323cm</Height>
+                  <TablixCells>
+                    <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>
+                        <rd:Selected>true</rd:Selected>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Count">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!Count.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Count</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 />
+              </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.22646cm</Height>
+            <Width>19.82958cm</Width>
+            <ZIndex>2</ZIndex>
+            <Style>
+              <Border>
+                <Style>Double</Style>
+              </Border>
+            </Style>
+          </Tablix>
+        </ReportItems>
+        <Height>5.72875cm</Height>
+        <Style />
+      </Body>
+      <Width>21cm</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/SushiBar/SushiBarView.csproj

@@ -28,7 +28,6 @@
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
     <ProjectReference Include="..\SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj" />
     <ProjectReference Include="..\SushiBarFileImplement\SushiBarFileImplement.csproj" />
-    <ProjectReference Include="..\SushiBarListImplement\SushiBarListImplement.csproj" />
   </ItemGroup>
 
 	<ItemGroup>
@@ -36,5 +35,11 @@
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>
+	
+	<ItemGroup>
+		<None Update="ReportOrdersGroupedByDate.rdlc">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 
 </Project>

SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -12,11 +12,15 @@ namespace SushiBarBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
+        private readonly IShopLogic _shopLogic;
+        private readonly ISushiStorage _sushiStorage;
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, ISushiStorage sushiStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
+            _shopLogic = shopLogic;
+            _sushiStorage = sushiStorage;
         }
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
@@ -86,7 +90,19 @@ namespace SushiBarBusinessLogic.BusinessLogics
                 return false;
             }
             model.Status = newStatus;
-            if (model.Status == OrderStatus.Готов) model.DateImplement = DateTime.Now;
+            if (model.Status == OrderStatus.Готов) 
+            { 
+                model.DateImplement = DateTime.Now;
+                var sushi = _sushiStorage.GetElement(new() { Id = viewModel.SushiId });
+                if (sushi == null)
+                {
+                    throw new ArgumentNullException(nameof(sushi));
+                }
+                if (!_shopLogic.AddSushi(sushi, viewModel.Count))
+                {
+                    throw new Exception($"AddSushi operation failed. Shop is full.");
+                }
+            }
             else
             {
                 model.DateImplement = viewModel.DateImplement;

SushiBar/SushiBarBusinessLogic/BusinessLogics/ReportLogic.cs

@@ -10,24 +10,24 @@ namespace SushiBarBusinessLogic.BusinessLogics
 {
     public class ReportLogic : IReportLogic
     {
-        private readonly IIngredientStorage _ingredientStorage;
-
         private readonly ISushiStorage _sushiStorage;
 
         private readonly IOrderStorage _orderStorage;
 
+        private readonly IShopStorage _shopStorage;
+
         private readonly AbstractSaveToExcel _saveToExcel;
 
         private readonly AbstractSaveToWord _saveToWord;
 
         private readonly AbstractSaveToPdf _saveToPdf;
 
-        public ReportLogic(ISushiStorage productStorage, IIngredientStorage ingredientStorage, IOrderStorage orderStorage,
-            AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+        public ReportLogic(ISushiStorage productStorage, IOrderStorage orderStorage, 
+            AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf, IShopStorage shopStorage)
         {
             _sushiStorage = productStorage;
-            _ingredientStorage = ingredientStorage;
             _orderStorage = orderStorage;
+            _shopStorage = shopStorage;
 
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
@@ -40,13 +40,11 @@ namespace SushiBarBusinessLogic.BusinessLogics
         /// <returns></returns>
         public List<ReportSushiIngredientViewModel> GetSushiIngredient()
         {
-            var ingredients = _ingredientStorage.GetFullList();
-
-            var sushiList = _sushiStorage.GetFullList();
+            var listSushi = _sushiStorage.GetFullList();
 
             var list = new List<ReportSushiIngredientViewModel>();
 
-            foreach (var sushi in sushiList)
+            foreach (var sushi in listSushi)
             {
                 var record = new ReportSushiIngredientViewModel
                 {
@@ -54,19 +52,41 @@ namespace SushiBarBusinessLogic.BusinessLogics
                     Ingredients = new(),
                     TotalCount = 0
                 };
-                foreach (var ingredient in ingredients)
+                foreach (var ingredient in sushi.SushiIngredients)
                 {
-                    if (sushi.SushiIngredients.ContainsKey(ingredient.Id))
-                    {
-                        record.Ingredients.Add(new(ingredient.IngredientName, 
-                            sushi.SushiIngredients[ingredient.Id].Item2));
-                        record.TotalCount += sushi.SushiIngredients[ingredient.Id].Item2;
-                    }
+                    record.Ingredients.Add(new(ingredient.Value.Item1.IngredientName, ingredient.Value.Item2));
+                    record.TotalCount += ingredient.Value.Item2;
                 }
-
                 list.Add(record);
             }
+            return list;
+        }
 
+        /// <summary>
+        /// Получение списка суши с указанием, в каких магазинах используются
+        /// </summary>
+        /// <returns></returns>
+        public List<ReportShopSushiViewModel> GetShopSushi()
+        {
+            var shops = _shopStorage.GetFullList();
+
+            var list = new List<ReportShopSushiViewModel>();
+
+            foreach (var shop in shops)
+            {
+                var record = new ReportShopSushiViewModel
+                {
+                    ShopName = shop.ShopName,
+                    ListSushi = new(),
+                    TotalCount = 0
+                };
+                foreach (var sushi in shop.ListSushi)
+                {
+                    record.ListSushi.Add(new(sushi.Value.Item1.SushiName, sushi.Value.Item2));
+                    record.TotalCount += sushi.Value.Item2;
+                }
+                list.Add(record);
+            }
             return list;
         }
 
@@ -89,6 +109,24 @@ namespace SushiBarBusinessLogic.BusinessLogics
                     .ToList();
         }
 
+        /// <summary>
+        /// Получение списка заказов, сгруппированных по дате
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<ReportOrdersGroupedByDateViewModel> GetOrdersGroupedByDate()
+        {
+            return _orderStorage.GetFullList()
+                .GroupBy(x => x.DateCreate.Date)
+                .Select(x => new ReportOrdersGroupedByDateViewModel
+                {
+                    DateCreate = x.Key,
+                    Count = x.Count(),
+                    Sum = x.Sum(x => x.Sum)
+                })
+                .ToList();
+        }
+
         /// <summary>
         /// Сохранение суши в файл-Word
         /// </summary>
@@ -103,6 +141,20 @@ namespace SushiBarBusinessLogic.BusinessLogics
             });
         }
 
+        /// <summary>
+        /// Сохранение магазинов в файл-Word
+        /// </summary>
+        /// <param name="model"></param>
+        public void SaveShopsToWordFile(ReportBindingModel model)
+        {
+            _saveToWord.CreateShopsDoc(new WordInfo
+            {
+                FileName = model.FileName,
+                Title = "Список магазинов",
+                Shops = _shopStorage.GetFullList()
+            });
+        }
+
         /// <summary>
         /// Сохранение ингредиентов с указаеним суши в файл-Excel
         /// </summary>
@@ -118,7 +170,21 @@ namespace SushiBarBusinessLogic.BusinessLogics
         }
 
         /// <summary>
-        /// Сохранение заказов в файл-Pdf
+        /// Сохранение суши с указаеним магазина в файл-Excel
+        /// </summary>
+        /// <param name="model"></param>
+        public void SaveShopSushiToExcelFile(ReportBindingModel model)
+        {
+            _saveToExcel.CreateShopReport(new ExcelInfo
+            {
+                FileName = model.FileName,
+                Title = "Список магазинов",
+                ShopListSushi = GetShopSushi()
+            });
+        }
+
+        /// <summary>
+        /// Сохранение заказов по периоду в файл-Pdf
         /// </summary>
         /// <param name="model"></param>
         public void SaveOrdersToPdfFile(ReportBindingModel model)
@@ -132,5 +198,19 @@ namespace SushiBarBusinessLogic.BusinessLogics
                 Orders = GetOrders(model)
             });
         }
+
+        /// <summary>
+        /// Сохранение заказов в файл-Pdf
+        /// </summary>
+        /// <param name="model"></param>
+        public void SaveOrdersGroupedByDateToPdfFile(ReportBindingModel model)
+        {
+            _saveToPdf.CreateOrdersGroupedByDateDoc(new PdfInfo
+            {
+                FileName = model.FileName,
+                Title = "Список заказов",
+                OrdersGroupedByDate = GetOrdersGroupedByDate()
+            });
+        }
     }
 }

SushiBar/SushiBarBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -0,0 +1,216 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+
+namespace SushiBarBusinessLogic.BusinessLogics
+{
+    public class ShopLogic : IShopLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IShopStorage _shopStorage;
+        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
+        {
+            _logger = logger;
+            _shopStorage = shopStorage;
+        }
+        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;
+        }
+        private void CheckModel(ShopBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName));
+            }
+            if (model.MaxCountSushi < 0)
+            {
+                throw new ArgumentException(
+                    "Максимальное количество суши в магазине не может быть меньше нуля",
+                    nameof(model.MaxCountSushi));
+            }
+            _logger.LogInformation("Shop. ShopName:{0}.Address:{1}. Id: {2}",
+                model.ShopName, model.Address, model.Id);
+            var element = _shopStorage.GetElement(new ShopSearchModel
+            {
+                ShopName = model.ShopName
+            });
+            if (element != null && element.Id != model.Id && element.ShopName == model.ShopName)
+            {
+                throw new InvalidOperationException("Магазин с таким названием уже есть");
+            }
+        }
+
+        public bool AddSushiInShop(ShopSearchModel model, ISushiModel sushi, int count)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (count <= 0)
+            {
+                throw new ArgumentException("Количество суши должно быть больше 0", nameof(count));
+            }
+            _logger.LogInformation("AddSushiInShop. ShopName:{ShopName}.Id:{ Id}",
+                model.ShopName, model.Id);
+            var element = _shopStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("AddSushiInShop element not found");
+                return false;
+            }
+            if (element.MaxCountSushi - 
+                element.ListSushi.Select(x => x.Value.Item2).Sum() < count)
+            {
+                throw new ArgumentNullException("Магазин переполнен", nameof(count));
+            }
+            _logger.LogInformation("AddSushiInShop find. Id:{Id}", element.Id);
+
+            if (element.ListSushi.TryGetValue(sushi.Id, out var pair))
+            {
+                element.ListSushi[sushi.Id] = (sushi, count + pair.Item2);
+                _logger.LogInformation(
+                    "AddSushiInShop. Added {count} {sushi} to '{ShopName}' shop",
+                    count, sushi.SushiName, element.ShopName);
+            }
+            else
+            {
+                element.ListSushi[sushi.Id] = (sushi, count);
+                _logger.LogInformation(
+                    "AddSushiInShop. Added {count} new sushi {sushi} to '{ShopName}' shop",
+                    count, sushi.SushiName, element.ShopName);
+            }
+            _shopStorage.Update(new() {
+                Id = element.Id,
+                Address = element.Address,
+                ShopName = element.ShopName,
+                DateOpening = element.DateOpening,
+                MaxCountSushi = element.MaxCountSushi,
+                ListSushi = element.ListSushi,
+            });
+            return true;
+        }
+
+        public bool AddSushi(ISushiModel model, int count)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (count <= 0)
+            {
+                throw new ArgumentException("Количество суши должно быть больше 0", nameof(count));
+            }
+            var freeCount = _shopStorage.GetFullList()
+                .Select(x => x.MaxCountSushi - x.ListSushi
+                .Select(p => p.Value.Item2).Sum()).Sum() - count;
+            if (freeCount < 0)
+            {
+                _logger.LogInformation("AddSushi. Не удалось добавить изделия в магазины, они переполнены.");
+                return false;
+            }
+            foreach (var shop in _shopStorage.GetFullList())
+            {
+                int countFree = shop.MaxCountSushi - shop.ListSushi.Select(x => x.Value.Item2).Sum();
+                if (countFree < count)
+                {
+                    if (!AddSushiInShop(new() { Id = shop.Id }, model, countFree))
+                    {
+                        _logger.LogWarning("AddSushiInShop operation failed.");
+                        return false;
+                    }
+                    count -= countFree;
+                }
+                else
+                {
+                    if (!AddSushiInShop(new() { Id = shop.Id }, model, count))
+                    {
+                        _logger.LogWarning("AddSushiInShop operation failed.");
+                        return false;
+                    }
+                    count = 0;
+                }
+                if (count == 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool SellSushi(ISushiModel model, int count)
+        {
+            return _shopStorage.SellSushi(model, count);
+        }
+    }
+}

SushiBar/SushiBarBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -6,7 +6,7 @@ namespace SushiBarBusinessLogic.OfficePackage
     public abstract class AbstractSaveToExcel
     {
 		/// <summary>
-		/// Создание отчета
+		/// Создание отчета по ингредиентам в суши
 		/// </summary>
 		/// <param name="info"></param>
 		public void CreateReport(ExcelInfo info)
@@ -28,18 +28,18 @@ namespace SushiBarBusinessLogic.OfficePackage
 			});
 
 			uint rowIndex = 2;
-			foreach (var pc in info.SushiIngredients)
+			foreach (var si in info.SushiIngredients)
 			{
 				InsertCellInWorksheet(new ExcelCellParameters
 				{
 					ColumnName = "A",
 					RowIndex = rowIndex,
-					Text = pc.SushiName,
+					Text = si.SushiName,
 					StyleInfo = ExcelStyleInfoType.Text
 				});
 				rowIndex++;
 
-				foreach (var (Ingredient, Count) in pc.Ingredients)
+				foreach (var (Ingredient, Count) in si.Ingredients)
 				{
 					InsertCellInWorksheet(new ExcelCellParameters
 					{
@@ -71,7 +71,7 @@ namespace SushiBarBusinessLogic.OfficePackage
 				{
 					ColumnName = "C",
 					RowIndex = rowIndex,
-					Text = pc.TotalCount.ToString(),
+					Text = si.TotalCount.ToString(),
 					StyleInfo = ExcelStyleInfoType.Text
 				});
 				rowIndex++;
@@ -80,11 +80,86 @@ namespace SushiBarBusinessLogic.OfficePackage
 			SaveExcel(info);
 		}
 
-		/// <summary>
-		/// Создание excel-файла
-		/// </summary>
-		/// <param name="info"></param>
-		protected abstract void CreateExcel(ExcelInfo info);
+        /// <summary>
+        /// Создание отчета по суши в магазинах
+        /// </summary>
+        /// <param name="info"></param>
+        public void CreateShopReport(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 ss in info.ShopListSushi)
+            {
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = ss.ShopName,
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+
+                foreach (var (Sushi, Count) in ss.ListSushi)
+                {
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "B",
+                        RowIndex = rowIndex,
+                        Text = Sushi,
+                        StyleInfo = ExcelStyleInfoType.TextWithBroder
+                    });
+
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "C",
+                        RowIndex = rowIndex,
+                        Text = Count.ToString(),
+                        StyleInfo = ExcelStyleInfoType.TextWithBroder
+                    });
+
+                    rowIndex++;
+                }
+
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = "Итого",
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "C",
+                    RowIndex = rowIndex,
+                    Text = ss.TotalCount.ToString(),
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+            }
+
+            SaveExcel(info);
+        }
+
+        /// <summary>
+        /// Создание excel-файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void CreateExcel(ExcelInfo info);
 
 		/// <summary>
 		/// Добавляем новую ячейку в лист

SushiBar/SushiBarBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -5,6 +5,10 @@ namespace SushiBarBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToPdf
     {
+        /// <summary>
+		/// Создание doc-файла
+		/// </summary>
+		/// <param name="info"></param>
         public void CreateDoc(PdfInfo info)
         {
             CreatePdf(info);
@@ -34,10 +38,32 @@ namespace SushiBarBusinessLogic.OfficePackage
             SavePdf(info);
         }
 
-        /// <summary>
-		/// Создание doc-файла
-		/// </summary>
-		/// <param name="info"></param>
+        public void CreateOrdersGroupedByDateDoc(PdfInfo info)
+        {
+            CreatePdf(info);
+            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+            
+            CreateTable(new List<string> { "3cm", "3cm", "3cm"});
+
+            CreateRow(new PdfRowParameters
+            {
+                Texts = new List<string> { "Дата заказов", "Количество заказов" ,"Сумма" },
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+
+            foreach (var order in info.OrdersGroupedByDate)
+            {
+                CreateRow(new PdfRowParameters
+                {
+                    Texts = new List<string> { order.DateCreate.ToShortDateString(), order.Count.ToString(), order.Sum.ToString() },
+                    Style = "Normal",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Left
+                });
+            }
+
+            SavePdf(info);
+        }
         protected abstract void CreatePdf(PdfInfo info);
 
         /// <summary>

SushiBar/SushiBarBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -23,7 +23,7 @@ namespace SushiBarBusinessLogic.OfficePackage
             {
                 CreateParagraph(new WordParagraph
                 {
-                    Texts = new List<(string, WordTextProperties)> { 
+                    Texts = new List<(string, WordTextProperties)> {
                         (sushi.SushiName+' ', new WordTextProperties { Size = "24", Bold = true }),
                         (sushi.Price.ToString(), new WordTextProperties { Size = "24" })
                     },
@@ -38,12 +38,59 @@ namespace SushiBarBusinessLogic.OfficePackage
             SaveWord(info);
         }
 
+        public void CreateShopsDoc(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
+                }
+            });
+
+            List<WordRow> rows = new List<WordRow>();
+            rows.Add(new WordRow
+            {
+                Rows = new List<(string, WordTextProperties)> {
+                        ("Название", new WordTextProperties { Size = "24", Bold = true }),
+                        ("Адрес", new WordTextProperties { Size = "24", Bold = true }),
+                        ("Дата открытия", new WordTextProperties { Size = "24", Bold = true })
+                }
+            });
+
+            foreach (var shop in info.Shops)
+            {
+                rows.Add(new WordRow
+                {
+                    Rows = new List<(string, WordTextProperties)> {
+                        (shop.ShopName, new WordTextProperties { Size = "24" }),
+                        (shop.Address, new WordTextProperties { Size = "24" }),
+                        (shop.DateOpening.ToShortDateString(), new WordTextProperties { Size = "24" })
+                    }
+                });
+            }
+
+            CreateTable(rows);
+
+            SaveWord(info);
+        }
+
         /// <summary>
 		/// Создание doc-файла
 		/// </summary>
 		/// <param name="info"></param>
         protected abstract void CreateWord(WordInfo info);
 
+        /// <summary>
+        /// Создание таблицы
+        /// </summary>
+        /// <param name="rows"></param>
+        protected abstract void CreateTable(List<WordRow> rows);
+
         /// <summary>
         /// Создание абзаца с текстом
         /// </summary>

SushiBar/SushiBarBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -9,5 +9,7 @@ namespace SushiBarBusinessLogic.OfficePackage.HelperModels
         public string Title { get; set; } = string.Empty;
 
         public List<ReportSushiIngredientViewModel> SushiIngredients { get; set; } = new();
+
+        public List<ReportShopSushiViewModel> ShopListSushi { get; set; } = new();
     }
 }

SushiBar/SushiBarBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -13,5 +13,7 @@ namespace SushiBarBusinessLogic.OfficePackage.HelperModels
         public DateTime DateTo { get; set; }
 
         public List<ReportOrdersViewModel> Orders { get; set; } = new();
+
+        public List<ReportOrdersGroupedByDateViewModel> OrdersGroupedByDate { get; set; } = new();
     }
 }

SushiBar/SushiBarBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -9,5 +9,7 @@ namespace SushiBarBusinessLogic.OfficePackage.HelperModels
         public string Title { get; set; } = string.Empty;
 
         public List<SushiViewModel> ListSushi { get; set; } = new();
+
+        public List<ShopViewModel> Shops { get; set; } = new();
     }
 }

SushiBar/SushiBarBusinessLogic/OfficePackage/HelperModels/WordRow.cs

@@ -0,0 +1,7 @@
+namespace SushiBarBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordRow
+    {
+        public List<(string, WordTextProperties)> Rows { get; set; } = new();
+    }
+}

SushiBar/SushiBarBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -89,6 +89,60 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             _docBody = mainPart.Document.AppendChild(new Body());
         }
 
+        protected override void CreateTable(List<WordRow> data)
+        {
+            if (_docBody == null || data == null)
+            {
+                return;
+            }
+            Table table = new Table();
+            var tableProp = new TableProperties();
+            tableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed });
+            tableProp.AppendChild(new TableBorders(
+                    new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 }
+                    ));
+            tableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto });
+            table.AppendChild(tableProp);
+            TableGrid tableGrid = new TableGrid();
+            for (int j = 0; j < data[0].Rows.Count; ++j)
+            {
+                tableGrid.AppendChild(new GridColumn() { Width = "3200" });
+            }
+            table.AppendChild(tableGrid);
+            for (int i = 0; i < data.Count; ++i)
+            {
+                TableRow docRow = new TableRow();
+                for (int j = 0; j < data[i].Rows.Count; ++j)
+                {
+                    var docParagraph = new Paragraph(); 
+                    var docRun = new Run();
+                    var runProperties = new RunProperties();
+
+                    docParagraph.AppendChild(CreateParagraphProperties(data[i].Rows[j].Item2));
+                    
+                    runProperties.AppendChild(new RunFonts() { Ascii = "Times New Roman", ComplexScript = "Times New Roman", HighAnsi = "Times New Roman" });
+                    runProperties.AppendChild(new FontSize { Val = data[i].Rows[j].Item2.Size == null ? data[i].Rows[j].Item2.Size : "24" });
+                    if (data[i].Rows[j].Item2.Bold) 
+                        runProperties.AppendChild(new Bold());
+
+                    docRun.AppendChild(runProperties);
+                    docRun.AppendChild(new Text { Text = data[i].Rows[j].Item1.ToString(), Space = SpaceProcessingModeValues.Preserve });
+
+                    docParagraph.AppendChild(docRun);
+                    TableCell docCell = new TableCell();
+                    docCell.AppendChild(docParagraph);
+                    docRow.AppendChild(docCell);
+                }
+                table.AppendChild(docRow);
+            }
+            _docBody.AppendChild(table);
+        }
+
         protected override void CreateParagraph(WordParagraph paragraph)
         {
             if (_docBody == null || paragraph == null)

SushiBar/SushiBarContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,22 @@
+using SushiBarDataModels.Models;
+
+namespace SushiBarContracts.BindingModels
+{
+    public class ShopBindingModel : IShopModel
+    {
+        public int Id { get; set; }
+        public string ShopName { get; set; } = string.Empty;
+
+        public string Address { get; set; } = string.Empty;
+
+        public DateTime DateOpening { get; set; } = DateTime.Now;
+
+        public Dictionary<int, (ISushiModel, int)> ListSushi
+        {
+            get;
+            set;
+        } = new();
+
+        public int MaxCountSushi { get; set; }
+    }
+}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -11,6 +11,12 @@ namespace SushiBarContracts.BusinessLogicsContracts
         /// <returns></returns>
         List<ReportSushiIngredientViewModel> GetSushiIngredient();
 
+        /// <summary>
+        /// Получение списка суши с указанием, в каких магазинах используются
+        /// </summary>
+        /// <returns></returns>
+        List<ReportShopSushiViewModel> GetShopSushi();
+
         /// <summary>
         /// Получение списка заказов за определенный период
         /// </summary>
@@ -19,21 +25,46 @@ namespace SushiBarContracts.BusinessLogicsContracts
         List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
 
         /// <summary>
-        /// Сохранение индгредиентов в файл-Word
+        /// Получение списка заказов, сгруппированных по дате
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        List<ReportOrdersGroupedByDateViewModel> GetOrdersGroupedByDate();
+
+        /// <summary>
+        /// Сохранение суши в файл-Word
         /// </summary>
         /// <param name="model"></param>
         void SaveListSushiToWordFile(ReportBindingModel model);
 
+        /// <summary>
+        /// Сохранение магазинов в файл-Word
+        /// </summary>
+        /// <param name="model"></param>
+        void SaveShopsToWordFile(ReportBindingModel model);
+
         /// <summary>
         /// Сохранение индгредиентов с указаеним суши в файл-Excel
         /// </summary>
         /// <param name="model"></param>
         void SaveSushiIngredientToExcelFile(ReportBindingModel model);
 
+        /// <summary>
+        /// Сохранение суши с указаеним магазинов в файл-Excel
+        /// </summary>
+        /// <param name="model"></param>
+        void SaveShopSushiToExcelFile(ReportBindingModel model);
+
         /// <summary>
         /// Сохранение заказов в файл-Pdf
         /// </summary>
         /// <param name="model"></param>
         void SaveOrdersToPdfFile(ReportBindingModel model);
+
+        /// <summary>
+        /// Сохранение сгруппированных заказов в файл-Pdf
+        /// </summary>
+        /// <param name="model"></param>
+        void SaveOrdersGroupedByDateToPdfFile(ReportBindingModel model);
     }
 }

SushiBar/SushiBarContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,19 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+
+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 AddSushiInShop(ShopSearchModel model, ISushiModel sushi, int count);
+        bool AddSushi(ISushiModel sushi, int count);
+        bool SellSushi(ISushiModel sushi, int count);
+    }
+}

SushiBar/SushiBarContracts/SearchModels/ShopSearchModel.cs

@@ -0,0 +1,8 @@
+namespace SushiBarContracts.SearchModels
+{
+    public class ShopSearchModel
+    {
+        public int? Id { get; set; }
+        public string? ShopName { get; set; }
+    }
+}

SushiBar/SushiBarContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,18 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+
+namespace SushiBarContracts.StoragesContracts
+{
+    public interface IShopStorage
+    {
+        List<ShopViewModel> GetFullList();
+        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
+        ShopViewModel? GetElement(ShopSearchModel model);
+        ShopViewModel? Insert(ShopBindingModel model);
+        ShopViewModel? Update(ShopBindingModel model);
+        ShopViewModel? Delete(ShopBindingModel model);
+        bool SellSushi(ISushiModel model, int count);
+    }
+}

SushiBar/SushiBarContracts/ViewModels/ReportOrdersGroupedByDateViewModel.cs

@@ -0,0 +1,11 @@
+namespace SushiBarContracts.ViewModels
+{
+    public class ReportOrdersGroupedByDateViewModel
+    {
+        public DateTime DateCreate { get; set; }
+
+        public int Count { get; set; } 
+
+        public double Sum { get; set; }
+    }
+}

SushiBar/SushiBarContracts/ViewModels/ReportShopSushiViewModel.cs

@@ -0,0 +1,11 @@
+namespace SushiBarContracts.ViewModels
+{
+    public class ReportShopSushiViewModel
+    {
+        public string ShopName { get; set; } = string.Empty;
+
+        public int TotalCount { get; set; }
+
+        public List<(string Sushi, int Count)> ListSushi { get; set; } = new();
+    }
+}

SushiBar/SushiBarContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,26 @@
+using SushiBarDataModels.Models;
+using System.ComponentModel;
+
+namespace SushiBarContracts.ViewModels
+{
+    public class ShopViewModel : IShopModel
+    {
+        public int Id { get; set; }
+        [DisplayName("Название магазина")]
+        public string ShopName { get; set; } = string.Empty;
+
+        [DisplayName("Адрес магазина")]
+        public string Address { get; set; } = string.Empty;
+
+        [DisplayName("Дата открытия")]
+        public DateTime DateOpening { get; set; } = DateTime.Now;
+        [DisplayName("Максимальное количество суши")]
+        public int MaxCountSushi { get; set; }
+
+        public Dictionary<int, (ISushiModel, int)> ListSushi
+        {
+            get;
+            set;
+        } = new();
+    }
+}

SushiBar/SushiBarDataModels/Models/IShopModel.cs

@@ -0,0 +1,11 @@
+namespace SushiBarDataModels.Models
+{
+    public interface IShopModel : IId
+    {
+        string ShopName { get; }
+        string Address { get; }
+        DateTime DateOpening { get; }
+        Dictionary<int, (ISushiModel, int)> ListSushi { get; }
+        int MaxCountSushi { get; }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Implements/ShopStorage.cs

@@ -0,0 +1,152 @@
+using Microsoft.EntityFrameworkCore;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
+using SushiBarDataModels.Models;
+using System.Collections.Generic;
+using System.Xml.Linq;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+    public class ShopStorage : IShopStorage
+    {
+        public List<ShopViewModel> GetFullList()
+        {
+            using var context = new SushiBarDatabase();
+            return context.Shops
+                    .Include(x => x.ListSushiFk)
+                    .ThenInclude(x => x.Sushi)
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                return new();
+            }
+            using var context = new SushiBarDatabase();
+            return context.Shops
+                    .Include(x => x.ListSushiFk)
+                    .ThenInclude(x => x.Sushi)
+                    .Where(x => x.ShopName.Contains(model.ShopName))
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+        public ShopViewModel? GetElement(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            return context.Shops
+                .Include(x => x.ListSushiFk)
+                .ThenInclude(x => x.Sushi)
+                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
+                                (model.Id.HasValue && x.Id == model.Id))
+                ?.GetViewModel;
+        }
+        public ShopViewModel? Insert(ShopBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var newShop = Shop.Create(context, model);
+            if (newShop == null)
+            {
+                return null;
+            }
+            context.Shops.Add(newShop);
+            context.SaveChanges();
+            return newShop.GetViewModel;
+        }
+        public ShopViewModel? Update(ShopBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            using var transaction = context.Database.BeginTransaction();
+            try
+            {
+                var shop = context.Shops.FirstOrDefault(rec => rec.Id == model.Id);
+                if (shop == null)
+                {
+                    return null;
+                }
+                shop.Update(model);
+                context.SaveChanges();
+                shop.UpdateSushi(context, model);
+                transaction.Commit();
+                return shop.GetViewModel;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+        public ShopViewModel? Delete(ShopBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var element = context.Shops
+                .Include(x => x.ListSushiFk)
+                .FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Shops.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+        public bool SellSushi(ISushiModel model, int count)
+        {
+            using var context = new SushiBarDatabase();
+            using var transaction = context.Database.BeginTransaction();
+            try
+            {
+                foreach (var shop in context.Shops
+                    .Include(x => x.ListSushiFk)
+                    .ThenInclude(x => x.Sushi)
+                    .ToList()
+                    .Where(x => x.ListSushi.ContainsKey(model.Id)))
+                {
+                    int countInCurrentShop = shop.ListSushi[model.Id].Item2;
+                    if (countInCurrentShop <= count)
+                    {
+                        var elem = context.ShopSushi
+                            .Where(x => x.SushiId == model.Id)
+                            .FirstOrDefault(x => x.ShopId == shop.Id);
+                        context.ShopSushi.Remove(elem);
+                        shop.ListSushi.Remove(model.Id);
+                        count -= countInCurrentShop;
+                    }
+                    else
+                    {
+                        shop.ListSushi[model.Id] = (shop.ListSushi[model.Id].Item1, countInCurrentShop - count);
+                        count = 0;
+                        shop.UpdateSushi(context, new()
+                        {
+                            Id = shop.Id,
+                            ListSushi = shop.ListSushi,
+                        });
+                    }
+                    if (count == 0)
+                    {
+                        context.SaveChanges();
+                        transaction.Commit();
+                        return true;
+                    }
+                }
+                transaction.Rollback();
+                return false;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Implements/SushiStorage.cs

@@ -4,6 +4,7 @@ using SushiBarContracts.SearchModels;
 using SushiBarContracts.StoragesContracts;
 using SushiBarContracts.ViewModels;
 using SushiBarDatabaseImplement.Models;
+using SushiBarDataModels.Models;
 
 namespace SushiBarDatabaseImplement.Implements
 {

SushiBar/SushiBarDatabaseImplement/Migrations/20230323154341_ShopMigration.Designer.cs

@@ -0,0 +1,250 @@
+// <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("20230323154341_ShopMigration")]
+    partial class ShopMigration
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Ingredient", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("float");
+
+                    b.Property<string>("IngredientName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Ingredients");
+                });
+
+            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.Shop", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("DateOpening")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("MaxCountSushi")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ShopName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shops");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushi", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ShopId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ShopId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("ShopSushi");
+                });
+
+            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("ListSushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiIngredient", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("IngredientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IngredientId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("SushiIngredients");
+                });
+
+            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.ShopSushi", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("ListSushiFk")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("ShopsFk")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Shop");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiIngredient", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Ingredient", "Ingredient")
+                        .WithMany("SushiIngredients")
+                        .HasForeignKey("IngredientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("Ingredients")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ingredient");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Ingredient", b =>
+                {
+                    b.Navigation("SushiIngredients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("ListSushiFk");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Navigation("Ingredients");
+
+                    b.Navigation("Orders");
+
+                    b.Navigation("ShopsFk");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/20230323154341_ShopMigration.cs

@@ -0,0 +1,78 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class ShopMigration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Shops",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    ShopName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Address = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    DateOpening = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    MaxCountSushi = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Shops", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ShopSushi",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SushiId = table.Column<int>(type: "int", nullable: false),
+                    ShopId = table.Column<int>(type: "int", nullable: false),
+                    Count = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ShopSushi", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ShopSushi_ListSushi_SushiId",
+                        column: x => x.SushiId,
+                        principalTable: "ListSushi",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ShopSushi_Shops_ShopId",
+                        column: x => x.ShopId,
+                        principalTable: "Shops",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ShopSushi_ShopId",
+                table: "ShopSushi",
+                column: "ShopId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ShopSushi_SushiId",
+                table: "ShopSushi",
+                column: "SushiId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ShopSushi");
+
+            migrationBuilder.DropTable(
+                name: "Shops");
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -1,6 +1,10 @@
 // <auto-generated />
+using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SushiBarDatabaseImplement;
 
 #nullable disable
 
@@ -71,6 +75,59 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("Orders");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("DateOpening")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("MaxCountSushi")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ShopName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shops");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushi", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ShopId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ShopId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("ShopSushi");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Property<int>("Id")
@@ -128,6 +185,25 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushi", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("ListSushiFk")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("ShopsFk")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Shop");
+
+                    b.Navigation("Sushi");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiIngredient", b =>
                 {
                     b.HasOne("SushiBarDatabaseImplement.Models.Ingredient", "Ingredient")
@@ -152,11 +228,18 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("SushiIngredients");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("ListSushiFk");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Navigation("Ingredients");
 
                     b.Navigation("Orders");
+
+                    b.Navigation("ShopsFk");
                 });
 #pragma warning restore 612, 618
         }

SushiBar/SushiBarDatabaseImplement/Models/Shop.cs

@@ -0,0 +1,105 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Xml.Linq;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class Shop : IShopModel
+    {
+        public int Id { get; private set; }
+        [Required]
+        public string ShopName { get; private set; } = string.Empty;
+        [Required]
+        public string Address { get; private set; } = string.Empty;
+        [Required]
+        public DateTime DateOpening { get; private set; }
+        [Required]
+        public int MaxCountSushi { get; private set; }
+
+        private Dictionary<int, (ISushiModel, int)>? _shopSushi = null;
+
+        [NotMapped]
+        public Dictionary<int, (ISushiModel, int)> ListSushi
+        {
+            get
+            {
+                if (_shopSushi == null)
+                {
+                    _shopSushi = ListSushiFk
+                            .ToDictionary(recPC => recPC.SushiId, recPC => (recPC.Sushi as ISushiModel, recPC.Count));
+                }
+                return _shopSushi;
+            }
+        }
+
+        [ForeignKey("ShopId")]
+        public virtual List<ShopSushi> ListSushiFk { get; set; } = new();
+
+        public static Shop Create(SushiBarDatabase context, ShopBindingModel model)
+        {
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Address = model.Address,
+                DateOpening = model.DateOpening,
+                MaxCountSushi = model.MaxCountSushi,
+                ListSushiFk = model.ListSushi.Select(x => new ShopSushi
+                {
+                    Sushi = context.ListSushi.First(y => y.Id == x.Key),
+                    Count = x.Value.Item2
+                }).ToList()
+            };
+        }
+
+        public void Update(ShopBindingModel model)
+        {
+            ShopName = model.ShopName;
+            Address = model.Address;
+            DateOpening = model.DateOpening;
+            MaxCountSushi = model.MaxCountSushi;
+        }
+
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            DateOpening = DateOpening,
+            MaxCountSushi = MaxCountSushi,
+            ListSushi = ListSushi
+        };
+
+        public void UpdateSushi(SushiBarDatabase context, ShopBindingModel model)
+        {
+            var shopSushi = context.ShopSushi.Where(rec => rec.ShopId == model.Id).ToList();
+            if (shopSushi != null && shopSushi.Count > 0)
+            {   // удалили те, которых нет в модели
+                context.ShopSushi.RemoveRange(shopSushi.Where(rec => !model.ListSushi.ContainsKey(rec.SushiId)));
+                context.SaveChanges();
+                // обновили количество у существующих записей
+                foreach (var updateSushi in shopSushi)
+                {
+                    updateSushi.Count = model.ListSushi[updateSushi.SushiId].Item2;
+                    model.ListSushi.Remove(updateSushi.SushiId);
+                }
+                context.SaveChanges();
+            }
+            var shop = context.Shops.First(x => x.Id == Id);
+            foreach (var ss in model.ListSushi)
+            {
+                context.ShopSushi.Add(new ShopSushi
+                {
+                    Shop = shop,
+                    Sushi = context.ListSushi.First(x => x.Id == ss.Key),
+                    Count = ss.Value.Item2
+                });
+                context.SaveChanges();
+            }
+            _shopSushi = null;
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/ShopSushi.cs

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

SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs

@@ -36,6 +36,8 @@ namespace SushiBarDatabaseImplement.Models
         public virtual List<SushiIngredient> Ingredients { get; set; } = new();
         [ForeignKey("SushiId")]
         public virtual List<Order> Orders { get; set; } = new();
+        [ForeignKey("SushiId")]
+        public virtual List<ShopSushi> ShopsFk { get; set; } = new();
 
         public static Sushi Create(SushiBarDatabase context, SushiBindingModel model)
         {

SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs

@@ -21,5 +21,9 @@ namespace SushiBarDatabaseImplement
         public virtual DbSet<SushiIngredient> SushiIngredients { set; get; }
 
         public virtual DbSet<Order> Orders { set; get; }
+        
+        public virtual DbSet<Shop> Shops { set; get; }
+
+        public virtual DbSet<ShopSushi> ShopSushi { set; get; }
     }
 }

SushiBar/SushiBarFileImplement/DataFileSingleton.cs

@@ -9,9 +9,11 @@ namespace SushiBarFileImplement
         private readonly string IngredientFileName = "Ingredient.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string SushiFileName = "Sushi.xml";
+        private readonly string ShopFileName = "Shop.xml";
         public List<Ingredient> Ingredients { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Sushi> ListSushi { get; private set; }
+        public List<Shop> Shops { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -25,11 +27,13 @@ namespace SushiBarFileImplement
         public void SaveListSushi() => SaveData(ListSushi, SushiFileName,
             "ListSushi", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
         private DataFileSingleton()
         {
             Ingredients = LoadData(IngredientFileName, "Ingredient", x => Ingredient.Create(x)!)!;
             ListSushi = LoadData(SushiFileName, "Sushi", x => Sushi.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
+            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName,
             Func<XElement, T> selectFunction)

SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs

@@ -48,14 +48,8 @@ namespace SushiBarFileImplement.Implements
         private OrderViewModel GetViewModel(Order order)
         {
             var viewModel = order.GetViewModel;
-            foreach (var sushi in source.ListSushi)
-            {
-                if (sushi.Id == order.SushiId)
-                {
-                    viewModel.SushiName = sushi.SushiName;
-                    break;
-                }
-            }
+            var sushi = source.ListSushi.FirstOrDefault(x => x.Id == order.SushiId);
+            if (sushi != null) viewModel.SushiName = sushi.SushiName;
             return viewModel;
         }
         public OrderViewModel? Insert(OrderBindingModel model)

SushiBar/SushiBarFileImplement/Implements/ShopStorage.cs

@@ -0,0 +1,102 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using SushiBarFileImplement.Models;
+
+namespace SushiBarFileImplement.Implements
+{
+    public class ShopStorage : IShopStorage
+    {
+        private readonly DataFileSingleton source;
+        public ShopStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<ShopViewModel> GetFullList()
+        {
+            return source.Shops.Select(x => x.GetViewModel).ToList();
+        }
+        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                return new();
+            }
+            return source.Shops.Where(x =>
+                x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList();
+        }
+        public ShopViewModel? GetElement(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Shops.FirstOrDefault(x =>
+                (!string.IsNullOrEmpty(model.ShopName) && x.ShopName ==
+                model.ShopName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        public ShopViewModel? Insert(ShopBindingModel model)
+        {
+            model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
+            var newShop = Shop.Create(model);
+            if (newShop == null)
+            {
+                return null;
+            }
+            source.Shops.Add(newShop);
+            source.SaveShops();
+            return newShop.GetViewModel;
+        }
+        public ShopViewModel? Update(ShopBindingModel model)
+        {
+            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
+            if (shop == null)
+            {
+                return null;
+            }
+            shop.Update(model);
+            source.SaveShops();
+            return shop.GetViewModel;
+        }
+        public ShopViewModel? Delete(ShopBindingModel model)
+        {
+            var element = source.Shops.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                source.Shops.Remove(element);
+                source.SaveShops();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+
+        public bool SellSushi(ISushiModel model, int count)
+        {
+            if (source.Shops.Select(x => x.ListSushi.FirstOrDefault(y => y.Key == model.Id).Value.Item2).Sum() < count)
+            {
+                return false;
+            }
+            foreach (var shop in source.Shops.Where(x => x.ListSushi.ContainsKey(model.Id)))
+            {
+                int countInCurrentShop = shop.ListSushi[model.Id].Item2;
+                if (countInCurrentShop <= count)
+                {
+                    shop.ListSushi.Remove(model.Id);
+                    count -= countInCurrentShop;
+                }
+                else
+                {
+                    shop.ListSushi[model.Id] = (shop.ListSushi[model.Id].Item1, countInCurrentShop - count);
+                    count = 0;
+                }
+                if (count == 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

SushiBar/SushiBarFileImplement/Implements/SushiStorage.cs

@@ -2,7 +2,9 @@
 using SushiBarContracts.SearchModels;
 using SushiBarContracts.StoragesContracts;
 using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
 using SushiBarFileImplement.Models;
+using System.Reflection;
 
 namespace SushiBarFileImplement.Implements
 {

SushiBar/SushiBarFileImplement/Models/Shop.cs

@@ -0,0 +1,107 @@
+
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System.Reflection.Metadata;
+using System.Xml.Linq;
+
+namespace SushiBarFileImplement.Models
+{
+    public class Shop : IShopModel
+    {
+        public int Id { get; private set; }
+        public string ShopName { get; private set; } = string.Empty;
+        public string Address { get; private set; } = string.Empty;
+        public DateTime DateOpening { get; private set; }
+        public int MaxCountSushi { get; private set; }
+        public Dictionary<int, int> CountSushi 
+        { 
+            get; 
+            private set;
+        } = new();
+
+        private Dictionary<int, (ISushiModel, int)>? _shopSushi = null;
+        public Dictionary<int, (ISushiModel, int)> ListSushi
+        {
+            get
+            {
+                if (_shopSushi == null)
+                {
+                    var source = DataFileSingleton.GetInstance();
+                    _shopSushi = 
+                        CountSushi.ToDictionary(x => x.Key, 
+                        y => ((source.ListSushi.FirstOrDefault(z => z.Id == y.Key) as ISushiModel)!, y.Value));
+                }
+                return _shopSushi;
+            }
+        }
+
+        public static Shop? Create(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Address = model.Address,
+                MaxCountSushi = model.MaxCountSushi,
+                DateOpening = model.DateOpening,
+                CountSushi = model.ListSushi.ToDictionary(x => x.Key, x => x.Value.Item2)
+            };
+        }
+        public static Shop? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ShopName = element.Element("ShopName")!.Value,
+                Address = element.Element("Address")!.Value,
+                DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value),
+                MaxCountSushi = Convert.ToInt32(element.Element("MaxCountSushi")!.Value),
+                CountSushi = element.Element("ListSushi")!.Elements("Sushi").ToDictionary(
+                    x => Convert.ToInt32(x.Element("Key")?.Value),
+                    x => Convert.ToInt32(x.Element("Value")?.Value))
+            };
+        }
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ShopName = model.ShopName;
+            Address = model.Address;
+            DateOpening = model.DateOpening;
+            MaxCountSushi = model.MaxCountSushi;
+            CountSushi = model.ListSushi.ToDictionary(x => x.Key, x => x.Value.Item2);
+            _shopSushi = null;
+        }
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            ListSushi = ListSushi,
+            DateOpening = DateOpening,
+            MaxCountSushi = MaxCountSushi,
+        };
+        public XElement GetXElement => new("Shop",
+             new XAttribute("Id", Id),
+             new XElement("ShopName", ShopName),
+             new XElement("Address", Address),
+             new XElement("DateOpening", DateOpening),
+             new XElement("MaxCountSushi", MaxCountSushi),
+             new XElement("ListSushi", CountSushi
+                 .Select(x => new XElement("Sushi",
+                     new XElement("Key", x.Key),
+                     new XElement("Value", x.Value))
+                 ).ToArray()));
+    }
+}

SushiBar/SushiBarListImplement/DataListSingleton.cs

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

SushiBar/SushiBarListImplement/Implements/ShopStorage.cs

@@ -0,0 +1,108 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using SushiBarListImplement.Models;
+
+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 ?? string.Empty))
+                {
+                    result.Add(shop.GetViewModel);
+                }
+            }
+            return result;
+        }
+        public ShopViewModel? GetElement(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            foreach (var shop in _source.Shops)
+            {
+                if ((!string.IsNullOrEmpty(model.ShopName) &&
+                shop.ShopName == model.ShopName) ||
+                (model.Id.HasValue && shop.Id == model.Id))
+                {
+                    return shop.GetViewModel;
+                }
+            }
+            return null;
+        }
+        public ShopViewModel? Insert(ShopBindingModel model)
+        {
+            model.Id = 1;
+            foreach (var shop in _source.Shops)
+            {
+                if (model.Id <= shop.Id)
+                {
+                    model.Id = shop.Id + 1;
+                }
+            }
+            var newShop = Shop.Create(model);
+            if (newShop == null)
+            {
+                return null;
+            }
+            _source.Shops.Add(newShop);
+            return newShop.GetViewModel;
+        }
+        public ShopViewModel? Update(ShopBindingModel model)
+        {
+            foreach (var shop in _source.Shops)
+            {
+                if (shop.Id == model.Id)
+                {
+                    shop.Update(model);
+                    return shop.GetViewModel;
+                }
+            }
+            return null;
+        }
+        public ShopViewModel? Delete(ShopBindingModel model)
+        {
+            for (int i = 0; i < _source.Shops.Count; ++i)
+            {
+                if (_source.Shops[i].Id == model.Id)
+                {
+                    var element = _source.Shops[i];
+                    _source.Shops.RemoveAt(i);
+                    return element.GetViewModel;
+                }
+            }
+            return null;
+        }
+
+        public bool SellSushi(ISushiModel model, int count)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

SushiBar/SushiBarListImplement/Models/Shop.cs

@@ -0,0 +1,55 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+
+namespace SushiBarListImplement.Models
+{
+    public class Shop : IShopModel
+    {
+        public int Id { get; private set; }
+        public string ShopName { get; private set; } = string.Empty;
+        public string Address { get; private set; } = string.Empty;
+        public DateTime DateOpening { get; private set; }
+        public Dictionary<int, (ISushiModel, int)> ListSushi
+        {
+            get;
+            private set;
+        } = new();
+        public static Shop? Create(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Address = model.Address,
+                DateOpening = model.DateOpening,
+                ListSushi = new()
+            };
+        }
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ShopName = model.ShopName;
+            Address = model.Address;
+            DateOpening = model.DateOpening;
+            ListSushi = model.ListSushi;
+        }
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            ListSushi = ListSushi,
+            DateOpening = DateOpening,
+        };
+
+        public int MaxCountSushi => throw new NotImplementedException();
+    }
+}