wm fx

.gitignore

@@ -14,9 +14,6 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
-# dll files
-*.dll
-
 # Mono auto generated files
 mono_crash.*
 

SoftwareInstallation/AbstractShowClientApp/Controllers/HomeController.cs

@@ -144,16 +144,5 @@ namespace AbstractShowClientApp.Controllers
 			var prod = APIClient.GetRequest<PackageViewModel>($"api/main/getpackage?packageId={package}");
 			return count * (prod?.Price ?? 1);
 		}
-
-		[HttpGet]
-		public IActionResult Mails()
-		{
-			if (APIClient.Client == null)
-			{
-				return Redirect("~/Home/Enter");
-			}
-			return
-			View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
-		}
 	}
 }

SoftwareInstallation/AbstractShowClientApp/Views/Home/Mails.cshtml

@@ -1,54 +0,0 @@
-@using AbstractSoftwareInstallationContracts.ViewModels
-
-@model List<MessageInfoViewModel>
-
-@{
-	ViewData["Title"] = "Mails";
-}
-
-<div class="text-center">
-	<h1 class="display-4">Письма</h1>
-</div>
-
-
-<div class="text-center">
-	@{
-		if (Model == null)
-		{
-			<h3 class="display-4">Авторизируйтесь</h3>
-			return;
-		}
-
-		<table class="table">
-			<thead>
-				<tr>
-					<th>
-						Дата письма
-					</th>
-					<th>
-						Заголовок
-					</th>
-					<th>
-						Текст
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				@foreach (var item in Model)
-				{
-					<tr>
-						<td>
-							@Html.DisplayFor(modelItem => item.DateDelivery)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Subject)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Body)
-						</td>
-					</tr>
-				}
-			</tbody>
-		</table>
-	}
-</div>

SoftwareInstallation/AbstractShowClientApp/Views/Shared/_Layout.cshtml

@@ -20,19 +20,16 @@
                 <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
 					<ul class="navbar-nav flex-grow-1">
 						<li class="nav-item">
-							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Index">Заказы</a>
+							<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Заказы</a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
-						</li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Mails">Письма</a>
-                        </li>
-						<li class="nav-item">
-							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Enter">Вход</a>
+							<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Register">Регистрация</a>
+							<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Register">Регистрация</a>
 						</li>
 					</ul>
                 </div>

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/AbstractSoftwareInstallationBusinessLogic.csproj

@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
-    <PackageReference Include="MailKit" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.14" />
   </ItemGroup>

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/BusinessLogic/BackUpLogic.cs

@@ -1,99 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using AbstractSoftwareInstallationDataModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Serialization.Json;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
-{
-    public class BackUpLogic : IBackUpLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IBackUpInfo _backUpInfo;
-        public BackUpLogic(ILogger<BackUpLogic> logger, IBackUpInfo backUpInfo)
-        {
-            _logger = logger;
-            _backUpInfo = backUpInfo;
-        }
-        public void CreateBackUp(BackUpSaveBindingModel model)
-        {
-            if (_backUpInfo == null)
-            {
-                return;
-            }
-            try
-            {
-                _logger.LogDebug("Clear folder");
-                // зачистка папки и удаление старого архива
-                var dirInfo = new DirectoryInfo(model.FolderName);
-                if (dirInfo.Exists)
-                {
-                    foreach (var file in dirInfo.GetFiles())
-                    {
-                        file.Delete();
-                    }
-                }
-                _logger.LogDebug("Delete archive");
-                string fileName = $"{model.FolderName}.zip";
-                if (File.Exists(fileName))
-                {
-                    File.Delete(fileName);
-                }
-                // берем метод для сохранения
-                _logger.LogDebug("Get assembly");
-                var typeIId = typeof(IId);
-                var assembly = typeIId.Assembly;
-                if (assembly == null)
-                {
-                    throw new ArgumentNullException("Сборка не найдена", nameof(assembly));
-                }
-                var types = assembly.GetTypes();
-                var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance);
-                _logger.LogDebug("Find {count} types", types.Length);
-                foreach (var type in types)
-                {
-                    if (type.IsInterface && type.GetInterface(typeIId.Name) != null)
-                    {
-                        var modelType = _backUpInfo.GetTypeByModelInterface(type.Name);
-                        if (modelType == null)
-                        {
-                            throw new InvalidOperationException($"Не найденкласс - модель для { type.Name }");
-                        }
-                        _logger.LogDebug("Call SaveToFile method for {name} type", type.Name);
-                        // вызываем метод на выполнение
-                        method?.MakeGenericMethod(modelType).Invoke(this, new object[] { model.FolderName });
-                    }
-                }
-                _logger.LogDebug("Create zip and remove folder");
-                // архивируем
-                ZipFile.CreateFromDirectory(model.FolderName, fileName);
-                // удаляем папку
-                dirInfo.Delete(true);
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-        private void SaveToFile<T>(string folderName) where T : class, new()
-        {
-            var records = _backUpInfo.GetList<T>();
-            if (records == null)
-            {
-                _logger.LogWarning("{type} type get null list", typeof(T).Name);
-                return;
-            }
-            var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
-            using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate);
-            jsonFormatter.WriteObject(fs, records);
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/BusinessLogic/ClientLogic.cs

@@ -8,7 +8,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
@@ -48,10 +47,6 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
                 _logger.LogWarning("ReadElement element not found");
                 return null;
             }
-            if (!string.IsNullOrEmpty(model.Password) && element.Password != model.Password)
-            {
-                return null;
-            }
             _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
             return element;
         }
@@ -123,14 +118,6 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
             {
                 throw new InvalidOperationException("Такой клиент уже есть");
             }
-            if (!Regex.IsMatch(model.Email, @"^[\w\.]{1,30}@{1}[^\d\W]+\.{1}[^\d\W]{2,4}$"))
-            {
-                throw new ArgumentException("Неверно введен адрес электронной почты", nameof(model.Email));
-            }
-            if (!Regex.IsMatch(model.Password, @"^[^\s:""]{8,20}$"))
-            {
-                throw new ArgumentException("Неверно введен пароль", nameof(model.Password));
-            }
         }
     }
 }

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/BusinessLogic/MessageInfoLogic.cs

@@ -1,48 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using AbstractSoftwareInstallationContracts.SearchModels;
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
-{
-    public class MessageInfoLogic : IMessageInfoLogic
-    {
-		private readonly ILogger _logger;
-		private readonly IMessageInfoStorage _messageInfoStorage;
-		public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage MessageInfoStorage)
-		{
-			_logger = logger;
-			_messageInfoStorage = MessageInfoStorage;
-		}
-
-		public bool Create(MessageInfoBindingModel model)
-		{
-			if (_messageInfoStorage.Insert(model) == null)
-			{
-				_logger.LogWarning("Insert operation failed");
-				return false;
-			}
-			return true;
-		}
-
-		public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
-		{
-			_logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId} ", model?.MessageId, model?.ClientId);
-			var list = (model == null) ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model);
-			if (list == null)
-			{
-				_logger.LogWarning("ReadList return null list");
-				return null;
-			}
-			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
-			return list;
-		}
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -5,7 +5,6 @@ using AbstractSoftwareInstallationContracts.ViewModels;
 using AbstractSoftwareInstallationContracts.StoragesContracts;
 using Microsoft.Extensions.Logging;
 using AbstractSoftwareInstallationDataModels;
-using AbstractSoftwareInstallationBusinessLogic.MailWorker;
 
 namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
 {
@@ -13,31 +12,10 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IClientLogic _clientLogic;
-        private readonly AbstractMailWorker _mailWorker;
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage OrderStorage, IClientLogic clientLogic, AbstractMailWorker mailWorker)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage OrderStorage)
         {
             _logger = logger;
             _orderStorage = OrderStorage;
-            _clientLogic = clientLogic;
-            _mailWorker = mailWorker;
-        }
-        public void SendOrderStatusMail(int clientId, string subject, string text)
-        {
-            var client = _clientLogic.ReadElement(new ClientSearchModel
-            {
-                Id = clientId
-            });
-            if (client == null)
-            {
-                throw new ArgumentNullException($"Клиент с Id:{clientId} не найден.");
-            }
-            _mailWorker.MailSendAsync(new MailSendInfoBindingModel
-            {
-                MailAddress = client.Email,
-                Subject = subject,
-                Text = text
-            });
         }
         private void CheckModel(OrderBindingModel model, bool withParams = true)
         {
@@ -85,19 +63,17 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
         {
             CheckModel(model);
             if (model.Status != OrderStatus.Неизвестен)
-            {
-                _logger.LogWarning("Insert operation failed. Order status incorrect.");
+            { 
+                _logger.LogWarning("Order status is incorrect");
                 return false;
             }
             model.Status = OrderStatus.Принят;
-            var result = _orderStorage.Insert(model);
-            if (result == null)
+            if (_orderStorage.Insert(model) == null)
             {
                 model.Status = OrderStatus.Неизвестен;
-                _logger.LogWarning("Insert operation failed");
+                _logger.LogWarning("Failed to insert order into a storage");
                 return false;
             }
-            SendOrderStatusMail(result.ClientId, $"Новый заказ создан. Номер заказа #{result.Id}", $"Заказ #{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят");
             return true;
         }
         public bool StatusUpdate(OrderBindingModel rawModel, OrderStatus _newStatus)
@@ -123,23 +99,24 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
             {
                 model.ImplementerId = rawModel.ImplementerId;
             }
-
-            CheckModel(model, false);
-            if (model.Status + 1 != _newStatus)
+            if (viewModel.Status + 1 != _newStatus)
             {
                 _logger.LogWarning("Status update to " + _newStatus.ToString() + " operation failed. Order status incorrect.");
                 return false;
             }
-            model.Status = _newStatus;
-            if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now;
-            var result = _orderStorage.Update(model);
-            if (result == null)
+            rawModel.Status = _newStatus;
+            if (rawModel.Status == OrderStatus.Выдан) rawModel.DateImplement = DateTime.Now;
+            else
             {
-                model.Status--;
+                rawModel.DateImplement = viewModel.DateImplement;
+            }
+            CheckModel(rawModel, false);
+            if (_orderStorage.Update(rawModel) == null)
+            {
+                rawModel.Status--;
                 _logger.LogWarning("Update operation failed");
                 return false;
             }
-            SendOrderStatusMail(result.ClientId, $"Изменен статус заказа #{result.Id}", $"Заказ #{result.Id} изменен статус на {result.Status}");
             return true;
         }
         public OrderViewModel? ReadElement(OrderSearchModel model)

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/BusinessLogic/WorkModeling.cs

@@ -71,17 +71,15 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
 						}))
 						{
 							// делаем работу
-							Thread.Sleep(implementer.WorkExperience * _rnd.Next(1000, 10000) * order.Count);
+							Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
 							_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
 							_orderLogic.FinishOrder(new OrderBindingModel
 							{
 								Id = order.Id,
 								ImplementerId = implementer.Id
 							});
-							// отдыхаем
-							Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
-						}
-
+							
+						}						
 					}
 					// кто-то мог уже перехватить заказ, игнорируем ошибку
 					catch (InvalidOperationException ex)
@@ -94,6 +92,8 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
 						_logger.LogError(ex, "Error while do work");
 						throw;
 					}
+					// отдыхаем
+					Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
 				}
 			});
 		}
@@ -138,7 +138,5 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
 				throw;
 			}
 		}
