Revert "тупанула жесть"

This reverts commit 041d08bd43.

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/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 SoftwareInstallationBusinessLogic.BusinessLogics
@@ -109,15 +108,6 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics
                 throw new ArgumentNullException("Нет пароля клиента",
                nameof(model.ClientFIO));
             }
-            if (!Regex.IsMatch(model.Email, @"^[^@\s]+@[^@\s]+\.[^@\s]+$", RegexOptions.IgnoreCase))
-            {
-                throw new ArgumentException("Неправильно введенный email", nameof(model.Email));
-            }
-
-            if (!Regex.IsMatch(model.Password, @"^^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase))
-            {
-                throw new ArgumentException("Неправильно введенный пароль", nameof(model.Password));
-            }
             _logger.LogInformation("Client. ClientFIO:{ClientFIO}." +
                 "Email:{ Email}. Password:{ Password}. Id: { Id} ", model.ClientFIO, model.Email, model.Password, model.Id);
             var element = _clientStorage.GetElement(new ClientSearchModel

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -1,101 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.BusinessLogicsContracts;
-using SoftwareInstallationContracts.SearchModels;
-using SoftwareInstallationContracts.StoragesContracts;
-using SoftwareInstallationContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.BusinessLogics
-{
-    public class MessageInfoLogic : IMessageInfoLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IMessageInfoStorage _messageStorage;
-		private readonly IClientStorage _clientStorage;
-
-		public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage messageStorage, IClientStorage clientStorage)
-        {
-            _logger = logger;
-            _messageStorage = messageStorage;
-			_clientStorage = clientStorage;
-
-		}
-
-        public bool Create(MessageInfoBindingModel model)
-        {
-			CheckModel(model);
-			if (_messageStorage.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 ? _messageStorage.GetFullList() : _messageStorage.GetFilteredList(model);
-
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-
-                return null;
-            }
-
-            _logger.LogInformation("ReadList. Count: {Count}", list.Count);
-
-            return list;
-        }
-		private void CheckModel(MessageInfoBindingModel model, bool withParams = true)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-			if (!withParams)
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(model.MessageId))
-			{
-				throw new ArgumentNullException("Не указан id сообщения", nameof(model.MessageId));
-			}
-			if (string.IsNullOrEmpty(model.SenderName))
-			{
-				throw new ArgumentNullException("Не указао почта", nameof(model.SenderName));
-			}
-			if (string.IsNullOrEmpty(model.Subject))
-			{
-				throw new ArgumentNullException("Не указана тема", nameof(model.Subject));
-			}
-			if (string.IsNullOrEmpty(model.Body))
-			{
-				throw new ArgumentNullException("Не указан текст сообщения", nameof(model.Subject));
-			}
-
-			_logger.LogInformation("MessageInfo. MessageId:{MessageId}.SenderName:{SenderName}.Subject:{Subject}.Body:{Body}", model.MessageId, model.SenderName, model.Subject, model.Body);
-			var element = _clientStorage.GetElement(new ClientSearchModel
-			{
-				Email = model.SenderName
-			});
-			if (element == null)
-			{
-				_logger.LogWarning("Не удалоссь найти клиента, отправившего письмо с адреса Email:{Email}", model.SenderName);
-			}
-			else
-			{
-				model.ClientId = element.Id;
-			}
-		}
-
-	}
-}

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using SoftwareInstallationBusinessLogic.MailWorker;
 using SoftwareInstallationContracts.BindingModels;
 using SoftwareInstallationContracts.BusinessLogicsContracts;
 using SoftwareInstallationContracts.SearchModels;
@@ -18,8 +17,6 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly AbstractMailWorker _mailWorker;
-        private readonly IClientLogic _clientLogic;
         static readonly object locker = new object();
 
         public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -72,14 +72,14 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics
                             ImplementerId = implementer.Id
                         });
                         // делаем работу
