готово

This reverts commit 5a9a99b1b6.

FishFactory/FishFactory.csproj

@@ -16,6 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\FishFactoryBusinessLogic\FishFactoryBusinessLogic.csproj" />
     <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
+    <ProjectReference Include="..\FishFactoryFileImplement\FishFactoryFileImplement.csproj" />
     <ProjectReference Include="..\FishFactoryListImplement\FishFactoryListImplement.csproj" />
   </ItemGroup>
 

FishFactory/FishFactory.sln

@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryDataModel", "..\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryListImplement", "..\FishFactoryListImplement\FishFactoryListImplement.csproj", "{A507DACE-7D8D-4C0F-AB5D-764FE1A61EDC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryFileImplement", "..\FishFactoryFileImplement\FishFactoryFileImplement.csproj", "{4EB943AB-67A8-4386-8874-FA0E3E98159C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +63,14 @@ Global
 		{A507DACE-7D8D-4C0F-AB5D-764FE1A61EDC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A507DACE-7D8D-4C0F-AB5D-764FE1A61EDC}.Release|x86.ActiveCfg = Release|x86
 		{A507DACE-7D8D-4C0F-AB5D-764FE1A61EDC}.Release|x86.Build.0 = Release|x86
+		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Debug|x86.Build.0 = Debug|Any CPU
+		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|x86.ActiveCfg = Release|Any CPU
+		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

FishFactory/FormCanned.Designer.cs

@@ -239,10 +239,10 @@
         private TextBox textBoxName;
         private TextBox textBoxPrice;
         private GroupBox groupBox1;
+        private Button buttonSave;
+        private Button buttonCancel;
         private DataGridViewTextBoxColumn Number;
         private DataGridViewTextBoxColumn Component;
         private DataGridViewTextBoxColumn Count;
-        private Button buttonSave;
-        private Button buttonCancel;
     }
 }

FishFactory/FormCanneds.Designer.cs

@@ -89,7 +89,6 @@
             dataGridView.ReadOnly = true;
             dataGridView.RowHeadersWidth = 51;
             dataGridView.RowTemplate.Height = 24;
-            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
             dataGridView.Size = new Size(709, 568);
             dataGridView.TabIndex = 5;
             // 

FishFactory/FormCanneds.cs

@@ -1,4 +1,14 @@
-using FishFactoryContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using FishFactory;
+using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
 

FishFactory/FormComponent.cs

@@ -1,5 +1,15 @@
-using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Microsoft.Extensions.Logging;
 using FishFactoryContracts.BusinessLogicsContracts;
+using Microsoft.VisualBasic.Logging;
 using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.BindingModels;
 

FishFactory/FormComponents.cs

@@ -1,6 +1,15 @@
 using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace FishFactory.Forms
 {

FishFactory/FormMain.Designer.cs

@@ -33,14 +33,12 @@
             toolStripDropDownButton1 = new ToolStripDropDownButton();
             компонентыToolStripMenuItem = new ToolStripMenuItem();
             консервыToolStripMenuItem = new ToolStripMenuItem();
-            магазиныToolStripMenuItem = new ToolStripMenuItem();
             buttonCreateOrder = new Button();
             buttonTakeOrderInWork = new Button();
             buttonOrderReady = new Button();
             buttonIssuedOrder = new Button();
             buttonRef = new Button();
             dataGridView = new DataGridView();
-            toolStripLabelReplenish2 = new ToolStripLabel();
             toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -48,7 +46,7 @@
             // toolStrip1
             // 
             toolStrip1.ImageScalingSize = new Size(20, 20);
-            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, toolStripLabelReplenish2 });
+            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 });
             toolStrip1.Location = new Point(0, 0);
             toolStrip1.Name = "toolStrip1";
             toolStrip1.Size = new Size(1107, 27);
@@ -58,7 +56,7 @@
             // toolStripDropDownButton1
             // 
             toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, консервыToolStripMenuItem, магазиныToolStripMenuItem });
+            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, консервыToolStripMenuItem });
             toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image");
             toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
             toolStripDropDownButton1.Name = "toolStripDropDownButton1";
@@ -79,13 +77,6 @@
             консервыToolStripMenuItem.Text = "Консервы";
             консервыToolStripMenuItem.Click += консервыToolStripMenuItem_Click;
             // 
