Merge branch 'Lab1_Hard' into Lab2

CarRepairShop/CarRepairShop/FormMain.Designer.cs

@@ -32,6 +32,8 @@
             справочникиToolStripMenuItem = new ToolStripMenuItem();
             компонентыToolStripMenuItem = new ToolStripMenuItem();
             ремонтToolStripMenuItem = new ToolStripMenuItem();
+            ShopsToolStripMenuItem = new ToolStripMenuItem();
+            SupplyToolStripMenuItem = new ToolStripMenuItem();
             dataGridView = new DataGridView();
             buttonCreateOrder = new Button();
             buttonTakeOrderInWork = new Button();
@@ -54,7 +56,7 @@
             // 
             // справочникиToolStripMenuItem
             // 
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, ремонтToolStripMenuItem });
+            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, ремонтToolStripMenuItem, ShopsToolStripMenuItem, SupplyToolStripMenuItem });
             справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             справочникиToolStripMenuItem.Size = new Size(117, 24);
             справочникиToolStripMenuItem.Text = "Справочники";
@@ -73,6 +75,20 @@
             ремонтToolStripMenuItem.Text = "Ремонт";
             ремонтToolStripMenuItem.Click += RepairToolStripMenuItem_Click;
             // 
+            // ShopsToolStripMenuItem
+            // 
+            ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem";
+            ShopsToolStripMenuItem.Size = new Size(182, 26);
+            ShopsToolStripMenuItem.Text = "Магазины";
+            ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
+            // 
+            // SupplyToolStripMenuItem
+            // 
+            SupplyToolStripMenuItem.Name = "SupplyToolStripMenuItem";
+            SupplyToolStripMenuItem.Size = new Size(182, 26);
+            SupplyToolStripMenuItem.Text = "Поставки";
+            SupplyToolStripMenuItem.Click += SupplyToolStripMenuItem_Click;
+            // 
             // dataGridView
             // 
             dataGridView.AllowUserToAddRows = false;
@@ -171,5 +187,7 @@
         private Button buttonOrderReady;
         private Button buttonIssuedOrder;
         private Button buttonRefresh;
+        private ToolStripMenuItem ShopsToolStripMenuItem;
+        private ToolStripMenuItem SupplyToolStripMenuItem;
     }
 }

CarRepairShop/CarRepairShop/FormMain.cs

@@ -156,5 +156,21 @@ namespace CarRepairShop
         {
             LoadData();
         }
+        private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            if (service is FormShops form)
+            {
+                form.ShowDialog();
+            }
+        }
+        private void SupplyToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormSupply));
+            if (service is FormSupply form)
+            {
+                form.ShowDialog();
+            }
+        }
     }
 }

CarRepairShop/CarRepairShop/FormShop.Designer.cs