-                        Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
+                        Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 10000) * order.Count);
                         _logger.LogDebug("DoWork. Worker {Id} finish order {Order} ", implementer.Id, order.Id);
                         _orderLogic.FinishOrder(new OrderBindingModel
                         {
                             Id = order.Id,
                         });
                         // отдыхаем
-                        Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+                        Thread.Sleep(implementer.Qualification * _rnd.Next(10, 50));
                     }
                     // кто-то мог уже перехватить заказ, игнорируем ошибку
                     catch (InvalidOperationException ex)

SoftwareInstallation/SoftwareInstallationBusinessLogic/MailWorker/AbsractMailWorker.cs

@@ -1,85 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.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 ILogger _logger;
-        public AbstractMailWorker(ILogger<AbstractMailWorker> logger,
-       IMessageInfoLogic messageInfoLogic)
-        {
-            _logger = logger;
-            _messageInfoLogic = messageInfoLogic;
-        }
-        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)
-            {
-                _messageInfoLogic.Create(mail);
-            }
-        }
-        protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
-        protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
-    }
-
-}

SoftwareInstallation/SoftwareInstallationBusinessLogic/MailWorker/MailKitWorker.cs

@@ -1,83 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.Net;
-using System.Security.Authentication;
-using System.Text;
-using System.Threading.Tasks;
-using MailKit.Net.Pop3;
-using MailKit.Security;
-
-namespace SoftwareInstallationBusinessLogic.MailWorker
-{
-    public class MailKitWorker : AbstractMailWorker
-    {
-        public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic
-       messageInfoLogic) : base(logger, messageInfoLogic) { }
-        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 error)
-                { }
-                finally
-                {
-                    client.Disconnect(true);
-                }
-            });
-            return list;
-        }
-    }
-}

SoftwareInstallation/SoftwareInstallationBusinessLogic/SoftwareInstallationBusinessLogic.csproj

@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
-    <PackageReference Include="MailKit" Version="4.5.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />

SoftwareInstallation/SoftwareInstallationClientApp/Controllers/HomeController.cs

@@ -139,14 +139,5 @@ namespace SoftwareInstallationClientApp.Controllers
             var pack = APIClient.GetRequest<PackageViewModel>($"api/main/getpackage?packageId={package}");
             return count * (pack?.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/SoftwareInstallationClientApp/Views/Home/Mails.cshtml

@@ -1,54 +0,0 @@
-@using SoftwareInstallationContracts.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/SoftwareInstallationClientApp/Views/Shared/_Layout.cshtml

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

SoftwareInstallation/SoftwareInstallationContracts/BindingModels/MailConfigBindingModel.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationContracts.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/SoftwareInstallationContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationContracts.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/SoftwareInstallationContracts/BindingModels/MessageInfoBindingModel.cs

@@ -1,20 +0,0 @@
-using SoftwareInstallationDataModels;
-using SoftwareInstallationDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationContracts.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 string Subject { get; set; } = string.Empty;
-        public string Body { get; set; } = string.Empty;
-        public DateTime DateDelivery { get; set; }
-    }
-}

SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

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

SoftwareInstallation/SoftwareInstallationContracts/SearchModels/MessageInfoSearchModel.cs

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

SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IMessageInfoStorage.cs

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

SoftwareInstallation/SoftwareInstallationContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,29 +0,0 @@
-using SoftwareInstallationDataModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationContracts.ViewModels
-{
-    public class MessageInfoViewModel : IMessageInfoModel
-    {
-        public string MessageId { get; set; } = string.Empty;
-
-        public int? ClientId { get; set; }
-
-        [DisplayName("Имя отправителя")]
-        public string SenderName { get; set; } = string.Empty;
-
-        [DisplayName("Дата отправления")]
-        public DateTime DateDelivery { get; set; }
-
-        [DisplayName("Тема")]
-        public string Subject { get; set; } = string.Empty;
-
-        [DisplayName("Содержание")]
-        public string Body { get; set; } = string.Empty;
-    }
-}

