надо протестить

IceCreamShop/IceCreamBusinessLogic/BusinessLogics/ImplementationBusinessLogicExtension.cs

@@ -0,0 +1,35 @@
+using IceCreamBusinessLogic.BusinessLogics;
+using IceCreamBusinessLogic.MailWorker;
+using IceCreamBusinessLogic.OfficePackage.Implements;
+using IceCreamBusinessLogic.OfficePackage;
+using IceCreamShopContracts.BusinessLogicsContracts;
+using IceCreamShopContracts.DI;
+using IceCreamBusinessLogic.BusinessLogic;
+
+namespace ConfectioneryBusinessLogic
+{
+    public class ImplementationBusinessLogicExtension : IImplementationBusinessLogicExtension
+    {
+        public int Priority => 0;
+
+        public void RegisterServices()
+        {
+            DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
+            DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
+            DependencyManager.Instance.RegisterType<IIceCreamLogic, IceCreamLogic>();
+            DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
+            DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
+            DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
+            DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
+            DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
+            DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
+            DependencyManager.Instance.RegisterType<IShopLogic, ShopLogic>();
+
+            DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
+
+            DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
+        }
+    }
+}

IceCreamShop/IceCreamShop/DataGridViewExtension.cs

@@ -31,6 +31,7 @@ namespace IceCreamShopView
                 {
                     column.HeaderText = columnAttr.Title;
                     column.Visible = columnAttr.Visible;
+                    column.DefaultCellStyle.Format = columnAttr.Format;
                     if (columnAttr.IsUseAutoSize)
                     {
                         column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString());

IceCreamShop/IceCreamShop/FormMain.Designer.cs

@@ -38,13 +38,19 @@
             мороженоеToolStripMenuItem = new ToolStripMenuItem();
             клиентыToolStripMenuItem = new ToolStripMenuItem();
             ImplementersToolStripMenuItem = new ToolStripMenuItem();
+            магазиныToolStripMenuItem = new ToolStripMenuItem();
             отчетыToolStripMenuItem = new ToolStripMenuItem();
             iceCreamComponentsToolStripMenuItem = new ToolStripMenuItem();
             iceCreamToolStripMenuItem = new ToolStripMenuItem();
             ordersToolStripMenuItem = new ToolStripMenuItem();
+            listShopsToolStripMenuItem = new ToolStripMenuItem();
+            shopWorkloadToolStripMenuItem = new ToolStripMenuItem();
+            ordersByDateToolStripMenuItem = new ToolStripMenuItem();
             DoWorkToolStripMenuItem = new ToolStripMenuItem();
             MailToolStripMenuItem = new ToolStripMenuItem();
             createBackupToolStripMenuItem = new ToolStripMenuItem();
+            buttonSupplyShop = new Button();
+            SellIceCreamButton = new Button();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             menuStrip.SuspendLayout();
             SuspendLayout();
@@ -106,7 +112,7 @@
             // 
             // справочникиToolStripMenuItem
             // 
-			справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, мороженоеToolStripMenuItem, клиентыToolStripMenuItem, ImplementersToolStripMenuItem });
+            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, мороженоеToolStripMenuItem, клиентыToolStripMenuItem, ImplementersToolStripMenuItem, магазиныToolStripMenuItem });
             справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             справочникиToolStripMenuItem.Size = new Size(94, 20);
             справочникиToolStripMenuItem.Text = "Справочники";
@@ -139,9 +145,16 @@
             ImplementersToolStripMenuItem.Text = "Исполнители";
             ImplementersToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
             // 
+            // магазиныToolStripMenuItem
+            // 
+            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            магазиныToolStripMenuItem.Size = new Size(149, 22);
+            магазиныToolStripMenuItem.Text = "Магазины";
+            магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
+            // 
             // отчетыToolStripMenuItem
             // 
-			отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { iceCreamComponentsToolStripMenuItem, iceCreamToolStripMenuItem, ordersToolStripMenuItem });
+            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { iceCreamComponentsToolStripMenuItem, iceCreamToolStripMenuItem, ordersToolStripMenuItem, listShopsToolStripMenuItem, shopWorkloadToolStripMenuItem, ordersByDateToolStripMenuItem });
             отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
             отчетыToolStripMenuItem.Size = new Size(60, 20);
             отчетыToolStripMenuItem.Text = "Отчеты";
@@ -167,6 +180,27 @@
             ordersToolStripMenuItem.Text = "Список заказов";
             ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
             // 