@@ -0,0 +1,203 @@
+namespace CarRepairShop
+{
+    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()
+        {
+            dateTimePicker = new DateTimePicker();
+            textBoxName = new TextBox();
+            textBoxAdress = new TextBox();
+            labelName = new Label();
+            labelAdress = new Label();
+            labelDate = new Label();
+            buttonSave = new Button();
+            buttonCancel = new Button();
+            dataGridView = new DataGridView();
+            ColumnId = new DataGridViewTextBoxColumn();
+            ShopName = new DataGridViewTextBoxColumn();
+            ColumnCost = new DataGridViewTextBoxColumn();
+            ColumnCount = new DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // dateTimePicker
+            // 
+            dateTimePicker.Location = new Point(97, 93);
+            dateTimePicker.Margin = new Padding(3, 4, 3, 4);
+            dateTimePicker.Name = "dateTimePicker";
+            dateTimePicker.Size = new Size(363, 27);
+            dateTimePicker.TabIndex = 0;
+            // 
+            // textBoxName
+            // 
+            textBoxName.Location = new Point(97, 16);
+            textBoxName.Margin = new Padding(3, 4, 3, 4);
+            textBoxName.Name = "textBoxName";
+            textBoxName.Size = new Size(363, 27);
+            textBoxName.TabIndex = 1;
+            // 
+            // textBoxAdress
+            // 
+            textBoxAdress.Location = new Point(97, 55);
+            textBoxAdress.Margin = new Padding(3, 4, 3, 4);
+            textBoxAdress.Name = "textBoxAdress";
+            textBoxAdress.Size = new Size(363, 27);
+            textBoxAdress.TabIndex = 2;
+            // 
+            // labelName
+            // 
+            labelName.AutoSize = true;
+            labelName.Location = new Point(14, 20);
+            labelName.Name = "labelName";
+            labelName.Size = new Size(77, 20);
+            labelName.TabIndex = 3;
+            labelName.Text = "Название";
+            // 
+            // labelAdress
+            // 
+            labelAdress.AutoSize = true;
+            labelAdress.Location = new Point(14, 59);
+            labelAdress.Name = "labelAdress";
+            labelAdress.Size = new Size(51, 20);
+            labelAdress.TabIndex = 4;
+            labelAdress.Text = "Адрес";
+            // 
+            // labelDate
+            // 
+            labelDate.AutoSize = true;
+            labelDate.Location = new Point(14, 101);
+            labelDate.Name = "labelDate";
+            labelDate.Size = new Size(41, 20);
+            labelDate.TabIndex = 5;
+            labelDate.Text = "Дата";
+            // 
+            // buttonSave
+            // 
+            buttonSave.Location = new Point(277, 340);
+            buttonSave.Margin = new Padding(3, 4, 3, 4);
+            buttonSave.Name = "buttonSave";
+            buttonSave.Size = new Size(91, 31);
+            buttonSave.TabIndex = 6;
+            buttonSave.Text = "Сохранить";
+            buttonSave.UseVisualStyleBackColor = true;
+            buttonSave.Click += SaveButton_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(375, 340);
+            buttonCancel.Margin = new Padding(3, 4, 3, 4);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(86, 31);
+            buttonCancel.TabIndex = 7;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            buttonCancel.Click += CancelButton_Click;
+            // 
+            // dataGridView
+            // 
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ShopName, ColumnCost, ColumnCount });
+            dataGridView.Location = new Point(14, 132);
+            dataGridView.Margin = new Padding(3, 4, 3, 4);
+            dataGridView.Name = "dataGridView";
+            dataGridView.RowHeadersWidth = 51;
+            dataGridView.Size = new Size(447, 200);
+            dataGridView.TabIndex = 8;
+            // 
+            // ColumnId
+            // 
+            ColumnId.HeaderText = "Идентификатор";
+            ColumnId.MinimumWidth = 6;
+            ColumnId.Name = "ColumnId";
+            ColumnId.Visible = false;
+            ColumnId.Width = 125;
+            // 
+            // ShopName
+            // 
+            ShopName.HeaderText = "Название";
+            ShopName.MinimumWidth = 6;
+            ShopName.Name = "ShopName";
+            ShopName.ReadOnly = true;
+            ShopName.Width = 150;
+            // 
+            // ColumnCost
+            // 
+            ColumnCost.HeaderText = "Цена";
+            ColumnCost.MinimumWidth = 6;
+            ColumnCost.Name = "ColumnCost";
+            ColumnCost.ReadOnly = true;
+            ColumnCost.Width = 125;
+            // 
+            // ColumnCount
+            // 
+            ColumnCount.HeaderText = "Количество";
+            ColumnCount.MinimumWidth = 6;
+            ColumnCount.Name = "ColumnCount";
+            ColumnCount.ReadOnly = true;
+            ColumnCount.Width = 125;
+            // 
+            // FormShop
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(470, 380);
+            Controls.Add(dataGridView);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonSave);
+            Controls.Add(labelDate);
+            Controls.Add(labelAdress);
+            Controls.Add(labelName);
+            Controls.Add(textBoxAdress);
+            Controls.Add(textBoxName);
+            Controls.Add(dateTimePicker);
+            Margin = new Padding(3, 4, 3, 4);
+            Name = "FormShop";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "Магазин";
+            Load += FormShop_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private DateTimePicker dateTimePicker;
+        private TextBox textBoxName;
+        private TextBox textBoxAdress;
+        private Label labelName;
+        private Label labelAdress;
+        private Label labelDate;
+        private Button buttonSave;
+        private Button buttonCancel;
+        private DataGridView dataGridView;
+        private DataGridViewTextBoxColumn ColumnId;
+        private DataGridViewTextBoxColumn ShopName;
+        private DataGridViewTextBoxColumn ColumnCost;
+        private DataGridViewTextBoxColumn ColumnCount;
+    }
+}