-            // магазиныToolStripMenuItem
-            // 
-            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            магазиныToolStripMenuItem.Size = new Size(182, 26);
-            магазиныToolStripMenuItem.Text = "Магазины";
-            магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
-            // 
             // buttonCreateOrder
             // 
             buttonCreateOrder.Location = new Point(914, 75);
@@ -154,14 +145,6 @@
             dataGridView.Size = new Size(872, 580);
             dataGridView.TabIndex = 6;
             // 
-            // toolStripLabelReplenish2
-            // 
-            toolStripLabelReplenish2.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripLabelReplenish2.Name = "toolStripLabelReplenish2";
-            toolStripLabelReplenish2.Size = new Size(168, 24);
-            toolStripLabelReplenish2.Text = "Пополнение магазина";
-            toolStripLabelReplenish2.Click += toolStripLabelReplenish_Click;
-            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -197,7 +180,5 @@
         private ToolStripDropDownButton toolStripDropDownButton1;
         private ToolStripMenuItem компонентыToolStripMenuItem;
         private ToolStripMenuItem консервыToolStripMenuItem;
-        private ToolStripMenuItem магазиныToolStripMenuItem;
-        private ToolStripLabel toolStripLabelReplenish2;
     }
 }

FishFactory/FormMain.cs

@@ -1,6 +1,15 @@
 using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace FishFactory.Forms
 {
@@ -56,26 +65,6 @@ namespace FishFactory.Forms
                 form.ShowDialog();
             }
         }
-
-        private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void toolStripLabelReplenish_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShopReplenish));
-            if (service is FormShopReplenish form)
-            {
-                form.ShowDialog();
-            }
-        }
-
         private void buttonCreateOrder_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));

FishFactory/FormShop.Designer.cs

@@ -1,179 +0,0 @@
-namespace FishFactory.Forms
-{
-    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()
-        {
-            label1 = new Label();
-            label2 = new Label();
-            textBoxShopName = new TextBox();
-            textBoxAdress = new TextBox();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            dataGridView = new DataGridView();
-            CannedName = new DataGridViewTextBoxColumn();
-            Count = new DataGridViewTextBoxColumn();
-            label3 = new Label();
-            openingDatePicker = new DateTimePicker();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(12, 23);
-            label1.Name = "label1";
-            label1.Size = new Size(80, 20);
-            label1.TabIndex = 0;
-            label1.Text = "Название:";
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(12, 67);
-            label2.Name = "label2";
-            label2.Size = new Size(54, 20);
-            label2.TabIndex = 1;
-            label2.Text = "Адрес:";
-            // 
-            // textBoxShopName
-            // 
-            textBoxShopName.Location = new Point(103, 20);
-            textBoxShopName.Name = "textBoxShopName";
-            textBoxShopName.Size = new Size(304, 27);
-            textBoxShopName.TabIndex = 2;
-            // 
-            // textBoxAdress
-            // 
-            textBoxAdress.Location = new Point(103, 60);
-            textBoxAdress.Name = "textBoxAdress";
-            textBoxAdress.Size = new Size(304, 27);
-            textBoxAdress.TabIndex = 3;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(513, 509);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(123, 33);
-            buttonSave.TabIndex = 4;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(663, 509);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(123, 33);
-            buttonCancel.TabIndex = 5;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToAddRows = false;
-            dataGridView.AllowUserToDeleteRows = false;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { CannedName, Count });
-            dataGridView.Location = new Point(0, 108);
-            dataGridView.Name = "dataGridView";
-            dataGridView.ReadOnly = true;
-            dataGridView.RowHeadersWidth = 51;
-            dataGridView.RowTemplate.Height = 29;
-            dataGridView.Size = new Size(851, 376);
-            dataGridView.TabIndex = 6;
-            // 
-            // CannedName
-            // 
-            CannedName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-            CannedName.HeaderText = "Консерва";
-            CannedName.MinimumWidth = 6;
-            CannedName.Name = "CannedName";
-            CannedName.ReadOnly = true;
-            // 
-            // Count
-            // 
-            Count.HeaderText = "Количество";
-            Count.MinimumWidth = 125;
-            Count.Name = "Count";
-            Count.ReadOnly = true;
-            Count.Width = 170;
-            // 
-            // label3
-            // 
-            label3.AutoSize = true;
-            label3.Location = new Point(438, 23);
-            label3.Name = "label3";
-            label3.Size = new Size(113, 20);
-            label3.TabIndex = 7;
-            label3.Text = "Дата открытия:";
-            // 
-            // openingDatePicker
-            // 
-            openingDatePicker.Location = new Point(557, 20);
-            openingDatePicker.Name = "openingDatePicker";
-            openingDatePicker.Size = new Size(294, 27);
-            openingDatePicker.TabIndex = 8;
-            // 
-            // FormShop
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(863, 568);
-            Controls.Add(openingDatePicker);
-            Controls.Add(label3);
-            Controls.Add(dataGridView);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(textBoxAdress);
-            Controls.Add(textBoxShopName);
-            Controls.Add(label2);
-            Controls.Add(label1);
-            Name = "FormShop";
-            Text = "Магазин";
-            Load += FormShop_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label label1;
-        private Label label2;
-        private TextBox textBoxShopName;
-        private TextBox textBoxAdress;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn CannedName;
-        private DataGridViewTextBoxColumn Count;
-        private Label label3;
-        private DateTimePicker openingDatePicker;
-    }
-}