+            // listShopsToolStripMenuItem
+            // 
+            listShopsToolStripMenuItem.Name = "listShopsToolStripMenuItem";
+            listShopsToolStripMenuItem.Size = new Size(238, 22);
+            listShopsToolStripMenuItem.Text = "Список магазинов";
+            listShopsToolStripMenuItem.Click += listShopsToolStripMenuItem_Click;
+            // 
+            // shopWorkloadToolStripMenuItem
+            // 
+            shopWorkloadToolStripMenuItem.Name = "shopWorkloadToolStripMenuItem";
+            shopWorkloadToolStripMenuItem.Size = new Size(238, 22);
+            shopWorkloadToolStripMenuItem.Text = "Загруженность магазинов";
+            shopWorkloadToolStripMenuItem.Click += shopWorkloadToolStripMenuItem_Click;
+            // 
+            // ordersByDateToolStripMenuItem
+            // 
+            ordersByDateToolStripMenuItem.Name = "ordersByDateToolStripMenuItem";
+            ordersByDateToolStripMenuItem.Size = new Size(238, 22);
+            ordersByDateToolStripMenuItem.Text = "Заказы по дате";
+            ordersByDateToolStripMenuItem.Click += ordersByDateToolStripMenuItem_Click;
+            // 
             // DoWorkToolStripMenuItem
             // 
             DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
@@ -188,11 +222,35 @@
             createBackupToolStripMenuItem.Text = "Создать бекап";
             createBackupToolStripMenuItem.Click += createBackupToolStripMenuItem_Click;
             // 
+            // buttonSupplyShop
+            // 
+            buttonSupplyShop.Location = new Point(1081, 243);
+            buttonSupplyShop.Margin = new Padding(3, 2, 3, 2);
+            buttonSupplyShop.Name = "buttonSupplyShop";
+            buttonSupplyShop.Size = new Size(170, 37);
+            buttonSupplyShop.TabIndex = 14;
+            buttonSupplyShop.Text = "Пополнение магазина";
+            buttonSupplyShop.UseVisualStyleBackColor = true;
+            buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
+            // 
+            // SellIceCreamButton
+            // 
+            SellIceCreamButton.Location = new Point(1081, 284);
+            SellIceCreamButton.Margin = new Padding(3, 2, 3, 2);
+            SellIceCreamButton.Name = "SellIceCreamButton";
+            SellIceCreamButton.Size = new Size(170, 37);
+            SellIceCreamButton.TabIndex = 15;
+            SellIceCreamButton.Text = "Продажа мороженого";
+            SellIceCreamButton.UseVisualStyleBackColor = true;
+            SellIceCreamButton.Click += new System.EventHandler(this.SellIceCreamButton_Click);
+            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(1261, 347);
+            Controls.Add(SellIceCreamButton);
+            Controls.Add(buttonSupplyShop);
             Controls.Add(buttonUpdate);
             Controls.Add(buttonSetToFinish);
             Controls.Add(buttonCreateOrder);