CarRepairShop/CarRepairShop/FormShop.cs

@@ -0,0 +1,114 @@
+using CarRepairShopContracts.BindingModels;
+using CarRepairShopContracts.BusinessLogicsContracts;
+using CarRepairShopContracts.SearchModels;
+using CarRepairShopDataModels.Models;
+using Microsoft.Extensions.Logging;
+
+namespace CarRepairShop
+{
+    public partial class FormShop : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IShopLogic _logic;
+        public int? _id;
+        private Dictionary<int, (IRepairModel, int)> _repairs;
+        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+        }
+
+        private void FormShop_Load(object sender, EventArgs e)
+        {
+            if (_id.HasValue)
+            {
+                _logger.LogInformation("Загрузка магазина");
+                try
+                {
+                    var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
+                    if (shop != null)
+                    {
+                        textBoxName.Text = shop.ShopName;
+                        textBoxAdress.Text = shop.Address;
+                        dateTimePicker.Text = shop.DateOpen.ToString();
+                        _repairs = shop.ShopRepairs;
+                    }
+                    LoadData();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка загрузки магазина");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                    MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadData()
+        {
+            _logger.LogInformation("Загрузка товаров магазина");
+            try
+            {
+                if (_repairs != null)
+                {
+                    foreach (var repair in _repairs)
+                    {
+                        dataGridView.Rows.Add(new object[] { repair.Key, repair.Value.Item1.RepairName, repair.Value.Item1.Price, repair.Value.Item2 });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки ремонтов магазина");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+               MessageBoxIcon.Error);
+            }
+        }
+
+        private void CancelButton_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+        private void SaveButton_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxName.Text))
+            {
+                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(textBoxAdress.Text))
+            {
+                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Сохранение магазина");
+            try
+            {
+                var model = new ShopBindingModel
+                {
+                    Id = _id ?? 0,
+                    ShopName = textBoxName.Text,
+                    Address = textBoxAdress.Text,
+                    DateOpen = dateTimePicker.Value.Date,
+                    ShopRepairs = _repairs
+                };
+                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);
+            }
+        }
+    }
+}

CarRepairShop/CarRepairShop/FormShop.resx

@@ -0,0 +1,120 @@
+<?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>

CarRepairShop/CarRepairShop/FormShops.Designer.cs