-
-
 	}
 }

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -1,82 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationBusinessLogic.MailWorker
-{
-    public abstract class AbstractMailWorker
-    {
-		protected string _mailLogin = string.Empty;
-		protected string _mailPassword = string.Empty;
-		protected string _smtpClientHost = string.Empty;
-		protected int _smtpClientPort;
-		protected string _popHost = string.Empty;
-		protected int _popPort;
-		private readonly IMessageInfoLogic _messageInfoLogic;
-		private readonly IClientLogic _clientLogic;
-		private readonly ILogger _logger;
-		public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic)
-		{
-			_logger = logger;
-			_messageInfoLogic = messageInfoLogic;
-			_clientLogic = clientLogic;
-		}
-		public void MailConfig(MailConfigBindingModel config)
-		{
-			_mailLogin = config.MailLogin;
-			_mailPassword = config.MailPassword;
-			_smtpClientHost = config.SmtpClientHost;
-			_smtpClientPort = config.SmtpClientPort;
-			_popHost = config.PopHost;
-			_popPort = config.PopPort;
-			_logger.LogDebug("Config: {login}, {password}, {clientHost},{ clientPOrt}, { popHost}, { popPort}", _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
-		}
-		public async void MailSendAsync(MailSendInfoBindingModel info)
-		{
-			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0)
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
-			{
-				return;
-			}
-			_logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject);
-			await SendMailAsync(info);
-		}
-		public async void MailCheck()
-		{
-			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(_popHost) || _popPort == 0)
-			{
-				return;
-			}
-			if (_messageInfoLogic == null)
-			{
-				return;
-			}
-			var list = await ReceiveMailAsync();
-			_logger.LogDebug("Check Mail: {Count} new mails", list.Count);
-			foreach (var mail in list)
-			{
-				mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id;
-				_messageInfoLogic.Create(mail);
-			}
-		}
-		protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
-		protected abstract Task<List<MessageInfoBindingModel>>
-		ReceiveMailAsync();
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/MailWorker/MailKitWorker.cs