@@ -207,243 +265,6 @@
             ResumeLayout(false);
             PerformLayout();
         }
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.buttonUpdate = new System.Windows.Forms.Button();
-            this.buttonSetToFinish = new System.Windows.Forms.Button();
-            this.buttonCreateOrder = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.menuStrip = new System.Windows.Forms.MenuStrip();
-            this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.мороженоеToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.клиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ImplementersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.iceCreamComponentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.iceCreamToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.listShopsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.shopWorkloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ordersByDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DoWorkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.buttonSupplyShop = new System.Windows.Forms.Button();
-            this.SellIceCreamButton = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.menuStrip.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // buttonUpdate
-            // 
-            this.buttonUpdate.Location = new System.Drawing.Point(1231, 392);
-            this.buttonUpdate.Name = "buttonUpdate";
-            this.buttonUpdate.Size = new System.Drawing.Size(194, 49);
-            this.buttonUpdate.TabIndex = 13;
-            this.buttonUpdate.Text = "Обновить";
-            this.buttonUpdate.UseVisualStyleBackColor = true;
-            this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click);
-            // 
-            // buttonSetToFinish
-            // 
-            this.buttonSetToFinish.Location = new System.Drawing.Point(1231, 90);
-            this.buttonSetToFinish.Name = "buttonSetToFinish";
-            this.buttonSetToFinish.Size = new System.Drawing.Size(194, 49);
-            this.buttonSetToFinish.TabIndex = 12;
-            this.buttonSetToFinish.Text = "Заказ выдан";
-            this.buttonSetToFinish.UseVisualStyleBackColor = true;
-            this.buttonSetToFinish.Click += new System.EventHandler(this.buttonSetToFinish_Click);
-            // 
-            // buttonCreateOrder
-            // 
-            this.buttonCreateOrder.Location = new System.Drawing.Point(1231, 35);
-            this.buttonCreateOrder.Name = "buttonCreateOrder";
-            this.buttonCreateOrder.Size = new System.Drawing.Size(194, 49);
-            this.buttonCreateOrder.TabIndex = 9;
-            this.buttonCreateOrder.Text = "Создать заказ";
-            this.buttonCreateOrder.UseVisualStyleBackColor = true;
-            this.buttonCreateOrder.Click += new System.EventHandler(this.buttonCreateOrder_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(14, 35);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(1202, 407);
-            this.dataGridView.TabIndex = 8;
-            // 
-            // menuStrip
-            // 
-            this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.справочникиToolStripMenuItem,
-            this.отчетыToolStripMenuItem,
-            this.DoWorkToolStripMenuItem});
-            this.menuStrip.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip.Name = "menuStrip";
-            this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 3, 0, 3);
-            this.menuStrip.Size = new System.Drawing.Size(1433, 30);
-            this.menuStrip.TabIndex = 7;
-            this.menuStrip.Text = "Справочники";
-            // 
-            // справочникиToolStripMenuItem
-            // 
-            this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.компонентыToolStripMenuItem,
-            this.мороженоеToolStripMenuItem,
-            this.клиентыToolStripMenuItem,
-            this.ImplementersToolStripMenuItem,
-            this.магазиныToolStripMenuItem});
-            this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
-            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
-            this.справочникиToolStripMenuItem.Text = "Справочники";
-            // 
-            // компонентыToolStripMenuItem
-            // 
-            this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-            this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            this.компонентыToolStripMenuItem.Text = "Компоненты";
-            this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click);
-            // 
-            // мороженоеToolStripMenuItem
-            // 
-            this.мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem";
-            this.мороженоеToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            this.мороженоеToolStripMenuItem.Text = "Мороженое";
-            this.мороженоеToolStripMenuItem.Click += new System.EventHandler(this.мороженоеToolStripMenuItem_Click);
-            // 
-            // клиентыToolStripMenuItem
-            // 
-            this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            this.клиентыToolStripMenuItem.Text = "Клиенты";
-            this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click);
-            // 
-            // ImplementersToolStripMenuItem
-            // 
-            this.ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
-            this.ImplementersToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            this.ImplementersToolStripMenuItem.Text = "Исполнители";
-            this.ImplementersToolStripMenuItem.Click += new System.EventHandler(this.ImplementersToolStripMenuItem_Click);
-            // 
-            // магазиныToolStripMenuItem
-            // 
-            this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            this.магазиныToolStripMenuItem.Text = "Магазины";
-            this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click);
-            // 
-            // отчетыToolStripMenuItem
-            // 
-            this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.iceCreamComponentsToolStripMenuItem,
-            this.iceCreamToolStripMenuItem,
-            this.ordersToolStripMenuItem,
-            this.listShopsToolStripMenuItem,
-            this.shopWorkloadToolStripMenuItem,
-            this.ordersByDateToolStripMenuItem});
-            this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
-            this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
-            this.отчетыToolStripMenuItem.Text = "Отчеты";
-            // 
-            // iceCreamComponentsToolStripMenuItem
-            // 
-            this.iceCreamComponentsToolStripMenuItem.Name = "iceCreamComponentsToolStripMenuItem";
-            this.iceCreamComponentsToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            this.iceCreamComponentsToolStripMenuItem.Text = "Список мороженых";
-            this.iceCreamComponentsToolStripMenuItem.Click += new System.EventHandler(this.IceCreamsToolStripMenuItem_Click);
-            // 
-            // iceCreamToolStripMenuItem
-            // 
-            this.iceCreamToolStripMenuItem.Name = "iceCreamToolStripMenuItem";
-            this.iceCreamToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            this.iceCreamToolStripMenuItem.Text = "Мороженые с компонентами";
-            this.iceCreamToolStripMenuItem.Click += new System.EventHandler(this.IceCreamComponentsToolStripMenuItem_Click);
-            // 
-            // ordersToolStripMenuItem
-            // 
-            this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
-            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            this.ordersToolStripMenuItem.Text = "Список заказов";
-            this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
-            // 
-            // listShopsToolStripMenuItem
-            // 
-            this.listShopsToolStripMenuItem.Name = "listShopsToolStripMenuItem";
-            this.listShopsToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            this.listShopsToolStripMenuItem.Text = "Список магазинов";
-            this.listShopsToolStripMenuItem.Click += new System.EventHandler(this.listShopsToolStripMenuItem_Click);
-            // 
-            // shopWorkloadToolStripMenuItem
-            // 
-            this.shopWorkloadToolStripMenuItem.Name = "shopWorkloadToolStripMenuItem";
-            this.shopWorkloadToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            this.shopWorkloadToolStripMenuItem.Text = "Загруженность магазинов";
-            this.shopWorkloadToolStripMenuItem.Click += new System.EventHandler(this.shopWorkloadToolStripMenuItem_Click);
-            // 
-            // ordersByDateToolStripMenuItem
-            // 
-            this.ordersByDateToolStripMenuItem.Name = "ordersByDateToolStripMenuItem";
-            this.ordersByDateToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            this.ordersByDateToolStripMenuItem.Text = "Заказы по дате";
-            this.ordersByDateToolStripMenuItem.Click += new System.EventHandler(this.ordersByDateToolStripMenuItem_Click);
-            // 
-            // DoWorkToolStripMenuItem
-            // 
-            this.DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
-            this.DoWorkToolStripMenuItem.Size = new System.Drawing.Size(114, 24);
-            this.DoWorkToolStripMenuItem.Text = "Запуск работ";
-            this.DoWorkToolStripMenuItem.Click += new System.EventHandler(this.DoWorkToolStripMenuItem_Click);
-            // 
-            // buttonSupplyShop
-            // 
-            this.buttonSupplyShop.Location = new System.Drawing.Point(1231, 292);
-            this.buttonSupplyShop.Name = "buttonSupplyShop";
-            this.buttonSupplyShop.Size = new System.Drawing.Size(194, 44);
-            this.buttonSupplyShop.TabIndex = 14;
-            this.buttonSupplyShop.Text = "Пополнение магазина";
-            this.buttonSupplyShop.UseVisualStyleBackColor = true;
-            this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
-            // 
-            // SellIceCreamButton
-            // 
-            this.SellIceCreamButton.Location = new System.Drawing.Point(1231, 248);
-            this.SellIceCreamButton.Name = "SellIceCreamButton";
-            this.SellIceCreamButton.Size = new System.Drawing.Size(194, 40);
-            this.SellIceCreamButton.TabIndex = 15;
-            this.SellIceCreamButton.Text = "Продажа мороженого";
-            this.SellIceCreamButton.UseVisualStyleBackColor = true;
-            this.SellIceCreamButton.Click += new System.EventHandler(this.SellIceCreamButton_Click);
-            // 
-            // FormMain
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1433, 467);
-            this.Controls.Add(this.SellIceCreamButton);
-            this.Controls.Add(this.buttonSupplyShop);
-            this.Controls.Add(this.buttonUpdate);
-            this.Controls.Add(this.buttonSetToFinish);
-            this.Controls.Add(this.buttonCreateOrder);
-            this.Controls.Add(this.dataGridView);
-            this.Controls.Add(this.menuStrip);
-            this.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.Name = "FormMain";
-            this.Text = "Магазин мороженого";
-            this.Load += new System.EventHandler(this.FormMain_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.menuStrip.ResumeLayout(false);
-            this.menuStrip.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
 
         #endregion
 
@@ -464,27 +285,11 @@
         private ToolStripMenuItem DoWorkToolStripMenuItem;
         private ToolStripMenuItem MailToolStripMenuItem;
         private ToolStripMenuItem createBackupToolStripMenuItem;
-	}
-        private Button buttonUpdate;
-        private Button buttonSetToFinish;
-        private Button buttonCreateOrder;
-        private DataGridView dataGridView;
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem справочникиToolStripMenuItem;
-        private ToolStripMenuItem компонентыToolStripMenuItem;
-        private ToolStripMenuItem мороженоеToolStripMenuItem;
-        private ToolStripMenuItem отчетыToolStripMenuItem;
-        private ToolStripMenuItem iceCreamComponentsToolStripMenuItem;
-        private ToolStripMenuItem iceCreamToolStripMenuItem;
-        private ToolStripMenuItem ordersToolStripMenuItem;
-        private ToolStripMenuItem клиентыToolStripMenuItem;
-        private ToolStripMenuItem ImplementersToolStripMenuItem;
-        private ToolStripMenuItem DoWorkToolStripMenuItem;
         private ToolStripMenuItem магазиныToolStripMenuItem;