SoftwareInstallation/SoftwareInstallationDataModels/IMessageInfoModel.cs

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

SoftwareInstallation/SoftwareInstallationDatabaseImplement/Client.cs

@@ -22,9 +22,8 @@ namespace SoftwareInstallationDatabaseImplement.Models
         [Required]
         public string Password { get; set; } = string.Empty;
         [ForeignKey("ClientId")]
-        public virtual List<Order> Orders { get; set; } = new();
+        public virtual List<Order> Orders { get; set; } =
-        [ForeignKey("ClientId")]
+        new();
-        public virtual List<Message> Messages { get; set; } = new();
         public static Client? Create(ClientBindingModel model)
         {
             if (model == null)

SoftwareInstallation/SoftwareInstallationDatabaseImplement/Message.cs

@@ -1,56 +0,0 @@
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationDataModels;
-using SoftwareInstallationDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationDatabaseImplement.Models
-{
-    public class Message : IMessageInfoModel
-    {
-        [Key]
-        public string MessageId { get; private set; } = string.Empty;
-        public int? ClientId { get; private set; }
-        [Required]
-        public string SenderName { get; private set; } = string.Empty;
-        [Required]
-        public DateTime DateDelivery { get; private set; } = DateTime.Now;
-        [Required]
-        public string Subject { get; private set; } = string.Empty;
-        [Required]
-        public string Body { get; private set; } = string.Empty;
-        public virtual Client? Client { get; set; }
-
-        public static Message? 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/SoftwareInstallationDatabaseImplement/MessageInfoStorage.cs

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

SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240518120837_MailMessage.Designer.cs

@@ -1,298 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SoftwareInstallationDatabaseImplement;
-
-#nullable disable
-
-namespace SoftwareInstallationDatabaseImplement.Migrations
-{
-    [DbContext(typeof(SoftwareInstallationDatabase))]
-    [Migration("20240518120837_MailMessage")]
-    partial class MailMessage
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.17")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.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("SoftwareInstallationDatabaseImplement.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("SoftwareInstallationDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Message", 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("SoftwareInstallationDatabaseImplement.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("SoftwareInstallationDatabaseImplement.Models.PackageComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PackageId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("PackageId");
-
-                    b.ToTable("PackageComponents");
-                });
-
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.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("SoftwareInstallationDatabaseImplement.Models.Message", b =>
-                {
-                    b.HasOne("SoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Messages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.PackageComponent", b =>
-                {
-                    b.HasOne("SoftwareInstallationDatabaseImplement.Models.Component", "Component")
-                        .WithMany("PackageComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SoftwareInstallationDatabaseImplement.Models.Package", "Package")
-                        .WithMany("Components")
-                        .HasForeignKey("PackageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Package");
-                });
-
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Order", b =>
-                {
-                    b.HasOne("SoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SoftwareInstallationDatabaseImplement.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
-                    b.HasOne("SoftwareInstallationDatabaseImplement.Models.Package", "Package")
-                        .WithMany("Orders")
-                        .HasForeignKey("PackageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-
-                    b.Navigation("Package");
-                });
-
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Messages");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("PackageComponents");
-                });
-
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Package", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240518120837_MailMessage.cs

@@ -1,48 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace SoftwareInstallationDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class MailMessage : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            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");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Messages");
-        }
-    }
-}

SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/SoftwareInstallationDatabaseModelSnapshot.cs

@@ -94,36 +94,6 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Message", 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("SoftwareInstallationDatabaseImplement.Models.Package", b =>
                 {
                     b.Property<int>("Id")
@@ -213,15 +183,6 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
                     b.ToTable("Orders");
                 });
 