FishFactory/FormShop.cs

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

FishFactory/FormShop.resx

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

FishFactory/FormShopReplenish.Designer.cs

@@ -1,142 +0,0 @@
-namespace FishFactory.Forms
-{
-    partial class FormShopReplenish
-    {
-        /// <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()
-        {
-            label1 = new Label();
-            label2 = new Label();
-            label3 = new Label();
-            comboBoxShopCanneds = new ComboBox();
-            comboBoxCanned = new ComboBox();
-            textBoxCount = new TextBox();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            SuspendLayout();
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(23, 33);
-            label1.Name = "label1";
-            label1.Size = new Size(72, 20);
-            label1.TabIndex = 0;
-            label1.Text = "Магазин:";
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(23, 78);
-            label2.Name = "label2";
-            label2.Size = new Size(79, 20);
-            label2.TabIndex = 1;
-            label2.Text = "Консерва:";
-            // 
-            // label3
-            // 
-            label3.AutoSize = true;
-            label3.Location = new Point(23, 126);
-            label3.Name = "label3";
-            label3.Size = new Size(93, 20);
-            label3.TabIndex = 2;
-            label3.Text = "Количество:";
-            // 
-            // comboBoxShopCanneds
-            // 
-            comboBoxShopCanneds.FormattingEnabled = true;
-            comboBoxShopCanneds.Location = new Point(140, 33);
-            comboBoxShopCanneds.Name = "comboBoxShopCanneds";
-            comboBoxShopCanneds.Size = new Size(383, 28);
-            comboBoxShopCanneds.TabIndex = 3;
-            // 
-            // comboBoxCanned
-            // 
-            comboBoxCanned.FormattingEnabled = true;
-            comboBoxCanned.Location = new Point(140, 78);
-            comboBoxCanned.Name = "comboBoxCanned";
-            comboBoxCanned.Size = new Size(383, 28);
-            comboBoxCanned.TabIndex = 4;
-            // 
-            // textBoxCount
-            // 
-            textBoxCount.Location = new Point(140, 123);
-            textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(199, 27);
-            textBoxCount.TabIndex = 5;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(281, 175);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(107, 34);
-            buttonSave.TabIndex = 6;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(407, 175);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(107, 34);
-            buttonCancel.TabIndex = 7;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // FormShopReplenish
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(538, 221);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(textBoxCount);
-            Controls.Add(comboBoxCanned);
-            Controls.Add(comboBoxShopCanneds);
-            Controls.Add(label3);
-            Controls.Add(label2);
-            Controls.Add(label1);
-            Name = "FormShopReplenish";
-            Text = "Пополнение магазина";
-            Load += FormShopReplenish_Load;
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label label1;
-        private Label label2;
-        private Label label3;
-        private ComboBox comboBoxShopCanneds;
-        private ComboBox comboBoxCanned;
-        private TextBox textBoxCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

FishFactory/FormShopReplenish.cs

@@ -1,88 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-
-namespace FishFactory.Forms
-{
-    public partial class FormShopReplenish : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ICannedLogic _logicP;
-        private readonly IShopLogic _logicS;
-        private List<ShopViewModel> _shopList = new List<ShopViewModel>();
-        private List<CannedViewModel> _cannedList = new List<CannedViewModel>();
-
-        public FormShopReplenish(ILogger<FormShopReplenish> logger, ICannedLogic logicP, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicP = logicP;
-            _logicS = logicS;
-        }
-
-        private void FormShopReplenish_Load(object sender, EventArgs e)
-        {
-            _shopList = _logicS.ReadList(null);
-            _cannedList = _logicP.ReadList(null);
-            if (_shopList != null)
-            {
-                comboBoxShopCanneds.DisplayMember = "ShopName";
-                comboBoxShopCanneds.ValueMember = "Id";
-                comboBoxShopCanneds.DataSource = _shopList;
-                comboBoxShopCanneds.SelectedItem = null;
-                _logger.LogInformation("Загрузка магазинов для поставок");
-            }
-            if (_cannedList != null)
-            {
-                comboBoxCanned.DisplayMember = "CannedName";
-                comboBoxCanned.ValueMember = "Id";
-                comboBoxCanned.DataSource = _cannedList;
-                comboBoxCanned.SelectedItem = null;
-                _logger.LogInformation("Загрузка консерв для поставок");
-            }
-        }
-
-        private void buttonSave_Click(object sender, EventArgs e)
-        {
-            if (comboBoxShopCanneds.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxCanned.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите консерву", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание поставки");
-            try
-            {
-                var operationResult = _logicS.Replenish(new ReplenishBindingModel
-                {
-                    ShopId = Convert.ToInt32(comboBoxShopCanneds.SelectedValue),
-                    CannedId = Convert.ToInt32(comboBoxCanned.SelectedValue),
-                    Count = Convert.ToInt32(textBoxCount.Text)
-                });
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания поставки");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

FishFactory/FormShopReplenish.resx

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

FishFactory/FormShops.Designer.cs

@@ -1,122 +0,0 @@
-namespace FishFactory.Forms
-{
-    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()
-        {
-            dataGridView = new DataGridView();
-            buttonAdd = new Button();
-            buttonUpd = new Button();
-            buttonDel = new Button();
-            buttonRef = new Button();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToAddRows = false;
-            dataGridView.AllowUserToDeleteRows = false;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(0, 0);
-            dataGridView.Name = "dataGridView";
-            dataGridView.ReadOnly = true;
-            dataGridView.RowHeadersWidth = 51;
-            dataGridView.RowTemplate.Height = 29;
-            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(525, 673);
-            dataGridView.TabIndex = 0;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.AccessibleRole = AccessibleRole.None;
-            buttonAdd.Location = new Point(565, 76);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(130, 35);
-            buttonAdd.TabIndex = 1;
-            buttonAdd.Text = "Добавить";
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // buttonUpd
-            // 
-            buttonUpd.AccessibleRole = AccessibleRole.None;
-            buttonUpd.Location = new Point(565, 130);
-            buttonUpd.Name = "buttonUpd";
-            buttonUpd.Size = new Size(130, 35);
-            buttonUpd.TabIndex = 2;
-            buttonUpd.Text = "Изменить";
-            buttonUpd.UseVisualStyleBackColor = true;
-            buttonUpd.Click += buttonUpd_Click;
-            // 
-            // buttonDel
-            // 
-            buttonDel.AccessibleRole = AccessibleRole.None;
-            buttonDel.Location = new Point(565, 186);
-            buttonDel.Name = "buttonDel";
-            buttonDel.Size = new Size(130, 35);
-            buttonDel.TabIndex = 3;
-            buttonDel.Text = "Удалить";
-            buttonDel.UseVisualStyleBackColor = true;
-            buttonDel.Click += buttonDel_Click;
-            // 
-            // buttonRef
-            // 
-            buttonRef.AccessibleRole = AccessibleRole.None;
-            buttonRef.Location = new Point(565, 243);
-            buttonRef.Name = "buttonRef";
-            buttonRef.Size = new Size(130, 35);
-            buttonRef.TabIndex = 4;
-            buttonRef.Text = "Обновить";
-            buttonRef.UseVisualStyleBackColor = true;
-            buttonRef.Click += buttonRef_Click;
-            // 
-            // FormShops
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(722, 674);
-            Controls.Add(buttonRef);
-            Controls.Add(buttonDel);
-            Controls.Add(buttonUpd);
-            Controls.Add(buttonAdd);
-            Controls.Add(dataGridView);
-            Name = "FormShops";
-            Text = "Список магазинов";
-            Load += FormShops_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private DataGridView dataGridView;
-        private Button buttonAdd;
-        private Button buttonUpd;
-        private Button buttonDel;
-        private Button buttonRef;
-    }
-}

FishFactory/FormShops.cs

@@ -1,105 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-
-namespace FishFactory.Forms
-{
-    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["ShopCanneds"].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();
-        }
-    }
-}

FishFactory/FormShops.resx

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

FishFactory/Program.cs

@@ -2,7 +2,7 @@ using FishFactory.Forms;
 using FishFactoryContracts.BusinessLogicsContracts;
 using FishFactoryBusinessLogic.BusinessLogic;
 using FishFactoryContracts.StoragesContracts;
-using FishFactoryListImplement.Implements;
+using FishFactoryFileImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
@@ -38,11 +38,9 @@ namespace FishFactory
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ICannedStorage, CannedStorage>();
-            services.AddTransient<IShopStorage,  ShopStorage>();
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ICannedLogic, CannedLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -50,9 +48,6 @@ namespace FishFactory
             services.AddTransient<FormCanned>();
             services.AddTransient<FormCannedComponent>();
             services.AddTransient<FormCanneds>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShopReplenish>();
         }
     }
 }

FishFactoryBusinessLogic/BusinessLogic/CannedLogic.cs

@@ -4,6 +4,11 @@ using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.StoragesContracts;
 using FishFactoryContracts.ViewModels;
 using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace FishFactoryBusinessLogic.BusinessLogic
 {

FishFactoryBusinessLogic/BusinessLogic/ShopLogic.cs

@@ -1,154 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-
-namespace FishFactoryBusinessLogic.BusinessLogic
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        private readonly ICannedStorage _cannedStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, ICannedStorage cannedStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-            _cannedStorage = cannedStorage;
-        }
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{Id}", model?.ShopName, model?.Id);
-            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Replenish(ReplenishBindingModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Количество изделий должно быть больше 0");
-            }
-            var shop = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Id = model.ShopId
-            });
-            if (shop == null)
-            {
-                throw new ArgumentException("Магазина не существует");
-            }
-            if (shop.ShopCanneds.ContainsKey(model.CannedId))
-            {
-                var oldValue = shop.ShopCanneds[model.CannedId];
-                oldValue.Item2 += model.Count;
-                shop.ShopCanneds[model.CannedId] = oldValue;
-            }
-            else
-            {
-                var canned = _cannedStorage.GetElement(new CannedSearchModel
-                {
-                    Id = model.CannedId
-                });
-                if (canned == null)
-                {
-                    throw new ArgumentException($"Поставка: Товар с id:{model.CannedId} не найденн");
-                }
-                shop.ShopCanneds.Add(model.CannedId, (canned, model.Count));
-            }
-            return true;
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.Adress))
-            {
-                throw new ArgumentException("Нет адреса магазина", nameof(model.Adress));
-            }
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentNullException("Нет названия компонента", nameof(model.ShopName));
-            }
-            _logger.LogInformation("Shop. ShopName:{ShopName}.Adress:{Adress}.OpeningDate:{OpeningDate}. Id: {Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = model.ShopName
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-    }
-}