-        private Button buttonSupplyShop;
-        private Button SellIceCreamButton;
         private ToolStripMenuItem listShopsToolStripMenuItem;
         private ToolStripMenuItem shopWorkloadToolStripMenuItem;
         private ToolStripMenuItem ordersByDateToolStripMenuItem;
+        private Button buttonSupplyShop;
+        private Button SellIceCreamButton;
     }
 }

IceCreamShop/IceCreamShop/FormMain.cs

@@ -1,20 +1,8 @@
-using AbstractIceCreamShopDataModels.Enums;
+using IceCreamShop;
-using ConfectioneryBusinessLogic;
-using IceCreamBusinessLogic.BusinessLogics;
-using IceCreamShop;
 using IceCreamShopContracts.BindingModels;
 using IceCreamShopContracts.BusinessLogicsContracts;
 using IceCreamShopContracts.DI;
 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 IceCreamShopView
 {
@@ -25,6 +13,7 @@ namespace IceCreamShopView
         private readonly IReportLogic _reportLogic;
         private readonly IWorkProcess _workProcess;
         private readonly IBackUpLogic _backUpLogic;
+
         public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic)
         {
             InitializeComponent();
@@ -75,11 +64,8 @@ namespace IceCreamShopView
         }
         private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            var form = DependencyManager.Instance.Resolve<FormShops>();
-            if (service is FormShops form)
-            {
             form.ShowDialog();
-            }
         }
 
         private void buttonSetToWork_Click(object sender, EventArgs e)
@@ -134,15 +120,6 @@ namespace IceCreamShopView
                 }
             }
         }