-            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Message", b =>
-                {
-                    b.HasOne("SoftwareInstallationDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Messages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
             modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.PackageComponent", b =>
                 {
                     b.HasOne("SoftwareInstallationDatabaseImplement.Models.Component", "Component")
@@ -273,8 +234,6 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
 
             modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("Messages");
-
                     b.Navigation("Orders");
                 });
 

SoftwareInstallation/SoftwareInstallationDatabaseImplement/SoftwareInstallationDatabase.cs

@@ -15,7 +15,7 @@ namespace SoftwareInstallationDatabaseImplement
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Data Source=WIN-45522256GVD\SQLEXPRESS;Initial Catalog=SoftwareInstallationDatabase2;Integrated Security=True;MultipleActiveResultSets=True;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=WIN-45522256GVD\SQLEXPRESS;Initial Catalog=SoftwareInstallationDatabase1;Integrated Security=True;MultipleActiveResultSets=True;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }
@@ -25,6 +25,5 @@ namespace SoftwareInstallationDatabaseImplement
         public virtual DbSet<Order> Orders { set; get; }
         public virtual DbSet<Client> Clients { set; get; }
         public virtual DbSet<Implementer> Implementers { set; get; }
-        public virtual DbSet<Message> Messages { set; get; }
     }
 }

SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs

@@ -17,13 +17,11 @@ namespace SoftwareInstallationFileImplement
         private readonly string PackageFileName = "Package.xml";
         private readonly string ClientFileName = "Client.xml";
         private readonly string ImplementerFileName = "Implementer.xml";