@@ -1,79 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Mail;
-using System.Text;
-using System.Threading.Tasks;
-using MailKit.Net.Pop3;
-using MailKit.Security;
-
-namespace AbstractSoftwareInstallationBusinessLogic.MailWorker
-{
-    public class MailKitWorker : AbstractMailWorker
-    {
-		public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) : base(logger, messageInfoLogic, clientLogic) { }
-		protected override async Task SendMailAsync(MailSendInfoBindingModel info)
-		{
-			using var objMailMessage = new MailMessage();
-			using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
-			try
-			{
-				objMailMessage.From = new MailAddress(_mailLogin);
-				objMailMessage.To.Add(new MailAddress(info.MailAddress));
-				objMailMessage.Subject = info.Subject;
-				objMailMessage.Body = info.Text;
-				objMailMessage.SubjectEncoding = Encoding.UTF8;
-				objMailMessage.BodyEncoding = Encoding.UTF8;
-				objSmtpClient.UseDefaultCredentials = false;
-				objSmtpClient.EnableSsl = true;
-				objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
-				objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
-				await Task.Run(() => objSmtpClient.Send(objMailMessage));
-			}
-			catch (Exception)
-			{
-				throw;
-			}
-		}
-		protected override async Task<List<MessageInfoBindingModel>>
-	   ReceiveMailAsync()
-		{
-			var list = new List<MessageInfoBindingModel>();
-			using var client = new Pop3Client();
-			await Task.Run(() =>
-			{
-				try
-				{
-					client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
-					client.Authenticate(_mailLogin, _mailPassword);
-					for (int i = 0; i < client.Count; i++)
-					{
-						var message = client.GetMessage(i);
-						foreach (var mail in message.From.Mailboxes)
-						{
-							list.Add(new MessageInfoBindingModel
-							{
-								DateDelivery = message.Date.DateTime,
-								MessageId = message.MessageId,
-								SenderName = mail.Address,
-								Subject = message.Subject,
-								Body = message.TextBody
-							});
-						}
-					}
-				}
-				catch (MailKit.Security.AuthenticationException)
-				{ }
-				finally
-				{
-					client.Disconnect(true);
-				}
-			});
-			return list;
-		}
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/AbstractSoftwareInstallationContracts.csproj

@@ -6,12 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
-    <PackageReference Include="Unity" Version="5.11.10" />
-    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AbstractSoftwareInstallationDataModels\AbstractSoftwareInstallationDataModels.csproj" />
   </ItemGroup>

SoftwareInstallation/AbstractSoftwareInstallationContracts/Attributes/ColumnAttribute.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.Attributes
-{
-    [AttributeUsage(AttributeTargets.Property)]
-    public class ColumnAttribute : Attribute
-    {
-        public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false)
-        {
-            Title = title;
-            Visible = visible;
-            Width = width;
-            GridViewAutoSize = gridViewAutoSize;
-            IsUseAutoSize = isUseAutoSize;
-        }
-        public string Title { get; private set; }
-        public bool Visible { get; private set; }
-        public int Width { get; private set; }
-        public GridViewAutoSize GridViewAutoSize { get; private set; }
-        public bool IsUseAutoSize { get; private set; }
-    }
-
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/Attributes/GridViewAutoSize.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.Attributes
-{
-    public enum GridViewAutoSize
-    {
-        NotSet = 0,
-        None = 1,
-        ColumnHeader = 2,
-        AllCellsExceptHeader = 4,
-        AllCells = 6,
-        DisplayedCellsExceptHeader = 8,
-        DisplayedCells = 10,
-        Fill = 16
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/BackUpSaveBindingModel.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.BindingModels
-{
-    public class BackUpSaveBindingModel
-    {
-        public string FolderName { get; set; } = string.Empty;
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/MailConfigBindingModel.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.BindingModels
-{
-    public class MailConfigBindingModel
-    {
-		public string MailLogin { get; set; } = string.Empty;
-		public string MailPassword { get; set; } = string.Empty;
-		public string SmtpClientHost { get; set; } = string.Empty;
-		public int SmtpClientPort { get; set; }
-		public string PopHost { get; set; } = string.Empty;
-		public int PopPort { get; set; }
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.BindingModels
-{
-    public class MailSendInfoBindingModel
-    {
-        public string MailAddress { get; set; } = string.Empty;
-        public string Subject { get; set; } = string.Empty;
-        public string Text { get; set; } = string.Empty;
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/MessageInfoBindingModel.cs

@@ -1,26 +0,0 @@
-using AbstractSoftwareInstallationDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.BindingModels
-{
-    public class MessageInfoBindingModel : IMessageInfoModel
-    {
-		public string MessageId { get; set; } = string.Empty;
-
-		public int? ClientId { get; set; }
-
-		public string SenderName { get; set; } = string.Empty;
-
-		public DateTime DateDelivery { get; set; }
-
-		public string Subject { get; set; } = string.Empty;
-
-		public string Body { get; set; } = string.Empty;
-
-        public int Id => throw new NotImplementedException();
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/BusinessLogicsContracts/IBackUpLogic.cs

@@ -1,14 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.BusinessLogicsContracts
-{
-    public interface IBackUpLogic
-    {
-        void CreateBackUp(BackUpSaveBindingModel model);
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

@@ -1,17 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.SearchModels;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.BusinessLogicsContracts
-{
-    public interface IMessageInfoLogic
-    {
-        List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model);
-        bool Create(MessageInfoBindingModel model);
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/DI/DependencyManager.cs

@@ -1,66 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.DI
-{
-    public class DependencyManager
-    {
-        private readonly IDependencyContainer _dependencyManager;
-
-        private static DependencyManager? _manager;
-
-        private static readonly object _locjObject = new();
-
-        private DependencyManager()
-        {
-            _dependencyManager = new UnityDependencyContainer();
-        }
-
-        public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _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>();
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/DI/IDependencyContainer.cs

@@ -1,40 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.DI
-{
-    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>();
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/DI/IImplementationExtension.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.DI
-{
-    public interface IImplementationExtension
-    {
-        public int Priority { get; }
-        /// <summary>
-        /// Регистрация сервисов
-        /// </summary>
-        public void RegisterServices();
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/DI/ServiceDependencyContainer.cs

@@ -1,62 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.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>()!;
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/DI/ServiceProviderLoader.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.DI
-{
-    public static partial class ServiceProviderLoader
-    {
-        /// Загрузка всех классов-реализаций IImplementationExtension
-        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";
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/DI/UnityDependencyContainer.cs

@@ -1,44 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Unity;
-using Unity.Lifetime;
-using Unity.Microsoft.Logging;
-
-namespace AbstractSoftwareInstallationContracts.DI
-{
-    public class UnityDependencyContainer : IDependencyContainer
-    {
-        private readonly IUnityContainer _container;
-
-        public UnityDependencyContainer()
-        {
-            _container = new UnityContainer();
-        }
-
-        public void AddLogging(Action<ILoggingBuilder> configure)
-        {
-            var factory = LoggerFactory.Create(configure);
-            _container.AddExtension(new LoggingExtension(factory));
-        }
-
-        public void RegisterType<T>(bool isSingle) where T : class
-        {
-            _container.RegisterType<T>(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient);
-
-        }
-
-        public T Resolve<T>()
-        {
-            return _container.Resolve<T>();
-        }
-
-        void IDependencyContainer.RegisterType<T, U>(bool isSingle)
-        {
-            _container.RegisterType<T, U>(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient);
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/SearchModels/MessageInfoSearchModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.SearchModels
-{
-    public class MessageInfoSearchModel
-    {
-        public int? ClientId { get; set; }
-        public string? MessageId { get; set; }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/StoragesContracts/IBackUpInfo.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.StoragesContracts
-{
-    public interface IBackUpInfo
-    {
-        List<T>? GetList<T>() where T : class, new();
-        Type? GetTypeByModelInterface(string modelInterfaceName);
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -1,19 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.SearchModels;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.StoragesContracts
-{
-	public interface IMessageInfoStorage
-	{
-		List<MessageInfoViewModel> GetFullList();
-		List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model);
-		MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
-		MessageInfoViewModel? Insert(MessageInfoBindingModel model);
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/ViewModels/ClientViewModel.cs

@@ -1,5 +1,4 @@
-using AbstractSoftwareInstallationContracts.Attributes;
-using AbstractSoftwareInstallationDataModels.Models;
+using AbstractSoftwareInstallationDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,17 +10,13 @@ namespace AbstractSoftwareInstallationContracts.ViewModels
 {
     public class ClientViewModel : IClientModel
     {
-        [Column(visible: false)]
         public int Id { get; set; }
-
-        [Column(title: "ФИО клиента", width: 150)]
-        public string ClientFIO { get; set; } = string.Empty;
-
-        [Column(title: "Логин (эл.почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
-        public string Email { get; set; } = string.Empty;
-
-        [Column(title: "Пароль", width: 150)]
-        public string Password { get; set; } = string.Empty;
+        [DisplayName("ФИО клиента")]
+        public string ClientFIO { get; set; }= string.Empty;
+        [DisplayName("Логин (эл. почта)")]
+        public string Email { get; set; }= string.Empty;
+        [DisplayName("Пароль")]
+        public string Password { get; set; }= string.Empty;
 
     }
 }

SoftwareInstallation/AbstractSoftwareInstallationContracts/ViewModels/ImplementerViewModel.cs

@@ -1,5 +1,4 @@
-using AbstractSoftwareInstallationContracts.Attributes;
-using AbstractSoftwareInstallationDataModels.Models;
+using AbstractSoftwareInstallationDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,19 +10,18 @@ namespace AbstractSoftwareInstallationContracts.ViewModels
 {
     public class ImplementerViewModel : IImplementerModel
     {
-        [Column(visible: false)]
         public int Id { get; set; }
 
-        [Column("ФИО", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("ФИО")]
         public string ImplementerFIO { get; set; } = string.Empty;
 
-        [Column("Пароль", width: 200)]
+        [DisplayName("Пароль")]
         public string Password { get; set; } = string.Empty;
 
-        [Column("Трудовой стаж", width: 200)]
+        [DisplayName("Опыт работы")]
         public int WorkExperience { get; set; }
 
-        [Column("Квалификация", width: 200)]
+        [DisplayName("Квалификация")]
         public int Qualification { get; set; }
     }
 }

SoftwareInstallation/AbstractSoftwareInstallationContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,35 +0,0 @@
-using AbstractSoftwareInstallationContracts.Attributes;
-using AbstractSoftwareInstallationDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationContracts.ViewModels
-{
-    public class MessageInfoViewModel : IMessageInfoModel
-    {
-        [Column(visible: false)]
-        public string MessageId { get; set; } = string.Empty;
-
-        [Column(visible: false)]
-        public int? ClientId { get; set; }
-
-        [Column("Отправитель", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)]
-        public string SenderName { get; set; } = string.Empty;
-
-        [Column("Дата письма", width: 100)]
-        public DateTime DateDelivery { get; set; }
-
-        [Column("Заголовок", width: 150)]
-        public string Subject { get; set; } = string.Empty;
-
-        [Column("Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
-        public string Body { get; set; } = string.Empty;
-
-        [Column(visible: false)]
-        public int Id => throw new NotImplementedException();
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationContracts/ViewModels/OrderViewModel.cs

@@ -6,37 +6,33 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AbstractSoftwareInstallationContracts.Attributes;
 
 namespace AbstractSoftwareInstallationContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
-
-        [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+       
+        [DisplayName("Номер заказа")]
         public int Id { get; set; }
-        [Column(visible: false)]
         public int PackageId { get; set; }
-        [Column(visible: false)]
         public int ClientId { get; set; }
-        [Column(visible: false)]
         public int? ImplementerId { get; set; }
-        [Column("Пакет", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+        [DisplayName("Пакет")]
         public string PackageName { get; set; } = string.Empty;
 
-        [Column("Почта клиента", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+        [DisplayName("Логин клиента")]
         public string Email { get; set; } = string.Empty;
-        [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+        [DisplayName("Исполнитель")]
         public string ImplementerFIO { get; set; } = string.Empty;
-        [Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+        [DisplayName("Количество")]
         public int Count { get; set; }
-        [Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+        [DisplayName("Сумма")]
         public double Sum { get; set; }
-        [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+        [DisplayName("Статус")]
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        [Column("Дата создания", width: 100)]
+        [DisplayName("Дата создания")]
         public DateTime DateCreate { get; set; } = DateTime.Now;
-        [Column("Дата выдачи", width: 100)]
+        [DisplayName("Дата выдачи")]
         public DateTime? DateImplement { get; set; }
     }
 }

SoftwareInstallation/AbstractSoftwareInstallationContracts/ViewModels/PackageViewModel.cs

@@ -1,19 +1,20 @@
-using AbstractSoftwareInstallationContracts.Attributes;
-using AbstractSoftwareInstallationDataModels.Models;
+using AbstractSoftwareInstallationDataModels.Models;
+using System.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace AbstractSoftwareInstallationContracts.ViewModels
 {
     public class PackageViewModel : IPackageModel
     {
-        [Column(visible: false)]
-        public int ColumnId { get; set; }
-        [Column(visible: false)]
         public int Id { get; set; }
-        [Column("Имя пакета", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Имя пакета")]
         public string PackageName { get; set; } = string.Empty;
-        [Column("Цена", width: 100)]
+        [DisplayName("Цена")]
         public double Price { get; set; }
-        [Column(visible: false)]
         public Dictionary<int, (ISoftwareModel, int)> PackageSoftware
         {
             get;

SoftwareInstallation/AbstractSoftwareInstallationContracts/ViewModels/SoftwareViewModel.cs

@@ -1,19 +1,19 @@
-
-
-using AbstractSoftwareInstallationContracts.Attributes;
-using AbstractSoftwareInstallationDataModels.Models;
+using AbstractSoftwareInstallationDataModels.Models;
+using System.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace AbstractSoftwareInstallationContracts.ViewModels
 {
     public class SoftwareViewModel : ISoftwareModel
     {
-        [Column(visible: false)]
-        public int ColumnId { get; set; }
-        [Column(visible: false)]
         public int Id { get; set; }
-        [Column("Название ПО", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Название")]
         public string SoftwareName { get; set; } = string.Empty;
-        [Column("Цена", width: 100)]
+        [DisplayName("Цена")]
         public double Cost { get; set; }
     }
 }

SoftwareInstallation/AbstractSoftwareInstallationDataModels/Models/IMessageInfoModel.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationDataModels.Models
-{
-    public interface IMessageInfoModel : IId
-    {
-		string MessageId { get; }
-		int? ClientId { get; }
-		string SenderName { get; }
-		DateTime DateDelivery { get; }
-		string Subject { get; }
-		string Body { get; }
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/AbstractSoftwareInstallationDatabase.cs

@@ -16,7 +16,7 @@ optionsBuilder)
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Data Source=DANYAXREN\SQLEXPRESS;Initial Catalog=SoftwareInstallation1;Integrated Security=True;MultipleActiveResultSets=True;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-QA8P9OJ;Initial Catalog=SoftwareInstallation1;Integrated Security=True;MultipleActiveResultSets=True;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }
@@ -26,6 +26,5 @@ optionsBuilder)
         public virtual DbSet<Order> Orders { set; get; }
         public virtual DbSet<Client> Clients { set; get; }
         public virtual DbSet<Implementer> Implementers { set; get; }
-        public virtual DbSet<MessageInfo> Messages { set; get; }
     }
 }

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/AbstractSoftwareInstallationDatabaseImplement.csproj

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

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/DatabaseImplementationExtension.cs

@@ -1,27 +0,0 @@
-using AbstractSoftwareInstallationContracts.DI;
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using AbstractSoftwareInstallationDatabaseImplement.Implements;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationDatabaseImplement
-{
-    public class DatabaseImplementationExtension : IImplementationExtension
-    {
-        public int Priority => 2;
-
-        public void RegisterServices()
-        {
-            DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-            DependencyManager.Instance.RegisterType<ISoftwareStorage, SoftwareStorage>();
-            DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
-            DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-            DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-            DependencyManager.Instance.RegisterType<IPackageStorage, PackageStorage>();
-            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Implements/BackUpInfo.cs

@@ -1,31 +0,0 @@
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationDatabaseImplement.Implements
-{
-    public class BackUpInfo : IBackUpInfo
-    {
-        public List<T>? GetList<T>() where T : class, new()
-        {
-            using var context = new AbstractSoftwareInstallationDatabase();
-            return context.Set<T>().ToList();
-        }
-        public Type? GetTypeByModelInterface(string modelInterfaceName)
-        {
-            var assembly = typeof(BackUpInfo).Assembly;
-            var types = assembly.GetTypes();
-            foreach (var type in types)
-            {
-                if (type.IsClass && type.GetInterface(modelInterfaceName) != null)
-                {
-                    return type;
-                }
-            }
-            return null;
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -1,56 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.SearchModels;
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using AbstractSoftwareInstallationDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationDatabaseImplement.Implements
-{
-    public class MessageInfoStorage : IMessageInfoStorage
-	{
-		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-		{
-			using var context = new AbstractSoftwareInstallationDatabase();
-			if (model.MessageId != null)
-			{
-				return context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
-			}
-			return null;
-		}
-
-		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-		{
-			using var context = new AbstractSoftwareInstallationDatabase();
-			return context.Messages
-				.Where(x => x.ClientId == model.ClientId)
-				.Select(x => x.GetViewModel)
-				.ToList();
-		}
-
-		public List<MessageInfoViewModel> GetFullList()
-		{
-			using var context = new AbstractSoftwareInstallationDatabase();
-			return context.Messages
-				.Select(x => x.GetViewModel)
-				.ToList();
-		}
-
-		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-		{
-			using var context = new AbstractSoftwareInstallationDatabase();
-			var newMessage = MessageInfo.Create(model);
-			if (newMessage == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId)))
-			{
-				return null;
-			}
-			context.Messages.Add(newMessage);
-			context.SaveChanges();
-			return newMessage.GetViewModel;
-		}
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/20230602161333_mail.Designer.cs

@@ -1,296 +0,0 @@
-// <auto-generated />
-using System;
-using AbstractSoftwareInstallationDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
-{
-    [DbContext(typeof(AbstractSoftwareInstallationDatabase))]
-    [Migration("20230602161333_mail")]
-    partial class mail
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.4")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("AbstractPackageInstallationDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PackageId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.HasIndex("PackageId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("int");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Messages");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("PackageName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Packages");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.PackageSoftware", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PackageId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SoftwareId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PackageId");
-
-                    b.HasIndex("SoftwareId");
-
-                    b.ToTable("PackageSoftwares");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Software", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.Property<string>("SoftwareName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Softwares");
-                });
-
-            modelBuilder.Entity("AbstractPackageInstallationDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
-                        .WithMany("Orders")
-                        .HasForeignKey("PackageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-
-                    b.Navigation("Package");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.PackageSoftware", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
-                        .WithMany("Softwares")
-                        .HasForeignKey("PackageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Software", "Software")
-                        .WithMany("PackageSoftwares")
-                        .HasForeignKey("SoftwareId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Package");
-
-                    b.Navigation("Software");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
-                {
-                    b.Navigation("Orders");
-
-                    b.Navigation("Softwares");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Software", b =>
-                {
-                    b.Navigation("PackageSoftwares");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/20230602161333_mail.cs

@@ -1,89 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class mail : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Orders_Implementers_ImplementerId",
-                table: "Orders");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "ImplementerId",
-                table: "Orders",
-                type: "int",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "int");
-
-            migrationBuilder.CreateTable(
-                name: "Messages",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    ClientId = table.Column<int>(type: "int", nullable: true),
-                    SenderName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    Subject = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Body = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Messages", x => x.MessageId);
-                    table.ForeignKey(
-                        name: "FK_Messages_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Messages_ClientId",
-                table: "Messages",
-                column: "ClientId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Orders_Implementers_ImplementerId",
-                table: "Orders",
-                column: "ImplementerId",
-                principalTable: "Implementers",
-                principalColumn: "Id");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Orders_Implementers_ImplementerId",
-                table: "Orders");
-
-            migrationBuilder.DropTable(
-                name: "Messages");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "ImplementerId",
-                table: "Orders",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "int",
-                oldNullable: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Orders_Implementers_ImplementerId",
-                table: "Orders",
-                column: "ImplementerId",
-                principalTable: "Implementers",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Cascade);
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/20230602203557_mail2.Designer.cs

@@ -1,298 +0,0 @@
-// <auto-generated />
-using System;
-using AbstractSoftwareInstallationDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
-{
-    [DbContext(typeof(AbstractSoftwareInstallationDatabase))]
-    [Migration("20230602203557_mail2")]
-    partial class mail2
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.4")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("AbstractPackageInstallationDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PackageId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.HasIndex("PackageId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("int");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Messages");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("PackageName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Packages");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.PackageSoftware", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PackageId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SoftwareId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PackageId");
-
-                    b.HasIndex("SoftwareId");
-
-                    b.ToTable("PackageSoftwares");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Software", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.Property<string>("SoftwareName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Softwares");
-                });
-
-            modelBuilder.Entity("AbstractPackageInstallationDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
-                        .WithMany("Orders")
-                        .HasForeignKey("PackageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-
-                    b.Navigation("Package");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Messages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.PackageSoftware", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
-                        .WithMany("Softwares")
-                        .HasForeignKey("PackageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Software", "Software")
-                        .WithMany("PackageSoftwares")
-                        .HasForeignKey("SoftwareId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Package");
-
-                    b.Navigation("Software");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Messages");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
-                {
-                    b.Navigation("Orders");
-
-                    b.Navigation("Softwares");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Software", b =>
-                {
-                    b.Navigation("PackageSoftwares");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/20230602203557_mail2.cs

@@ -1,22 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class mail2 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/20230820151252_order_fix.Designer.cs

@@ -1,298 +0,0 @@
-// <auto-generated />
-using System;
-using AbstractSoftwareInstallationDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
-{
-    [DbContext(typeof(AbstractSoftwareInstallationDatabase))]
-    [Migration("20230820151252_order_fix")]
-    partial class order_fix
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.4")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("AbstractPackageInstallationDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PackageId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.HasIndex("PackageId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("int");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Messages");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("PackageName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Packages");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.PackageSoftware", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PackageId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SoftwareId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PackageId");
-
-                    b.HasIndex("SoftwareId");
-
-                    b.ToTable("PackageSoftwares");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Software", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.Property<string>("SoftwareName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Softwares");
-                });
-
-            modelBuilder.Entity("AbstractPackageInstallationDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
-                        .WithMany("Orders")
-                        .HasForeignKey("PackageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-
-                    b.Navigation("Package");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Messages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.PackageSoftware", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
-                        .WithMany("Softwares")
-                        .HasForeignKey("PackageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Software", "Software")
-                        .WithMany("PackageSoftwares")
-                        .HasForeignKey("SoftwareId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Package");
-
-                    b.Navigation("Software");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Messages");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
-                {
-                    b.Navigation("Orders");
-
-                    b.Navigation("Softwares");
-                });
-
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Software", b =>
-                {
-                    b.Navigation("PackageSoftwares");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/20230820151252_order_fix.cs

@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class order_fix : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<int>(
-            name: "ImplementerId",
-            table: "Orders",
-            nullable: true,
-            oldNullable: false,
-            oldClrType: typeof(int),
-            oldType: "int");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/AbstractSoftwareInstallationDatabaseModelSnapshot.cs

@@ -42,7 +42,7 @@ namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
-                    b.Property<int?>("ImplementerId")
+                    b.Property<int>("ImplementerId")
                         .HasColumnType("int");
 
                     b.Property<int>("PackageId")
@@ -117,36 +117,6 @@ namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
                     b.ToTable("Implementers");
                 });
 
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Messages");
-                });
-
             modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
                 {
                     b.Property<int>("Id")
@@ -223,7 +193,9 @@ namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
 
                     b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Implementer", "Implementer")
                         .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
+                        .HasForeignKey("ImplementerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
                         .WithMany("Orders")
@@ -238,15 +210,6 @@ namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
                     b.Navigation("Package");
                 });
 
-            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Messages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
             modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.PackageSoftware", b =>
                 {
                     b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
@@ -268,8 +231,6 @@ namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
 
             modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("Messages");
-
                     b.Navigation("Orders");
                 });
 

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Models/Client.cs

@@ -7,30 +7,23 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AbstractSoftwareInstallationDatabaseImplement.Models
 {
-    [DataContract]
     public class Client : IClientModel
     {
-        [DataMember]
         public int Id { get; private set; }
-        [DataMember]
         [Required]
         public string ClientFIO { get; private set; } = string.Empty;
-        [DataMember]
         [Required]
         public string Email { get; private set; } = string.Empty;
-        [DataMember]
         [Required]
         public string Password { get; private set; } = string.Empty;
         [ForeignKey("ClientId")]
         public virtual List<Order> Orders { get; set; } = new();
-        [ForeignKey("ClientId")]
-        public virtual List<MessageInfo> Messages { get; set; } = new();
+
         public static Client? Create(ClientBindingModel? model)
         {
             if (model == null)

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Models/Implementer.cs

@@ -7,24 +7,17 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AbstractSoftwareInstallationDatabaseImplement.Models
 {
-    [DataContract]
     public class Implementer : IImplementerModel
     {
-        [DataMember]
         public int Id { get; private set; }
-        [DataMember]
         public int Qualification { get; private set; }
-        [DataMember]
         public string ImplementerFIO { get; private set; } = string.Empty;
-        [DataMember]
         public int WorkExperience { get; private set; }
-        [DataMember]
         public string Password { get; private set; } = string.Empty;
         [ForeignKey("ImplementerId")]
         public virtual List<Order> Orders { get; set; } = new();

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Models/MessageInfo.cs

@@ -1,62 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using AbstractSoftwareInstallationDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationDatabaseImplement.Models
-{
-	[DataContract]
-	public class MessageInfo : IMessageInfoModel
-	{
-		[DataMember]
-		[Key]
-		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;
-
-		public virtual Client? Client { get; private set; }
-
-		public static MessageInfo? Create(MessageInfoBindingModel model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new()
-			{
-				Body = model.Body,
-				Subject = model.Subject,
-				ClientId = model.ClientId,
-				MessageId = model.MessageId,
-				SenderName = model.SenderName,
-				DateDelivery = model.DateDelivery,
-			};
-		}
-
-		public MessageInfoViewModel GetViewModel => new()
-		{
-			Body = Body,
-			Subject = Subject,
-			ClientId = ClientId,
-			MessageId = MessageId,
-			SenderName = SenderName,
-			DateDelivery = DateDelivery,
-		};
-
-        public int Id => throw new NotImplementedException();
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Models/Order.cs

@@ -8,36 +8,28 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AbstractPackageInstallationDatabaseImplement.Models
 {
-    [DataContract]
     public class Order : IOrderModel
     {
-        [DataMember]
         public int Id { get; private set; }
-        [DataMember]
         [Required]
         public int PackageId { get; private set; }
-        [DataMember]
         [Required]
         public int ClientId { get; private set; }
         public int? ImplementerId { get; private set; }
-        [DataMember]
+        [Required]
         public int Count { get; private set; }
-        [DataMember]
         [Required]
         public double Sum { get; private set; }
-        [DataMember]
         [Required]
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-        [DataMember]
         [Required]
         public DateTime DateCreate { get; private set; } = DateTime.Now;
-        [DataMember]
+
         public DateTime? DateImplement { get; private set; }
         public virtual Package Package { get; set; }
         public virtual Client Client { get; set; }

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Models/Package.cs

@@ -9,26 +9,21 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AbstractSoftwareInstallationDatabaseImplement.Models
 {
-    [DataContract]
     public class Package : IPackageModel
     {
-        [DataMember]
         public int Id { get; private set; }
-        [DataMember]
         [Required]
         public string PackageName { get; private set; } = string.Empty;
-        [DataMember]
         [Required]
         public double Price { get; private set; }
 
         private Dictionary<int, (ISoftwareModel, int)>? _packageSoftwares = null;
-        [DataMember]
+
         [NotMapped]
         public Dictionary<int, (ISoftwareModel, int)> PackageSoftware
         {

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Models/Software.cs

@@ -6,21 +6,16 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AbstractSoftwareInstallationDatabaseImplement.Models
 {
-    [DataContract]
     public class Software : ISoftwareModel
     {
-        [DataMember]
         public int Id { get; private set; }
-        [DataMember]
         [Required]
         public string SoftwareName { get; private set; } = String.Empty;
-        [DataMember]
         [Required]
         public double Cost { get; set; }
         [ForeignKey("SoftwareId")]

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/AbstractSoftwareInstallationFileImplement.csproj

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

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/DataFileSingleton.cs

@@ -10,15 +10,13 @@ namespace AbstractSoftwareInstallationFileImplement
         private readonly string SoftwareFileName = "Software.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string PackageFileName = "Package.xml";
-        private readonly string ClientFileName = "Client.xml";
+        private readonly string ClientFileName = "Package.xml";
         private readonly string ImplementerFileName = "Implementer.xml";
-        private readonly string MessageFileName = "Message.xml";
         public List<Software> Softwares { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Package> Packages { get; private set; }
         public List<Client> Clients { get; private set; }
         public List<Implementer> Implementers { get; private set; }
-        public List<MessageInfo> Messages { get; private set; }
 
         public static DataFileSingleton GetInstance()
         {
@@ -33,7 +31,7 @@ namespace AbstractSoftwareInstallationFileImplement
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
         public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement);
-        public void SaveMessages() => SaveData(Messages, MessageFileName, "Messages", x => x.GetXElement);
+
 
         private DataFileSingleton()
         {
@@ -42,7 +40,7 @@ namespace AbstractSoftwareInstallationFileImplement
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
             Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
-            Messages = LoadData(MessageFileName, "Message", x => MessageInfo.Create(x)!)!;
+
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/FileImplementationExtension.cs

@@ -1,27 +0,0 @@
-using AbstractSoftwareInstallationContracts.DI;
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using AbstractSoftwareInstallationFileImplement.Implements;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmFileImplement
-{
-    public class FileImplementationExtension : IImplementationExtension
-    {
-        public int Priority => 1;
-
-        public void RegisterServices()
-        {
-            DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-            DependencyManager.Instance.RegisterType<ISoftwareStorage, SoftwareStorage>();
-            DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
-            DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-            DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-            DependencyManager.Instance.RegisterType<IPackageStorage, PackageStorage>();
-            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/Implements/BackUpInfo.cs

@@ -1,33 +0,0 @@
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationFileImplement.Implements
-{
-    public class BackUpInfo : IBackUpInfo
-    {
-        public List<T>? GetList<T>() where T : class, new()
-        {
-            var source = DataFileSingleton.GetInstance();
-            return (List<T>?)source.GetType().GetProperties()
-                .FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == typeof(T))
-                ?.GetValue(source);
-        }
-        public Type? GetTypeByModelInterface(string modelInterfaceName)
-        {
-            var assembly = typeof(BackUpInfo).Assembly;
-            var types = assembly.GetTypes();
-            foreach (var type in types)
-            {
-                if (type.IsClass && type.GetInterface(modelInterfaceName) != null)
-                {
-                    return type;
-                }
-            }
-            return null;
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/Implements/MessageInfoStorage.cs

@@ -1,58 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.SearchModels;
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using AbstractSoftwareInstallationFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationFileImplement.Implements
-{
-    public class MessageInfoStorage : IMessageInfoStorage
-    {
-		private readonly DataFileSingleton _source;
-		public MessageInfoStorage()
-		{
-			_source = DataFileSingleton.GetInstance();
-		}
-
-		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-		{
-			if (model.MessageId != null)
-			{
-				return _source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
-			}
-			return null;
-		}
-
-		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-		{
-			return _source.Messages
-				.Where(x => x.ClientId == model.ClientId)
-				.Select(x => x.GetViewModel)
-				.ToList();
-		}
-
-		public List<MessageInfoViewModel> GetFullList()
-		{
-			return _source.Messages
-				.Select(x => x.GetViewModel)
-				.ToList();
-		}
-
-		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-		{
-			var newMessage = MessageInfo.Create(model);
-			if (newMessage == null)
-			{
-				return null;
-			}
-			_source.Messages.Add(newMessage);
-			_source.SaveMessages();
-			return newMessage.GetViewModel;
-		}
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/Models/MessageInfo.cs

@@ -1,79 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace AbstractSoftwareInstallationFileImplement.Models
-{
-    public class MessageInfo
-    {
-		public string MessageId { get; private set; } = string.Empty;
-
-		public int? ClientId { get; private set; }
-
-		public string SenderName { get; private set; } = string.Empty;
-
-		public DateTime DateDelivery { get; private set; } = DateTime.Now;
-
-		public string Subject { get; private set; } = string.Empty;
-
-		public string Body { get; private set; } = string.Empty;
-
-		public static MessageInfo? Create(MessageInfoBindingModel model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new()
-			{
-				Body = model.Body,
-				Subject = model.Subject,
-				ClientId = model.ClientId,
-				MessageId = model.MessageId,
-				SenderName = model.SenderName,
-				DateDelivery = model.DateDelivery,
-			};
-		}
-
-		public static MessageInfo? Create(XElement element)
-		{
-			if (element == null)
-			{
-				return null;
-			}
-			return new()
-			{
-				Body = element.Attribute("Body")!.Value,
-				Subject = element.Attribute("Subject")!.Value,
-				ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value),
-				MessageId = element.Attribute("MessageId")!.Value,
-				SenderName = element.Attribute("SenderName")!.Value,
-				DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value),
-			};
-		}
-
-		public MessageInfoViewModel GetViewModel => new()
-		{
-			Body = Body,
-			Subject = Subject,
-			ClientId = ClientId,
-			MessageId = MessageId,
-			SenderName = SenderName,
-			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)
-			);
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationListImplement/AbstractSoftwareInstallationListImplement.csproj

@@ -11,8 +11,4 @@
     <ProjectReference Include="..\AbstractSoftwareInstallationDataModels\AbstractSoftwareInstallationDataModels.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-  </Target>
-
 </Project>

SoftwareInstallation/AbstractSoftwareInstallationListImplement/DataListSingleton.cs

@@ -16,8 +16,6 @@ namespace AbstractSoftwareInstallationListImplement
         public List<Package> Packages { get; set; }
         public List<Client> Clients { get; set; }
         public List<Implementer> Implementers { get; set; }
-        public List<MessageInfo> Messages { get; set; }
-
         private DataListSingleton()
         {
             Softwares = new List<Software>();
@@ -25,7 +23,6 @@ namespace AbstractSoftwareInstallationListImplement
             Packages = new List<Package>();
             Clients = new List<Client>();
             Implementers = new List<Implementer>();
-            Messages = new List<MessageInfo>();
         }
         public static DataListSingleton GetInstance()
         {

SoftwareInstallation/AbstractSoftwareInstallationListImplement/Implements/BackUpInfo.cs

@@ -1,22 +0,0 @@
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationListImplement.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();
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationListImplement/Implements/ImplementerStorage.cs

@@ -1,112 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.SearchModels;
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using AbstractSoftwareInstallationListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationListImplement.Implements
-{
-    public class ImplementerStorage : IImplementerStorage
-    {
-        private readonly DataListSingleton _source;
-        public ImplementerStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-        {
-            foreach (var x in _source.Implementers)
-            {
-                if (model.Id.HasValue && x.Id == model.Id)
-                    return x.GetViewModel;
-                if (model.ImplementerFIO != null && model.Password != null &&
-                    x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password))
-                    return x.GetViewModel;
-                if (model.ImplementerFIO != null && x.ImplementerFIO.Equals(model.ImplementerFIO))
-                    return x.GetViewModel;
-            }
-            return null;
-        }
-
-        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
-        {
-            if (model == null)
-            {
-                return new();
-            }
-            List<ImplementerViewModel> list = new();
-            if (model.ImplementerFIO != null)
-            {
-                foreach (var implementer in _source.Implementers)
-                {
-                    if (implementer.ImplementerFIO.Contains(model.ImplementerFIO))
-                    {
-                        list.Add(implementer.GetViewModel);
-                    }
-                }
-            }
-            return list;
-        }
-
-        public List<ImplementerViewModel> GetFullList()
-        {
-            var result = new List<ImplementerViewModel>();
-            foreach (var implementer in _source.Implementers)
-            {
-                result.Add(implementer.GetViewModel);
-            }
-            return result;
-        }
-
-        public ImplementerViewModel? Insert(ImplementerBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var implementer in _source.Implementers)
-            {
-                if (model.Id <= implementer.Id)
-                {
-                    model.Id = implementer.Id + 1;
-                }
-            }
-            var res = Implementer.Create(model);
-            if (res != null)
-            {
-                _source.Implementers.Add(res);
-            }
-            return res?.GetViewModel;
-        }
-
-        public ImplementerViewModel? Update(ImplementerBindingModel model)
-        {
-            foreach (var implementer in _source.Implementers)
-            {
-                if (implementer.Id == model.Id)
-                {
-                    implementer.Update(model);
-                    return implementer.GetViewModel;
-                }
-            }
-            return null;
-        }
-
-        public ImplementerViewModel? Delete(ImplementerBindingModel model)
-        {
-            for (int i = 0; i < _source.Implementers.Count; ++i)
-            {
-                if (_source.Implementers[i].Id == model.Id)
-                {
-                    var element = _source.Implementers[i];
-                    _source.Implementers.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationListImplement/Implements/MessageInfoStorage.cs

@@ -1,65 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.SearchModels;
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using AbstractSoftwareInstallationListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationListImplement.Implements
-{
-    public class MessageInfoStorage : IMessageInfoStorage
-    {
-		private readonly DataListSingleton _source;
-		public MessageInfoStorage()
-		{
-			_source = DataListSingleton.GetInstance();
-		}
-
-		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-		{
-			foreach (var message in _source.Messages)
-			{
-				if (model.MessageId != null && model.MessageId.Equals(message.MessageId)) return message.GetViewModel;
-			}
-			return null;
-		}
-
-		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-		{
-			List<MessageInfoViewModel> result = new();
-			foreach (var item in _source.Messages)
-			{
-				if (item.ClientId.HasValue && item.ClientId == model.ClientId)
-				{
-					result.Add(item.GetViewModel);
-				}
-			}
-			return result;
-		}
-
-		public List<MessageInfoViewModel> GetFullList()
-		{
-			List<MessageInfoViewModel> result = new();
-			foreach (var item in _source.Messages)
-			{
-				result.Add(item.GetViewModel);
-			}
-			return result;
-		}
-
-		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-		{
-			var newMessage = MessageInfo.Create(model);
-			if (newMessage == null)
-			{
-				return null;
-			}
-			_source.Messages.Add(newMessage);
-			return newMessage.GetViewModel;
-		}
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationListImplement/ListImplementationExtension.cs

@@ -1,28 +0,0 @@
-using AbstractOrderInstallationListImplement.Implements;
-using AbstractPackageInstallationListImplement.Implements;
-using AbstractSoftwareInstallationContracts.DI;
-using AbstractSoftwareInstallationContracts.StoragesContracts;
-using AbstractSoftwareInstallationListImplement.Implements;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationListImplement
-{
-    public class ListImplementationExtension : IImplementationExtension
-    {
-        public int Priority => 1;
-
-        public void RegisterServices()
-        {
-            DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-            DependencyManager.Instance.RegisterType<ISoftwareStorage, SoftwareStorage>();
-            DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-            DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-            DependencyManager.Instance.RegisterType<IPackageStorage, PackageStorage>();
-            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-        }
-    }
-}

SoftwareInstallation/AbstractSoftwareInstallationListImplement/Models/MessageInfo.cs

@@ -1,53 +0,0 @@
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractSoftwareInstallationListImplement.Models
-{
-	public class MessageInfo
-    {
-		public string MessageId { get; private set; } = string.Empty;
-
-		public int? ClientId { get; private set; }
-
-		public string SenderName { get; private set; } = string.Empty;
-
-		public DateTime DateDelivery { get; private set; } = DateTime.Now;
-
-		public string Subject { get; private set; } = string.Empty;
-
-		public string Body { get; private set; } = string.Empty;
-
-		public static MessageInfo? Create(MessageInfoBindingModel model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new()
-			{
-				Body = model.Body,
-				Subject = model.Subject,
-				ClientId = model.ClientId,
-				MessageId = model.MessageId,
-				SenderName = model.SenderName,
-				DateDelivery = model.DateDelivery,
-			};
-		}
-
-		public MessageInfoViewModel GetViewModel => new()
-		{
-			Body = Body,
-			Subject = Subject,
-			ClientId = ClientId,
-			MessageId = MessageId,
-			SenderName = SenderName,
-			DateDelivery = DateDelivery,
-		};
-
-	}
-}

SoftwareInstallation/AbstractSoftwareInstallationRestApi/Controllers/ClientController.cs

@@ -14,13 +14,10 @@ namespace AbstractSoftwareInstallationRestApi.Controllers
 
         private readonly IClientLogic _logic;
 
-        private readonly IMessageInfoLogic _mailLogic;
-
-        public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger<ClientController> logger)
+        public ClientController(IClientLogic logic, ILogger<ClientController> logger)
         {
             _logger = logger;
             _logic = logic;
-            _mailLogic = mailLogic;
         }
 
         [HttpGet]
@@ -68,22 +65,5 @@ namespace AbstractSoftwareInstallationRestApi.Controllers
                 throw;
             }
         }
-
-        [HttpGet]
-        public List<MessageInfoViewModel>? GetMessages(int clientId)
-        {
-            try
-            {
-                return _mailLogic.ReadList(new MessageInfoSearchModel
-                {
-                    ClientId = clientId
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения писем клиента");
-                throw;
-            }
-        }
     }
 }

SoftwareInstallation/AbstractSoftwareInstallationRestApi/Program.cs

@@ -1,6 +1,4 @@
 using AbstractSoftwareInstallationBusinessLogic.BusinessLogic;
-using AbstractSoftwareInstallationBusinessLogic.MailWorker;
-using AbstractSoftwareInstallationContracts.BindingModels;
 using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
 using AbstractSoftwareInstallationContracts.StoragesContracts;
 using AbstractSoftwareInstallationDatabaseImplement.Implements;
@@ -16,14 +14,11 @@ builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
 builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IPackageStorage, PackageStorage>();
-builder.Services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
 
 builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IPackageLogic, PackageLogic>();
-builder.Services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
-builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -35,17 +30,6 @@ builder.Services.AddSwaggerGen(c =>
 
 var app = builder.Build();
 
-var mailSender = app.Services.GetService<AbstractMailWorker>();
-mailSender?.MailConfig(new MailConfigBindingModel
-{
-	MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty,
-	MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty,
-	SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty,
-	SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()),
-	PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty,
-	PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString())
-});
-
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

SoftwareInstallation/AbstractSoftwareInstallationRestApi/appsettings.json

@@ -5,13 +5,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-
-  "SmtpClientHost": "smtp.gmail.com",
-  "SmtpClientPort": "587",
-  "PopHost": "pop.gmail.com",
-  "PopPort": "995",
-  "MailLogin": "doodlydoolka@gmail.com",
-  "MailPassword": "boob pmwo rkhx hfqz"
-
-}
+  "AllowedHosts": "*"
+}

SoftwareInstallation/SoftwareInstallation/App.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<appSettings>
-		<add key="SmtpClientHost" value="smtp.gmail.com" />
-		<add key="SmtpClientPort" value="587" />
-		<add key="PopHost" value="pop.gmail.com" />
-		<add key="PopPort" value="995" />
-		<add key="MailLogin" value="doodlydoolka@gmail.com" />
-		<add key="MailPassword" value="boob pmwo rkhx hfqz" />
-	</appSettings>
-</configuration>

SoftwareInstallation/SoftwareInstallation/DataGridViewExtension.cs

@@ -1,50 +0,0 @@
-using AbstractSoftwareInstallationContracts.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallation
-{
-    public static class DataGridViewExtension
-    {
-        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)
-            {
-                var property = properties.FirstOrDefault(x => x.Name == column.Name);
-                if (property == null)
-                {
-                    throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем { column.Name }");
-                }
-                var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault();
-                if (attribute == null)
-                {
-                    throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства { property.Name }");
-                }
-                // ищем нужный нам атрибут
-                if (attribute is ColumnAttribute columnAttr)
-                {
-                    column.HeaderText = columnAttr.Title;
-                    column.Visible = columnAttr.Visible;
-                    if (columnAttr.IsUseAutoSize)
-                    {
-                        column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString());
-                    }
-                    else
-                    {
-                        column.Width = columnAttr.Width;
-                    }
-                }
-            }
-        }
-    }
-}

SoftwareInstallation/SoftwareInstallation/FormClients.cs

@@ -1,7 +1,6 @@
 using AbstractSoftwareInstallationContracts.BindingModels;
 using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
-using SoftwareInstallation;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -36,7 +35,13 @@ namespace SoftwareInstallationView
         {
             try
             {
-                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["Email"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
                 _logger.LogInformation("Загрузка клиентов");
             }
             catch (Exception ex)

SoftwareInstallation/SoftwareInstallation/FormImplementers.cs

@@ -1,6 +1,5 @@
 using AbstractSoftwareInstallationContracts.BindingModels;
 using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using AbstractSoftwareInstallationContracts.DI;
 using Microsoft.Extensions.Logging;
 using SoftwareInstallation;
 using System;
@@ -34,7 +33,13 @@ namespace SoftwareInstallationView
         {
             try
             {
-                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
                 _logger.LogInformation("Загрузка исполнителей");
             }
             catch (Exception ex)
@@ -47,8 +52,8 @@ namespace SoftwareInstallationView
 
         private void buttonCreate_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormImplementer>();
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+            if (service is FormImplementer form)
             {
                 if (form.ShowDialog() == DialogResult.OK)
                 {
@@ -61,9 +66,8 @@ namespace SoftwareInstallationView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<FormImplementer>();
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                if (form.ShowDialog() == DialogResult.OK)
+                var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+                if (service is FormImplementer form)
                 {
                     form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     if (form.ShowDialog() == DialogResult.OK)

SoftwareInstallation/SoftwareInstallation/FormMails.Designer.cs

@@ -1,62 +0,0 @@
-namespace SoftwareInstallationView
-{
-    partial class FormMails
-    {
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			dataGridView = new DataGridView();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
-			// 
-			// dataGridView
-			// 
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Location = new Point(12, 12);
-			dataGridView.Name = "dataGridView";
-			dataGridView.RowHeadersWidth = 51;
-			dataGridView.RowTemplate.Height = 29;
-			dataGridView.Size = new Size(776, 426);
-			dataGridView.TabIndex = 0;
-			// 
-			// FormMails
-			// 
-			AutoScaleDimensions = new SizeF(8F, 20F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(800, 450);
-			Controls.Add(dataGridView);
-			Name = "FormMails";
-			Text = "Письма";
-			Load += FormMails_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-		}
-
-		#endregion
-
-		private DataGridView dataGridView;
-	}
-}

SoftwareInstallation/SoftwareInstallation/FormMails.cs

@@ -1,43 +0,0 @@
-using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using SoftwareInstallation;
-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 SoftwareInstallationView
-{
-    public partial class FormMails : Form
-    {
-		private readonly ILogger _logger;
-		private readonly IMessageInfoLogic _logic;
-
-		public FormMails(ILogger<FormMails> logger, IMessageInfoLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-		}
-
-		private void FormMails_Load(object sender, EventArgs e)
-		{
-			try
-			{
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-				_logger.LogInformation("Загрузка писем");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки писем");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-				MessageBoxIcon.Error);
-			}
-		}
-	}
-}

SoftwareInstallation/SoftwareInstallation/FormMails.resx

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

SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs

@@ -1,5 +1,4 @@
-
-using SoftwareInstallation;
+using SoftwareInstallation;
 
 namespace SoftwareInstallationView
 {
@@ -31,187 +30,174 @@ namespace SoftwareInstallationView
         /// </summary>
         private void InitializeComponent()
         {
-            dataGridView = new DataGridView();
-            buttonCreateOrder = new Button();
-            buttonIssuedOrder = new Button();
-            buttonRef = new Button();
-            menuStrip1 = new MenuStrip();
-            guideToolStripMenuItem = new ToolStripMenuItem();
-            packageToolStripMenuItem2 = new ToolStripMenuItem();
-            storageToolStripMenuItem3 = new ToolStripMenuItem();
-            clientToolStripMenuItem = new ToolStripMenuItem();
-            implementerToolStripMenuItem = new ToolStripMenuItem();
-            письмаToolStripMenuItem = new ToolStripMenuItem();
-            reportsToolStripMenuItem = new ToolStripMenuItem();
-            packagesToolStripMenuItem = new ToolStripMenuItem();
-            packageSoftwaresToolStripMenuItem = new ToolStripMenuItem();
-            ordersToolStripMenuItem = new ToolStripMenuItem();
-            startWorksToolStripMenuItem = new ToolStripMenuItem();
-            бэкапToolStripMenuItem = new ToolStripMenuItem();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            menuStrip1.SuspendLayout();
-            SuspendLayout();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.buttonCreateOrder = new System.Windows.Forms.Button();
+            this.buttonIssuedOrder = new System.Windows.Forms.Button();
+            this.buttonRef = new System.Windows.Forms.Button();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.guideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.packageToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.storageToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.clientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.implementerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.reportsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.packagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.packageSoftwaresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.startWorksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.menuStrip1.SuspendLayout();
+            this.SuspendLayout();
             // 
             // dataGridView
             // 
-            dataGridView.BackgroundColor = SystemColors.ControlLightLight;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(1, 41);
-            dataGridView.Margin = new Padding(3, 4, 3, 4);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowHeadersWidth = 51;
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(1017, 307);
-            dataGridView.TabIndex = 0;
+            this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Location = new System.Drawing.Point(1, 31);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowTemplate.Height = 25;
+            this.dataGridView.Size = new System.Drawing.Size(890, 230);
+            this.dataGridView.TabIndex = 0;
             // 
             // buttonCreateOrder
             // 
-            buttonCreateOrder.Location = new Point(1046, 41);
-            buttonCreateOrder.Margin = new Padding(3, 4, 3, 4);
-            buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonCreateOrder.Size = new Size(175, 31);
-            buttonCreateOrder.TabIndex = 2;
-            buttonCreateOrder.Text = "Создать заказ";
-            buttonCreateOrder.UseVisualStyleBackColor = true;
-            buttonCreateOrder.Click += buttonCreateOrder_Click;
+            this.buttonCreateOrder.Location = new System.Drawing.Point(915, 31);
+            this.buttonCreateOrder.Name = "buttonCreateOrder";
+            this.buttonCreateOrder.Size = new System.Drawing.Size(153, 23);
+            this.buttonCreateOrder.TabIndex = 2;
+            this.buttonCreateOrder.Text = "Создать заказ";
+            this.buttonCreateOrder.UseVisualStyleBackColor = true;
+            this.buttonCreateOrder.Click += new System.EventHandler(this.buttonCreateOrder_Click);
             // 
             // buttonIssuedOrder
             // 
-            buttonIssuedOrder.Location = new Point(1046, 80);
-            buttonIssuedOrder.Margin = new Padding(3, 4, 3, 4);
-            buttonIssuedOrder.Name = "buttonIssuedOrder";
-            buttonIssuedOrder.Size = new Size(175, 31);
-            buttonIssuedOrder.TabIndex = 5;
-            buttonIssuedOrder.Text = "Заказ выдан";
-            buttonIssuedOrder.UseVisualStyleBackColor = true;
-            buttonIssuedOrder.Click += buttonIssuedOrder_Click;
+            this.buttonIssuedOrder.Location = new System.Drawing.Point(915, 60);
+            this.buttonIssuedOrder.Name = "buttonIssuedOrder";
+            this.buttonIssuedOrder.Size = new System.Drawing.Size(153, 23);
+            this.buttonIssuedOrder.TabIndex = 5;
+            this.buttonIssuedOrder.Text = "Заказ выдан";
+            this.buttonIssuedOrder.UseVisualStyleBackColor = true;
+            this.buttonIssuedOrder.Click += new System.EventHandler(this.buttonIssuedOrder_Click);
             // 
             // buttonRef
             // 
-            buttonRef.Location = new Point(1046, 119);
-            buttonRef.Margin = new Padding(3, 4, 3, 4);
-            buttonRef.Name = "buttonRef";
-            buttonRef.Size = new Size(175, 31);
-            buttonRef.TabIndex = 6;
-            buttonRef.Text = "Обновить список";
-            buttonRef.UseVisualStyleBackColor = true;
-            buttonRef.Click += buttonRef_Click;
+            this.buttonRef.Location = new System.Drawing.Point(915, 89);
+            this.buttonRef.Name = "buttonRef";
+            this.buttonRef.Size = new System.Drawing.Size(153, 23);
+            this.buttonRef.TabIndex = 6;
+            this.buttonRef.Text = "Обновить список";
+            this.buttonRef.UseVisualStyleBackColor = true;
+            this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
             // 
             // menuStrip1
             // 
-            menuStrip1.ImageScalingSize = new Size(20, 20);
-            menuStrip1.Items.AddRange(new ToolStripItem[] { guideToolStripMenuItem, reportsToolStripMenuItem, startWorksToolStripMenuItem, бэкапToolStripMenuItem });
-            menuStrip1.Location = new Point(0, 0);
-            menuStrip1.Name = "menuStrip1";
-            menuStrip1.Padding = new Padding(7, 3, 0, 3);
-            menuStrip1.Size = new Size(1255, 30);
-            menuStrip1.TabIndex = 1;
-            menuStrip1.Text = "Справочники";
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.guideToolStripMenuItem,
+            this.reportsToolStripMenuItem,
+            this.startWorksToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(1098, 24);
+            this.menuStrip1.TabIndex = 1;
+            this.menuStrip1.Text = "Справочники";
             // 
             // guideToolStripMenuItem
             // 
-            guideToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { packageToolStripMenuItem2, storageToolStripMenuItem3, clientToolStripMenuItem, implementerToolStripMenuItem, письмаToolStripMenuItem });
-            guideToolStripMenuItem.Name = "guideToolStripMenuItem";
-            guideToolStripMenuItem.Size = new Size(117, 24);
-            guideToolStripMenuItem.Text = "Справочники";
+            this.guideToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.packageToolStripMenuItem2,
+            this.storageToolStripMenuItem3,
+            this.clientToolStripMenuItem,
+            this.implementerToolStripMenuItem});
+            this.guideToolStripMenuItem.Name = "guideToolStripMenuItem";
+            this.guideToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
+            this.guideToolStripMenuItem.Text = "Справочники";
             // 
             // packageToolStripMenuItem2
             // 
-            packageToolStripMenuItem2.Name = "packageToolStripMenuItem2";
-            packageToolStripMenuItem2.Size = new Size(224, 26);
-            packageToolStripMenuItem2.Text = "Пакеты";
-            packageToolStripMenuItem2.Click += packageToolStripMenuItem_Click;
+            this.packageToolStripMenuItem2.Name = "packageToolStripMenuItem2";
+            this.packageToolStripMenuItem2.Size = new System.Drawing.Size(148, 22);
+            this.packageToolStripMenuItem2.Text = "Пакеты";
+            this.packageToolStripMenuItem2.Click += new System.EventHandler(this.packageToolStripMenuItem_Click);
             // 
             // storageToolStripMenuItem3
             // 
-            storageToolStripMenuItem3.Name = "storageToolStripMenuItem3";
-            storageToolStripMenuItem3.Size = new Size(224, 26);
-            storageToolStripMenuItem3.Text = "ПО";
-            storageToolStripMenuItem3.Click += softwareToolStripMenuItem_Click;
+            this.storageToolStripMenuItem3.Name = "storageToolStripMenuItem3";
+            this.storageToolStripMenuItem3.Size = new System.Drawing.Size(148, 22);
+            this.storageToolStripMenuItem3.Text = "ПО";
+            this.storageToolStripMenuItem3.Click += new System.EventHandler(this.softwareToolStripMenuItem_Click);
             // 
             // clientToolStripMenuItem
             // 
-            clientToolStripMenuItem.Name = "clientToolStripMenuItem";
-            clientToolStripMenuItem.Size = new Size(224, 26);
-            clientToolStripMenuItem.Text = "Клиенты";
-            clientToolStripMenuItem.Click += clientToolStripMenuItem_Click;
+            this.clientToolStripMenuItem.Name = "clientToolStripMenuItem";
+            this.clientToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.clientToolStripMenuItem.Text = "Клиенты";
+            this.clientToolStripMenuItem.Click += new System.EventHandler(this.clientToolStripMenuItem_Click);
             // 
             // implementerToolStripMenuItem
             // 
-            implementerToolStripMenuItem.Name = "implementerToolStripMenuItem";
-            implementerToolStripMenuItem.Size = new Size(224, 26);
-            implementerToolStripMenuItem.Text = "Исполнитель";
-            implementerToolStripMenuItem.Click += implementerToolStripMenuItem_Click;
-            // 
-            // письмаToolStripMenuItem
-            // 
-            письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
-            письмаToolStripMenuItem.Size = new Size(224, 26);
-            письмаToolStripMenuItem.Text = "Письма";
-            письмаToolStripMenuItem.Click += mailsToolStripMenuItem_Click;
+            this.implementerToolStripMenuItem.Name = "implementerToolStripMenuItem";
+            this.implementerToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.implementerToolStripMenuItem.Text = "Исполнитель";
+            this.implementerToolStripMenuItem.Click += new System.EventHandler(this.implementerToolStripMenuItem_Click);
             // 
             // reportsToolStripMenuItem
             // 
-            reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { packagesToolStripMenuItem, packageSoftwaresToolStripMenuItem, ordersToolStripMenuItem });
-            reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
-            reportsToolStripMenuItem.Size = new Size(73, 24);
-            reportsToolStripMenuItem.Text = "Отчеты";
+            this.reportsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.packagesToolStripMenuItem,
+            this.packageSoftwaresToolStripMenuItem,
+            this.ordersToolStripMenuItem});
+            this.reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
+            this.reportsToolStripMenuItem.Size = new System.Drawing.Size(60, 20);
+            this.reportsToolStripMenuItem.Text = "Отчеты";
             // 
             // packagesToolStripMenuItem
             // 
-            packagesToolStripMenuItem.Name = "packagesToolStripMenuItem";
-            packagesToolStripMenuItem.Size = new Size(201, 26);
-            packagesToolStripMenuItem.Text = "Список пакетов";
-            packagesToolStripMenuItem.Click += packagesToolStripMenuItem_Click;
+            this.packagesToolStripMenuItem.Name = "packagesToolStripMenuItem";
+            this.packagesToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
+            this.packagesToolStripMenuItem.Text = "Список пакетов";
+            this.packagesToolStripMenuItem.Click += new System.EventHandler(this.packagesToolStripMenuItem_Click);
             // 
             // packageSoftwaresToolStripMenuItem
             // 
-            packageSoftwaresToolStripMenuItem.Name = "packageSoftwaresToolStripMenuItem";
-            packageSoftwaresToolStripMenuItem.Size = new Size(201, 26);
-            packageSoftwaresToolStripMenuItem.Text = "ПО по пакетам";
-            packageSoftwaresToolStripMenuItem.Click += packageSoftwaresToolStripMenuItem_Click;
+            this.packageSoftwaresToolStripMenuItem.Name = "packageSoftwaresToolStripMenuItem";
+            this.packageSoftwaresToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
+            this.packageSoftwaresToolStripMenuItem.Text = "ПО по пакетам";
+            this.packageSoftwaresToolStripMenuItem.Click += new System.EventHandler(this.packageSoftwaresToolStripMenuItem_Click);
             // 
             // ordersToolStripMenuItem
             // 
-            ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
-            ordersToolStripMenuItem.Size = new Size(201, 26);
-            ordersToolStripMenuItem.Text = "Список заказов";
-            ordersToolStripMenuItem.Click += ordersToolStripMenuItem_Click;
+            this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
+            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
+            this.ordersToolStripMenuItem.Text = "Список заказов";
+            this.ordersToolStripMenuItem.Click += new System.EventHandler(this.ordersToolStripMenuItem_Click);
             // 
             // startWorksToolStripMenuItem
             // 
-            startWorksToolStripMenuItem.Name = "startWorksToolStripMenuItem";
-            startWorksToolStripMenuItem.Size = new Size(114, 24);
-            startWorksToolStripMenuItem.Text = "Запуск работ";
-            startWorksToolStripMenuItem.Click += startWorksToolStripMenuItem_Click;
-            // 
-            // бэкапToolStripMenuItem
-            // 
-            бэкапToolStripMenuItem.Name = "бэкапToolStripMenuItem";
-            бэкапToolStripMenuItem.Size = new Size(63, 24);
-            бэкапToolStripMenuItem.Text = "Бэкап";
-            бэкапToolStripMenuItem.Click += CreateBackupStripMenuItem_Click;
+            this.startWorksToolStripMenuItem.Name = "startWorksToolStripMenuItem";
+            this.startWorksToolStripMenuItem.Size = new System.Drawing.Size(92, 20);
+            this.startWorksToolStripMenuItem.Text = "Запуск работ";
+            this.startWorksToolStripMenuItem.Click += new System.EventHandler(this.startWorksToolStripMenuItem_Click);
             // 
             // FormMain
             // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1255, 351);
-            Controls.Add(buttonRef);
-            Controls.Add(buttonIssuedOrder);
-            Controls.Add(buttonCreateOrder);
-            Controls.Add(dataGridView);
-            Controls.Add(menuStrip1);
-            MainMenuStrip = menuStrip1;
-            Margin = new Padding(3, 4, 3, 4);
-            Name = "FormMain";
-            Text = "Магазин программного обеспечения";
-            Load += FormMain_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            menuStrip1.ResumeLayout(false);
-            menuStrip1.PerformLayout();
-            ResumeLayout(false);
-            PerformLayout();
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1098, 263);
+            this.Controls.Add(this.buttonRef);
+            this.Controls.Add(this.buttonIssuedOrder);
+            this.Controls.Add(this.buttonCreateOrder);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.menuStrip1);
+            this.MainMenuStrip = this.menuStrip1;
+            this.Name = "FormMain";
+            this.Text = "Магазин программного обеспечения";
+            this.Load += new System.EventHandler(this.FormMain_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
         }
 
         #endregion
@@ -231,7 +217,5 @@ namespace SoftwareInstallationView
         private ToolStripMenuItem ordersToolStripMenuItem;
         private ToolStripMenuItem implementerToolStripMenuItem;
         private ToolStripMenuItem startWorksToolStripMenuItem;
-        private ToolStripMenuItem письмаToolStripMenuItem;
-        private ToolStripMenuItem бэкапToolStripMenuItem;
     }
 }

SoftwareInstallation/SoftwareInstallation/FormMain.cs

@@ -1,6 +1,5 @@
 using AbstractSoftwareInstallationContracts.BindingModels;
 using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using AbstractSoftwareInstallationContracts.DI;
 using Microsoft.Extensions.Logging;
 using SoftwareInstallation;
 using System;
@@ -21,17 +20,14 @@ namespace SoftwareInstallationView
         private readonly IOrderLogic _orderLogic;
         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)
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic , IReportLogic reportLogic, IWorkProcess workProcess)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
             _workProcess = workProcess;
-            _backUpLogic = backUpLogic;
         }
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -39,11 +35,17 @@ namespace SoftwareInstallationView
         }
         private void LoadData()
         {
-
+            _logger.LogInformation("Загрузка заказов");
             try
             {
-                dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
-                _logger.LogInformation("Загрузка заказов");
+                var list = _orderLogic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["PackageId"].Visible = false;
+                    dataGridView.Columns["ClientId"].Visible = false;
+                    dataGridView.Columns["ImplementerId"].Visible = false;
+                }
             }
             catch (Exception ex)
             {
@@ -55,11 +57,14 @@ namespace SoftwareInstallationView
 
         private void buttonCreateOrder_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
-            form.ShowDialog();
-            LoadData();
+            var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+            if (service is FormCreateOrder form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
         }
-
+     
         private void buttonIssuedOrder_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
@@ -89,13 +94,19 @@ namespace SoftwareInstallationView
         }
         private void softwareToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormSoftwares>();
-            form.ShowDialog();
+            var service = Program.ServiceProvider?.GetService(typeof(FormSoftwares));
+            if (service is FormSoftwares form)
+            {
+                form.ShowDialog();
+            }
         }
         private void packageToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormPackages>();
-            form.ShowDialog();
+            var service = Program.ServiceProvider?.GetService(typeof(FormPackages));
+            if (service is FormPackages form)
+            {
+                form.ShowDialog();
+            }
         }
 
         private void buttonRef_Click(object sender, EventArgs e)
@@ -104,20 +115,24 @@ namespace SoftwareInstallationView
         }
         private void ordersToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormReportOrders>();
-            form.ShowDialog();
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+            if (service is FormReportOrders form)
+            {
+                form.ShowDialog();
+            }
         }
 
         private void packageSoftwaresToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormReportPackageSoftwares>();
-            form.ShowDialog();
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportPackageSoftwares));
+            if (service is FormReportPackageSoftwares form)
+            {
+                form.ShowDialog();
+            }
         }
 
         private void packagesToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormPackages>();
-            form.ShowDialog();
             using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
             if (dialog.ShowDialog() == DialogResult.OK)
             {
@@ -127,52 +142,28 @@ namespace SoftwareInstallationView
                 });
                 MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
-
         }
 
         private void clientToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormClients>();
-            form.ShowDialog();
-        }
-        private void mailsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var form = DependencyManager.Instance.Resolve<FormMails>();
-            form.ShowDialog();
+            var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+            if (service is FormClients form)
+            {
+                form.ShowDialog();
+            }
         }
         private void implementerToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormImplementers>();
-            form.ShowDialog();
-        }
+            var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+            if (service is FormImplementers form)
+            {
+                form.ShowDialog();
+            }
+        }   
         private void startWorksToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            _workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
+            _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
             MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
-        private void CreateBackupStripMenuItem_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                if (_backUpLogic != null)
-                {
-                    var fbd = new FolderBrowserDialog();
-                    if (fbd.ShowDialog() == DialogResult.OK)
-                    {
-                        _backUpLogic.CreateBackUp(new BackUpSaveBindingModel
-                        {
-                            FolderName = fbd.SelectedPath
-                        });
-                        MessageBox.Show("Бекап создан", "Сообщение",
-                            MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
     }
 }

SoftwareInstallation/SoftwareInstallation/FormPackage.cs

@@ -1,6 +1,5 @@
 using AbstractSoftwareInstallationContracts.BindingModels;
 using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using AbstractSoftwareInstallationContracts.DI;
 using AbstractSoftwareInstallationContracts.SearchModels;
 using AbstractSoftwareInstallationDataModels.Models;
 using Microsoft.Extensions.Logging;
@@ -80,40 +79,10 @@ namespace SoftwareInstallationView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormPackageSoftware>();
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FormPackageSoftware));
+
+            if (service is FormPackageSoftware form)
             {
-                if (form.SoftwareModel == null)
-                {
-                    return;
-                }
-
-                _logger.LogInformation("Добавление нового ПО: { SoftwareName} - { Count}", form.SoftwareModel.SoftwareName, form.Count);
-
-                if (_packageSoftwares.ContainsKey(form.Id))
-                {
-                    _packageSoftwares[form.Id] = (form.SoftwareModel, form.Count);
-                }
-
-                else
-                {
-                    _packageSoftwares.Add(form.Id, (form.SoftwareModel, form.Count));
-                }
-
-                LoadData();
-            }
-        }
-
-        private void buttonEdit_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var form = DependencyManager.Instance.Resolve<FormPackageSoftware>();
-
-                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
-                form.Id = id;
-                form.Count = _packageSoftwares[id].Item2;
-
                 if (form.ShowDialog() == DialogResult.OK)
                 {
                     if (form.SoftwareModel == null)
@@ -121,13 +90,50 @@ namespace SoftwareInstallationView
                         return;
                     }
 
-                    _logger.LogInformation("Изменение ПО: { SoftwareName} - { Count}", form.SoftwareModel.SoftwareName, form.Count);
-                    _packageSoftwares[form.Id] = (form.SoftwareModel, form.Count);
+                    _logger.LogInformation("Добавление нового ПО: { SoftwareName} - { Count}", form.SoftwareModel.SoftwareName, form.Count);
+
+                    if (_packageSoftwares.ContainsKey(form.Id))
+                    {
+                        _packageSoftwares[form.Id] = (form.SoftwareModel, form.Count);
+                    }
+
+                    else
+                    {
+                        _packageSoftwares.Add(form.Id, (form.SoftwareModel, form.Count));
+                    }
+
                     LoadData();
                 }
             }
         }
 
+        private void buttonEdit_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormPackageSoftware));
+
+                if (service is FormPackageSoftware form)
+                {
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
+                    form.Id = id;
+                    form.Count = _packageSoftwares[id].Item2;
+
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        if (form.SoftwareModel == null)
+                        {
+                            return;
+                        }
+
+                        _logger.LogInformation("Изменение ПО: { SoftwareName} - { Count}", form.SoftwareModel.SoftwareName, form.Count);
+                        _packageSoftwares[form.Id] = (form.SoftwareModel, form.Count);
+                        LoadData();
+                    }
+                }
+            }
+        }
+
         private void buttonDelete_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)

SoftwareInstallation/SoftwareInstallation/FormPackages.Designer.cs

@@ -111,7 +111,6 @@
             this.Text = "FormPackages";
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
             this.ResumeLayout(false);
-            this.Load += new System.EventHandler(this.FormPackages_Load);
 
         }
 

SoftwareInstallation/SoftwareInstallation/FormPackages.cs

@@ -1,6 +1,5 @@
 using AbstractSoftwareInstallationContracts.BindingModels;
 using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using AbstractSoftwareInstallationContracts.DI;
 using Microsoft.Extensions.Logging;
 using SoftwareInstallation;
 
@@ -15,6 +14,7 @@ namespace SoftwareInstallationView
             InitializeComponent();
             _logger = logger;
             _logic = logic;
+            LoadData();
         }
         private void FormPackages_Load(object sender, EventArgs e)
         {
@@ -24,7 +24,14 @@ namespace SoftwareInstallationView
         {
             try
             {
-                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["PackageName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["PackageSoftware"].Visible = false;
+                }
                 _logger.LogInformation("Загрузка пакетов");
             }
             catch (Exception ex)
@@ -35,10 +42,14 @@ namespace SoftwareInstallationView
         }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormPackage>();
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FormPackage));
+
+            if (service is FormPackage form)
             {
-                LoadData();
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
             }
         }
         private void ButtonUpd_Click(object sender, EventArgs e)
@@ -79,13 +90,16 @@ namespace SoftwareInstallationView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<FormPackage>();
+                var service = Program.ServiceProvider?.GetService(typeof(FormPackage));
 
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-
-                if (form.ShowDialog() == DialogResult.OK)
+                if (service is FormPackage form)
                 {
-                    LoadData();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }

SoftwareInstallation/SoftwareInstallation/FormSoftwares.Designer.cs

@@ -109,7 +109,6 @@
             this.Controls.Add(this.buttonAdd);
             this.Name = "FormSoftwares";
             this.Text = "Программные обеспечения";
-            this.Load += new System.EventHandler(this.FormSoftwares_Load);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
             this.ResumeLayout(false);
 

SoftwareInstallation/SoftwareInstallation/FormSoftwares.cs

@@ -1,7 +1,5 @@
 using AbstractSoftwareInstallationContracts.BindingModels;
 using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
-using AbstractSoftwareInstallationContracts.DI;
-using AbstractSoftwareInstallationContracts.ViewModels;
 using Microsoft.Extensions.Logging;
 using SoftwareInstallation;
 
@@ -9,14 +7,15 @@ namespace SoftwareInstallationView
 {
     public partial class FormSoftwares : Form
     {
-        private readonly ILogger _logger;
-        private readonly ISoftwareLogic _logic;
         public FormSoftwares(ILogger<FormSoftwares> logger, ISoftwareLogic logic)
         {
             InitializeComponent();
             _logger = logger;
             _logic = logic;
+            LoadData();
         }
+        private readonly ILogger _logger;
+        private readonly ISoftwareLogic _logic;
 
         private void FormSoftwares_Load(object sender, EventArgs e)
         {
@@ -26,7 +25,13 @@ namespace SoftwareInstallationView
         {
             try
             {
-                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["SoftwareName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
                 _logger.LogInformation("Загрузка компонентов");
             }
             catch (Exception ex)
@@ -38,10 +43,13 @@ namespace SoftwareInstallationView
         }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormSoftware>();
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FormSoftware));
+            if (service is FormSoftware form)
             {
-                LoadData();
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
             }
         }
         private void ButtonUpd_Click(object sender, EventArgs e)
@@ -53,10 +61,11 @@ namespace SoftwareInstallationView
             if (dataGridView.SelectedRows.Count == 1)
             {
                 if (MessageBox.Show("Удалить запись?", "Вопрос",
-                    MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+               MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление компонента");
+                    int id =
+                   Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    _logger.LogInformation("Удаление ПО");
                     try
                     {
                         if (!_logic.Delete(new SoftwareBindingModel
@@ -64,15 +73,15 @@ namespace SoftwareInstallationView
                             Id = id
                         }))
                         {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+                            throw new Exception("Ошибка при удалении.Дополнительная информация в логах.");
                         }
                         LoadData();
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError(ex, "Ошибка удаления компонента");
+                        _logger.LogError(ex, "Ошибка удаления ПО");
                         MessageBox.Show(ex.Message, "Ошибка",
-                            MessageBoxButtons.OK, MessageBoxIcon.Error);
+                       MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }
             }
@@ -81,13 +90,16 @@ namespace SoftwareInstallationView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<FormSoftware>();
+                var service = Program.ServiceProvider?.GetService(typeof(FormSoftware));
 
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-
-                if (form.ShowDialog() == DialogResult.OK)
+                if (service is FormSoftware form)
                 {
-                    LoadData();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }

SoftwareInstallation/SoftwareInstallation/Program.cs

@@ -1,3 +1,4 @@
+using AbstractSoftwareInstallationDatabaseImplement.Implements;
 using AbstractSoftwareInstallationBusinessLogic;
 using AbstractSoftwareInstallationBusinessLogic.BusinessLogic;
 using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
@@ -8,14 +9,13 @@ using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 using AbstractSoftwareInstallationBusinessLogic.OfficePackage;
 using AbstractSoftwareInstallationBusinessLogic.OfficePackage.Implements;
-using AbstractSoftwareInstallationBusinessLogic.MailWorker;
-using AbstractSoftwareInstallationContracts.BindingModels;
-using AbstractSoftwareInstallationContracts.DI;
 
 namespace SoftwareInstallation
 {
     internal static class Program
     {
+        private static ServiceProvider? _serviceProvider;
+        public static ServiceProvider? ServiceProvider => _serviceProvider;
         /// <summary>
         ///  The main entry point for the application.
         /// </summary>
@@ -23,69 +23,48 @@ namespace SoftwareInstallation
         static void Main()
         {
             ApplicationConfiguration.Initialize();
-
-            InitDependency();
-            try
-            {
-                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"])
-                });
-                // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
-            }
-            catch (Exception ex)
-            {
-                var logger = DependencyManager.Instance.Resolve<ILogger>();
-                logger?.LogError(ex, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
-            }
-
-            Application.Run(DependencyManager.Instance.Resolve<FormMain>());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            _serviceProvider = services.BuildServiceProvider();
+            Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
-
-        private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
-        private static void InitDependency()
+        private static void ConfigureServices(ServiceCollection services)
         {
-            DependencyManager.InitDependency();
-            DependencyManager.Instance.AddLogging(option =>
+            services.AddLogging(option =>
             {
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
             });
-            DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
-            DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
-            DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
-            DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
-            DependencyManager.Instance.RegisterType<ISoftwareLogic, SoftwareLogic>();
-            DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
-            DependencyManager.Instance.RegisterType<IPackageLogic, PackageLogic>();
-            DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
-            DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
+            services.AddTransient<IImplementerStorage, ImplementerStorage>();
+            services.AddTransient<IClientStorage, ClientStorage>();
+            services.AddTransient<ISoftwareStorage, SoftwareStorage>();
+            services.AddTransient<IOrderStorage, OrderStorage>();
+            services.AddTransient<IPackageStorage, PackageStorage>();
 
-            DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
-            DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
-            DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
-            DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(isSingle: true);
+            services.AddTransient<IImplementerLogic, ImplementerLogic>();
+            services.AddTransient<IClientLogic, ClientLogic>();
+            services.AddTransient<ISoftwareLogic, SoftwareLogic>();
+            services.AddTransient<IOrderLogic, OrderLogic>();
+            services.AddTransient<IPackageLogic, PackageLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+            services.AddTransient<IWorkProcess, WorkModeling>();
 
-            DependencyManager.Instance.RegisterType<FormMails>();
-            DependencyManager.Instance.RegisterType<FormImplementers>();
-            DependencyManager.Instance.RegisterType<FormImplementer>();
-            DependencyManager.Instance.RegisterType<FormMain>();
-            DependencyManager.Instance.RegisterType<FormClients>();
-            DependencyManager.Instance.RegisterType<FormSoftware>();
-            DependencyManager.Instance.RegisterType<FormSoftwares>();
-            DependencyManager.Instance.RegisterType<FormCreateOrder>();
-            DependencyManager.Instance.RegisterType<FormPackage>();
-            DependencyManager.Instance.RegisterType<FormPackageSoftware>();
-            DependencyManager.Instance.RegisterType<FormPackages>();
-            DependencyManager.Instance.RegisterType<FormReportOrders>();
-            DependencyManager.Instance.RegisterType<FormReportPackageSoftwares>();
+            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+
+            services.AddTransient<FormImplementers>();
+            services.AddTransient<FormImplementer>();
+            services.AddTransient<FormMain>();
+            services.AddTransient<FormClients>();
+            services.AddTransient<FormSoftware>();
+            services.AddTransient<FormSoftwares>();
+            services.AddTransient<FormCreateOrder>();
+            services.AddTransient<FormPackage>();
+            services.AddTransient<FormPackageSoftware>();
+            services.AddTransient<FormPackages>();
+            services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormReportPackageSoftwares>();
         }
 
     }

SoftwareInstallation/SoftwareInstallation/SoftwareInstallationView.csproj

@@ -9,20 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="log4net.config" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="5.0.0" />
-    <PackageReference Include="EntityFramework.ru" Version="5.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -37,27 +23,7 @@
     <ProjectReference Include="..\AbstractSoftwareInstallationBusinessLogic\AbstractSoftwareInstallationBusinessLogic.csproj" />
     <ProjectReference Include="..\AbstractSoftwareInstallationContracts\AbstractSoftwareInstallationContracts.csproj" />
     <ProjectReference Include="..\AbstractSoftwareInstallationDatabaseImplement\AbstractSoftwareInstallationDatabaseImplement.csproj" />
-    <ProjectReference Include="..\AbstractSoftwareInstallationFileImplement\AbstractSoftwareInstallationFileImplement.csproj" />
     <ProjectReference Include="..\AbstractSoftwareInstallationListImplement\AbstractSoftwareInstallationListImplement.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="App.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>App.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="App.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>App.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
 </Project>

SoftwareInstallation/SoftwareInstallation/log4net.config

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<log4net>
-	<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
-		<file value="c:/temp/AbstractSoftwareInstallationRestApi.log" />
-		<appendToFile value="true" />
-		<maximumFileSize value="100KB" />
-		<maxSizeRollBackups value="2" />
-		<layout type="log4net.Layout.PatternLayout">
-			<conversionPattern value="%date %5level %logger.%method [%line] - MESSAGE: %message%newline %exception" />
-		</layout>
-	</appender>
-	<root>
-		<level value="TRACE" />
-		<appender-ref ref="RollingFile" />
-	</root>
-</log4net>