-        private void buttonCreateOrder_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
-            if (service is FormCreateOrder form)
-            {
-                form.ShowDialog();
-                LoadData();
-            }
-        }
 
         private void buttonSetToFinish_Click(object sender, EventArgs e)
         {
@@ -203,24 +180,18 @@ namespace IceCreamShopView
             var form = DependencyManager.Instance.Resolve<FormClients>();
             form.ShowDialog();
         }
+
         private void buttonSupplyShop_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply));
+            var form = DependencyManager.Instance.Resolve<FormShopSupply>();
-            if (service is FormShopSupply form)
-            {
             form.ShowDialog();
         }
-        }
 
         private void SellIceCreamButton_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSellIceCream));
+            var form = DependencyManager.Instance.Resolve<FormSellIceCream>();
-
-            if (service is FormSellIceCream form)
-            {
             form.ShowDialog();
         }
-        }
 
         private void listShopsToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -237,29 +208,8 @@ namespace IceCreamShopView
 
         private void shopWorkloadToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportShopWorkload));
+            var form = DependencyManager.Instance.Resolve<FormReportShopWorkload>();
-            if (service is FormReportShopWorkload form)
-            {
             form.ShowDialog();
-            }
-        }
-
-        private void ordersByDateToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportDateOrders));
-            if (service is FormReportDateOrders form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormClients));
-            if (service is FormClients form)
-            {
-                form.ShowDialog();
-            }
         }
 
         private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e)
@@ -268,6 +218,12 @@ namespace IceCreamShopView
             form.ShowDialog();
         }
 
+        private void ordersByDateToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var form = DependencyManager.Instance.Resolve<FormReportDateOrders>();
+            form.ShowDialog();
+        }
+
         private void DoWorkToolStripMenuItem_Click(object sender, EventArgs e)
         {
             _workProcess.DoWork(

IceCreamShop/IceCreamShop/FormShops.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using IceCreamShopContracts.DI;
 
 namespace IceCreamShopView
 {
@@ -33,49 +34,34 @@ namespace IceCreamShopView
         {
             try
             {
-                var list = _logic.ReadList(null);
+                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["Name"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["ShopIceCreams"].Visible = false;
-                }
-
                 _logger.LogInformation("Загрузка магазинов");
-
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                MessageBoxIcon.Error);
             }
         }
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+            var form = DependencyManager.Instance.Resolve<FormShop>();
-
-            if (service is FormShop form)
-            {
             if (form.ShowDialog() == DialogResult.OK)
             {
                 LoadData();
             }
         }
-        }
 
         private void buttonEdit_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+                var service = DependencyManager.Instance.Resolve<FormShop>();
-
                 if (service is FormShop form)
                 {
                     form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-
                     if (form.ShowDialog() == DialogResult.OK)
                     {
                         LoadData();
@@ -88,11 +74,12 @@ namespace IceCreamShopView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                if (MessageBox.Show("Удалить магазин?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                if (MessageBox.Show("Удалить запись?", "Вопрос",
+                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    int id =
+                    Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     _logger.LogInformation("Удаление магазина");
-
                     try
                     {
                         if (!_logic.Delete(new ShopBindingModel
@@ -102,13 +89,13 @@ namespace IceCreamShopView
                         {
                             throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
                         }
-
                         LoadData();
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError(ex, "Ошибка удаления изделия");
+                        _logger.LogError(ex, "Ошибка удаления магазина");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        MessageBox.Show(ex.Message, "Ошибка",
+                        MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }
             }

IceCreamShop/IceCreamShop/FormViewMail.cs

@@ -1,5 +1,6 @@
 using IceCreamShop;
 using IceCreamShopContracts.BusinessLogicsContracts;
+using IceCreamShopContracts.DI;
 using IceCreamShopContracts.ViewModels;
 using Microsoft.Extensions.Logging;
 
@@ -29,7 +30,11 @@ namespace IceCreamShopView
 		{
             try
             {
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+                dataGridView.FillAndConfigGrid(_logic.ReadList(new()
+                {
+                    Page = currentPage,
+                    PageSize = pageSize,
+                }));
                 _logger.LogInformation("Загрузка списка писем");
                 labelInfoPages.Text = $"{currentPage} страница";
                 return true;
@@ -75,13 +80,10 @@ namespace IceCreamShopView
 
 		private void dataGridView_RowHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormReplyMail));
+            var form = DependencyManager.Instance.Resolve<FormReplyMail>();
-			if (service is FormReplyMail form)
-			{
             form.MessageId = (string)dataGridView.Rows[e.RowIndex].Cells["MessageId"].Value;
             form.ShowDialog();
             MailLoad();
         }
 	}
-	}
 }

IceCreamShop/IceCreamShop/Program.cs

@@ -60,24 +60,6 @@ namespace IceCreamShop
 				option.AddNLog("nlog.config");
 			});
 
-			DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
-			DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
-			DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
-			DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
-			DependencyManager.Instance.RegisterType<IIceCreamLogic, IceCreamLogic>();
-			DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
-			DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
-			DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
-
-			DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>();
-
-			DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
-
-			DependencyManager.Instance.RegisterType<FormMain>();
-			DependencyManager.Instance.RegisterType<FormImplementer>();
-			DependencyManager.Instance.RegisterType<FormImplementers>();
             DependencyManager.Instance.RegisterType<FormClients>();
             DependencyManager.Instance.RegisterType<FormComponent>();
             DependencyManager.Instance.RegisterType<FormComponents>();
@@ -85,8 +67,18 @@ namespace IceCreamShop
             DependencyManager.Instance.RegisterType<FormIceCream>();
             DependencyManager.Instance.RegisterType<FormIceCreamComponent>();
             DependencyManager.Instance.RegisterType<FormIceCreams>();
-			DependencyManager.Instance.RegisterType<FormReportProductComponents>();
+            DependencyManager.Instance.RegisterType<FormImplementer>();
+            DependencyManager.Instance.RegisterType<FormImplementers>();
+            DependencyManager.Instance.RegisterType<FormMain>();
+            DependencyManager.Instance.RegisterType<FormReplyMail>();
+            DependencyManager.Instance.RegisterType<FormReportDateOrders>();
             DependencyManager.Instance.RegisterType<FormReportOrders>();
+            DependencyManager.Instance.RegisterType<FormReportProductComponents>();
+            DependencyManager.Instance.RegisterType<FormReportShopWorkload>();
+            DependencyManager.Instance.RegisterType<FormSellIceCream>();
+            DependencyManager.Instance.RegisterType<FormShop>();
+            DependencyManager.Instance.RegisterType<FormShops>();
+            DependencyManager.Instance.RegisterType<FormShopSupply>();
             DependencyManager.Instance.RegisterType<FormViewMail>();
         }
         private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();

IceCreamShop/IceCreamShopContracts/Attributes/ColumnAttribute.cs

@@ -13,13 +13,16 @@
 
         public bool IsUseAutoSize { get; private set; }
 
-        public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false)
+        public string Format { get; private set; }
+
+        public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false, string format = "")
         {
             Title = title;
             Visible = visible;
             Width = width;
             GridViewAutoSize = gridViewAutoSize;
             IsUseAutoSize = isUseAutoSize;
+            Format = format;
         }
     }
 }