-        private readonly string MessageFileName = "Message.xml";
         public List<Component> Components { 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<Message> Messages { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -37,7 +35,6 @@ namespace SoftwareInstallationFileImplement
         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()
         {
@@ -46,7 +43,6 @@ namespace SoftwareInstallationFileImplement
             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 => Message.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

SoftwareInstallation/SoftwareInstallationFileImplement/Implementer.cs

@@ -1,7 +1,6 @@
 using SoftwareInstallationContracts.BindingModels;
 using SoftwareInstallationContracts.ViewModels;
 using SoftwareInstallationDataModels;
-using SoftwareInstallationDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,79 +8,71 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace SoftwareInstallationFileImplement.Models
+namespace SoftwareInstallationFileImplement
 {
     public class Implementer : IImplementerModel
     {
-        public string ImplementerFIO { get; private set; } = string.Empty;
-
-        public string Password { get; private set; } = string.Empty;
-
-        public int WorkExperience { get; private set; }
-
-        public int Qualification { get; private set; }
-
         public int Id { get; private set; }
-
+        public string ImplementerFIO { get; private set; } = string.Empty;
-        public static Implementer? Create(XElement element)
+        public string Password { get; set; } = string.Empty;
-        {
+        public int Qualification { get; set; } = 0;
-            if (element == null)
+        public int WorkExperience { get; set; } = 0;
-            {
-                return null;
-            }
-            return new()
-            {
-                ImplementerFIO = element.Element("FIO")!.Value,
-                Password = element.Element("Password")!.Value,
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                Qualification = Convert.ToInt32(element.Element("Qualification")!.Value),
-                WorkExperience = Convert.ToInt32(element.Element("WorkExperience")!.Value),
-            };
-        }
-
         public static Implementer? Create(ImplementerBindingModel model)
         {
             if (model == null)
             {
                 return null;
             }
-            return new()
+            return new Implementer()
             {
                 Id = model.Id,
-                Password = model.Password,
-                Qualification = model.Qualification,
                 ImplementerFIO = model.ImplementerFIO,
+                Password = model.Password,
                 WorkExperience = model.WorkExperience,
+                Qualification = model.Qualification
             };
         }
-
         public void Update(ImplementerBindingModel model)
         {
             if (model == null)
             {
                 return;
             }
-            Password = model.Password;
-            Qualification = model.Qualification;
             ImplementerFIO = model.ImplementerFIO;
+            Password = model.Password;
             WorkExperience = model.WorkExperience;
+            Qualification = model.Qualification;
         }
-
         public ImplementerViewModel GetViewModel => new()
         {
             Id = Id,
-            Password = Password,
-            Qualification = Qualification,
             ImplementerFIO = ImplementerFIO,
-            WorkExperience = WorkExperience
+            Password = Password,
+            WorkExperience = WorkExperience,
+            Qualification = Qualification
         };
+        public static Implementer? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Implementer()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ImplementerFIO = element.Element("ImplementerFIO")!.Value,
+                Password = element.Element("Password")!.Value,
+                Qualification = Convert.ToInt32(element.Element("Qualification")!.Value),
+                WorkExperience = Convert.ToInt32(element.Element("WorkExperience")!.Value)
+            };
+        }
 
-        public XElement GetXElement => new("Client",
+        public XElement GetXElement => new("Implementer",
-            new XAttribute("Id", Id),
+                new XAttribute("Id", Id),
-            new XElement("Password", Password),
+                new XElement("ImplementerFIO", ImplementerFIO),
-            new XElement("FIO", ImplementerFIO),
+                new XElement("Password", Password),
-            new XElement("Qualification", Qualification),
+                new XElement("Qualification", Qualification.ToString()),
-            new XElement("WorkExperience", WorkExperience)
+                new XElement("WorkExperience", WorkExperience.ToString())
             );
     }
 }

SoftwareInstallation/SoftwareInstallationFileImplement/ImplementerStorage.cs

@@ -2,107 +2,81 @@
 using SoftwareInstallationContracts.SearchModels;
 using SoftwareInstallationContracts.StoragesContracts;
 using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationFileImplement.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SoftwareInstallationFileImplement.Implements
+namespace SoftwareInstallationFileImplement
 {
     public class ImplementerStorage : IImplementerStorage
     {
-        private readonly DataFileSingleton _source;
+        private readonly DataFileSingleton source;
         public ImplementerStorage()
         {
-            _source = DataFileSingleton.GetInstance();
+            source = DataFileSingleton.GetInstance();
         }
-        public ImplementerViewModel? Delete(ImplementerBindingModel model)
+        public List<ImplementerViewModel> GetFullList()
         {
-            var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+            return source.Implementers
-
+            .Select(x => x.GetViewModel)
-            if (res != null)
+           .ToList();
-            {
-                _source.Implementers.Remove(res);
-                _source.SaveImplementers();
-            }
-            return res?.GetViewModel;
         }
-
+        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel
-        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+       model)
         {
-            if (model.Id.HasValue)
+            if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password))
-                return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
-
-            if (model.ImplementerFIO != null && model.Password != null)
-                return _source.Implementers
-                    .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)
-                                      && x.Password.Equals(model.Password))
-                    ?.GetViewModel;
-
-            if (model.ImplementerFIO != null)
-                return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
-
-            return null;
-        }
-
-        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
-        {
-            if (model == null)
             {
                 return new();
             }
-
+            return source.Implementers
-            if (model.Id.HasValue)
+            .Where(x => (string.IsNullOrEmpty(model.ImplementerFIO) || x.ImplementerFIO.Contains(model.ImplementerFIO)) &&
-            {
+            (string.IsNullOrEmpty(model.Password) || x.Password.Contains(model.Password)))
-                var res = GetElement(model);
+           .Select(x => x.GetViewModel)
-
+           .ToList();
-                return res != null ? new() { res } : new();
-            }
-
-            if (model.ImplementerFIO != null)
-            {
-                return _source.Implementers
-                    .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-            }
-
-            return new();
         }
-
+        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-        public List<ImplementerViewModel> GetFullList()
         {
-            return _source.Implementers.Select(x => x.GetViewModel).ToList();
+            return source.Implementers
+            .FirstOrDefault(x => (string.IsNullOrEmpty(model.ImplementerFIO) || x.ImplementerFIO == model.ImplementerFIO) &&
+                                 (!model.Id.HasValue || x.Id == model.Id) && (string.IsNullOrEmpty(model.Password) || x.Password == model.Password))
+            ?.GetViewModel;
         }
