Исправление имен

Исправление модели отображения заказа
Может быть так будет лучше
2023-03-10 16:44:26 +04:00 · 2023-03-01 20:14:15 +04:00 · 2023-02-28 12:38:33 +04:00 · 2023-02-27 23:42:56 +04:00 · 2023-02-27 22:36:23 +04:00 · 2023-02-27 22:24:18 +04:00
50 changed files with 1809 additions and 1424 deletions
--- a/SushiBar/SushiBar.sln
+++ b/SushiBar/SushiBar.sln
@@ -5,13 +5,17 @@ VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarView", "SushiBar\SushiBarView.csproj", "{021299FA-4932-4367-A9A7-378EB340D8BC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarDataModels", "SushiBarDataModels\SushiBarDataModels.csproj", "{8DD9F541-A4FA-4C0B-8E7D-8525C0D77E1C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarDataModels", "SushiBarDataModels\SushiBarDataModels.csproj", "{8DD9F541-A4FA-4C0B-8E7D-8525C0D77E1C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarContracts", "SushiBarContracts\SushiBarContracts.csproj", "{1B31E006-79D1-4376-AEEB-55AF60806AB1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarContracts", "SushiBarContracts\SushiBarContracts.csproj", "{1B31E006-79D1-4376-AEEB-55AF60806AB1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarBusinessLogic", "SushiBarBusinessLogic\SushiBarBusinessLogic.csproj", "{2755BF17-8728-4D7E-A4EE-BC8810C508F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarBusinessLogic", "SushiBarBusinessLogic\SushiBarBusinessLogic.csproj", "{2755BF17-8728-4D7E-A4EE-BC8810C508F6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarListImplement", "SushiBarListImplement\SushiBarListImplement.csproj", "{81A91405-3721-40EF-A47C-CEBD92C0A4D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarListImplement", "SushiBarListImplement\SushiBarListImplement.csproj", "{81A91405-3721-40EF-A47C-CEBD92C0A4D0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarFileImplement", "SushiBarFileImplement\SushiBarFileImplement.csproj", "{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarDatabaseImplement", "SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj", "{206B0A13-956D-4E9A-88CD-17F89158E0E7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +43,14 @@ Global
 		{81A91405-3721-40EF-A47C-CEBD92C0A4D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81A91405-3721-40EF-A47C-CEBD92C0A4D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81A91405-3721-40EF-A47C-CEBD92C0A4D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{206B0A13-956D-4E9A-88CD-17F89158E0E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{206B0A13-956D-4E9A-88CD-17F89158E0E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{206B0A13-956D-4E9A-88CD-17F89158E0E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{206B0A13-956D-4E9A-88CD-17F89158E0E7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/SushiBar/SushiBar/FormMain.Designer.cs
+++ b/SushiBar/SushiBar/FormMain.Designer.cs
@@ -32,14 +32,12 @@
            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.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.menuStrip.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
            this.SuspendLayout();
@@ -58,8 +56,7 @@
            // 
            this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.ингредиентыToolStripMenuItem,
-            this.сушиToolStripMenuItem,
-            this.shopsToolStripMenuItem});
+            this.сушиToolStripMenuItem});
            this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
            this.справочникиToolStripMenuItem.Text = "Справочники";
@@ -78,16 +75,9 @@
            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);
-            // 
            // buttonUpdate
            // 
-            this.buttonUpdate.Location = new System.Drawing.Point(781, 299);
+            this.buttonUpdate.Location = new System.Drawing.Point(780, 314);
            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);
@@ -98,7 +88,7 @@
            // 
            // buttonSetToFinish
            // 
-            this.buttonSetToFinish.Location = new System.Drawing.Point(781, 237);
+            this.buttonSetToFinish.Location = new System.Drawing.Point(780, 252);
            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);
@@ -109,7 +99,7 @@
            // 
            // buttonSetToDone
            // 
-            this.buttonSetToDone.Location = new System.Drawing.Point(781, 175);
+            this.buttonSetToDone.Location = new System.Drawing.Point(780, 190);
            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);
@@ -120,7 +110,7 @@
            // 
            // buttonSetToWork
            // 
-            this.buttonSetToWork.Location = new System.Drawing.Point(781, 113);
+            this.buttonSetToWork.Location = new System.Drawing.Point(780, 128);
            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);
@@ -131,7 +121,7 @@
            // 
            // buttonCreateOrder
            // 
-            this.buttonCreateOrder.Location = new System.Drawing.Point(781, 51);
+            this.buttonCreateOrder.Location = new System.Drawing.Point(780, 66);
            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);
@@ -152,23 +142,11 @@
            this.dataGridView.Size = new System.Drawing.Size(755, 426);
            this.dataGridView.TabIndex = 7;
            // 
-            // buttonAddSushiInShop
-            // 
-            this.buttonAddSushiInShop.Location = new System.Drawing.Point(781, 361);
-            this.buttonAddSushiInShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonAddSushiInShop.Name = "buttonAddSushiInShop";
-            this.buttonAddSushiInShop.Size = new System.Drawing.Size(170, 58);
-            this.buttonAddSushiInShop.TabIndex = 13;
-            this.buttonAddSushiInShop.Text = "Добавить суши в магазин";
-            this.buttonAddSushiInShop.UseVisualStyleBackColor = true;
-            this.buttonAddSushiInShop.Click += new System.EventHandler(this.ButtonAddSushiInShop_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.Controls.Add(this.buttonAddSushiInShop);
            this.Controls.Add(this.buttonUpdate);
            this.Controls.Add(this.buttonSetToFinish);
            this.Controls.Add(this.buttonSetToDone);
@@ -200,7 +178,5 @@
        private Button buttonSetToWork;
        private Button buttonCreateOrder;
        private DataGridView dataGridView;
-        private ToolStripMenuItem shopsToolStripMenuItem;
-        private Button buttonAddSushiInShop;
    }
 }
--- a/SushiBar/SushiBar/FormMain.cs
+++ b/SushiBar/SushiBar/FormMain.cs
@@ -143,22 +143,5 @@ namespace SushiBarView
        {
            LoadData();
        }
-        private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void ButtonAddSushiInShop_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShopSushi));
-            if (service is FormShopSushi form)
-            {
-                form.ShowDialog();
-            }
-        }
    }
 }