IceCreamShop/IceCreamShopContracts/BindingModels/MessageInfoBindingModel.cs

@@ -16,11 +16,10 @@ namespace IceCreamShopContracts.BindingModels
 
         public DateTime DateDelivery { get; set; }
 
-		public int Id => throw new NotImplementedException();
-	}
-
         public bool HasRead { get; set; }
 
         public string? Reply { get; set; }
+
+        public int Id => throw new NotImplementedException();
 	}
 }

IceCreamShop/IceCreamShopContracts/DI/DependencyManager.cs

@@ -22,7 +22,9 @@ namespace IceCreamShopContracts.DI
         /// </summary>
         public static void InitDependency()
         {
-            var ext = ServiceProviderLoader.GetImplementationExtensions();
+            var extList = ServiceProviderLoader.GetImplementationExtensions();
+            foreach (var ext in extList)
+            {
                 if (ext == null)
                 {
                     throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
@@ -30,6 +32,7 @@ namespace IceCreamShopContracts.DI
                 // регистрируем зависимости
                 ext.RegisterServices();
             }
+        }
 
         /// <summary>
         /// Регистрация логгера

IceCreamShop/IceCreamShopContracts/DI/IImplementationBusinessLogicExtension.cs

@@ -0,0 +1,9 @@
+
+namespace IceCreamShopContracts.DI
+{
+    /// <summary>
+    /// Интерфейс для индентификации и отделения загрузки бизнес-логики от загрузки хранилищ
+    /// </summary>
+    /// <seealso cref="IceCreamShopContracts.DI.IImplementationExtension" />
+    public interface IImplementationBusinessLogicExtension : IImplementationExtension { }
+}

IceCreamShop/IceCreamShopContracts/DI/ServiceProviderLoader.cs

@@ -8,33 +8,41 @@ namespace IceCreamShopContracts.DI
         /// Загрузка всех классов-реализаций IImplementationExtension
         /// </summary>
         /// <returns></returns>
-        public static IImplementationExtension? GetImplementationExtensions()
+        public static List<IImplementationExtension?> GetImplementationExtensions()
         {
-            IImplementationExtension? source = null;
+            Type[] handledTypes =
+            {
+                typeof(IImplementationBusinessLogicExtension),
+                typeof(IImplementationExtension)
+            };
+            var result = handledTypes.Select(x => (IImplementationExtension?)null).ToList();
             var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories);
             foreach (var file in files.Distinct())
             {
                 Assembly asm = Assembly.LoadFrom(file);
                 foreach (var t in asm.GetExportedTypes())
                 {
-                    if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t))
+                    for (var i = 0; i < handledTypes.Length; i++)
                     {
-                        if (source == null)
+                        if (t.IsClass && handledTypes[i].IsAssignableFrom(t))
                         {
-                            source = (IImplementationExtension)Activator.CreateInstance(t)!;
+                            if (result[i] == null)
+                            {
+                                result[i] = (IImplementationExtension)Activator.CreateInstance(t)!;
                             }
                             else
                             {
                                 var newSource = (IImplementationExtension)Activator.CreateInstance(t)!;
-                            if (newSource.Priority > source.Priority)
+                                if (newSource.Priority > result[i].Priority)
                                 {
-                                source = newSource;
+                                    result[i] = newSource;
                                 }
                             }
                         }
                     }
                 }