-
         public ImplementerViewModel? Insert(ImplementerBindingModel model)
         {
-            model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1;
+            model.Id = source.Implementers.Count > 0 ? source.Implementers.Max(x =>
-
+           x.Id) + 1 : 1;
-            var res = Implementer.Create(model);
+            var newImplementer = Implementer.Create(model);
-
+            if (newImplementer == null)
-            if (res != null)
             {
-                _source.Implementers.Add(res);
+                return null;
-                _source.SaveImplementers();
             }
-
+            source.Implementers.Add(newImplementer);
-            return res?.GetViewModel;
+            source.SaveImplementers();
+            return newImplementer.GetViewModel;
         }
-
         public ImplementerViewModel? Update(ImplementerBindingModel model)
         {
-            var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+            var implementer = source.Implementers.FirstOrDefault(x => x.Id == model.Id);
-
+            if (implementer == null)
-            if (res != null)
             {
-                res.Update(model);
+                return null;
-                _source.SaveImplementers();
             }
-
+            implementer.Update(model);
-            return res?.GetViewModel;
+            source.SaveImplementers();
+            return implementer.GetViewModel;
+        }
+        public ImplementerViewModel? Delete(ImplementerBindingModel model)
+        {
+            var element = source.Implementers.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                source.Implementers.Remove(element);
+                source.SaveImplementers();
+                return element.GetViewModel;
+            }
+            return null;
         }
     }
 }

SoftwareInstallation/SoftwareInstallationFileImplement/Message.cs

@@ -1,81 +0,0 @@
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationDataModels;
-using SoftwareInstallationDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace SoftwareInstallationFileImplement.Models
-{
-    public class Message : IMessageInfoModel
-    {
-        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 Message? Create(MessageInfoBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Body = model.Body,
-                Subject = model.Subject,
-                DateDelivery = model.DateDelivery,
-                SenderName = model.SenderName,
-                ClientId = model.ClientId,
-                MessageId = model.MessageId
-            };
-        }
-
-        public static Message? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Body = element.Attribute("Body")!.Value,
-                Subject = element.Attribute("Subject")!.Value,
-                DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value),
-                SenderName = element.Attribute("SenderName")!.Value,
-                ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value),
-                MessageId = element.Attribute("MessageId")!.Value,
-            };
-        }
-
-        public MessageInfoViewModel GetViewModel => new()
-        {
-            Body = Body,
-            Subject = Subject,
-            DateDelivery = DateDelivery,
-            SenderName = SenderName,
-            ClientId = ClientId,
-            MessageId = MessageId
-        };
-
-        public XElement GetXElement => new("MessageInfo",
-            new XAttribute("Subject", Subject),
-            new XAttribute("Body", Body),
-            new XAttribute("ClientId", ClientId),
-            new XAttribute("MessageId", MessageId),
-            new XAttribute("SenderName", SenderName),
-            new XAttribute("DateDelivery", DateDelivery)
-            );
-    }
-}

SoftwareInstallation/SoftwareInstallationFileImplement/MessageInfoStorage.cs

@@ -1,57 +0,0 @@
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.SearchModels;
-using SoftwareInstallationContracts.StoragesContracts;
-using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationFileImplement.Implements
-{
-	public class MessageInfoStorage : IMessageInfoStorage
-	{
-		private readonly DataFileSingleton source;
-		public MessageInfoStorage()
-		{
-			source = DataFileSingleton.GetInstance();
-		}
-		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-		{
-			if (model.MessageId == null)
-				return null;
-			return source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
-		}
-
-		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-		{
-			if (!model.ClientId.HasValue)
-				return new();
-			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 = Message.Create(model);
-			if (newMessage == null)
-			{
-				return null;
-			}
-			source.Messages.Add(newMessage);
-			source.SaveMessages();
-			return newMessage.GetViewModel;
-		}
-	}
-}

SoftwareInstallation/SoftwareInstallationListImplement/DataListSingleton.cs

@@ -15,7 +15,6 @@ namespace SoftwareInstallationListImplement
         public List<Package> Packages { get; set; }
         public List<Client> Clients { get; set; }
         public List<Implementer> Implementers { get; set; }
