implement of dynamic dependency injections (not startable for some reason...)

.gitignore

@@ -398,3 +398,5 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
+*.dll
+

FlowerShop/FlowerShop/DataGridViewExtension.cs

@@ -4,13 +4,14 @@ namespace FlowerShopView
 {
 	public static class DataGridViewExtension
 	{
-		public static void FillandConfigGrid<T>(this DataGridView grid, List<T>? data)
+		public static void FillAndConfigGrid<T>(this DataGridView grid, List<T>? data)
 		{
 			if (data == null)
 			{
 				return;
 			}
 			grid.DataSource = data;
+
 			var type = typeof(T);
 			var properties = type.GetProperties();
 			foreach (DataGridViewColumn column in grid.Columns)
@@ -18,23 +19,21 @@ namespace FlowerShopView
 				var property = properties.FirstOrDefault(x => x.Name == column.Name);
 				if (property == null)
 				{
-					throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем { column.Name }");
+					throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем {column.Name}");
-			    }
+				}
 				var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault();
 				if (attribute == null)
 				{
-					throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства { property.Name }");
+					throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства {property.Name}");
-			    }
+				}
-				// ищем нужный нам атрибут
+
 				if (attribute is ColumnAttribute columnAttr)
 				{
 					column.HeaderText = columnAttr.Title;
 					column.Visible = columnAttr.Visible;
 					if (columnAttr.IsUseAutoSize)
 					{
-						column.AutoSizeMode =
+						column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString());
-					   (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode)
-					   , columnAttr.GridViewAutoSize.ToString());
 					}
 					else
 					{

FlowerShop/FlowerShop/FlowerShopView.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows7.0</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -22,9 +22,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\FlowerShopBusinessLogic\FlowerShopBusinessLogic.csproj" />
-    <ProjectReference Include="..\FlowerShopDatabaseImplement\FlowerShopDatabaseImplement.csproj" />
-    <ProjectReference Include="..\FlowerShopFileImplement\FlowerShopFileImplement.csproj" />
-    <ProjectReference Include="..\FlowerShopListImplement\FlowerShopListImplement.csproj" />
   </ItemGroup>
 
 </Project>

FlowerShop/FlowerShop/FormClients.cs

@@ -24,7 +24,7 @@ namespace FlowerShopView
 		{
 			try
 			{
-				dataGridView.FillandConfigGrid(_logic.ReadList(null));
+				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
 				_logger.LogInformation("Загрузка клиентов");
 			}
 			catch (Exception ex)

FlowerShop/FlowerShop/FormComponents.cs

@@ -1,5 +1,6 @@
 using FlowerShopContracts.BindingModels;
 using FlowerShopContracts.BusinessLogicsContracts;
+using FlowerShopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace FlowerShopView
@@ -22,7 +23,7 @@ namespace FlowerShopView
         {
             try
             {
-                dataGridView.FillandConfigGrid(_logic.ReadList(null));
+                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
                 _logger.LogInformation("Загрузка компонентов");
             }
             catch (Exception ex)
@@ -34,7 +35,7 @@ namespace FlowerShopView
         }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
+            var service = DependencyManager.Instance.Resolve<FormComponent>();
             if (service is FormComponent form)
             {
                 if (form.ShowDialog() == DialogResult.OK)
@@ -47,7 +48,7 @@ namespace FlowerShopView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
+                var service = DependencyManager.Instance.Resolve<FormComponent>();
                 if (service is FormComponent form)
                 {
                     form.Id =

FlowerShop/FlowerShop/FormFlower.cs

@@ -1,5 +1,6 @@
 using FlowerShopContracts.BindingModels;
 using FlowerShopContracts.BusinessLogicsContracts;
+using FlowerShopContracts.DI;
 using FlowerShopContracts.SearchModels;
 using FlowerShopDataModels.Models;
 using Microsoft.Extensions.Logging;
@@ -70,7 +71,7 @@ namespace FlowerShopView
         }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormFlowerComponent));
+            var service = DependencyManager.Instance.Resolve<FormFlowerComponent>();
             if (service is FormFlowerComponent form)
             {
                 if (form.ShowDialog() == DialogResult.OK)
@@ -96,7 +97,7 @@ namespace FlowerShopView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormFlowerComponent));
+                var service = DependencyManager.Instance.Resolve<FormFlowerComponent>();
                 if (service is FormFlowerComponent form)
                 {
                     int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);

FlowerShop/FlowerShop/FormFlowers.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using FlowerShopContracts.BindingModels;
 using FlowerShopContracts.BusinessLogicsContracts;