@@ -0,0 +1,126 @@
+namespace CarRepairShop
+{
+    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();
+            buttonUpdate = new Button();
+            buttonRefresh = new Button();
+            buttonDelete = new Button();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            dataGridView.BackgroundColor = Color.White;
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Location = new Point(14, 16);
+            dataGridView.Margin = new Padding(3, 4, 3, 4);
+            dataGridView.Name = "dataGridView";
+            dataGridView.RowHeadersWidth = 51;
+            dataGridView.Size = new Size(449, 499);
+            dataGridView.TabIndex = 0;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(470, 16);
+            buttonAdd.Margin = new Padding(3, 4, 3, 4);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(130, 31);
+            buttonAdd.TabIndex = 1;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonUpdate
+            // 
+            buttonUpdate.Location = new Point(470, 55);
+            buttonUpdate.Margin = new Padding(3, 4, 3, 4);
+            buttonUpdate.Name = "buttonUpdate";
+            buttonUpdate.Size = new Size(130, 31);
+            buttonUpdate.TabIndex = 2;
+            buttonUpdate.Text = "Изменить";
+            buttonUpdate.UseVisualStyleBackColor = true;
+            buttonUpdate.Click += ButtonUpdate_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Location = new Point(470, 93);
+            buttonRefresh.Margin = new Padding(3, 4, 3, 4);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(130, 31);
+            buttonRefresh.TabIndex = 3;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonDelete
+            // 
+            buttonDelete.Location = new Point(470, 132);
+            buttonDelete.Margin = new Padding(3, 4, 3, 4);
+            buttonDelete.Name = "buttonDelete";
+            buttonDelete.Size = new Size(130, 31);
+            buttonDelete.TabIndex = 4;
+            buttonDelete.Text = "Удалить";
+            buttonDelete.UseVisualStyleBackColor = true;
+            buttonDelete.Click += ButtonDelete_Click;
+            // 
+            // FormShops
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(616, 537);
+            Controls.Add(buttonDelete);
+            Controls.Add(buttonRefresh);
+            Controls.Add(buttonUpdate);
+            Controls.Add(buttonAdd);
+            Controls.Add(dataGridView);
+            Margin = new Padding(3, 4, 3, 4);
+            Name = "FormShops";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "Магазины";
+            Load += FormShops_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private DataGridView dataGridView;
+        private Button buttonAdd;
+        private Button buttonUpdate;
+        private Button buttonRefresh;
+        private Button buttonDelete;
+        private DataGridViewTextBoxColumn Column1;
+        private DataGridViewTextBoxColumn Column2;
+        private DataGridViewTextBoxColumn Column3;
+        private DataGridViewTextBoxColumn Column4;
+        private DataGridViewTextBoxColumn Column5;
+    }
+}

CarRepairShop/CarRepairShop/FormShops.cs

@@ -0,0 +1,118 @@
+using CarRepairShopContracts.BindingModels;
+using CarRepairShopContracts.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 CarRepairShop
+{
+    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 LoadData()
+        {
+            try
+            {
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["DateOpen"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["ShopRepairs"].Visible = false;
+                }
+                _logger.LogInformation("Загрузка магазинов");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки магазинов");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void FormShops_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
+        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 ButtonUpdate_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+                if (service is FormShop form)
+                {
+                    var tmp = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    form._id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
+                }
+            }
+        }
+
+        private void ButtonRefresh_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
+        private void ButtonDelete_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);
+                    }
+                }
+            }
+        }
+    }
+}

CarRepairShop/CarRepairShop/FormShops.resx

@@ -0,0 +1,120 @@
+<?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>

CarRepairShop/CarRepairShop/FormSupply.Designer.cs