--- a/SushiBar/SushiBar/FormShop.Designer.cs
+++ b/SushiBar/SushiBar/FormShop.Designer.cs
@@ -1,188 +0,0 @@
-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.labelShop = new System.Windows.Forms.Label();
-            this.textBoxShop = new System.Windows.Forms.TextBox();
-            this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
-            this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnSushiName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).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(221, 23);
-            this.textBoxAddress.TabIndex = 14;
-            // 
-            // labelTime
-            // 
-            this.labelTime.AutoSize = true;
-            this.labelTime.Location = new System.Drawing.Point(386, 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;
-            // 
-            // 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(386, 27);
-            this.dateTimePicker.Name = "dateTimePicker";
-            this.dateTimePicker.Size = new System.Drawing.Size(207, 23);
-            this.dateTimePicker.TabIndex = 19;
-            // 
-            // 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";
-            // 
-            // 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.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();
-            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;
-    }
-}
--- a/SushiBar/SushiBar/FormShop.cs
+++ b/SushiBar/SushiBar/FormShop.cs
@@ -1,120 +0,0 @@
-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();
-                        _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
-                };
-                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();
-        }
-    }
-}
--- a/SushiBar/SushiBar/FormShop.resx
+++ b/SushiBar/SushiBar/FormShop.resx
@@ -1,69 +0,0 @@
-<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>
--- a/SushiBar/SushiBar/FormShopSushi.Designer.cs
+++ b/SushiBar/SushiBar/FormShopSushi.Designer.cs
@@ -1,151 +0,0 @@
-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;
-    }
-}
--- a/SushiBar/SushiBar/FormShopSushi.cs
+++ b/SushiBar/SushiBar/FormShopSushi.cs
@@ -1,90 +0,0 @@
-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();
-        }
-    }
-}
--- a/SushiBar/SushiBar/FormShopSushi.resx
+++ b/SushiBar/SushiBar/FormShopSushi.resx
@@ -1,60 +0,0 @@
-<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>
--- a/SushiBar/SushiBar/FormShops.Designer.cs
+++ b/SushiBar/SushiBar/FormShops.Designer.cs
@@ -1,122 +0,0 @@
-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;
-    }
-}
--- a/SushiBar/SushiBar/FormShops.cs
+++ b/SushiBar/SushiBar/FormShops.cs
@@ -1,102 +0,0 @@
-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();
-        }
-    }
-}
--- a/SushiBar/SushiBar/FormShops.resx
+++ b/SushiBar/SushiBar/FormShops.resx
@@ -1,60 +0,0 @@
-<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>
--- a/SushiBar/SushiBar/Program.cs
+++ b/SushiBar/SushiBar/Program.cs
@@ -4,8 +4,7 @@ using NLog.Extensions.Logging;
 using SushiBarBusinessLogic.BusinessLogics;
 using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.StoragesContracts;
-using SushiBarListImplement.Implements;
-using SushiBusinessLogic;
+using SushiBarDatabaseImplement.Implements;

 namespace SushiBarView
 {
@@ -40,11 +39,9 @@ namespace SushiBarView
            services.AddTransient<IIngredientStorage, IngredientStorage>();
            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<IShopLogic, ShopLogic>();
            services.AddTransient<FormMain>();
            services.AddTransient<FormIngredient>();
            services.AddTransient<FormIngredients>();
@@ -52,9 +49,6 @@ namespace SushiBarView
            services.AddTransient<FormSushi>();
            services.AddTransient<FormSushiIngredients>();
            services.AddTransient<FormListSushi>();
-            services.AddTransient<FormShopSushi>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormShop>();
        }

    }
--- a/SushiBar/SushiBar/SushiBarView.csproj
+++ b/SushiBar/SushiBar/SushiBarView.csproj
@@ -9,6 +9,14 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
@@ -17,6 +25,8 @@
  <ItemGroup>
    <ProjectReference Include="..\SushiBarBusinessLogic\SushiBarBusinessLogic.csproj" />
    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj" />
+    <ProjectReference Include="..\SushiBarFileImplement\SushiBarFileImplement.csproj" />
    <ProjectReference Include="..\SushiBarListImplement\SushiBarListImplement.csproj" />
  </ItemGroup>