-        public List<Message> Messages { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
@@ -23,7 +22,6 @@ namespace SoftwareInstallationListImplement
             Packages = new List<Package>();
             Clients = new List<Client>();
             Implementers = new List<Implementer>();
-            Messages = new List<Message>();
         }
         public static DataListSingleton GetInstance()
         {

SoftwareInstallation/SoftwareInstallationListImplement/Message.cs

@@ -1,54 +0,0 @@
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationDataModels;
-using SoftwareInstallationDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationListImplement.Models
-{
-    public class Message : IMessageInfoModel
-    {
-        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 Message? Create(MessageInfoBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Body = model.Body,
-                Subject = model.Subject,
-                DateDelivery = model.DateDelivery,
-                SenderName = model.SenderName,
-                ClientId = model.ClientId,
-                MessageId = model.MessageId
-            };
-        }
-
-        public MessageInfoViewModel GetViewModel => new()
-        {
-            Body = Body,
-            Subject = Subject,
-            DateDelivery = DateDelivery,
-            SenderName = SenderName,
-            ClientId = ClientId,
-            MessageId = MessageId
-        };
-    }
-}

SoftwareInstallation/SoftwareInstallationListImplement/MessageInfoStorage.cs

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

SoftwareInstallation/SoftwareInstallationRestApi/Controllers/ClientController.cs

@@ -12,12 +12,11 @@ namespace SoftwareInstallationRestApi.Controllers
     {
         private readonly ILogger _logger;
         private readonly IClientLogic _logic;
-        private readonly IMessageInfoLogic _mailLogic;
+        public ClientController(IClientLogic logic, ILogger<ClientController>
-        public ClientController(IClientLogic logic, ILogger<ClientController> logger, IMessageInfoLogic mailLogic)
+       logger)
         {
             _logger = logger;
             _logic = logic;
-            _mailLogic = mailLogic;
         }
         [HttpGet]
         public ClientViewModel? Login(string login, string password)
@@ -62,21 +61,5 @@ namespace SoftwareInstallationRestApi.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/SoftwareInstallationRestApi/Program.cs

@@ -1,7 +1,5 @@
 using Microsoft.OpenApi.Models;
 using SoftwareInstallationBusinessLogic.BusinessLogics;
-using SoftwareInstallationBusinessLogic.MailWorker;
-using SoftwareInstallationContracts.BindingModels;
 using SoftwareInstallationContracts.BusinessLogicsContracts;
 using SoftwareInstallationContracts.StoragesContracts;
 using SoftwareInstallationDatabaseImplement;
@@ -15,15 +13,10 @@ builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IPackageStorage, PackageStorage>();
 builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
-builder.Services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
-
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IPackageLogic, PackageLogic>();
 builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
-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
@@ -37,19 +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/SoftwareInstallationRestApi/appsettings.json

@@ -5,11 +5,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
+  "AllowedHosts": "*"
-  "SmtpClientHost": "smtp.gmail.com",
-  "SmtpClientPort": "587",
-  "PopHost": "pop.gmail.com",
-  "PopPort": "995",
-  "MailLogin": "klkaznacheeva77@gmail.com",
-  "MailPassword": "gvdq swje buuh zuiv"
 }

SoftwareInstallation/SoftwareInstallationView/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="klkaznacheeva77@gmail.com" />
-		<add key ="MailPassword" value="gvdq swje buuh zuiv"/>
-	</appSettings>
-</configuration>

SoftwareInstallation/SoftwareInstallationView/FormMails.Designer.cs

@@ -1,59 +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(3, 2);
-            DataGridView.Name = "DataGridView";
-            DataGridView.Size = new Size(794, 445);
-            DataGridView.TabIndex = 1;
-            // 
-            // FormMails
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
-            Controls.Add(DataGridView);
-            Name = "FormMails";
-            Text = "Письма";
-            ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private DataGridView DataGridView;
-    }
-}

SoftwareInstallation/SoftwareInstallationView/FormMails.cs