+using FlowerShopContracts.DI;
 
 namespace FlowerShopView
 {
@@ -24,7 +25,7 @@ namespace FlowerShopView
         {
             try
             {
-                dataGridView.FillandConfigGrid(_logic.ReadList(null));
+                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
                 _logger.LogInformation("Загрузка цветов");
             }
             catch (Exception ex)
@@ -35,7 +36,7 @@ namespace FlowerShopView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormFlower));
+            var service = DependencyManager.Instance.Resolve<FormFlower>();
             if (service is FormFlower form)
             {
                 if (form.ShowDialog() == DialogResult.OK)
@@ -49,7 +50,7 @@ namespace FlowerShopView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormFlower));
+                var service = DependencyManager.Instance.Resolve<FormFlower>();
                 if (service is FormFlower form)
                 {
                     form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);

FlowerShop/FlowerShop/FormImplementers.cs

@@ -1,5 +1,6 @@
 using FlowerShopContracts.BindingModels;
 using FlowerShopContracts.BusinessLogicsContracts;
+using FlowerShopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace FlowerShopView
@@ -21,7 +22,7 @@ namespace FlowerShopView
 		{
 			try
 			{
-				DataGridView.FillandConfigGrid(_implementerLogic.ReadList(null));
+				DataGridView.FillAndConfigGrid(_implementerLogic.ReadList(null));
 				_logger.LogInformation("Загрузка исполнителей");
 			}
 			catch (Exception ex)
@@ -38,7 +39,7 @@ namespace FlowerShopView
 
 		private void AddButton_Click(object sender, EventArgs e)
 		{
-			var Service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+			var Service = DependencyManager.Instance.Resolve<FormImplementer>();
 
 			if (Service is FormImplementer Form)
 			{
@@ -53,7 +54,7 @@ namespace FlowerShopView
 		{
 			if (DataGridView.SelectedRows.Count == 1)
 			{
-				var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+				var service = DependencyManager.Instance.Resolve<FormImplementer>();
 				if (service is FormImplementer Form)
 				{
 					Form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value);

FlowerShop/FlowerShop/FormMail.cs

@@ -20,7 +20,7 @@ namespace FlowerShopView
 		{
 			try
 			{
-				dataGridView.FillandConfigGrid(_messageLogic.ReadList(null));
+				dataGridView.FillAndConfigGrid(_messageLogic.ReadList(null));
 				_logger.LogInformation("Загрузка почтовых собщений");
 			}
 			catch (Exception ex)

FlowerShop/FlowerShop/FormMain.cs

@@ -1,6 +1,6 @@
-using FlowerShopBusinessLogic.BusinessLogics;
+using FlowerShopContracts.BindingModels;
-using FlowerShopContracts.BindingModels;
 using FlowerShopContracts.BusinessLogicsContracts;
+using FlowerShopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace FlowerShopView
@@ -29,7 +29,7 @@ namespace FlowerShopView
 		{
 			try
 			{
-				dataGridView.FillandConfigGrid(_orderLogic.ReadList(null));
+				dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
 				_logger.LogInformation("Загрузка заказов");
 			}
 			catch (Exception ex)
@@ -40,7 +40,7 @@ namespace FlowerShopView
 		}
 		private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+			var service = DependencyManager.Instance.Resolve<FormComponents>();
 			if (service is FormComponents form)
 			{
 				form.ShowDialog();
@@ -48,7 +48,7 @@ namespace FlowerShopView
 		}
 		private void ЦветыToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormFlowers));
+			var service = DependencyManager.Instance.Resolve<FormFlowers>();
 			if (service is FormFlowers form)
 			{
 				form.ShowDialog();
@@ -56,7 +56,7 @@ namespace FlowerShopView
 		}
 		private void ButtonCreateOrder_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+			var service = DependencyManager.Instance.Resolve<FormCreateOrder>();
 			if (service is FormCreateOrder form)
 			{
 				form.ShowDialog();
@@ -108,7 +108,7 @@ namespace FlowerShopView
 
 		private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+			var service = DependencyManager.Instance.Resolve<FormReportOrders>();
 			if (service is FormReportOrders form)
 			{
 				form.ShowDialog();
@@ -117,7 +117,7 @@ namespace FlowerShopView
 
 		private void компонентыПоЦветамToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormReportFlowerComponents));
+			var service = DependencyManager.Instance.Resolve <FormReportFlowerComponents>();
 			if (service is FormReportFlowerComponents form)
 			{
 				form.ShowDialog();
@@ -126,7 +126,7 @@ namespace FlowerShopView
 
 		private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+			var service = DependencyManager.Instance.Resolve<FormClients>();
 			if (service is FormClients form)
 			{
 				form.ShowDialog();
@@ -135,7 +135,7 @@ namespace FlowerShopView
 
 		private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+			var service = DependencyManager.Instance.Resolve<FormImplementers>();
 			if (service is FormImplementers form)
 			{
 				form.ShowDialog();
@@ -144,13 +144,13 @@ namespace FlowerShopView
 
 		private void запускToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			_workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
+			_workProcess.DoWork((DependencyManager.Instance.Resolve<IImplementerLogic>() as IImplementerLogic)!, _orderLogic);
 			MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}
 
 		private void письмаToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var Service = Program.ServiceProvider?.GetService(typeof(FormMail));
+			var Service = DependencyManager.Instance.Resolve<FormMail>();
 
 			if (Service is FormMail Form)
 			{

FlowerShop/FlowerShop/Program.cs

@@ -2,100 +2,92 @@
 using FlowerShopBusinessLogic.OfficePackage.Implements;
 using FlowerShopBusinessLogic.OfficePackage;
 using FlowerShopContracts.BusinessLogicsContracts;
-using FlowerShopContracts.StoragesContracts;
-using FlowerShopDatabaseImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 using FlowerShopBusinessLogic.MailWorker;
 using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.DI;
 
 namespace FlowerShopView
 {
     internal static class Program
     {
-        private static ServiceProvider? _serviceProvider;
+		/// <summary>
-        public static ServiceProvider? ServiceProvider => _serviceProvider;
+		/// The main entry point for the application.
-        /// <summary>
+		/// </summary>
-        /// The main entry point for the application.
+		[STAThread]
-        /// </summary>
+		static void Main()
-        [STAThread]
+		{
-        static void Main()
+			// To customize application configuration such as set high DPI settings or default font,
-        {
+			// see https://aka.ms/applicationconfiguration.
-            // To customize application configuration such as set high DPI settings or default font,
+			ApplicationConfiguration.Initialize();
-            // see https://aka.ms/applicationconfiguration.
+			var services = new ServiceCollection();
-            ApplicationConfiguration.Initialize();
+			InitDependency();
-            var services = new ServiceCollection();
+			try
-            ConfigureServices(services);
+			{
-            _serviceProvider = services.BuildServiceProvider();
+				var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
+				mailSender?.MailConfig(new MailConfigBindingModel
+				{
+					MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ??
+				string.Empty,
+					MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ??
+				string.Empty,
+					SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ??
+				string.Empty,
+					SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
+					PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
+					PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
+				});
+				// создаем таймер
+				var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
+			}
+			catch (Exception ex)
+			{
+				var logger =
+				DependencyManager.Instance.Resolve<ILogger>();
+				logger?.LogError(ex, "Ошибка работы с почтой");
+			}
+			Application.Run(DependencyManager.Instance.Resolve<FormMain>());
+		}
+		private static void InitDependency()
+		{
+			DependencyManager.InitDependency();
+			DependencyManager.Instance.AddLogging(option =>
+			{
+				option.SetMinimumLevel(LogLevel.Information);
+				option.AddNLog("nlog.config");
+			});
+			DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
+			DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
+			DependencyManager.Instance.RegisterType<IFlowerLogic, FlowerLogic>();
+			DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
+			DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
+			DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
+			DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
+			DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
+			DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
 
-            try
+			DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
-            {
+			DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
-                var MailSender = _serviceProvider.GetService<AbstractMailWorker>();
+			DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
-                MailSender?.MailConfig(new MailConfigBindingModel
+			DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
-                {
-                    MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
-                    MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
-                    SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty,
-                    SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
-                    PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
-                    PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
-                });
 
-                var Timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
+			DependencyManager.Instance.RegisterType<FormMain>();
-            }
+			DependencyManager.Instance.RegisterType<FormComponent>();
-            catch (Exception ex)
+			DependencyManager.Instance.RegisterType<FormComponents>();
-            {
+			DependencyManager.Instance.RegisterType<FormCreateOrder>();
-                var Logger = _serviceProvider.GetService<ILogger>();
+			DependencyManager.Instance.RegisterType<FormFlower>();
-                Logger?.LogError(ex, "Ошибка загрузки писем");
+			DependencyManager.Instance.RegisterType<FormFlowerComponent>();
-            }
+			DependencyManager.Instance.RegisterType<FormFlowers>();
+			DependencyManager.Instance.RegisterType<FormReportFlowerComponents>();
+			DependencyManager.Instance.RegisterType<FormReportOrders>();
+			DependencyManager.Instance.RegisterType<FormClients>();
+			DependencyManager.Instance.RegisterType<FormImplementer>();
+			DependencyManager.Instance.RegisterType<FormImplementers>();
+			DependencyManager.Instance.RegisterType<FormMail>();
+		}
+		private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
+	}
 
-            Application.Run(_serviceProvider.GetRequiredService<FormMain>());
-        }
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddLogging(option =>
-            {
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddNLog("nlog.config");
-            });
-            services.AddTransient<IComponentStorage, ComponentStorage>();
-            services.AddTransient<IOrderStorage, OrderStorage>();
-            services.AddTransient<IFlowerStorage, FlowerStorage>();
-			services.AddTransient<IClientStorage, ClientStorage>();
-            services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
-			services.AddTransient<IBackUpInfo, BackUpInfo>();
-
-			services.AddTransient<IComponentLogic, ComponentLogic>();
-            services.AddTransient<IOrderLogic, OrderLogic>();
-            services.AddTransient<IFlowerLogic, FlowerLogic>();
-            services.AddTransient<IReportLogic, ReportLogic>();
-			services.AddTransient<IClientLogic, ClientLogic>();
-            services.AddTransient<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<IWorkProcess, WorkModeling>();
-            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
-            services.AddTransient<IBackUpLogic, BackUpLogic>();
-
-            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
-            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
-            services.AddTransient<AbstractSaveToWord, SaveToWord>();
-            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
-
-            services.AddTransient<FormMain>();
-            services.AddTransient<FormComponent>();
-            services.AddTransient<FormComponents>();
-            services.AddTransient<FormCreateOrder>();
-            services.AddTransient<FormFlower>();
-            services.AddTransient<FormFlowerComponent>();
-            services.AddTransient<FormFlowers>();
-            services.AddTransient<FormReportOrders>();
-            services.AddTransient<FormReportFlowerComponents>();
-			services.AddTransient<FormClients>();
-            services.AddTransient<FormImplementer>();
-			services.AddTransient<FormImplementers>();
-            services.AddTransient<FormMail>();
-        }
-        private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
-    }
 }

FlowerShop/FlowerShop/ReportOrders.rdlc

@@ -369,7 +369,7 @@
                     </TablixCell>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="ProductName">
+                        <Textbox Name="FlowerName">
                           <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
@@ -383,7 +383,7 @@
                               <Style />
                             </Paragraph>
                           </Paragraphs>
-                          <rd:DefaultName>ProductName</rd:DefaultName>
+                          <rd:DefaultName>FlowerName</rd:DefaultName>
                           <Style>
                             <Border>
                               <Color>LightGrey</Color>

FlowerShop/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

FlowerShop/FlowerShopClientApp/FlowerShopClientApp.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

FlowerShop/FlowerShopClientApp/Program.cs

@@ -13,7 +13,7 @@ APIClient.Connect(builder.Configuration);
 if (!app.Environment.IsDevelopment())
 {
 	app.UseExceptionHandler("/Home/Error");
-	// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+	// The default HSTS value is 30 days. You may want to change this for flowerion scenarios, see https://aka.ms/aspnetcore-hsts.
 	app.UseHsts();
 }
 

FlowerShop/FlowerShopClientApp/wwwroot/lib/jquery-validation/dist/additional-methods.js

@@ -942,13 +942,13 @@ $.validator.addMethod( "postcodeUK", function( value, element ) {
  *
  * The end result is that neither of these inputs:
  *
- *	<input class="productinfo" name="partnumber">
+ *	<input class="flowerinfo" name="partnumber">
- *	<input class="productinfo" name="description">
+ *	<input class="flowerinfo" name="description">
  *
  *	...will validate unless at least one of them is filled.
  *
- * partnumber:	{require_from_group: [1,".productinfo"]},
+ * partnumber:	{require_from_group: [1,".flowerinfo"]},
- * description: {require_from_group: [1,".productinfo"]}
+ * description: {require_from_group: [1,".flowerinfo"]}
  *
  * options[0]: number of fields that must be filled in the group
  * options[1]: CSS selector that defines the group of conditionally required fields
@@ -981,16 +981,16 @@ $.validator.addMethod( "require_from_group", function( value, element, options )
  *
  * The end result, is that none of these inputs:
  *
- *	<input class="productinfo" name="partnumber">
+ *	<input class="flowerinfo" name="partnumber">
- *	<input class="productinfo" name="description">
+ *	<input class="flowerinfo" name="description">
- *	<input class="productinfo" name="color">
+ *	<input class="flowerinfo" name="color">
  *
  *	...will validate unless either at least two of them are filled,
  *	OR none of them are.
  *
- * partnumber:	{skip_or_fill_minimum: [2,".productinfo"]},
+ * partnumber:	{skip_or_fill_minimum: [2,".flowerinfo"]},
- * description: {skip_or_fill_minimum: [2,".productinfo"]},
+ * description: {skip_or_fill_minimum: [2,".flowerinfo"]},
- * color:		{skip_or_fill_minimum: [2,".productinfo"]}
+ * color:		{skip_or_fill_minimum: [2,".flowerinfo"]}
  *
  * options[0]: number of fields that must be filled in the group
  * options[1]: CSS selector that defines the group of conditionally required fields

FlowerShop/FlowerShopClientApp/wwwroot/lib/jquery/dist/jquery.js

@@ -4772,7 +4772,7 @@ function adjustCSS( elem, prop, valueParts, tween ) {
 		while ( maxIterations-- ) {
 
 			// Evaluate and update our best guess (doubling guesses that zero out).
-			// Finish if the scale equals or crosses 1 (making the old*new product non-positive).
+			// Finish if the scale equals or crosses 1 (making the old*new flower non-positive).
 			jQuery.style( elem, prop, initialInUnit + unit );
 			if ( ( 1 - scale ) * ( 1 - ( scale = currentValue() / initial || 0.5 ) ) <= 0 ) {
 				maxIterations = 0;

FlowerShop/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs

@@ -4,6 +4,7 @@ namespace FlowerShopContracts.BindingModels
 {
     public class MessageInfoBindingModel : IMessageInfoModel
     {
+        public int Id { get; set; }
         public string MessageId { get; set; } = string.Empty;
         public int? ClientId { get; set; }
         public string SenderName { get; set; } = string.Empty;

FlowerShop/FlowerShopContracts/DI/DependencyManager.cs

@@ -0,0 +1,71 @@
+using Microsoft.Extensions.Logging;
+
+namespace FlowerShopContracts.DI
+{
+	/// <summary>
+	/// Менеджер для работы с зависимостями
+	/// </summary>
+	public class DependencyManager
+	{
+		private readonly IDependencyContainer _dependencyManager;
+		private static DependencyManager? _manager;
+		private static readonly object _locker = new();
+		private DependencyManager()
+		{
+			_dependencyManager = new ServiceDependencyContainer();
+		}
+		public static DependencyManager Instance
+		{
+			get
+			{
+				if (_manager == null) 
+				{ 
+					lock (_locker) 
+					{ 
+						_manager = new DependencyManager(); 
+					} 
+				}
+				return _manager;
+			}
+		}
+		/// <summary>
+		/// Иницализация библиотек, в которых идут установки зависомстей
+		/// </summary>
+		public static void InitDependency()
+		{
+			var ext = ServiceProviderLoader.GetImplementationExtensions();
+			if (ext == null)
+			{
+				throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
+			}
+			// регистрируем зависимости
+			ext.RegisterServices();
+		}
+		/// <summary>
+		/// Регистрация логгера
+		/// </summary>
+		/// <param name="configure"></param>
+		public void AddLogging(Action<ILoggingBuilder> configure) => _dependencyManager.AddLogging(configure);
+		/// <summary>
+		/// Добавление зависимости
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <typeparam name="U"></typeparam>
+		public void RegisterType<T, U>(bool isSingle = false) where U :
+		class, T where T : class => _dependencyManager.RegisterType<T, U>(isSingle);
+		/// <summary>
+		/// Добавление зависимости
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <typeparam name="U"></typeparam>
+		public void RegisterType<T>(bool isSingle = false) where T : class =>
+		_dependencyManager.RegisterType<T>(isSingle);
+		/// <summary>
+		/// Получение класса со всеми зависмостями
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <returns></returns>
+		public T Resolve<T>() => _dependencyManager.Resolve<T>();
+	}
+
+}

FlowerShop/FlowerShopContracts/DI/IDependencyContainer.cs

@@ -0,0 +1,37 @@
+using Microsoft.Extensions.Logging;
+
+namespace FlowerShopContracts.DI
+{
+	/// <summary>
+	/// Интерфейс установки зависмости между элементами
+	/// </summary>
+	public interface IDependencyContainer
+	{
+		/// <summary>
+		/// Регистрация логгера
+		/// </summary>
+		/// <param name="configure"></param>
+		void AddLogging(Action<ILoggingBuilder> configure);
+		/// <summary>
+		/// Добавление зависимости
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <typeparam name="U"></typeparam>
+		/// <param name="isSingle"></param>
+		void RegisterType<T, U>(bool isSingle) where U : class, T where T :
+		class;
+		/// <summary>
+		/// Добавление зависимости
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="isSingle"></param>
+		void RegisterType<T>(bool isSingle) where T : class;
+		/// <summary>
+		/// Получение класса со всеми зависмостями
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <returns></returns>
+		T Resolve<T>();
+	}
+
+}

FlowerShop/FlowerShopContracts/DI/IImplementationExtensioncs.cs

@@ -0,0 +1,15 @@
+namespace FlowerShopContracts.DI
+{
+	/// <summary>
+	/// Интерфейс для регистрации зависимостей в модулях
+	/// </summary>
+	public interface IImplementationExtension
+	{
+		public int Priority { get; }
+		/// <summary>
+		/// Регистрация сервисов
+		/// </summary>
+		public void RegisterServices();
+	}
+
+}

FlowerShop/FlowerShopContracts/DI/ServiceDependencyContainer.cs

@@ -0,0 +1,52 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace FlowerShopContracts.DI
+{
+	public class ServiceDependencyContainer : IDependencyContainer
+	{
+		private ServiceProvider? _serviceProvider;
+		private readonly ServiceCollection _serviceCollection;
+
+		public ServiceDependencyContainer()
+		{
+			_serviceCollection = new ServiceCollection();
+		}
+		public void AddLogging(Action<ILoggingBuilder> Configure)
+		{
+			_serviceCollection.AddLogging(Configure);
+		}
+		public void RegisterType<T, U>(bool isSingle) where U : class, T where T : class
+		{
+			if (isSingle)
+			{
+				_serviceCollection.AddSingleton<T, U>();
+			}
+			else
+			{
+				_serviceCollection.AddTransient<T, U>();
+			}
+			_serviceProvider = null;
+		}
+		public void RegisterType<T>(bool isSingle) where T : class
+		{
+			if (isSingle)
+			{
+				_serviceCollection.AddSingleton<T>();
+			}
+			else
+			{
+				_serviceCollection.AddTransient<T>();
+			}
+			_serviceProvider = null;
+		}
+		public T Resolve<T>()
+		{
+			if (_serviceProvider == null)
+			{
+				_serviceProvider = _serviceCollection.BuildServiceProvider();
+			}
+			return _serviceProvider.GetService<T>()!;
+		}
+	}
+}

FlowerShop/FlowerShopContracts/DI/ServiceProviderLoader.cs

@@ -0,0 +1,50 @@
+using System.Reflection;
+
+namespace FlowerShopContracts.DI
+{
+	public class ServiceProviderLoader
+	{
+		/// <summary>
+		/// Загрузка всех классов-реализаций IImplementationExtension
+		/// </summary>
+		/// <returns></returns>
+		public static IImplementationExtension? GetImplementationExtensions()
+		{
+			IImplementationExtension? source = null;
+			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))
+					{
+						if (source == null)
+						{
+							source = (IImplementationExtension)Activator.CreateInstance(t)!;
+						}
+						else
+						{
+							var newSource = (IImplementationExtension)Activator.CreateInstance(t)!;
+							if (newSource.Priority > source.Priority)
+							{
+								source = newSource;
+							}
+						}
+					}
+				}
+			}
+			return source;
+		}
+
+		private static string TryGetImplementationExtensionsFolder()
+		{
+			var directory = new DirectoryInfo(Directory.GetCurrentDirectory());
+			while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions"))
+			{
+				directory = directory.Parent;
+			}
+			return $"{directory?.FullName}\\ImplementationExtensions";
+		}
+	}
+}

FlowerShop/FlowerShopContracts/FlowerShopContracts.csproj

@@ -1,11 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\FlowerShopDataModels\FlowerShopDataModels.csproj" />
   </ItemGroup>

FlowerShop/FlowerShopDataModels/FlowerShopDataModels.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabase.cs

@@ -9,7 +9,7 @@ namespace FlowerShopDatabaseImplement
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseNpgsql(@"Host=localhost;Database=FlowerShopDatabaseFull;Username=postgres;Password=postgres");
+                optionsBuilder.UseNpgsql(@"Host=localhost;Database=FlowerShopDatabaseTestFull;Username=postgres;Password=postgres");
             }
             base.OnConfiguring(optionsBuilder);
             AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);

FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj

@@ -1,19 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <Optimize>False</Optimize>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.27" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.19" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.27" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.19">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.27">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.22" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.18" />
   </ItemGroup>
 
   <ItemGroup>
@@ -21,4 +28,23 @@
     <ProjectReference Include="..\FlowerShopDataModels\FlowerShopDataModels.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+	
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
+	</Target>
+
 </Project>

FlowerShop/FlowerShopDatabaseImplement/ImplementationExtension.cs

@@ -0,0 +1,21 @@
+using FlowerShopContracts.DI;
+using FlowerShopContracts.StoragesContracts;
+using FlowerShopDatabaseImplement.Implements;
+
+namespace FlowerShopDatabaseImplement
+{
+	public class ImplementationExtension : IImplementationExtension
+	{
+		public int Priority => 3;
+		public void RegisterServices()
+		{
+			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
+			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+			DependencyManager.Instance.RegisterType<IFlowerStorage, FlowerStorage>();
+			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+		}
+	}
+}

FlowerShop/FlowerShopDatabaseImplement/Implements/FlowerStorage.cs

@@ -69,17 +69,17 @@ namespace FlowerShopDatabaseImplement.Implements
             using var transaction = context.Database.BeginTransaction();
             try
             {
-                var product = context.Flowers.FirstOrDefault(rec =>
+                var flower = context.Flowers.FirstOrDefault(rec =>
                 rec.Id == model.Id);
-                if (product == null)
+                if (flower == null)
                 {
                     return null;
                 }
-                product.Update(model);
+                flower.Update(model);
                 context.SaveChanges();
-                product.UpdateComponents(context, model);
+                flower.UpdateComponents(context, model);
                 transaction.Commit();
-                return product.GetViewModel;
+                return flower.GetViewModel;
             }
             catch
             {

FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_InitCreate.cs

@@ -1,35 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FlowerShopDatabaseImplement.Migrations
-{
-    public partial class InitCreate : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "MessageInfos",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "text", nullable: false),
-                    ClientId = table.Column<int>(type: "integer", nullable: true),
-                    SenderName = table.Column<string>(type: "text", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
-                    Subject = table.Column<string>(type: "text", nullable: false),
-                    Body = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "MessageInfos");
-        }
-    }
-}

FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516142709_InitCreate.Designer.cs

@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace FlowerShopDatabaseImplement.Migrations
 {
     [DbContext(typeof(FlowerShopDatabase))]
-    [Migration("20240502144838_test")]
+    [Migration("20240516142709_InitCreate")]
-    partial class test
+    partial class InitCreate
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -157,6 +157,9 @@ namespace FlowerShopDatabaseImplement.Migrations
                     b.Property<DateTime>("DateDelivery")
                         .HasColumnType("timestamp without time zone");
 
+                    b.Property<int>("Id")
+                        .HasColumnType("integer");
+
                     b.Property<string>("SenderName")
                         .IsRequired()
                         .HasColumnType("text");

FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516142709_InitCreate.cs

@@ -0,0 +1,203 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FlowerShopDatabaseImplement.Migrations
+{
+    public partial class InitCreate : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Clients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ClientFIO = table.Column<string>(type: "text", nullable: false),
+                    Email = table.Column<string>(type: "text", nullable: false),
+                    Password = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Clients", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Components",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ComponentName = table.Column<string>(type: "text", nullable: false),
+                    Cost = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Components", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Flowers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    FlowerName = table.Column<string>(type: "text", nullable: false),
+                    Price = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Flowers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Implementers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ImplementerFIO = table.Column<string>(type: "text", nullable: false),
+                    Password = table.Column<string>(type: "text", nullable: false),
+                    WorkExperience = table.Column<int>(type: "integer", nullable: false),
+                    Qualification = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Implementers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "MessageInfos",
+                columns: table => new
+                {
+                    MessageId = table.Column<string>(type: "text", nullable: false),
+                    Id = table.Column<int>(type: "integer", nullable: false),
+                    ClientId = table.Column<int>(type: "integer", nullable: true),
+                    SenderName = table.Column<string>(type: "text", nullable: false),
+                    DateDelivery = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    Subject = table.Column<string>(type: "text", nullable: false),
+                    Body = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "FlowerComponents",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    FlowerId = table.Column<int>(type: "integer", nullable: false),
+                    ComponentId = table.Column<int>(type: "integer", nullable: false),
+                    Count = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_FlowerComponents", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_FlowerComponents_Components_ComponentId",
+                        column: x => x.ComponentId,
+                        principalTable: "Components",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_FlowerComponents_Flowers_FlowerId",
+                        column: x => x.FlowerId,
+                        principalTable: "Flowers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Orders",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    FlowerId = table.Column<int>(type: "integer", nullable: false),
+                    ClientId = table.Column<int>(type: "integer", nullable: false),
+                    ImplementerId = table.Column<int>(type: "integer", nullable: true),
+                    Count = table.Column<int>(type: "integer", nullable: false),
+                    Sum = table.Column<double>(type: "double precision", nullable: false),
+                    Status = table.Column<int>(type: "integer", nullable: false),
+                    DateCreate = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    DateImplement = table.Column<DateTime>(type: "timestamp without time zone", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Orders", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Orders_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Orders_Flowers_FlowerId",
+                        column: x => x.FlowerId,
+                        principalTable: "Flowers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Orders_Implementers_ImplementerId",
+                        column: x => x.ImplementerId,
+                        principalTable: "Implementers",
+                        principalColumn: "Id");
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_FlowerComponents_ComponentId",
+                table: "FlowerComponents",
+                column: "ComponentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_FlowerComponents_FlowerId",
+                table: "FlowerComponents",
+                column: "FlowerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ClientId",
+                table: "Orders",
+                column: "ClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_FlowerId",
+                table: "Orders",
+                column: "FlowerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "FlowerComponents");
+
+            migrationBuilder.DropTable(
+                name: "MessageInfos");
+
+            migrationBuilder.DropTable(
+                name: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "Components");
+
+            migrationBuilder.DropTable(
+                name: "Clients");
+
+            migrationBuilder.DropTable(
+                name: "Flowers");
+
+            migrationBuilder.DropTable(
+                name: "Implementers");
+        }
+    }
+}

FlowerShop/FlowerShopDatabaseImplement/Migrations/FlowerShopDatabaseModelSnapshot.cs

@@ -155,6 +155,9 @@ namespace FlowerShopDatabaseImplement.Migrations
                     b.Property<DateTime>("DateDelivery")
                         .HasColumnType("timestamp without time zone");
 
+                    b.Property<int>("Id")
+                        .HasColumnType("integer");
+
                     b.Property<string>("SenderName")
                         .IsRequired()
                         .HasColumnType("text");

FlowerShop/FlowerShopDatabaseImplement/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FlowerShopDatabaseImplement.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
+    /// </summary>
+    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
+    // с помощью такого средства, как ResGen или Visual Studio.
+    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
+    // с параметром /str или перестройте свой проект VS.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FlowerShopDatabaseImplement.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

FlowerShop/FlowerShopDatabaseImplement/Properties/Resources.resx

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		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">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</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.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:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<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" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</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>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>

FlowerShop/FlowerShopFileImplement/FlowerShopFileImplement.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,4 +11,7 @@
     <ProjectReference Include="..\FlowerShopDataModels\FlowerShopDataModels.csproj" />
   </ItemGroup>
 
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
+	</Target>
 </Project>

FlowerShop/FlowerShopFileImplement/ImplementationExtension.cs

@@ -0,0 +1,21 @@
+using FlowerShopContracts.DI;
+using FlowerShopContracts.StoragesContracts;
+using FlowerShopFileImplement.Implements;
+
+namespace FlowerShopFileImplement
+{
+	public class ImplementationExtension : IImplementationExtension
+	{
+		public int Priority => 1;
+		public void RegisterServices()
+		{
+			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
+			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+			DependencyManager.Instance.RegisterType<IFlowerStorage, FlowerStorage>();
+			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+		}
+	}
+}

FlowerShop/FlowerShopListImplement/FlowerShopListImplement.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,4 +11,7 @@
     <ProjectReference Include="..\FlowerShopDataModels\FlowerShopDataModels.csproj" />
   </ItemGroup>
 
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
+	</Target>
 </Project>

FlowerShop/FlowerShopListImplement/ImplementationExtension.cs

@@ -0,0 +1,22 @@
+using FlowerShopContracts.DI;
+using FlowerShopContracts.StoragesContracts;
+using FlowerShopListImplement.Implements;
+
+namespace FlowerShopListImplement
+{
+	public class ImplementationExtension : IImplementationExtension
+	{
+		public int Priority => 0;
+		public void RegisterServices()
+		{
+			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
+			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+			DependencyManager.Instance.RegisterType<IFlowerStorage, FlowerStorage>();
+			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+		}
+	}
+
+}

FlowerShop/FlowerShopListImplement/Implements/BackUpInfo.cs

@@ -0,0 +1,17 @@
+using FlowerShopContracts.StoragesContracts;
+
+namespace FlowerShopListImplement.Implements
+{
+	public class BackUpInfo : IBackUpInfo
+	{
+		public List<T>? GetList<T>() where T : class, new()
+		{
+			throw new NotImplementedException();
+		}
+
+		public Type? GetTypeByModelInterface(string modelInterfaceName)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

FlowerShop/FlowerShopRestApi/FlowerShopRestApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>