FishFactoryContracts/BindingModels/ReplenishBindingModel.cs

@@ -1,11 +0,0 @@
-using FishFactoryDataModel.Models;
-
-namespace FishFactoryContracts.BindingModels
-{
-    public class ReplenishBindingModel : IReplenishModel
-    {
-        public int ShopId { get; set; }
-        public int CannedId { get; set; }
-        public int Count { get; set; }
-    }
-}

FishFactoryContracts/BindingModels/ShopBindingModel.cs

@@ -1,13 +0,0 @@
-using FishFactoryDataModel.Models;
-
-namespace FishFactoryContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public int Id { get; set; }
-        public string ShopName { get; set; } = string.Empty;
-        public string Adress { get; set; } = string.Empty;
-        public DateTime OpeningDate { get; set; } = DateTime.Now;
-        public Dictionary<int, (ICannedModel, int)> ShopCanneds { get; set; } = new();
-    }
-}

FishFactoryContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,16 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.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 Replenish(ReplenishBindingModel model);
-    }
-}

FishFactoryContracts/SearchModels/OrderSearchModel.cs

@@ -1,4 +1,10 @@
-namespace FishFactoryContracts.SearchModels
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.SearchModels
 {
     public class OrderSearchModel
     {

FishFactoryContracts/SearchModels/ShopSearchModel.cs

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

FishFactoryContracts/StoragesContracts/IShopStorage.cs

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

FishFactoryContracts/ViewModels/ShopViewModel.cs

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

FishFactoryDataModels/FishFactoryDataModel.csproj

@@ -7,4 +7,8 @@
     <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Folder Include="Models\" />
+  </ItemGroup>
+
 </Project>

FishFactoryDataModels/Models/IReplenishModel.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryDataModel.Models
-{
-    public interface IReplenishModel
-    {
-        int ShopId {  get; }
-        int CannedId {  get; }
-        int Count { get; }
-    }
-}

FishFactoryDataModels/Models/IShopModel.cs

@@ -1,10 +0,0 @@
-namespace FishFactoryDataModel.Models
-{
-    public interface IShopModel : IId
-    {
-        string ShopName { get; }
-        string Adress {  get; }
-        DateTime OpeningDate {  get; }
-        Dictionary<int, (ICannedModel, int)> ShopCanneds { get; }
-    }
-}

FishFactoryFileImplement/DataFileSingleton.cs

@@ -0,0 +1,50 @@
+
+using FishFactoryFileImplement.Models;
+using System.Xml.Linq;
+
+namespace FishFactoryFileImplement
+{
+    internal class DataFileSingleton
+    {
+        private static DataFileSingleton? instance;
+        private readonly string ComponentFileName = "Component.xml";
+        private readonly string OrderFileName = "Order.xml";
+        private readonly string CannedFileName = "Canned.xml";
+        public List<Component> Components { get; private set; }
+        public List<Order> Orders { get; private set; }
+        public List<Canned> Canneds { get; private set; }
+        public static DataFileSingleton GetInstance()
+        {
+            if (instance == null)
+            {
+                instance = new DataFileSingleton();
+            }
+            return instance;
+        }
+        public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
+        public void SaveCanneds() => SaveData(Canneds, CannedFileName, "Canneds", x => x.GetXElement);
+        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+        private DataFileSingleton()
+        {
+            Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
+            Canneds = LoadData(CannedFileName, "Canned", x => Canned.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);
+            }
+        }
+
+    }
+}

FishFactoryFileImplement/FishFactoryFileImplement.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
+    <ProjectReference Include="..\FishFactoryDataModels\FishFactoryDataModel.csproj" />
+  </ItemGroup>
+
+</Project>

FishFactoryFileImplement/Implements/CannedStorage.cs

@@ -0,0 +1,72 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryFileImplement.Models;
+
+namespace FishFactoryFileImplement.Implements
+{
+    public class CannedStorage : ICannedStorage
+    {
+        private readonly DataFileSingleton _source;
+        public CannedStorage()
+        {
+            _source = DataFileSingleton.GetInstance();
+        }
+        public List<CannedViewModel> GetFullList()
+        {
+            return _source.Canneds.Select(x => x.GetViewModel).ToList();
+        }
+        public List<CannedViewModel> GetFilteredList(CannedSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.CannedName))
+            {
+                return new();
+            }
+            return _source.Canneds.Where(x => x.CannedName.Contains(model.CannedName)).Select(x => x.GetViewModel).ToList();
+        }
+        public CannedViewModel? GetElement(CannedSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.CannedName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return _source.Canneds.FirstOrDefault
+                (x => (!string.IsNullOrEmpty(model.CannedName) && x.CannedName == model.CannedName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        public CannedViewModel? Insert(CannedBindingModel model)
+        {
+            model.Id = _source.Canneds.Count > 0 ? _source.Canneds.Max(x => x.Id) + 1 : 1;
+            var newCanned = Canned.Create(model);
+            if (newCanned == null)
+            {
+                return null;
+            }
+            _source.Canneds.Add(newCanned);
+            _source.SaveCanneds();
+            return newCanned.GetViewModel;
+        }
+        public CannedViewModel? Update(CannedBindingModel model)
+        {
+            var canned = _source.Canneds.FirstOrDefault(x => x.Id == model.Id);
+            if (canned == null)
+            {
+                return null;
+            }
+            canned.Update(model);
+            _source.SaveCanneds();
+            return canned.GetViewModel;
+        }
+        public CannedViewModel? Delete(CannedBindingModel model)
+        {
+            var element = _source.Canneds.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                _source.Canneds.Remove(element);
+                _source.SaveCanneds();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

FishFactoryFileImplement/Implements/ComponentStorage.cs

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

FishFactoryFileImplement/Implements/OrderStorage.cs

@@ -0,0 +1,84 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryFileImplement.Models;
+using System.Xml.Linq;
+
+namespace FishFactoryFileImplement.Implements
+{
+    public class OrderStorage : IOrderStorage
+    {
+        private readonly DataFileSingleton _source;
+
+        public OrderStorage()
+        {
+            _source = DataFileSingleton.GetInstance();
+        }
+
+        public List<OrderViewModel> GetFullList()
+        {
+            return _source.Orders.Select(x => AttachCannedName(x)).ToList();
+        }
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
+            if (model == null || !model.Id.HasValue)
+            {
+                return new();
+            }
+            return _source.Orders.Where(x => x.Id == model.Id).Select(x => AttachCannedName(x)).ToList();
+        }
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+            return AttachCannedName(_source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id));
+        }
+        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 AttachCannedName(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 AttachCannedName(order);
+        }
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
+            var order = _source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            _source.Orders.Remove(order);
+            _source.SaveOrders();
+            return AttachCannedName(order);
+        }
+        private OrderViewModel AttachCannedName(Order order)
+        {
+            var viewModel = order.GetViewModel;
+            var canned = _source.Canneds.FirstOrDefault(x => x.Id == order.CannedId);
+            if (canned != null)
+            {
+                viewModel.CannedName = canned.CannedName;
+            }
+            return viewModel;
+        }
+    }
+}

FishFactoryFileImplement/Models/Canned.cs

@@ -0,0 +1,88 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModel.Models;
+using FishFactoryFileImplement;
+using System.Xml.Linq;
+
+namespace FishFactoryFileImplement.Models
+{
+    internal class Canned : ICannedModel
+    {
+        public int Id { get; private set; }
+        public string CannedName { get; private set; } = string.Empty;
+        public double Price { get; private set; }
+        public Dictionary<int, int> Components { get; private set; } = new();
+        private Dictionary<int, (IComponentModel, int)>? _cannedComponents = null;
+        public Dictionary<int, (IComponentModel, int)> CannedComponents
+        {
+            get
+            {
+                if (_cannedComponents == null)
+                {
+                    var source = DataFileSingleton.GetInstance();
+                    _cannedComponents = Components.ToDictionary(x => x.Key, y =>
+                    ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
+                }
+                return _cannedComponents;
+            }
+        }
+        public static Canned? Create(CannedBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Canned()
+            {
+                Id = model.Id,
+                CannedName = model.CannedName,
+                Price = model.Price,
+                Components = model.CannedComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
+            };
+        }
+
+        public static Canned? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Canned()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                CannedName = element.Element("CannedName")!.Value,
+                Price = Convert.ToDouble(element.Element("Price")!.Value),
+                Components = element.Element("CannedComponents")!.Elements("CannedComponent").ToDictionary
+            (x => Convert.ToInt32(x.Element("Key")?.Value),
+            x => Convert.ToInt32(x.Element("Value")?.Value))};
+        }
+
+        public void Update(CannedBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            CannedName = model.CannedName;
+            Price = model.Price;
+            Components = model.CannedComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
+            _cannedComponents = null;
+
+        }
+        public CannedViewModel GetViewModel => new()
+        {
+            Id = Id,
+            CannedName = CannedName,
+            Price = Price,
+            CannedComponents = CannedComponents
+        };
+        public XElement GetXElement => new("Canned",
+            new XAttribute("Id", Id),
+            new XElement("CannedName", CannedName),
+            new XElement("Price", Price.ToString()),
+            new XElement("CannedComponents", Components.Select(x =>
+            new XElement("CannedComponent",
+            new XElement("Key", x.Key),
+            new XElement("Value", x.Value))).ToArray()));
+    }
+}