--- a/SushiBar/SushiBarBusinessLogic/BusinessLogics/ShopLogic.cs
+++ b/SushiBar/SushiBarBusinessLogic/BusinessLogics/ShopLogic.cs
@@ -1,152 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
-
-namespace SushiBusinessLogic
-{
-    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));
-            }
-            _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;
-            }
-            _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,
-                ListSushi = element.ListSushi
-            });
-            return true;
-        }
-    }
-}
--- a/SushiBar/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj
+++ b/SushiBar/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj
@@ -7,6 +7,10 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
--- a/SushiBar/SushiBarContracts/BindingModels/ShopBindingModel.cs
+++ b/SushiBar/SushiBarContracts/BindingModels/ShopBindingModel.cs
@@ -1,20 +0,0 @@
-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();
-    }
-}
--- a/SushiBar/SushiBarContracts/BusinessLogicsContracts/IShopLogic.cs
+++ b/SushiBar/SushiBarContracts/BusinessLogicsContracts/IShopLogic.cs
@@ -1,17 +0,0 @@
-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);
-    }
-}
--- a/SushiBar/SushiBarContracts/SearchModels/ShopSearchModel.cs
+++ b/SushiBar/SushiBarContracts/SearchModels/ShopSearchModel.cs
@@ -1,8 +0,0 @@
-namespace SushiBarContracts.SearchModels
-{
-    public class ShopSearchModel
-    {
-        public int? Id { get; set; }
-        public string? ShopName { get; set; }
-    }
-}
--- a/SushiBar/SushiBarContracts/StoragesContracts/IShopStorage.cs
+++ b/SushiBar/SushiBarContracts/StoragesContracts/IShopStorage.cs
@@ -1,16 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
-
-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);
-    }
-}
--- a/SushiBar/SushiBarContracts/SushiBarContracts.csproj
+++ b/SushiBar/SushiBarContracts/SushiBarContracts.csproj
@@ -7,6 +7,10 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
--- a/SushiBar/SushiBarContracts/ViewModels/ShopViewModel.cs
+++ b/SushiBar/SushiBarContracts/ViewModels/ShopViewModel.cs
@@ -1,24 +0,0 @@
-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;
-
-        public Dictionary<int, (ISushiModel, int)> ListSushi
-        {
-            get;
-            set;
-        } = new();
-    }
-}
--- a/SushiBar/SushiBarDataModels/Models/IShopModel.cs
+++ b/SushiBar/SushiBarDataModels/Models/IShopModel.cs
@@ -1,10 +0,0 @@
-namespace SushiBarDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        string ShopName { get; }
-        string Address { get; }
-        DateTime DateOpening { get; }
-        Dictionary<int, (ISushiModel, int)> ListSushi { get; }
-    }
-}
--- a/SushiBar/SushiBarDataModels/SushiBarDataModels.csproj
+++ b/SushiBar/SushiBarDataModels/SushiBarDataModels.csproj
@@ -7,6 +7,10 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
--- a/SushiBar/SushiBarDatabaseImplement/Implements/IngredientStorage.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Implements/IngredientStorage.cs
@@ -0,0 +1,83 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+    public class IngredientStorage : IIngredientStorage
+    {
+        public List<IngredientViewModel> GetFullList()
+        {
+            using var context = new SushiBarDatabase();
+            return context.Ingredients
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+
+        public List<IngredientViewModel> GetFilteredList(IngredientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.IngredientName))
+            {
+                return new();
+            }
+            using var context = new SushiBarDatabase();
+            return context.Ingredients
+                    .Where(x => x.IngredientName.Contains(model.IngredientName))
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+
+        public IngredientViewModel? GetElement(IngredientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.IngredientName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            return context.Ingredients
+                    .FirstOrDefault(x => (!string.IsNullOrEmpty(model.IngredientName) && x.IngredientName == model.IngredientName) ||
+                        (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+
+        public IngredientViewModel? Insert(IngredientBindingModel model)
+        {
+            var newIngredient = Ingredient.Create(model);
+            if (newIngredient == null)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            context.Ingredients.Add(newIngredient);
+            context.SaveChanges();
+            return newIngredient.GetViewModel;
+        }
+
+        public IngredientViewModel? Update(IngredientBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var ingredient = context.Ingredients.FirstOrDefault(x => x.Id == model.Id);
+            if (ingredient == null)
+            {
+                return null;
+            }
+            ingredient.Update(model);
+            context.SaveChanges();
+            return ingredient.GetViewModel;
+        }
+
+        public IngredientViewModel? Delete(IngredientBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var element = context.Ingredients.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Ingredients.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs
@@ -0,0 +1,93 @@
+using Microsoft.EntityFrameworkCore;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+    public class OrderStorage : IOrderStorage
+    {
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var element = context.Orders
+                .Include(x => x.Sushi)
+                .FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Orders.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            return context.Orders
+                .Include(x => x.Sushi)
+                .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
+                ?.GetViewModel;
+        }
+
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return new();
+            }
+            using var context = new SushiBarDatabase();
+            return context.Orders
+                .Include(x => x.Sushi)
+                .Where(x => x.Id == model.Id)
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+        public List<OrderViewModel> GetFullList()
+        {
+            using var context = new SushiBarDatabase();
+            return context.Orders
+                .Include(x => x.Sushi)
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+
+        public OrderViewModel? Insert(OrderBindingModel model)
+        {
+            var newOrder = Order.Create(model);
+            if (newOrder == null)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            context.Orders.Add(newOrder);
+            context.SaveChanges();
+            return context.Orders
+                          .Include(x => x.Sushi)
+                          .FirstOrDefault(x => x.Id == newOrder.Id)
+                          ?.GetViewModel;
+        }
+
+        public OrderViewModel? Update(OrderBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var order = context.Orders
+                .Include(x => x.Sushi)
+                .FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            order.Update(model);
+            context.SaveChanges();
+            return order.GetViewModel;
+        }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Implements/SushiStorage.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Implements/SushiStorage.cs
@@ -0,0 +1,107 @@
+using Microsoft.EntityFrameworkCore;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+    public class SushiStorage : ISushiStorage
+    {
+        public List<SushiViewModel> GetFullList()
+        {
+            using var context = new SushiBarDatabase();
+            return context.ListSushi
+                    .Include(x => x.Ingredients)
+                    .ThenInclude(x => x.Ingredient)
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+
+        public List<SushiViewModel> GetFilteredList(SushiSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.SushiName))
+            {
+                return new();
+            }
+            using var context = new SushiBarDatabase();
+            return context.ListSushi
+                    .Include(x => x.Ingredients)
+                    .ThenInclude(x => x.Ingredient)
+                    .Where(x => x.SushiName.Contains(model.SushiName))
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+
+        public SushiViewModel? GetElement(SushiSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.SushiName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            return context.ListSushi
+                .Include(x => x.Ingredients)
+                .ThenInclude(x => x.Ingredient)
+                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.SushiName) && x.SushiName == model.SushiName) ||
+                                (model.Id.HasValue && x.Id == model.Id))
+                ?.GetViewModel;
+        }
+
+        public SushiViewModel? Insert(SushiBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var newSushi = Sushi.Create(context, model);
+            if (newSushi == null)
+            {
+                return null;
+            }
+            context.ListSushi.Add(newSushi);
+            context.SaveChanges();
+            return newSushi.GetViewModel;
+        }
+
+        public SushiViewModel? Update(SushiBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            using var transaction = context.Database.BeginTransaction();
+            try
+            {
+                var sushi = context.ListSushi.FirstOrDefault(rec => rec.Id == model.Id);
+                if (sushi == null)
+                {
+                    return null;
+                }
+                sushi.Update(model);
+                context.SaveChanges();
+                sushi.UpdateIngredients(context, model);
+                transaction.Commit();
+                return sushi.GetViewModel;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+
+        public SushiViewModel? Delete(SushiBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var element = context.ListSushi
+                .Include(x => x.Ingredients)
+                .Include(x => x.Orders)
+                .FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.ListSushi.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/20230227162916_InitMigration.Designer.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Migrations/20230227162916_InitMigration.Designer.cs
@@ -0,0 +1,156 @@
+// <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("20230227162916_InitMigration")]
+    partial class InitMigration
+    {
+        /// <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.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.Property<string>("SushiName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("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.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.Sushi", b =>
+                {
+                    b.Navigation("Ingredients");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/20230227162916_InitMigration.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Migrations/20230227162916_InitMigration.cs
@@ -0,0 +1,114 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitMigration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Ingredients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    IngredientName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Cost = table.Column<double>(type: "float", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Ingredients", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Orders",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SushiId = table.Column<int>(type: "int", nullable: false),
+                    Count = table.Column<int>(type: "int", nullable: false),
+                    Sum = table.Column<double>(type: "float", nullable: false),
+                    Status = table.Column<int>(type: "int", nullable: false),
+                    DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Orders", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ListSushi",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SushiName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Price = table.Column<double>(type: "float", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ListSushi", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "SushiIngredients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SushiId = table.Column<int>(type: "int", nullable: false),
+                    IngredientId = table.Column<int>(type: "int", nullable: false),
+                    Count = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SushiIngredients", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_SushiIngredients_Ingredients_IngredientId",
+                        column: x => x.IngredientId,
+                        principalTable: "Ingredients",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_SushiIngredients_ListSushi_SushiId",
+                        column: x => x.SushiId,
+                        principalTable: "ListSushi",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SushiIngredients_IngredientId",
+                table: "SushiIngredients",
+                column: "IngredientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SushiIngredients_SushiId",
+                table: "SushiIngredients",
+                column: "SushiId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "SushiIngredients");
+
+            migrationBuilder.DropTable(
+                name: "Ingredients");
+
+            migrationBuilder.DropTable(
+                name: "ListSushi");
+        }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/20230227181342_SecondMigration.Designer.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Migrations/20230227181342_SecondMigration.Designer.cs
@@ -0,0 +1,171 @@
+// <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("20230227181342_SecondMigration")]
+    partial class SecondMigration
+    {
+        /// <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.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.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.Sushi", b =>
+                {
+                    b.Navigation("Ingredients");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/20230227181342_SecondMigration.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Migrations/20230227181342_SecondMigration.cs
@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class SecondMigration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_SushiId",
+                table: "Orders",
+                column: "SushiId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Orders_ListSushi_SushiId",
+                table: "Orders",
+                column: "SushiId",
+                principalTable: "ListSushi",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Orders_ListSushi_SushiId",
+                table: "Orders");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Orders_SushiId",
+                table: "Orders");
+        }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs
@@ -0,0 +1,164 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    [DbContext(typeof(SushiBarDatabase))]
+    partial class SushiBarDatabaseModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.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.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.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.Sushi", b =>
+                {
+                    b.Navigation("Ingredients");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Models/Ingredient.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Models/Ingredient.cs
@@ -0,0 +1,63 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class Ingredient : IIngredientModel
+    {
+        public int Id { get; private set; }
+
+        [Required]
+        public string IngredientName { get; private set; } = string.Empty;
+
+        [Required]
+        public double Cost { get; set; }
+
+        [ForeignKey("IngredientId")]
+        public virtual List<SushiIngredient> SushiIngredients { get; set; } = new();
+
+        public static Ingredient? Create(IngredientBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Ingredient()
+            {
+                Id = model.Id,
+                IngredientName = model.IngredientName,
+                Cost = model.Cost
+            };
+        }
+
+        public static Ingredient Create(IngredientViewModel model)
+        {
+            return new Ingredient
+            {
+                Id = model.Id,
+                IngredientName = model.IngredientName,
+                Cost = model.Cost
+            };
+        }
+
+        public void Update(IngredientBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            IngredientName = model.IngredientName;
+            Cost = model.Cost;
+        }
+
+        public IngredientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            IngredientName = IngredientName,
+            Cost = Cost
+        };
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Models/Order.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Models/Order.cs
@@ -0,0 +1,64 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Enums;
+using SushiBarDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class Order : IOrderModel
+    {
+        [Required]
+        public int SushiId { get; set; }
+        [Required]
+        public int Count { get; set; }
+        [Required]
+        public double Sum { get; set; }
+        [Required]
+        public OrderStatus Status { get; set; }
+        [Required]
+        public DateTime DateCreate { get; set; }
+        public DateTime? DateImplement { get; set; }
+        public int Id { get; set; }
+        public Sushi Sushi { get; set; }
+        public static Order? Create(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = model.Id,
+                SushiId = model.SushiId,
+                Count = model.Count,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+            };
+        }
+
+        public void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Status = model.Status;
+            DateImplement = model.DateImplement;
+        }
+
+        public OrderViewModel GetViewModel => new()
+        {
+            SushiId = SushiId,
+            Count = Count,
+            Sum = Sum,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+            Id = Id,
+            Status = Status,
+            SushiName = Sushi.SushiName,
+        };
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs
@@ -0,0 +1,98 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class Sushi : ISushiModel
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string SushiName { get; set; } = string.Empty;
+
+        [Required]
+        public double Price { get; set; }
+
+        private Dictionary<int, (IIngredientModel, int)>? _sushiIngredients = null;
+
+        [NotMapped]
+        public Dictionary<int, (IIngredientModel, int)> SushiIngredients
+        {
+            get
+            {
+                if (_sushiIngredients == null)
+                {
+                    _sushiIngredients = Ingredients
+                            .ToDictionary(recPC => recPC.IngredientId, recPC => (recPC.Ingredient as IIngredientModel, recPC.Count));
+                }
+                return _sushiIngredients;
+            }
+        }
+
+        [ForeignKey("SushiId")]
+        public virtual List<SushiIngredient> Ingredients { get; set; } = new();
+        [ForeignKey("SushiId")]
+        public virtual List<Order> Orders { get; set; } = new();
+
+        public static Sushi Create(SushiBarDatabase context, SushiBindingModel model)
+        {
+            return new Sushi()
+            {
+                Id = model.Id,
+                SushiName = model.SushiName,
+                Price = model.Price,
+                Ingredients = model.SushiIngredients.Select(x => new SushiIngredient
+                {
+                    Ingredient = context.Ingredients.First(y => y.Id == x.Key),
+                    Count = x.Value.Item2
+                }).ToList()
+            };
+        }
+
+        public void Update(SushiBindingModel model)
+        {
+            SushiName = model.SushiName;
+            Price = model.Price;
+        }
+
+        public SushiViewModel GetViewModel => new()
+        {
+            Id = Id,
+            SushiName = SushiName,
+            Price = Price,
+            SushiIngredients = SushiIngredients
+        };
+
+        public void UpdateIngredients(SushiBarDatabase context, SushiBindingModel model)
+        {
+            var sushiIngredients = context.SushiIngredients.Where(rec => rec.SushiId == model.Id).ToList();
+            if (sushiIngredients != null && sushiIngredients.Count > 0)
+            {   // удалили те, которых нет в модели
+                context.SushiIngredients.RemoveRange(sushiIngredients.Where(rec => !model.SushiIngredients.ContainsKey(rec.IngredientId)));
+                context.SaveChanges();
+                // обновили количество у существующих записей
+                foreach (var updateIngredient in sushiIngredients)
+                {
+                    updateIngredient.Count = model.SushiIngredients[updateIngredient.IngredientId].Item2;
+                    model.SushiIngredients.Remove(updateIngredient.IngredientId);
+                }
+                context.SaveChanges();
+            }
+            var sushi = context.ListSushi.First(x => x.Id == Id);
+            foreach (var si in model.SushiIngredients)
+            {
+                context.SushiIngredients.Add(new SushiIngredient
+                {
+                    Sushi = sushi,
+                    Ingredient = context.Ingredients.First(x => x.Id == si.Key),
+                    Count = si.Value.Item2
+                });
+                context.SaveChanges();
+            }
+            _sushiIngredients = null;
+        }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/Models/SushiIngredient.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Models/SushiIngredient.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class SushiIngredient
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public int SushiId { get; set; }
+
+        [Required]
+        public int IngredientId { get; set; }
+
+        [Required]
+        public int Count { get; set; }
+
+        public virtual Ingredient Ingredient { get; set; } = new();
+
+        public virtual Sushi Sushi { get; set; } = new();
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
+++ b/SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore;
+using SushiBarDatabaseImplement.Models;
+
+namespace SushiBarDatabaseImplement
+{
+    public class SushiBarDatabase : DbContext
+    {
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            if (optionsBuilder.IsConfigured == false)
+            {
+                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-D8KMQQU\SQLEXPRESS;Initial Catalog=SushiBarDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+            }
+            base.OnConfiguring(optionsBuilder);
+        }
+
+        public virtual DbSet<Ingredient> Ingredients { set; get; }
+
+        public virtual DbSet<Sushi> ListSushi { set; get; }
+
+        public virtual DbSet<SushiIngredient> SushiIngredients { set; get; }
+
+        public virtual DbSet<Order> Orders { set; get; }
+    }
+}
--- a/SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj
+++ b/SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/SushiBar/SushiBarFileImplement/DataFileSingleton.cs
+++ b/SushiBar/SushiBarFileImplement/DataFileSingleton.cs
@@ -0,0 +1,53 @@
+using SushiBarFileImplement.Models;
+using System.Xml.Linq;
+
+namespace SushiBarFileImplement
+{
+    public class DataFileSingleton
+    {
+        private static DataFileSingleton? instance;
+        private readonly string IngredientFileName = "Ingredient.xml";
+        private readonly string OrderFileName = "Order.xml";
+        private readonly string SushiFileName = "Sushi.xml";
+        public List<Ingredient> Ingredients { get; private set; }
+        public List<Order> Orders { get; private set; }
+        public List<Sushi> ListSushi { get; private set; }
+        public static DataFileSingleton GetInstance()
+        {
+            if (instance == null)
+            {
+                instance = new DataFileSingleton();
+            }
+            return instance;
+        }
+        public void SaveIngredients() => SaveData(Ingredients, IngredientFileName,
+            "Ingredients", x => x.GetXElement);
+        public void SaveListSushi() => SaveData(ListSushi, SushiFileName,
+            "ListSushi", x => x.GetXElement);
+        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", 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)!)!;
+        }
+        private static List<T>? LoadData<T>(string filename, string xmlNodeName,
+            Func<XElement, T> selectFunction)
+        {
+            if (File.Exists(filename))
+            {
+                return
+                    XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
+            }
+            return new List<T>();
+        }
+        private static void SaveData<T>(List<T> data, string filename, string 
+            xmlNodeName, Func<T, XElement> selectFunction)
+        {
+            if (data != null)
+            {
+                new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
+            }
+        }
+    }
+}
--- a/SushiBar/SushiBarFileImplement/Implements/IngredientStorage.cs
+++ b/SushiBar/SushiBarFileImplement/Implements/IngredientStorage.cs
@@ -0,0 +1,74 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarFileImplement.Models;
+
+namespace SushiBarFileImplement.Implements
+{
+    public class IngredientStorage : IIngredientStorage
+    {
+        private readonly DataFileSingleton source;
+        public IngredientStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<IngredientViewModel> GetFullList()
+        {
+            return source.Ingredients.Select(x => x.GetViewModel).ToList();
+        }
+        public List<IngredientViewModel> GetFilteredList(IngredientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.IngredientName))
+            {
+                return new();
+            }
+            return source.Ingredients.Where(x => 
+                x.IngredientName.Contains(model.IngredientName)).Select(x => x.GetViewModel).ToList();
+        }
+        public IngredientViewModel? GetElement(IngredientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.IngredientName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Ingredients.FirstOrDefault(x =>
+                (!string.IsNullOrEmpty(model.IngredientName) && x.IngredientName == 
+                model.IngredientName) || (model.Id.HasValue && x.Id == model.Id)) ?.GetViewModel;
+        }
+        public IngredientViewModel? Insert(IngredientBindingModel model)
+        {
+            model.Id = source.Ingredients.Count > 0 ? source.Ingredients.Max(x => x.Id) + 1 : 1;
+            var newIngredient = Ingredient.Create(model);
+            if (newIngredient == null)
+            {
+                return null;
+            }
+            source.Ingredients.Add(newIngredient);
+            source.SaveIngredients();
+            return newIngredient.GetViewModel;
+        }
+        public IngredientViewModel? Update(IngredientBindingModel model)
+        {
+            var ingredient = source.Ingredients.FirstOrDefault(x => x.Id == model.Id);
+            if (ingredient == null)
+            {
+                return null;
+            }
+            ingredient.Update(model);
+            source.SaveIngredients();
+            return ingredient.GetViewModel;
+        }
+        public IngredientViewModel? Delete(IngredientBindingModel model)
+        {
+            var element = source.Ingredients.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                source.Ingredients.Remove(element);
+                source.SaveIngredients();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}
--- a/SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs
+++ b/SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,91 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarFileImplement.Models;
+
+namespace SushiBarFileImplement.Implements
+{
+    public class OrderStorage : IOrderStorage
+    {
+        private readonly DataFileSingleton source;
+        public OrderStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+
+        public List<OrderViewModel> GetFullList()
+        {
+            return source.Orders.Select(x => GetViewModel(x)).ToList();
+        }
+
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return new();
+            }
+            return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList();
+        }
+
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+
+            return source.Orders.FirstOrDefault(x => 
+                (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        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;
+                }
+            }
+            return viewModel;
+        }
+        public OrderViewModel? Insert(OrderBindingModel model)
+        {
+            model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
+            var newOrder = Order.Create(model);
+            if (newOrder == null)
+            {
+                return null;
+            }
+            source.Orders.Add(newOrder);
+            source.SaveOrders();
+            return GetViewModel(newOrder);
+        }
+
+        public OrderViewModel? Update(OrderBindingModel model)
+        {
+            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            order.Update(model);
+            source.SaveOrders();
+            return GetViewModel(order);
+        }
+
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
+            var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                source.Orders.Remove(element);
+                source.SaveOrders();
+                return GetViewModel(element);
+            }
+            return null;
+        }
+    }
+}
--- a/SushiBar/SushiBarFileImplement/Implements/SushiStorage.cs
+++ b/SushiBar/SushiBarFileImplement/Implements/SushiStorage.cs
@@ -0,0 +1,74 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarFileImplement.Models;
+
+namespace SushiBarFileImplement.Implements
+{
+    public class SushiStorage : ISushiStorage
+    {
+        private readonly DataFileSingleton source;
+        public SushiStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<SushiViewModel> GetFullList()
+        {
+            return source.ListSushi.Select(x => x.GetViewModel).ToList();
+        }
+        public List<SushiViewModel> GetFilteredList(SushiSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.SushiName))
+            {
+                return new();
+            }
+            return source.ListSushi.Where(x =>
+                x.SushiName.Contains(model.SushiName)).Select(x => x.GetViewModel).ToList();
+        }
+        public SushiViewModel? GetElement(SushiSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.SushiName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.ListSushi.FirstOrDefault(x =>
+                (!string.IsNullOrEmpty(model.SushiName) && x.SushiName ==
+                model.SushiName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        public SushiViewModel? Insert(SushiBindingModel model)
+        {
+            model.Id = source.ListSushi.Count > 0 ? source.ListSushi.Max(x => x.Id) + 1 : 1;
+            var newSushi = Sushi.Create(model);
+            if (newSushi == null)
+            {
+                return null;
+            }
+            source.ListSushi.Add(newSushi);
+            source.SaveListSushi();
+            return newSushi.GetViewModel;
+        }
+        public SushiViewModel? Update(SushiBindingModel model)
+        {
+            var sushi = source.ListSushi.FirstOrDefault(x => x.Id == model.Id);
+            if (sushi == null)
+            {
+                return null;
+            }
+            sushi.Update(model);
+            source.SaveListSushi();
+            return sushi.GetViewModel;
+        }
+        public SushiViewModel? Delete(SushiBindingModel model)
+        {
+            var element = source.ListSushi.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                source.ListSushi.Remove(element);
+                source.SaveListSushi();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}
--- a/SushiBar/SushiBarFileImplement/Models/Ingredient.cs
+++ b/SushiBar/SushiBarFileImplement/Models/Ingredient.cs
@@ -0,0 +1,59 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System.Xml.Linq;
+
+namespace SushiBarFileImplement.Models
+{
+    public class Ingredient : IIngredientModel
+    {
+        public int Id { get; private set; }
+        public string IngredientName { get; private set; } = string.Empty;
+        public double Cost { get; set; }
+        public static Ingredient? Create(IngredientBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Ingredient()
+            {
+                Id = model.Id,
+                IngredientName = model.IngredientName,
+                Cost = model.Cost
+            };
+        }
+        public static Ingredient? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Ingredient()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                IngredientName = element.Element("IngredientName")!.Value,
+                Cost = Convert.ToDouble(element.Element("Cost")!.Value)
+            };
+        }
+        public void Update(IngredientBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            IngredientName = model.IngredientName;
+            Cost = model.Cost;
+        }
+        public IngredientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            IngredientName = IngredientName,
+            Cost = Cost
+        };
+        public XElement GetXElement => new("Ingredient",
+        new XAttribute("Id", Id),
+        new XElement("IngredientName", IngredientName),
+        new XElement("Cost", Cost.ToString()));
+    }
+}
--- a/SushiBar/SushiBarFileImplement/Models/Order.cs
+++ b/SushiBar/SushiBarFileImplement/Models/Order.cs
@@ -0,0 +1,84 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Enums;
+using SushiBarDataModels.Models;
+using System.Xml.Linq;
+
+namespace SushiBarFileImplement.Models
+{
+    public class Order : IOrderModel
+    {
+        public int Id { get; private set; }
+        public int SushiId { get; private set; }
+        public int Count { get; private set; }
+        public double Sum { get; private set; }
+        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
+        public DateTime? DateImplement { get; private set; }
+        public static Order? Create(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = model.Id,
+                SushiId = model.SushiId,
+                Count = model.Count,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+            };
+        }
+
+        public static Order? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                SushiId = Convert.ToInt32(element.Element("SushiId")!.Value),
+                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+                Count = Convert.ToInt32(element.Element("Count")!.Value),
+                Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
+                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+                DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value)
+            };
+        }
+
+        public void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Status = model.Status;
+            DateImplement = model.DateImplement;
+        }
+
+        public OrderViewModel GetViewModel => new()
+        {
+            SushiId = SushiId,
+            Count = Count,
+            Sum = Sum,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+            Id = Id,
+            Status = Status,
+        };
+
+        public XElement GetXElement => new("Order",
+          new XAttribute("Id", Id),
+          new XElement("SushiId", SushiId),
+          new XElement("Count", Count.ToString()),
+          new XElement("Sum", Sum.ToString()),
+          new XElement("Status", Status.ToString()),
+          new XElement("DateCreate", DateCreate.ToString()),
+          new XElement("DateImplement", DateImplement.ToString()));
+    }
+}
--- a/SushiBar/SushiBarFileImplement/Models/Sushi.cs
+++ b/SushiBar/SushiBarFileImplement/Models/Sushi.cs
@@ -0,0 +1,82 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System.Xml.Linq;
+
+namespace SushiBarFileImplement.Models
+{
+    public class Sushi : ISushiModel
+    {
+        public int Id { get; private set; }
+        public string SushiName { get; private set; } = string.Empty;
+        public double Price { get; private set; }
+        public Dictionary<int, int> Ingredients { get; private set; } = new();
+        private Dictionary<int, (IIngredientModel, int)>? _sushiIngredients = null;
+        public Dictionary<int, (IIngredientModel, int)> SushiIngredients
+        {
+            get
+            {
+                if (_sushiIngredients == null)
+                {
+                    var source = DataFileSingleton.GetInstance();
+                    _sushiIngredients = Ingredients.ToDictionary(x => x.Key, y => ((source.Ingredients.FirstOrDefault(z => z.Id == y.Key) as IIngredientModel)!, y.Value));
+                }
+                return _sushiIngredients;
+            }
+        }
+        public static Sushi? Create(SushiBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Sushi()
+            {
+                Id = model.Id,
+                SushiName = model.SushiName,
+                Price = model.Price,
+                Ingredients = model.SushiIngredients.ToDictionary(x => x.Key, x => x.Value.Item2)
+            };
+        }
+        public static Sushi? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Sushi()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                SushiName = element.Element("SushiName")!.Value,
+                Price = Convert.ToDouble(element.Element("Price")!.Value),
+                Ingredients = element.Element("SushiIngredients")!.Elements("SushiIngredient").ToDictionary(x => 
+                    Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
+            };
+        }
+        public void Update(SushiBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            SushiName = model.SushiName;
+            Price = model.Price;
+            Ingredients = model.SushiIngredients.ToDictionary(x => x.Key, x => 
+                x.Value.Item2);
+            _sushiIngredients = null;
+        }
+        public SushiViewModel GetViewModel => new()
+        {
+            Id = Id,
+            SushiName = SushiName,
+            Price = Price,
+            SushiIngredients = SushiIngredients
+        };
+        public XElement GetXElement => new("Sushi",
+        new XAttribute("Id", Id),
+        new XElement("SushiName", SushiName),
+        new XElement("Price", Price.ToString()),
+        new XElement("SushiIngredients", Ingredients.Select(x => new XElement("SushiIngredient",
+            new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()));
+    }
+}
--- a/SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj
+++ b/SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/SushiBar/SushiBarListImplement/DataListSingleton.cs
+++ b/SushiBar/SushiBarListImplement/DataListSingleton.cs
@@ -8,13 +8,11 @@ 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()
        {
--- a/SushiBar/SushiBarListImplement/Implements/ShopStorage.cs
+++ b/SushiBar/SushiBarListImplement/Implements/ShopStorage.cs
@@ -1,102 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-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;
-        }
-    }
-}
--- a/SushiBar/SushiBarListImplement/Models/Shop.cs
+++ b/SushiBar/SushiBarListImplement/Models/Shop.cs
@@ -1,53 +0,0 @@
-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,
-        };
-    }
-}
--- a/SushiBar/SushiBarListImplement/SushiBarListImplement.csproj
+++ b/SushiBar/SushiBarListImplement/SushiBarListImplement.csproj
@@ -7,6 +7,10 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
Author	SHA1	Message	Date
dasha	eaafd9b703	Исправление имен	2023-03-10 16:44:26 +04:00
dasha	e962963589	Исправление модели отображения заказа	2023-03-01 20:14:15 +04:00
dasha	1a41ad5ce3	Может быть так будет лучше	2023-02-28 12:38:33 +04:00
dasha	9450ae2f6f	ЛР3	2023-02-27 23:42:56 +04:00
dasha	3f49eade0f	ЛР3	2023-02-27 22:36:23 +04:00
dasha	46b8e09d6a	ЛР3	2023-02-27 22:24:18 +04:00
dasha	c1f92ed0c6	ЛР3	2023-02-27 22:16:28 +04:00
dasha	8841a10725	Merge branch 'LabWork01' into LabWork02	2023-02-14 12:32:37 +04:00
dasha	777cc9f4ad	Merge branch 'LabWork01' into LabWork02	2023-02-14 11:47:10 +04:00
dasha	863deea987	Удаление лишнего using	2023-02-14 11:36:38 +04:00
dasha	e378dbb4e9	ЛР2	2023-02-12 16:27:41 +04:00
dasha	5b9722bae2	Слияние	2023-02-12 16:26:50 +04:00
dasha	b91edc375c	Исправление заказа	2023-02-12 16:00:47 +04:00
dasha	a8888dd285	ЛР2	2023-02-12 15:29:29 +04:00
dasha	58f59670cd	Merge branch 'LabWork01' into LabWork02	2023-02-12 15:00:42 +04:00
dasha	8a1e2acacb	Временный вариант	2023-02-12 14:57:32 +04:00