@@ -0,0 +1,150 @@
+namespace CarRepairShop
+{
+    partial class FormSupply
+    {
+        /// <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()
+        {
+            comboBoxShop = new ComboBox();
+            comboBoxRepair = new ComboBox();
+            textBoxCount = new TextBox();
+            buttonSave = new Button();
+            buttonCancel = new Button();
+            labelShop = new Label();
+            labelRepair = new Label();
+            labelCount = new Label();
+            SuspendLayout();
+            // 
+            // comboBoxShop
+            // 
+            comboBoxShop.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxShop.FormattingEnabled = true;
+            comboBoxShop.Location = new Point(110, 16);
+            comboBoxShop.Margin = new Padding(3, 4, 3, 4);
+            comboBoxShop.Name = "comboBoxShop";
+            comboBoxShop.Size = new Size(282, 28);
+            comboBoxShop.TabIndex = 0;
+            // 
+            // comboBoxRepair
+            // 
+            comboBoxRepair.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxRepair.FormattingEnabled = true;
+            comboBoxRepair.Location = new Point(110, 55);
+            comboBoxRepair.Margin = new Padding(3, 4, 3, 4);
+            comboBoxRepair.Name = "comboBoxRepair";
+            comboBoxRepair.Size = new Size(282, 28);
+            comboBoxRepair.TabIndex = 1;
+            // 
+            // textBoxCount
+            // 
+            textBoxCount.Location = new Point(110, 93);
+            textBoxCount.Margin = new Padding(3, 4, 3, 4);
+            textBoxCount.Name = "textBoxCount";
+            textBoxCount.Size = new Size(282, 27);
+            textBoxCount.TabIndex = 2;
+            // 
+            // buttonSave
+            // 
+            buttonSave.Location = new Point(204, 132);
+            buttonSave.Margin = new Padding(3, 4, 3, 4);
+            buttonSave.Name = "buttonSave";
+            buttonSave.Size = new Size(96, 31);
+            buttonSave.TabIndex = 3;
+            buttonSave.Text = "Сохранить";
+            buttonSave.UseVisualStyleBackColor = true;
+            buttonSave.Click += SaveButton_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(306, 132);
+            buttonCancel.Margin = new Padding(3, 4, 3, 4);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(86, 31);
+            buttonCancel.TabIndex = 4;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            buttonCancel.Click += CancelButton_Click;
+            // 
+            // labelShop
+            // 
+            labelShop.AutoSize = true;
+            labelShop.Location = new Point(12, 16);
+            labelShop.Name = "labelShop";
+            labelShop.Size = new Size(72, 20);
+            labelShop.TabIndex = 5;
+            labelShop.Text = "Магазин:";
+            // 
+            // labelRepair
+            // 
+            labelRepair.AutoSize = true;
+            labelRepair.Location = new Point(12, 55);
+            labelRepair.Name = "labelRepair";
+            labelRepair.Size = new Size(63, 20);
+            labelRepair.TabIndex = 6;
+            labelRepair.Text = "Ремонт:";
+            // 
+            // labelCount
+            // 
+            labelCount.AutoSize = true;
+            labelCount.Location = new Point(12, 93);
+            labelCount.Name = "labelCount";
+            labelCount.Size = new Size(93, 20);
+            labelCount.TabIndex = 7;
+            labelCount.Text = "Количество:";
+            // 
+            // FormSupply
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(406, 181);
+            Controls.Add(labelCount);
+            Controls.Add(labelRepair);
+            Controls.Add(labelShop);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonSave);
+            Controls.Add(textBoxCount);
+            Controls.Add(comboBoxRepair);
+            Controls.Add(comboBoxShop);
+            Margin = new Padding(3, 4, 3, 4);
+            Name = "FormSupply";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "Поставки";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private ComboBox comboBoxShop;
+        private ComboBox comboBoxRepair;
+        private TextBox textBoxCount;
+        private Button buttonSave;
+        private Button buttonCancel;
+        private Label labelShop;
+        private Label labelRepair;
+        private Label labelCount;
+    }
+}

CarRepairShop/CarRepairShop/FormSupply.cs