FishFactoryFileImplement/Models/Component.cs

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

FishFactoryFileImplement/Models/Order.cs

@@ -0,0 +1,85 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModel.Enums;
+using FishFactoryDataModel.Models;
+using System.Xml.Linq;
+
+namespace FishFactoryFileImplement.Models
+{
+    public class Order : IOrderModel
+    {
+        public int Id { get; private set; }
+        public int CannedId { get; private set; }
+        public int Count { get; private set; }
+        public double Sum { get; private set; }
+        public OrderStatus Status { get; private set; }
+        public DateTime DateCreate { get; private set; }
+        public DateTime? DateImplement { get; private set; }
+        public static Order? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                CannedId = Convert.ToInt32(element.Element("CannedId")!.Value),
+                Count = Convert.ToInt32(element.Element("Count")!.Value),
+                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+                Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
+                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+                DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value),
+            };
+        }
+        public static Order? Create(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = model.Id,
+                CannedId = model.CannedId,
+                Count = model.Count,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+            };
+        }
+        public void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            CannedId = model.CannedId;
+            Count = model.Count;
+            Sum = model.Sum;
+            Status = model.Status;
+            DateCreate = model.DateCreate;
+            DateImplement = model.DateImplement;
+        }
+        public OrderViewModel GetViewModel => new()
+        {
+            Id = Id,
+            CannedId = CannedId,
+            Count = Count,
+            Sum = Sum,
+            Status = Status,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+        };
+        public XElement GetXElement => new("Order",
+          new XAttribute("Id", Id),
+          new XElement("CannedId", CannedId),
+          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())
+        );
+    }
+}