-            return source;
+            }
+            return result;
         }
 
         private static string TryGetImplementationExtensionsFolder()

IceCreamShop/IceCreamShopContracts/ViewModels/ComponentViewModel.cs

@@ -17,7 +17,7 @@ namespace IceCreamShopContracts.ViewModels
 		[Column("Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
 		public string ComponentName { get; set; } = string.Empty;
 
-		[Column("Цена", width: 80)]
+        [Column("Цена", width: 80, format: "0.00")]
         public double Cost { get; set; }
 	}
 

IceCreamShop/IceCreamShopContracts/ViewModels/IceCreamViewModel.cs

@@ -17,7 +17,7 @@ namespace IceCreamShopContracts.ViewModels
         [Column("Название мороженого", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
 		public string IceCreamName { get; set; } = string.Empty;
 
-        [Column("Цена", width: 100)]
+        [Column("Цена", width: 100, format: "0.00")]
         public double Price { get; set; }
 
         [Column(visible: false)]

IceCreamShop/IceCreamShopContracts/ViewModels/MessageInfoViewModel.cs

@@ -14,7 +14,7 @@ namespace IceCreamShopContracts.ViewModels
         [Column("Отправитель", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)]
         public string SenderName { get; set; } = string.Empty;
 
-		[Column("Дата письма", width: 100)]
+        [Column("Дата письма", width: 100, format: "D")]
         public DateTime DateDelivery { get; set; }
 
         [Column("Заголовок", width: 150)]
@@ -24,15 +24,13 @@ namespace IceCreamShopContracts.ViewModels
         public string Body { get; set; } = string.Empty;
 
         [Column(visible: false)]
-		public int Id => throw new NotImplementedException();
-	}
-        [DisplayName("Текст")]
-        public string Body { get; set; } = string.Empty;
 
-		[DisplayName("Прочитано")]
+        public int Id => throw new NotImplementedException();
+
+        [Column("Прочитано", gridViewAutoSize: GridViewAutoSize.AllCellsExceptHeader, isUseAutoSize: true)]
         public bool HasRead { get; set; }
 
-		[DisplayName("Ответ")]
+        [Column("Ответ", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string? Reply { get; set; }
     }
 }

IceCreamShop/IceCreamShopContracts/ViewModels/OrderViewModel.cs

@@ -42,10 +42,10 @@ namespace IceCreamShopContracts.ViewModels
 		[Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
 		public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
 
-        [Column("Дата создания", width: 100)]
+        [Column("Дата создания", width: 100, format: "D")]
         public DateTime DateCreate { get; set; } = DateTime.Now;
 
-        [Column("Дата выполнения", width: 100)]
+        [Column("Дата выполнения", width: 100, format: "D")]
         public DateTime? DateImplement { get; set; }
     }
 }

IceCreamShop/IceCreamShopContracts/ViewModels/ShopViewModel.cs

@@ -1,4 +1,6 @@
 using AbstractIceCreamShopDataModels.Models;
+using IceCreamShopContracts.Attributes;
+using IceCreamShopContracts.Attributes;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,14 +12,19 @@ namespace IceCreamShopContracts.ViewModels
 {
     public class ShopViewModel : IShopModel
     {
+        [Column(visible: false)]
         public int Id { get; set; }
-        [DisplayName("Название магазина")]
+
+        [Column("Название магазина", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
         public string Name { get; set; } = string.Empty;
-        [DisplayName("Адрес")]
+
+        [Column("Адрес", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string Adress { get; set; } = string.Empty;
-        [DisplayName("Дата открытия")]
+
+        [Column("Дата открытия", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true, format: "f")]
         public DateTime OpeningDate { get; set; }
-        [DisplayName("Вместимость магазина")]
+
+        [Column("Вместимость магазина", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)]
         public int IceCreamMaxCount { get; set; }
 
         public Dictionary<int, (IIceCreamModel, int)> ShopIceCreams { get; set; } = new();

IceCreamShop/IceCreamShopDatabaseImplement/Models/MessageInfo.cs

@@ -13,20 +13,28 @@ namespace IceCreamShopDatabaseImplement.Models
 		[DataMember]
 		public string MessageId { get; private set; } = string.Empty;
 
+		[DataMember]
         public int? ClientId { get; private set; }
 
+		[DataMember]
         public string SenderName { get; private set; } = string.Empty;
 
+		[DataMember]
         public DateTime DateDelivery { get; private set; } = DateTime.Now;
 
+		[DataMember]
         public string Subject { get; private set; } = string.Empty;
 
+		[DataMember]
         public string Body { get; private set; } = string.Empty;
 
+		[DataMember]
         public Client? Client { get; private set; }
 
+		[DataMember]
         public bool HasRead { get; private set; }
 
+		[DataMember]
         public string? Reply { get; private set; }
 
 		public static MessageInfo? Create(MessageInfoBindingModel model)
@@ -61,6 +69,8 @@ namespace IceCreamShopDatabaseImplement.Models
 		public MessageInfoViewModel GetViewModel => new()
         {
             Body = Body,
+            Reply = Reply,
+            HasRead = HasRead,
             Subject = Subject,
             ClientId = ClientId,
             MessageId = MessageId,
@@ -69,15 +79,5 @@ namespace IceCreamShopDatabaseImplement.Models
         };
 
 		public int Id => throw new NotImplementedException();
-	}
-			Body = Body,
-			Reply = Reply,
-			HasRead = HasRead,
-			Subject = Subject,
-			ClientId = ClientId,
-			MessageId = MessageId,
-			SenderName = SenderName,
-			DateDelivery = DateDelivery,
-		};
 	}
 }

IceCreamShop/IceCreamShopFileImplement/FileImplementationExtension.cs

@@ -16,6 +16,7 @@ namespace IceCreamShopFileImplement
             DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
             DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
             DependencyManager.Instance.RegisterType<IIceCreamStorage, IceCreamStorage>();
+            DependencyManager.Instance.RegisterType<IShopStorage, ShopStorage>();
             DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
         }
     }

IceCreamShop/IceCreamShopFileImplement/Models/MessageInfo.cs

@@ -27,8 +27,10 @@ namespace IceCreamShopFileImplement.Models
         [DataMember]
 		public string Body { get; private set; } = string.Empty;
 
+		[DataMember]
         public bool HasRead { get; private set; }
 
+		[DataMember]
         public string? Reply { get; private set; }
 
 		public static MessageInfo? Create(MessageInfoBindingModel model)
@@ -101,15 +103,6 @@ namespace IceCreamShopFileImplement.Models
             new XAttribute("SenderName", SenderName),
             new XAttribute("DateDelivery", DateDelivery)
             );