@@ -0,0 +1,142 @@
+using CarRepairShopContracts.BusinessLogicsContracts;
+using CarRepairShopContracts.SearchModels;
+using CarRepairShopContracts.ViewModels;
+using CarRepairShopDataModels.Models;
+
+namespace CarRepairShop
+{
+    public partial class FormSupply : Form
+    {
+        private readonly List<RepairViewModel>? _repairList;
+        private readonly List<ShopViewModel>? _shopsList;
+        IShopLogic _shopLogic;
+        IRepairLogic _repairLogic;
+        public int ShopId
+        {
+            get
+            {
+                return
+       Convert.ToInt32(comboBoxShop.SelectedValue);
+            }
+            set
+            {
+                comboBoxShop.SelectedValue = value;
+            }
+        }
+        public int RepairId
+        {
+            get
+            {
+                return
+       Convert.ToInt32(comboBoxRepair.SelectedValue);
+            }
+            set
+            {
+                comboBoxRepair.SelectedValue = value;
+            }
+        }
+
+        public IRepairModel? RepairModel
+        {
+            get
+            {
+                if (_repairList == null)
+                {
+                    return null;
+                }
+                foreach (var elem in _repairList)
+                {
+                    if (elem.Id == RepairId)
+                    {
+                        return elem;
+                    }
+                }
+                return null;
+            }
+        }
+
+
+        public int Count
+        {
+            get { return Convert.ToInt32(textBoxCount.Text); }
+            set
+            { textBoxCount.Text = value.ToString(); }
+        }
+        public FormSupply(IRepairLogic repairLogic, IShopLogic shopLogic)
+        {
+            InitializeComponent();
+            _shopLogic = shopLogic;
+            _repairLogic = repairLogic;
+            _repairList = repairLogic.ReadList(null);
+            _shopsList = shopLogic.ReadList(null);
+            if (_repairList != null)
+            {
+                comboBoxRepair.DisplayMember = "RepairName";
+                comboBoxRepair.ValueMember = "Id";
+                comboBoxRepair.DataSource = _repairList;
+                comboBoxRepair.SelectedItem = null;
+            }
+            if (_shopsList != null)
+            {
+                comboBoxShop.DisplayMember = "ShopName";
+                comboBoxShop.ValueMember = "Id";
+                comboBoxShop.DataSource = _shopsList;
+                comboBoxShop.SelectedItem = null;
+            }
+        }
+
+        private void SaveButton_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCount.Text))
+            {
+                MessageBox.Show("Заполните поле Количество", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxRepair.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите ремонт", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxShop.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите магазин", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            try
+            {
+                int count = Convert.ToInt32(textBoxCount.Text);
+
+                bool res = _shopLogic.MakeSupply(
+                    new ShopSearchModel() { Id = Convert.ToInt32(comboBoxShop.SelectedValue) },
+                    _repairLogic.ReadElement(new() { Id = Convert.ToInt32(comboBoxRepair.SelectedValue) }),
+                    count
+                );
+
+                if (!res)
+                {
+                    throw new Exception("Ошибка при пополнении. Дополнительная информация в логах");
+                }
+
+                MessageBox.Show("Пополнение прошло успешно");
+                DialogResult = DialogResult.OK;
+                Close();
+
+            }
+            catch (Exception err)
+            {
+                MessageBox.Show("Ошибка пополнения");
+                return;
+            }
+        }
+
+        private void CancelButton_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

CarRepairShop/CarRepairShop/FormSupply.resx

@@ -0,0 +1,120 @@
+<?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>

CarRepairShop/CarRepairShop/Program.cs

@@ -34,6 +34,8 @@ namespace CarRepairShop
                 option.AddNLog("nlog.config");
             });
             services.AddTransient<IComponentStorage, ComponentStorage>();
+            services.AddTransient<IShopStorage, ShopStorage>();
+            services.AddTransient<IShopLogic, ShopLogic>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IRepairStorage, RepairStorage>();
             services.AddTransient<IComponentLogic, ComponentLogic>();
@@ -46,6 +48,9 @@ namespace CarRepairShop
             services.AddTransient<FormRepair>();
             services.AddTransient<FormRepairComponent>();
             services.AddTransient<FormRepairs>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormSupply>();
         }
     }
 }

CarRepairShop/CarRepairShopBusinessLogic/ShopLogic.cs