FishFactoryListImplement/DataListSingleton.cs

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

FishFactoryListImplement/Implements/ShopStorage.cs

@@ -1,100 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryListImplement.Models;
-
-namespace FishFactoryListImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataListSingleton _source;
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public List<ShopViewModel> GetFullList()
-        {
-            var result = new List<ShopViewModel>();
-            foreach (var shop in _source.Shops)
-            {
-                result.Add(shop.GetViewModel);
-            }
-            return result;
-        }
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            var result = new List<ShopViewModel>();
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return result;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.ShopName.Contains(model.ShopName))
-                {
-                    result.Add(shop.GetViewModel);
-                }
-            }
-            return result;
-        }
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) || (model.Id.HasValue && shop.Id == model.Id))
-                {
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var shop in _source.Shops)
-            {
-                if (model.Id <= shop.Id)
-                {
-                    model.Id = shop.Id + 1;
-                }
-            }
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            _source.Shops.Add(newShop);
-            return newShop.GetViewModel;
-        }
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Id == model.Id)
-                {
-                    shop.Update(model);
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            for (int i = 0; i < _source.Shops.Count; ++i)
-            {
-                if (_source.Shops[i].Id == model.Id)
-                {
-                    var element = _source.Shops[i];
-                    _source.Shops.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
-}

FishFactoryListImplement/Models/Shop.cs

@@ -1,54 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryDataModel.Models;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryListImplement.Models
-{
-    internal class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string ShopName { get; private set; } = string.Empty;
-        public string Adress { get; private set; } = string.Empty;
-        public DateTime OpeningDate { get; private set; }
-        public Dictionary<int, (ICannedModel, int)> ShopCanneds
-        {
-            get;
-            private set;
-        } = new Dictionary<int, (ICannedModel, int)>();
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Adress = model.Adress,
-                OpeningDate = model.OpeningDate,
-                ShopCanneds = model.ShopCanneds
-            };
-        }
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Adress = model.Adress;
-            OpeningDate = model.OpeningDate;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Adress = Adress,
-            OpeningDate = OpeningDate,
-            ShopCanneds = ShopCanneds
-        };
-    }
-}