-	}
-        public XElement GetXElement => new("MessageInfo",
-            new XAttribute("Body", Body),
-            new XAttribute("Subject", Subject),
-            new XAttribute("ClientId", ClientId),
-            new XAttribute("MessageId", MessageId),
-            new XAttribute("SenderName", SenderName),
-            new XAttribute("DateDelivery", DateDelivery)
-            );
 
         public int Id => throw new NotImplementedException();
     }

IceCreamShop/IceCreamShopListImplement/Implements/MessageInfoStorage.cs

@@ -2,7 +2,6 @@
 using IceCreamShopContracts.SearchModels;
 using IceCreamShopContracts.StoragesContracts;
 using IceCreamShopContracts.ViewModels;
-using IceCreamShopContracts.StoragesContracts;
 using IceCreamShopListImplement.Models;
 
 namespace IceCreamShopListImplement.Implements

IceCreamShop/IceCreamShopListImplement/ListImplementationExtension.cs

@@ -16,8 +16,8 @@ namespace IceCreamShopListImplement
 			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
             DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
             DependencyManager.Instance.RegisterType<IIceCreamStorage, IceCreamStorage>();
+            DependencyManager.Instance.RegisterType<IShopStorage, ShopStorage>();
             DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
         }
-
     }
 }

IceCreamShop/IceCreamShopListImplement/Models/MessageInfo.cs

@@ -26,8 +26,10 @@ namespace IceCreamShopListImplement.Models
         [DataMember]
 		public string Body { get; private set; } = string.Empty;
 
+        [DataMember]
         public bool HasRead { get; private set; }
 
+        [DataMember]
         public string? Reply { get; private set; }
 
 		public static MessageInfo? Create(MessageInfoBindingModel model)
@@ -62,6 +64,8 @@ namespace IceCreamShopListImplement.Models
 		public MessageInfoViewModel GetViewModel => new()
         {
             Body = Body,
+            Reply = Reply,
+            HasRead = HasRead,
             Subject = Subject,
             ClientId = ClientId,
             MessageId = MessageId,
@@ -70,15 +74,5 @@ namespace IceCreamShopListImplement.Models
         };
 
 		public int Id => throw new NotImplementedException();
-	}
-			Body = Body,
-			Reply = Reply,
-			HasRead = HasRead,
-			Subject = Subject,
-			ClientId = ClientId,
-			MessageId = MessageId,
-			SenderName = SenderName,
-			DateDelivery = DateDelivery,
-		};
 	}
 }