@@ -0,0 +1,166 @@
+using CarRepairShopContracts.BindingModels;
+using CarRepairShopContracts.BusinessLogicsContracts;
+using CarRepairShopContracts.SearchModels;
+using CarRepairShopContracts.StoragesContracts;
+using CarRepairShopContracts.ViewModels;
+using CarRepairShopDataModels.Models;
+using Microsoft.Extensions.Logging;
+
+namespace CarRepairShopBusinessLogic
+{
+    public class ShopLogic : IShopLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IShopStorage _shopStorage;
+
+        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
+        {
+            _logger = logger;
+            _shopStorage = shopStorage;
+        }
+
+        public List<ShopViewModel> ReadList(ShopSearchModel model)
+        {
+            _logger.LogInformation("ReadList. ShopName:{Name}. Id:{ Id}", model?.Name, 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 bool MakeSupply(ShopSearchModel model, IRepairModel repair, int count)
+        {
+            _logger.LogInformation("Try to supply shop. ShopName:{ShopName}. Id:{Id}", model.Name, model.Id);
+            if (model == null)
+            {
+                _logger.LogWarning("Read operation failed");
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (repair == null)
+            {
+                _logger.LogWarning("Read operation failed");
+                throw new ArgumentNullException(nameof(repair));
+            }
+            if (count <= 0)
+            {
+                _logger.LogWarning("Read operation failed");
+                throw new ArgumentNullException("Количество должно быть положительным числом");
+            }
+            ShopViewModel curModel = ReadElement(model);
+            if (curModel == null)
+            {
+                _logger.LogWarning("Read operation failed");
+                throw new ArgumentNullException(nameof(curModel));
+            }
+            if (curModel.ShopRepairs.TryGetValue(repair.Id, out var pair))
+            {
+                curModel.ShopRepairs[repair.Id] = (pair.Item1, pair.Item2 + count);
+            }
+            else
+            {
+                curModel.ShopRepairs.Add(repair.Id, (repair, count));
+            }
+            Update(new()
+            {
+                Id = curModel.Id,
+                ShopName = curModel.ShopName,
+                DateOpen = curModel.DateOpen,
+                Address = curModel.Address,
+                ShopRepairs = curModel.ShopRepairs,
+            });
+            _logger.LogInformation("Success. RepairName:{RepairName}. Id:{Id}. Supply:{count}", repair.RepairName, repair.Id, count);
+            return true;
+        }
+
+        public ShopViewModel ReadElement(ShopSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.Name, model.Id);
+            var element = _shopStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
+
+        public bool Create(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool Update(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool Delete(ShopBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_shopStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        private void CheckModel(ShopBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                throw new ArgumentNullException("Нет названия магазина",
+               nameof(model.ShopName));
+            }
+            if (string.IsNullOrEmpty(model.Address))
+            {
+                throw new ArgumentNullException("Нет адресса магазина",
+               nameof(model.ShopName));
+            }
+            if (model.DateOpen == null)
+            {
+                throw new ArgumentNullException("Нет даты открытия магазина",
+               nameof(model.ShopName));
+            }
+            _logger.LogInformation("Shop. ShopName:{ShopName}.Address:{Address}. DateOpen:{DateOpen}. Id: { Id}", model.ShopName, model.Address, model.DateOpen, model.Id);
+            var element = _shopStorage.GetElement(new ShopSearchModel
+            {
+                Name = model.ShopName
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Магазин с таким названием уже есть");
+            }
+        }
+    }
+}

CarRepairShop/CarRepairShopContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,14 @@
+using CarRepairShopDataModels;
+using CarRepairShopDataModels.Models;
+
+namespace CarRepairShopContracts.BindingModels
+{
+    public class ShopBindingModel : IShopModel
+    {
+        public int Id { get; set; }
+        public string ShopName { get; set; }
+        public string Address { get; set; }
+        public DateTime DateOpen { get; set; }
+        public Dictionary<int, (IRepairModel, int)> ShopRepairs { get; set; } = new();
+    }
+}

CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,17 @@
+using CarRepairShopContracts.BindingModels;
+using CarRepairShopContracts.SearchModels;
+using CarRepairShopContracts.ViewModels;
+using CarRepairShopDataModels.Models;
+
+namespace CarRepairShopContracts.BusinessLogicsContracts
+{
+    public interface IShopLogic
+    {
+        List<ShopViewModel>? ReadList(ShopSearchModel? model);
+        ShopViewModel? ReadElement(ShopSearchModel model);
+        bool Create(ShopBindingModel model);
+        bool Update(ShopBindingModel model);
+        bool Delete(ShopBindingModel model);
+        bool MakeSupply(ShopSearchModel model, IRepairModel repair, int count);
+    }
+}

CarRepairShop/CarRepairShopContracts/SearchModels/ShopSearchModel.cs

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

CarRepairShop/CarRepairShopContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,17 @@
+using CarRepairShopContracts.BindingModels;
+using CarRepairShopContracts.SearchModels;
+using CarRepairShopContracts.ViewModels;
+using CarRepairShopDataModels.Models;
+
+namespace CarRepairShopContracts.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);
+    }
+}

CarRepairShop/CarRepairShopContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,18 @@
+using CarRepairShopDataModels;
+using CarRepairShopDataModels.Models;
+using System.ComponentModel;
+
+namespace CarRepairShopContracts.ViewModels
+{
+    public class ShopViewModel : IShopModel
+    {
+        public int Id { get; set; }
+        [DisplayName("Название магазина")]
+        public string ShopName { get; set; }
+        [DisplayName("Адрес магазина")]
+        public string Address { get; set; }
+        [DisplayName("Дата открытия")]
+        public DateTime DateOpen { get; set; }
+        public Dictionary<int, (IRepairModel, int)> ShopRepairs { get; set; } = new();
+    }
+}

CarRepairShop/CarRepairShopDataModels/IShopModel.cs

@@ -0,0 +1,12 @@
+using CarRepairShopDataModels.Models;
+
+namespace CarRepairShopDataModels
+{
+    public interface IShopModel : IId
+    {
+        string ShopName { get; }
+        string Address { get; }
+        DateTime DateOpen { get; }
+        Dictionary<int, (IRepairModel, int)> ShopRepairs { get; }
+    }
+}

CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs

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

CarRepairShop/CarRepairShopListImplement/Implements/ShopStorage.cs

@@ -0,0 +1,104 @@
+using CarRepairShopContracts.BindingModels;
+using CarRepairShopContracts.SearchModels;
+using CarRepairShopContracts.StoragesContracts;
+using CarRepairShopContracts.ViewModels;
+using CarRepairShopDataModels.Models;
+using CarRepairShopListImplement.Models;
+
+namespace CarRepairShopListImplement.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.Name))
+            {
+                return result;
+            }
+            foreach (var shop in _source.Shops)
+            {
+                if (shop.ShopName.Contains(model.Name))
+                {
+                    result.Add(shop.GetViewModel);
+                }
+            }
+            return result;
+        }
+        public ShopViewModel? GetElement(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Name) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            foreach (var shop in _source.Shops)
+            {
+                if ((!string.IsNullOrEmpty(model.Name) &&
+               shop.ShopName == model.Name) ||
+                (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;
+        }
+    }
+}

CarRepairShop/CarRepairShopListImplement/Models/Shop.cs

@@ -0,0 +1,51 @@
+using CarRepairShopContracts.BindingModels;
+using CarRepairShopContracts.ViewModels;
+using CarRepairShopDataModels;
+using CarRepairShopDataModels.Models;
+
+namespace CarRepairShopListImplement.Models
+{
+    public class Shop : IShopModel
+    {
+        public int Id { get; private set; }
+        public string ShopName { get; private set; }
+        public string Address { get; private set; }
+        public DateTime DateOpen { get; private set; }
+        public Dictionary<int, (IRepairModel, int)> ShopRepairs { get; private set; } = new();
+
+        public static Shop? Create(ShopBindingModel model)
+        {
+            if (model == null)
+                return null;
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Address = model.Address,
+                DateOpen = model.DateOpen,
+                ShopRepairs = new()
+            };
+        }
+
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ShopName = model.ShopName;
+            Address = model.Address;
+            DateOpen = model.DateOpen;
+            ShopRepairs = model.ShopRepairs;
+        }
+
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            DateOpen = DateOpen,
+            ShopRepairs = ShopRepairs
+        };
+    }
+}