@@ -1,55 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SoftwareInstallationContracts.BusinessLogicsContracts;
-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;
-            LoadData();
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    DataGridView.DataSource = list;
-                    DataGridView.Columns["ClientId"].Visible = false;
-                    DataGridView.Columns["MessageId"].Visible = false;
-                    DataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка писем");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки писем");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
-
-        private void FormMails_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

SoftwareInstallation/SoftwareInstallationView/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/SoftwareInstallationView/FormMain.Designer.cs

@@ -43,14 +43,13 @@
             buttonCreateOrder = new Button();
             buttonIssuedOrder = new Button();
             buttonRefresh = new Button();
-            письмаToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
             // 
             // menuStrip
             // 
-            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, письмаToolStripMenuItem });
+            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
             menuStrip.Size = new Size(1180, 24);
@@ -165,13 +164,6 @@
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += buttonRefresh_Click;
             // 
-            // письмаToolStripMenuItem
-            // 
-            письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
-            письмаToolStripMenuItem.Size = new Size(62, 20);
-            письмаToolStripMenuItem.Text = "Письма";
-            письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click;
-            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -210,6 +202,5 @@
         private ToolStripMenuItem запускРаботToolStripMenuItem;
         private ToolStripMenuItem клиентыToolStripMenuItem;
         private ToolStripMenuItem исполнителиToolStripMenuItem;
-        private ToolStripMenuItem письмаToolStripMenuItem;
     }
 }

SoftwareInstallation/SoftwareInstallationView/FormMain.cs

@@ -182,14 +182,5 @@ namespace SoftwareInstallationView
             _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
             MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
-
-        private void письмаToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormMails));
-            if (service is FormMails form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

SoftwareInstallation/SoftwareInstallationView/Program.cs

@@ -9,8 +9,6 @@ using SoftwareInstallationContracts.StoragesContracts;
 using SoftwareInstallationDatabaseImplement;
 using SoftwareInstallationView;
 using SoftwareInstallationDatabaseImplement.Implements;
-using SoftwareInstallationBusinessLogic.MailWorker;
-using SoftwareInstallationContracts.BindingModels;
 
 namespace SoftwareInstallation
 {
@@ -30,38 +28,6 @@ namespace SoftwareInstallation
             var services = new ServiceCollection();
             ConfigureServices(services);
             _serviceProvider = services.BuildServiceProvider();
-
-            try
-            {
-                var mailSender =
-                _serviceProvider.GetService<AbstractMailWorker>();
-                mailSender?.MailConfig(new MailConfigBindingModel
-                {
-                    MailLogin =
-                System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ??
-                string.Empty,
-                    MailPassword =
-                System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ??
-                string.Empty,
-                    SmtpClientHost =
-                System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ??
-                string.Empty,
-                    SmtpClientPort =
-                Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
-                    PopHost =
-                System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
-                    PopPort =
-                Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
-                });
-                // ñîçäàåì òàéìåð
-                var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
-            }
-            catch (Exception ex)
-            {
-                var logger = _serviceProvider.GetService<ILogger>();
-                logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
-            }
-
             Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
         private static void ConfigureServices(ServiceCollection services)
@@ -76,8 +42,6 @@ namespace SoftwareInstallation
             services.AddTransient<IPackageStorage, PackageStorage>();
             services.AddTransient<IClientStorage, ClientStorage>();
             services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
-
 
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IClientLogic, ClientLogic>();
@@ -85,11 +49,8 @@ namespace SoftwareInstallation
             services.AddTransient<IPackageLogic, PackageLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
             services.AddTransient<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
             services.AddTransient<IWorkProcess, WorkModeling>();
 
-            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
-
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
@@ -105,8 +66,6 @@ namespace SoftwareInstallation
             services.AddTransient<FormImplementers>();
             services.AddTransient<FormReportPackageComponents>();
             services.AddTransient<FormReportOrders>();
-            services.AddTransient<FormMails>();
         }
-        private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
     }
 }