diff --git a/PlumbingRepair/PlumbingRepair.sln b/PlumbingRepair/PlumbingRepair.sln index aeae17f..4898aba 100644 --- a/PlumbingRepair/PlumbingRepair.sln +++ b/PlumbingRepair/PlumbingRepair.sln @@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairFileImplement EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairDatabaseImplement", "PlumbingRepairDatabaseImplement\PlumbingRepairDatabaseImplement.csproj", "{6DDC0CCD-97E0-4CB7-8024-C27DB9AEF97B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairClientApp", "..\..\PlumbingRepair 5 база\PlumbingRepairClientApp\PlumbingRepairClientApp.csproj", "{9A10B8D9-1C83-4A71-9517-F39C22C67DE5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairClientApp", "..\..\PlumbingRepair 7 база\PlumbingRepairClientApp\PlumbingRepairClientApp.csproj", "{712EBB90-7365-4F29-B7C6-91E3F5157B0C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairShopApp", "PlumbingRepairShopApp\PlumbingRepairShopApp.csproj", "{4CD222EE-61C1-43D7-85DB-953094F66874}" EndProject @@ -57,10 +57,10 @@ Global {6DDC0CCD-97E0-4CB7-8024-C27DB9AEF97B}.Debug|Any CPU.Build.0 = Debug|Any CPU {6DDC0CCD-97E0-4CB7-8024-C27DB9AEF97B}.Release|Any CPU.ActiveCfg = Release|Any CPU {6DDC0CCD-97E0-4CB7-8024-C27DB9AEF97B}.Release|Any CPU.Build.0 = Release|Any CPU - {9A10B8D9-1C83-4A71-9517-F39C22C67DE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A10B8D9-1C83-4A71-9517-F39C22C67DE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A10B8D9-1C83-4A71-9517-F39C22C67DE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A10B8D9-1C83-4A71-9517-F39C22C67DE5}.Release|Any CPU.Build.0 = Release|Any CPU + {712EBB90-7365-4F29-B7C6-91E3F5157B0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {712EBB90-7365-4F29-B7C6-91E3F5157B0C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {712EBB90-7365-4F29-B7C6-91E3F5157B0C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {712EBB90-7365-4F29-B7C6-91E3F5157B0C}.Release|Any CPU.Build.0 = Release|Any CPU {4CD222EE-61C1-43D7-85DB-953094F66874}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4CD222EE-61C1-43D7-85DB-953094F66874}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CD222EE-61C1-43D7-85DB-953094F66874}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/ClientLogic.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/ClientLogic.cs index f377b0b..192bd11 100644 --- a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/ClientLogic.cs @@ -4,6 +4,7 @@ using PlumbingRepairContracts.SearchModels; using PlumbingRepairContracts.StoragesContracts; using PlumbingRepairContracts.ViewModels; using Microsoft.Extensions.Logging; +using System.Text.RegularExpressions; namespace PlumbingRepairBusinessLogic.BusinessLogics { @@ -101,7 +102,17 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics { throw new ArgumentNullException("Нет логина(почты) клиента", nameof(model.Email)); } - _logger.LogInformation("Component. ClientFIO:{ClientFIO}. Email:{Email}.", model.ClientFIO, model.Email); + if (!Regex.IsMatch(model.Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$")) + { + throw new ArgumentException("Некорретно введен email клиента", nameof(model.Email)); + } + + if (string.IsNullOrEmpty(model.Password) || !Regex.IsMatch(model.Password, @"^(?=.*[A-Za-z])(?=.*\d)(?=.*[^A-Za-z0-9\n]).{10,50}$")) + { + + throw new ArgumentException("Некорректный пароль", nameof(model.Password)); + } + _logger.LogInformation("Component. ClientFIO:{ClientFIO}. Email:{Email}.", model.ClientFIO, model.Email); var element = _clientStorage.GetElement(new ClientSearchModel { Email = model.Email diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/MessageInfoLogic.cs new file mode 100644 index 0000000..3ddb42b --- /dev/null +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -0,0 +1,71 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.ViewModels; + +using Microsoft.Extensions.Logging; +using PlumbingRepairDataModels.Enums; +using PlumbingRepairContracts.StoragesContracts; + +namespace PlumbingRepairBusinessLogic.BusinessLogics +{ + public class MessageInfoLogic : IMessageInfoLogic + { + private readonly ILogger _logger; + + private readonly IMessageInfoStorage _messageStorage; + + public MessageInfoLogic(ILogger logger, IMessageInfoStorage messageStorage) + { + _logger = logger; + _messageStorage = messageStorage; + } + public List? 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; + } + public bool Create(MessageInfoBindingModel model) + { + if (_messageStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + public MessageInfoViewModel? ReadElement(MessageInfoSearchModel? model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. MessageId:{MessageId}", model.MessageId); + var element = _messageStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. MessageId:{Id}", element.MessageId); + return element; + } + public bool Update(MessageInfoBindingModel model) + { + if (_messageStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/OrderLogic.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/OrderLogic.cs index f3d64c7..8d33d6e 100644 --- a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/OrderLogic.cs @@ -6,7 +6,8 @@ using PlumbingRepairContracts.StoragesContracts; using PlumbingRepairDataModels.Enums; using Microsoft.Extensions.Logging; using System.Xml.Linq; - +using Org.BouncyCastle.Math.EC; +using PlumbingRepairBusinessLogic.MailWorker; namespace PlumbingRepairBusinessLogic.BusinessLogics { @@ -18,15 +19,19 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics private readonly IShopStorage _shopStorage; private readonly IWorkStorage _workStorage; private readonly IShopLogic _shopLogic; + private readonly AbstractMailWorker _mailWorker; + private readonly IClientStorage _clientStorage; static readonly object _locker = new object(); - public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage, IWorkStorage workStorage, IShopLogic shopLogic) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage, IWorkStorage workStorage, IShopLogic shopLogic, AbstractMailWorker mailWorker, IClientStorage clientStorage) { _logger = logger; _orderStorage = orderStorage; _shopStorage = shopStorage; _workStorage = workStorage; _shopLogic = shopLogic; - } + _clientStorage = clientStorage; + _mailWorker = mailWorker; + } public OrderViewModel? ReadElement(OrderSearchModel model) { @@ -51,14 +56,20 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics { _logger.LogWarning("Invalid order status"); return false; + } model.Status = OrderStatus.Принят; - if (_orderStorage.Insert(model) == null) + var result = _orderStorage.Insert(model); + if (result == null) { _logger.LogWarning("Insert operation failed"); return false; } - return true; + var orderView = _orderStorage.GetElement(new() { Id = result.Id }); + var clientView = _clientStorage.GetElement(new() { Id = orderView!.ClientId }); + + SendEmail(clientView, orderView); + return true; } public bool DeliveryOrder(OrderBindingModel model) @@ -132,9 +143,49 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics } _orderStorage.Update(model); - return true; + model.Status = newStatus; + if (model.Status == OrderStatus.Выдан) + model.DateImplement = DateTime.Now; + var orderView = _orderStorage.GetElement(new() { Id = model.Id }); + var clientView = _clientStorage.GetElement(new() { Id = orderView!.ClientId }); + + SendEmail(clientView, orderView); + return true; + } - private void CheckModel(OrderBindingModel model, bool withParams = true) + public void SendEmail(ClientViewModel clientModel, OrderViewModel orderModel) + { + if (clientModel == null && orderModel == null) + { + return; + } + + MailSendInfoBindingModel mailModel; + + if (orderModel.Status == OrderStatus.Принят) + { + mailModel = new MailSendInfoBindingModel + { + MailAddress = clientModel.Email, + Subject = $"Заказ №{orderModel.Id}", + Text = $"Ваш заказ №{orderModel.Id} в {orderModel.DateCreate} на сумму {orderModel.Sum} был принят!" + }; + } + else + { + mailModel = new MailSendInfoBindingModel + { + MailAddress = clientModel.Email, + Subject = $"Заказ №{orderModel.Id}", + Text = $"Заказ №{orderModel.Id} статус изменен в {orderModel.Status}" + }; + } + + + _mailWorker.MailSendAsync(mailModel); + } + + private void CheckModel(OrderBindingModel model, bool withParams = true) { if (model == null) { @@ -150,7 +201,10 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics { throw new ArgumentNullException("Некорректный идентификатор работы", nameof(model.WorkId)); } - + if (model.ClientId < 0) + { + throw new ArgumentNullException("Некорректный идентификатор клиента", nameof(model.ClientId)); + } if (model.Count <= 0) { throw new ArgumentNullException("Количество работ в заказе должно быть больше 0", nameof(model.Count)); @@ -161,7 +215,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); } - _logger.LogInformation("Order. OrderId:{Id}. Sum:{Sum}. WorkId: {WorkId}", model.Id, model.Sum, model.WorkId); + _logger.LogInformation("Order. OrderId:{Id}. Sum:{Sum}. WorkId: {WorkId}. ClientId: {ClientId}", model.Id, model.Sum, model.WorkId, model.ClientId); } } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/MailWorker/AbstractMailWorker.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..c9c5996 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,92 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace PlumbingRepairBusinessLogic.MailWorker +{ + public abstract class AbstractMailWorker + { + protected static string _mailLogin = string.Empty; + + protected static string _mailPassword = string.Empty; + + protected static string _smtpClientHost = string.Empty; + + protected static int _smtpClientPort; + + protected static string _popHost = string.Empty; + + protected static int _popPort; + + private readonly IMessageInfoLogic _messageInfoLogic; + + private readonly ILogger _logger; + + public AbstractMailWorker(ILogger 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> ReceiveMailAsync(); + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/MailWorker/MailKitWorker.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..c230c21 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,78 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using MailKit.Net.Pop3; +using MailKit.Security; +using Microsoft.Extensions.Logging; +using System.Net; +using System.Net.Mail; +using System.Text; + +namespace PlumbingRepairBusinessLogic.MailWorker +{ + public class MailKitWorker : AbstractMailWorker + { + public MailKitWorker(ILogger 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> ReceiveMailAsync() + { + var list = new List(); + 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 (AuthenticationException) + { } + finally + { + client.Disconnect(true); + } + }); + return list; + } + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/PlumbingRepairBusinessLogic.csproj b/PlumbingRepair/PlumbingRepairBusinessLogic/PlumbingRepairBusinessLogic.csproj index 34c6edc..5c2a82d 100644 --- a/PlumbingRepair/PlumbingRepairBusinessLogic/PlumbingRepairBusinessLogic.csproj +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/PlumbingRepairBusinessLogic.csproj @@ -11,6 +11,7 @@ + diff --git a/PlumbingRepair/PlumbingRepairClientApp/Controllers/HomeController.cs b/PlumbingRepair/PlumbingRepairClientApp/Controllers/HomeController.cs index 6c91456..d060e10 100644 --- a/PlumbingRepair/PlumbingRepairClientApp/Controllers/HomeController.cs +++ b/PlumbingRepair/PlumbingRepairClientApp/Controllers/HomeController.cs @@ -143,5 +143,16 @@ namespace PlumbingRepairClientApp.Controllers var prod = APIClient.GetRequest($"api/main/getwork?workId={work}"); return count * (prod?.Price ?? 1); } + + [HttpGet] + public IActionResult Mails() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + + return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); + } } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairClientApp/Views/Home/Mails.cshtml b/PlumbingRepair/PlumbingRepairClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..3b5b4d2 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,54 @@ +@using PlumbingRepairContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "Mails"; +} + +
+

Письма

+
+ + +
+ @{ + if (Model == null) + { +

Авторизируйтесь

+ return; + } + + + + + + + + + + + @foreach (var item in Model) + { + + + + + + } + +
+ Дата письма + + Заголовок + + Текст +
+ @Html.DisplayFor(modelItem => item.DateDelivery) + + @Html.DisplayFor(modelItem => item.Subject) + + @Html.DisplayFor(modelItem => item.Body) +
+ } +
\ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairClientApp/Views/Shared/_Layout.cshtml b/PlumbingRepair/PlumbingRepairClientApp/Views/Shared/_Layout.cshtml index ad0b0d7..4c78c42 100644 --- a/PlumbingRepair/PlumbingRepairClientApp/Views/Shared/_Layout.cshtml +++ b/PlumbingRepair/PlumbingRepairClientApp/Views/Shared/_Layout.cshtml @@ -25,6 +25,9 @@
  • Личные данные
    • +
  • + Письма +
  • Вход
    • diff --git a/PlumbingRepair/PlumbingRepairContracts/BindingModels/MailConfigBindingModel.cs b/PlumbingRepair/PlumbingRepairContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..3f089e6 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,12 @@ +namespace PlumbingRepairContracts.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; } + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairContracts/BindingModels/MailSendInfoBindingModel.cs b/PlumbingRepair/PlumbingRepairContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..6bda32f --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,9 @@ +namespace PlumbingRepairContracts.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; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairContracts/BindingModels/MessageInfoBindingModel.cs b/PlumbingRepair/PlumbingRepairContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..a59c4ea --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,20 @@ +using PlumbingRepairDataModels.Models; + +namespace PlumbingRepairContracts.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 bool IsRead { get; set; } = false; + public string? ReplyText { get; set; } = string.Empty; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..7029bdd --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,14 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.ViewModels; + +namespace PlumbingRepairContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + bool Create(MessageInfoBindingModel model); + MessageInfoViewModel? ReadElement(MessageInfoSearchModel? model); + bool Update(MessageInfoBindingModel model); + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairContracts/SearchModels/MessageInfoStorage.cs b/PlumbingRepair/PlumbingRepairContracts/SearchModels/MessageInfoStorage.cs new file mode 100644 index 0000000..116d7c7 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/SearchModels/MessageInfoStorage.cs @@ -0,0 +1,11 @@ +namespace PlumbingRepairContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public int? ClientId { get; set; } + + public string? MessageId { get; set; } + public int? Page { get; set; } + public int? PageSize { get; set; } + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairContracts/StoragesContracts/IMessageInfoStorage.cs b/PlumbingRepair/PlumbingRepairContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..0bbead6 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,15 @@ +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; + +namespace PlumbingRepairContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + MessageInfoViewModel? Update(MessageInfoBindingModel model); + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairContracts/ViewModels/MessageInfoViewModel.cs b/PlumbingRepair/PlumbingRepairContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..61d3380 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,24 @@ +using PlumbingRepairDataModels.Models; +using System.ComponentModel; + +namespace PlumbingRepairContracts.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; + [DisplayName("Прочитано")] + public bool IsRead { get; set; } = false; + [DisplayName("Ответ")] + public string? ReplyText { get; set; } + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs b/PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs index a1747a2..6bfff35 100644 --- a/PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs +++ b/PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs @@ -11,18 +11,20 @@ namespace PlumbingRepairContracts.ViewModels [DisplayName("Номер работы")] public int WorkId { get; set; } - [DisplayName("Работа")] - public string WorkName { get; set; } = string.Empty; [DisplayName("Клиент")] public int ClientId { get; set; } [DisplayName("ФИО клиента")] public string ClientFIO { get; set; } = string.Empty; + [DisplayName("Почта клиента")] + public string ClientEmail { get; set; } = string.Empty; - [DisplayName("Исполнитель")] + [DisplayName("Исполнитель")] public int? ImplementerId { get; set; } [DisplayName("ФИО исполнителя")] public string? ImplementerFIO { get; set; } = string.Empty; + [DisplayName("Работа")] + public string WorkName { get; set; } = string.Empty; [DisplayName("Количество")] public int Count { get; set; } diff --git a/PlumbingRepair/PlumbingRepairDataModels/Models/IMessageInfoModel.cs b/PlumbingRepair/PlumbingRepairDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..b5bde4b --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,15 @@ + +namespace PlumbingRepairDataModels.Models +{ + public interface IMessageInfoModel + { + string MessageId { get; } + int? ClientId { get; } + string SenderName { get; } + DateTime DateDelivery { get; } + string Subject { get; } + string Body { get; } + bool IsRead { get; } + string? ReplyText { get; } + } +} diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/MessageInfoStorage.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..72921c6 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,82 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDatabaseImplement.Models; + +namespace PlumbingRepairDatabaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public List GetFullList() + { + using var context = new PlumbingRepairDatabase(); + return context.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + using var context = new PlumbingRepairDatabase(); + if (model.ClientId.HasValue && model.Page.HasValue && model.PageSize.HasValue) + { + return context.Messages + .Where(x => x.ClientId == model.ClientId) + .Skip(model.PageSize.Value * model.Page.Value) + .Take(model.PageSize.Value) + .Select(x => x.GetViewModel) + .ToList(); + } + else if (model.Page.HasValue && model.PageSize.HasValue) + { + return context.Messages + .Skip(model.PageSize.Value * model.Page.Value) + .Take(model.PageSize.Value) + .Select(x => x.GetViewModel) + .ToList(); + } + return new(); + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + + if (string.IsNullOrEmpty(model.MessageId)) + return null; + using var context = new PlumbingRepairDatabase(); + return context.Messages + .FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + using var context = new PlumbingRepairDatabase(); + model.ClientId = context.Clients.FirstOrDefault(x => x.Email.Equals(model.SenderName))?.Id; + var newMessageInfo = MessageInfo.Create(model); + + if (newMessageInfo == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId))) + { + return null; + } + + + context.Messages.Add(newMessageInfo); + context.SaveChanges(); + return newMessageInfo.GetViewModel; + } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + using var context = new PlumbingRepairDatabase(); + var message = context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId); + if (message == null) + { + return null; + } + message.Update(model); + context.SaveChanges(); + return message.GetViewModel; + } + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs index 48d857a..ceca058 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs @@ -12,7 +12,7 @@ namespace PlumbingRepairDatabaseImplement.Implements public OrderViewModel? Delete(OrderBindingModel model) { using var context = new PlumbingRepairDatabase(); - var element = context.Orders.Include(x => x.Work).FirstOrDefault(rec => rec.Id == model.Id); + var element = context.Orders.Include(x => x.Work).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(rec => rec.Id == model.Id); if (element != null) { context.Orders.Remove(element); @@ -24,62 +24,91 @@ namespace PlumbingRepairDatabaseImplement.Implements public OrderViewModel? GetElement(OrderSearchModel model) { - if (!model.Id.HasValue) - { - return null; - } - using var context = new PlumbingRepairDatabase(); - if (model.Id.HasValue) - return AttachNames(context.Orders - .Include(x => x.Work) - .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id) - ?.GetViewModel); - else if (model.ImplementerId.HasValue && model.Status.HasValue) - return AttachNames(context.Orders - .Include(x => x.Implementer) - .FirstOrDefault(x => model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId) - ?.GetViewModel); - return null; - } + if (!model.Id.HasValue) + { + return null; + } + using var context = new PlumbingRepairDatabase(); + if (model.Id.HasValue) + return AttachNames(context.Orders + .Include(x => x.Work) + .Include(x => x.Implementer) + .Include(x => x.Client) + .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id) + ?.GetViewModel); + else if (model.ImplementerId.HasValue && model.Status.HasValue) + return AttachNames(context.Orders + .Include(x => x.Implementer) + .Include(x => x.Work) + .Include(x => x.Client) + .FirstOrDefault(x => model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId) + ?.GetViewModel); + return null; + } - public List GetFilteredList(OrderSearchModel model) + public List GetFilteredList(OrderSearchModel model) { using var context = new PlumbingRepairDatabase(); - - if (model.Id.HasValue) - { - return context.Orders - .Where(x => x.Id == model.Id) - .Select(x => AttachNames(x.GetViewModel)).ToList(); - } - if (model.Status.HasValue) - { - return context.Orders. - Include(x => x.Work) - .Include(x => x.Client) - .Include(x => x.Implementer) - .Where(x => x.Status.Equals(model.Status)) - .Select(x => x.GetViewModel) - .ToList(); + if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.ClientId.HasValue && !model.Status.HasValue) + { + return new(); } - if (model.ClientId.HasValue) - { - return context.Orders - .Include(x => x.Client). - Where(x => x.ClientId == model.ClientId) - .Select(x =>AttachNames(x.GetViewModel)).ToList(); - } - if (model.DateFrom != null && model.DateTo != null) - { - return context.Orders. - Include(x => x.Work) - .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo) - .Select(x => AttachNames(x.GetViewModel)).ToList(); - } - return new(); - } + + if (model.Id.HasValue) + { + return context.Orders + .Include(x => x.Work) + .Include(x => x.Implementer) + .Include(x => x.Client) + .Where(x => x.Id == model.Id) + .Select(x => AttachNames(x.GetViewModel)).ToList(); + } + if (model.Status.HasValue) + { + return context.Orders + .Include(x => x.Work) + .Include(x => x.Implementer) + .Include(x => x.Client) + .Where(x => x.ImplementerId == model.ImplementerId && x.Status == model.Status) + .Select(x => AttachNames(x.GetViewModel)).ToList(); + } + if (model.ClientId.HasValue) + { + return context.Orders + .Include(x => x.Client) + .Include(x => x.Work) + .Include(x => x.Implementer) + .Where(x => x.ClientId == model.ClientId) + .Select(x => AttachNames(x.GetViewModel)).ToList(); + } + if (model.ImplementerId.HasValue) + { + return context.Orders + .Include(x => x.Work) + .Include(x => x.Implementer) + .Include(x => x.Client) + .Where(x => x.ImplementerId == model.ImplementerId) + .Select(x => AttachNames(x.GetViewModel)).ToList(); + } + if (model.DateFrom != null && model.DateTo != null) + { + return context.Orders + .Include(x => x.Work) + .Include(x => x.Client) + .Include(x => x.Implementer) + .Where(x => (x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) + && (!model.ClientId.HasValue || x.ClientId == model.ClientId)) + .Select(x => x.GetViewModel) + .ToList(); + + } + return new(); + + + + } public List GetFullList() { @@ -87,6 +116,7 @@ namespace PlumbingRepairDatabaseImplement.Implements return context.Orders .Include(x => x.Work) .Include(x => x.Implementer) + .Include(x => x.Client) .Select(x =>AttachNames(x.GetViewModel)) .ToList(); } @@ -102,13 +132,13 @@ namespace PlumbingRepairDatabaseImplement.Implements context.Orders.Add(newOrder); context.SaveChanges(); - return AttachNames(newOrder.GetViewModel); + return AttachNames(context.Orders.Include(x => x.Work).Include(x => x.Implementer).Include(x => x.Client).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel); } public OrderViewModel? Update(OrderBindingModel model) { using var context = new PlumbingRepairDatabase(); - var order = context.Orders.Include(x => x.Work).FirstOrDefault(x => x.Id == model.Id); + var order = context.Orders.Include(x => x.Work).Include(x => x.Implementer).Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id); if (order == null) { return null; @@ -137,6 +167,7 @@ namespace PlumbingRepairDatabaseImplement.Implements if (client.Id == model.ClientId) { model.ClientFIO = client.ClientFIO; + model.ClientEmail = client.Email; return model; } } diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240503121400_initCreate.Designer.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240517111715_InitCreate.Designer.cs similarity index 87% rename from PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240503121400_initCreate.Designer.cs rename to PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240517111715_InitCreate.Designer.cs index 3867f4a..3c5618c 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240503121400_initCreate.Designer.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240517111715_InitCreate.Designer.cs @@ -12,8 +12,8 @@ using PlumbingRepairDatabaseImplement; namespace PlumbingRepairDatabaseImplement.Migrations { [DbContext(typeof(PlumbingRepairDatabase))] - [Migration("20240503121400_initCreate")] - partial class initCreate + [Migration("20240517111715_InitCreate")] + partial class InitCreate { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -96,6 +96,42 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("IsRead") + .HasColumnType("bit"); + + b.Property("ReplyText") + .HasColumnType("nvarchar(max)"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -238,6 +274,15 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.ToTable("WorkComponents"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("PlumbingRepairDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Order", b => { b.HasOne("PlumbingRepairDatabaseImplement.Models.Client", "Client") @@ -303,6 +348,8 @@ namespace PlumbingRepairDatabaseImplement.Migrations modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Client", b => { + b.Navigation("Messages"); + b.Navigation("Orders"); }); diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240503121400_initCreate.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240517111715_InitCreate.cs similarity index 86% rename from PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240503121400_initCreate.cs rename to PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240517111715_InitCreate.cs index 3283641..76d58f1 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240503121400_initCreate.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20240517111715_InitCreate.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace PlumbingRepairDatabaseImplement.Migrations { - public partial class initCreate : Migration + public partial class InitCreate : Migration { protected override void Up(MigrationBuilder migrationBuilder) { @@ -84,6 +84,29 @@ namespace PlumbingRepairDatabaseImplement.Migrations table.PrimaryKey("PK_Works", x => x.Id); }); + migrationBuilder.CreateTable( + name: "Messages", + columns: table => new + { + MessageId = table.Column(type: "nvarchar(450)", nullable: false), + ClientId = table.Column(type: "int", nullable: true), + SenderName = table.Column(type: "nvarchar(max)", nullable: false), + DateDelivery = table.Column(type: "datetime2", nullable: false), + Subject = table.Column(type: "nvarchar(max)", nullable: false), + Body = table.Column(type: "nvarchar(max)", nullable: false), + IsRead = table.Column(type: "bit", nullable: false), + ReplyText = table.Column(type: "nvarchar(max)", nullable: true) + }, + 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.CreateTable( name: "Orders", columns: table => new @@ -175,6 +198,11 @@ namespace PlumbingRepairDatabaseImplement.Migrations onDelete: ReferentialAction.Cascade); }); + migrationBuilder.CreateIndex( + name: "IX_Messages_ClientId", + table: "Messages", + column: "ClientId"); + migrationBuilder.CreateIndex( name: "IX_Orders_ClientId", table: "Orders", @@ -213,6 +241,9 @@ namespace PlumbingRepairDatabaseImplement.Migrations protected override void Down(MigrationBuilder migrationBuilder) { + migrationBuilder.DropTable( + name: "Messages"); + migrationBuilder.DropTable( name: "Orders"); diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/PlumbingRepairDatabaseModelSnapshot.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/PlumbingRepairDatabaseModelSnapshot.cs index 726c524..408f110 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/PlumbingRepairDatabaseModelSnapshot.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/PlumbingRepairDatabaseModelSnapshot.cs @@ -94,6 +94,42 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("IsRead") + .HasColumnType("bit"); + + b.Property("ReplyText") + .HasColumnType("nvarchar(max)"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -236,6 +272,15 @@ namespace PlumbingRepairDatabaseImplement.Migrations b.ToTable("WorkComponents"); }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("PlumbingRepairDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Order", b => { b.HasOne("PlumbingRepairDatabaseImplement.Models.Client", "Client") @@ -301,6 +346,8 @@ namespace PlumbingRepairDatabaseImplement.Migrations modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Client", b => { + b.Navigation("Messages"); + b.Navigation("Orders"); }); diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Client.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Client.cs index b5b6b89..a7e8810 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Client.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Client.cs @@ -20,8 +20,9 @@ namespace PlumbingRepairDatabaseImplement.Models [ForeignKey("ClientId")] public virtual List Orders{ get; set; } = new(); - - public static Client? Create(ClientBindingModel model) + [ForeignKey("ClientId")] + public virtual List Messages { get; set; } = new(); + public static Client? Create(ClientBindingModel model) { if (model == null) { diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/MessageInfo.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..be1fa55 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/MessageInfo.cs @@ -0,0 +1,61 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace PlumbingRepairDatabaseImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + [Key] + public string MessageId { get; set; } = string.Empty; + public int? ClientId { get; set; } + [Required] + public string SenderName { get; set; } = string.Empty; + [Required] + public DateTime DateDelivery { get; set; } = DateTime.Now; + [Required] + public string Subject { get; set; } = string.Empty; + [Required] + public string Body { get; set; } = string.Empty; + [Required] + public bool IsRead { get; private set; } = false; + public string? ReplyText { get; private set; } + + public virtual Client? Client { get; private set; } + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new MessageInfo() + { + MessageId = model.MessageId, + ClientId = model.ClientId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + Subject = model.Subject, + Body = model.Body + }; + } + public void Update(MessageInfoBindingModel model) + { + IsRead = model.IsRead; + ReplyText = model.ReplyText; + } + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + IsRead = IsRead, + ReplyText = ReplyText + }; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs index b3396dd..7b9e643 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Order.cs @@ -14,6 +14,7 @@ namespace PlumbingRepairDatabaseImplement.Models public int ClientId { get; set; } public int? ImplementerId { get; set; } + [Required] public int Count { get; set; } [Required] @@ -68,7 +69,8 @@ namespace PlumbingRepairDatabaseImplement.Models ImplementerId= ImplementerId, ImplementerFIO = Implementer == null ? null : Implementer.ImplementerFIO, Count = Count, - Sum = Sum, + ClientEmail = Client.Email, + Sum = Sum, DateCreate = DateCreate, DateImplement = DateImplement, Id = Id, diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDatabase.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDatabase.cs index 9f8f624..2793f3f 100644 --- a/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDatabase.cs +++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDatabase.cs @@ -27,5 +27,6 @@ namespace PlumbingRepairDatabaseImplement public virtual DbSet ShopWorks { set; get; } public virtual DbSet Clients { set; get; } public virtual DbSet Implementers { set; get; } + public virtual DbSet Messages { set; get; } } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairFileImplement/DataFileSingleton.cs b/PlumbingRepair/PlumbingRepairFileImplement/DataFileSingleton.cs index 2922dc0..b36f4cc 100644 --- a/PlumbingRepair/PlumbingRepairFileImplement/DataFileSingleton.cs +++ b/PlumbingRepair/PlumbingRepairFileImplement/DataFileSingleton.cs @@ -16,16 +16,17 @@ namespace PlumbingRepairFileImplement private readonly string ShopFileName = "Shop.xml"; private readonly string ClientFileName = "Client.xml"; - private readonly string ImplementerFileName = "Implementer.xml"; + private readonly string ImplementerFileName = "Implementer.xml"; + private readonly string MessageInfoFileName = "MessageInfo.xml"; public List Components { get; private set; } - + public List Orders { get; private set; } - public List Works { get; private set; } public List Shops { get; private set; } public List Clients { get; private set; } public List Implementers { get; private set; } + public List Messages { get; private set; } public static DataFileSingleton GetInstance() { if (instance == null) @@ -44,6 +45,7 @@ namespace PlumbingRepairFileImplement public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); + public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement); private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; @@ -52,7 +54,7 @@ namespace PlumbingRepairFileImplement Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; - + Messages = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/PlumbingRepair/PlumbingRepairFileImplement/Implements/MessageInfoStorage.cs b/PlumbingRepair/PlumbingRepairFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..f8aabed --- /dev/null +++ b/PlumbingRepair/PlumbingRepairFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,72 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairFileImplement.Models; + +namespace PlumbingRepairFileImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataFileSingleton source; + + public MessageInfoStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + var res = source.Messages + .Where(x => x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + if (!(model.Page.HasValue && model.PageSize.HasValue)) + { + return res.ToList(); + } + return res.Skip(model.PageSize.Value * model.Page.Value).Take(model.PageSize.Value).ToList(); + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (model.MessageId != null) + { + return null; + } + return source.Messages + .FirstOrDefault(x => x.MessageId == model.MessageId) + ?.GetViewModel; + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessageInfo = MessageInfo.Create(model); + if (newMessageInfo == null) + { + return null; + } + source.Messages.Add(newMessageInfo); + source.SaveMessages(); + return newMessageInfo.GetViewModel; + } + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + var message = source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId); + if (message == null) + { + return null; + } + message.Update(model); + source.SaveMessages(); + return message.GetViewModel; + } + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairFileImplement/Models/MessageInfo.cs b/PlumbingRepair/PlumbingRepairFileImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..39c34ef --- /dev/null +++ b/PlumbingRepair/PlumbingRepairFileImplement/Models/MessageInfo.cs @@ -0,0 +1,87 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; +using System.Xml.Linq; + +namespace PlumbingRepairFileImplement.Models +{ + internal class MessageInfo : 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 bool IsRead { get; private set; } = false; + public string? ReplyText { get; private set; } + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new MessageInfo() + { + 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 MessageInfo() + { + 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 void Update(MessageInfoBindingModel model) + { + IsRead = model.IsRead; + ReplyText = model.ReplyText; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + IsRead = IsRead, + ReplyText = ReplyText + }; + + 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), + new XElement("IsRead", IsRead), + new XElement("ReplyText", ReplyText) + ); + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairListImplement/DataListSingleton.cs b/PlumbingRepair/PlumbingRepairListImplement/DataListSingleton.cs index e731128..3511fd0 100644 --- a/PlumbingRepair/PlumbingRepairListImplement/DataListSingleton.cs +++ b/PlumbingRepair/PlumbingRepairListImplement/DataListSingleton.cs @@ -13,6 +13,7 @@ namespace PlumbingRepairListImplement public List Works { get; set; } public List Clients { get; set; } public List Implementers { get; set; } + public List Messages { get; set; } public List Shops { get; set; } @@ -25,6 +26,7 @@ namespace PlumbingRepairListImplement Shops = new List(); Clients = new List(); Implementers = new List(); + Messages = new List(); } public static DataListSingleton GetInstance() diff --git a/PlumbingRepair/PlumbingRepairListImplement/Implements/MessageInfoStorage.cs b/PlumbingRepair/PlumbingRepairListImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..36e1486 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairListImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,93 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairListImplement.Models; + +namespace PlumbingRepairListImplement.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 GetFilteredList(MessageInfoSearchModel model) + { + List result = new(); + + foreach (var item in _source.Messages) + { + if (item.ClientId.HasValue && item.ClientId == model.ClientId) + { + result.Add(item.GetViewModel); + } + } + + if (!(model.Page.HasValue && model.PageSize.HasValue)) + { + return result; + } + if (model.Page * model.PageSize >= result.Count) + { + return null; + } + List filteredResult = new(); + for (var i = model.PageSize.Value * model.Page.Value; i < model.Page.Value * model.PageSize.Value; i++) + { + filteredResult.Add(result[i]); + } + return filteredResult; + } + + public List GetFullList() + { + List 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; + } + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + foreach (var message in _source.Messages) + { + if (message.MessageId == model.MessageId) + { + message.Update(model); + return message.GetViewModel; + } + } + return null; + } + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairListImplement/Models/MessageInfo.cs b/PlumbingRepair/PlumbingRepairListImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..31c55c7 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairListImplement/Models/MessageInfo.cs @@ -0,0 +1,57 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; + +namespace PlumbingRepairListImplement.Models +{ + public class MessageInfo : 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 bool IsRead { get; private set; } = false; + public string? ReplyText { 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 void Update(MessageInfoBindingModel model) + { + IsRead = model.IsRead; + ReplyText = model.ReplyText; + } + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + IsRead = IsRead, + ReplyText = ReplyText + }; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairRestApi/Controllers/ClientController.cs b/PlumbingRepair/PlumbingRepairRestApi/Controllers/ClientController.cs index f2c84d0..0804bd1 100644 --- a/PlumbingRepair/PlumbingRepairRestApi/Controllers/ClientController.cs +++ b/PlumbingRepair/PlumbingRepairRestApi/Controllers/ClientController.cs @@ -13,11 +13,12 @@ namespace AbstractShopRestApi.Controllers private readonly ILogger _logger; private readonly IClientLogic _logic; - - public ClientController(IClientLogic logic, ILogger logger) + private readonly IMessageInfoLogic _mailLogic; + public ClientController(IClientLogic logic, ILogger logger, IMessageInfoLogic mailLogic) { _logger = logger; _logic = logic; + _mailLogic = mailLogic; } [HttpGet] @@ -65,5 +66,23 @@ namespace AbstractShopRestApi.Controllers throw; } } + [HttpGet] + public List? GetMessages(int clientId, int page) + { + try + { + return _mailLogic.ReadList(new MessageInfoSearchModel + { + ClientId = clientId, + Page = page, + PageSize = 5 + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения писем клиента"); + throw; + } + } } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairRestApi/Program.cs b/PlumbingRepair/PlumbingRepairRestApi/Program.cs index cc8f2d7..fb62258 100644 --- a/PlumbingRepair/PlumbingRepairRestApi/Program.cs +++ b/PlumbingRepair/PlumbingRepairRestApi/Program.cs @@ -3,6 +3,8 @@ using Microsoft.OpenApi.Models; using PlumbingRepairBusinessLogic.BusinessLogics; using PlumbingRepairContracts.BusinessLogicsContracts; using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairBusinessLogic.MailWorker; +using PlumbingRepairContracts.BindingModels; var builder = WebApplication.CreateBuilder(args); @@ -15,12 +17,16 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); + +builder.Services.AddSingleton(); builder.Services.AddControllers(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle @@ -32,6 +38,17 @@ builder.Services.AddSwaggerGen(c => var app = builder.Build(); +var mailSender = app.Services.GetService(); +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()) { diff --git a/PlumbingRepair/PlumbingRepairRestApi/appsettings.json b/PlumbingRepair/PlumbingRepairRestApi/appsettings.json index 10f68b8..a9d4c47 100644 --- a/PlumbingRepair/PlumbingRepairRestApi/appsettings.json +++ b/PlumbingRepair/PlumbingRepairRestApi/appsettings.json @@ -5,5 +5,12 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + + "SmtpClientHost": "smtp.gmail.com", + "SmtpClientPort": "587", + "PopHost": "pop.gmail.com", + "PopPort": "995", + "MailLogin": "t5424471@gmail.com", + "MailPassword": "qqks scqi soto dnva" } diff --git a/PlumbingRepair/PlumbingRepairView/App.config b/PlumbingRepair/PlumbingRepairView/App.config new file mode 100644 index 0000000..0c6f98a --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormMail.Designer.cs b/PlumbingRepair/PlumbingRepairView/FormMail.Designer.cs new file mode 100644 index 0000000..63fe023 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormMail.Designer.cs @@ -0,0 +1,152 @@ +namespace PlumbingRepairView +{ + partial class FormMail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.buttonSend = new System.Windows.Forms.Button(); + this.labelReply = new System.Windows.Forms.Label(); + this.textBoxReply = new System.Windows.Forms.TextBox(); + this.textBoxBody = new System.Windows.Forms.TextBox(); + this.labelBody = new System.Windows.Forms.Label(); + this.textBoxSubject = new System.Windows.Forms.TextBox(); + this.labelSubject = new System.Windows.Forms.Label(); + this.textBoxSender = new System.Windows.Forms.TextBox(); + this.labelSender = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // buttonSend + // + this.buttonSend.Location = new System.Drawing.Point(423, 409); + this.buttonSend.Name = "buttonSend"; + this.buttonSend.Size = new System.Drawing.Size(358, 34); + this.buttonSend.TabIndex = 17; + this.buttonSend.Text = "Отправить"; + this.buttonSend.UseVisualStyleBackColor = true; + this.buttonSend.Click += new System.EventHandler(this.ButtonSend_Click); + // + // labelReply + // + this.labelReply.AutoSize = true; + this.labelReply.Location = new System.Drawing.Point(423, 14); + this.labelReply.Name = "labelReply"; + this.labelReply.Size = new System.Drawing.Size(112, 25); + this.labelReply.TabIndex = 16; + this.labelReply.Text = "Текст ответа"; + // + // textBoxReply + // + this.textBoxReply.Location = new System.Drawing.Point(423, 42); + this.textBoxReply.Multiline = true; + this.textBoxReply.Name = "textBoxReply"; + this.textBoxReply.Size = new System.Drawing.Size(358, 361); + this.textBoxReply.TabIndex = 15; + // + // textBoxBody + // + this.textBoxBody.Location = new System.Drawing.Point(5, 200); + this.textBoxBody.Multiline = true; + this.textBoxBody.Name = "textBoxBody"; + this.textBoxBody.Size = new System.Drawing.Size(347, 243); + this.textBoxBody.TabIndex = 14; + // + // labelBody + // + this.labelBody.AutoSize = true; + this.labelBody.Location = new System.Drawing.Point(5, 172); + this.labelBody.Name = "labelBody"; + this.labelBody.Size = new System.Drawing.Size(152, 25); + this.labelBody.TabIndex = 13; + this.labelBody.Text = "Текст сообщения"; + // + // textBoxSubject + // + this.textBoxSubject.Location = new System.Drawing.Point(5, 119); + this.textBoxSubject.Name = "textBoxSubject"; + this.textBoxSubject.Size = new System.Drawing.Size(347, 31); + this.textBoxSubject.TabIndex = 12; + // + // labelSubject + // + this.labelSubject.AutoSize = true; + this.labelSubject.Location = new System.Drawing.Point(5, 91); + this.labelSubject.Name = "labelSubject"; + this.labelSubject.Size = new System.Drawing.Size(99, 25); + this.labelSubject.TabIndex = 11; + this.labelSubject.Text = "Заголовок"; + // + // textBoxSender + // + this.textBoxSender.Location = new System.Drawing.Point(5, 42); + this.textBoxSender.Name = "textBoxSender"; + this.textBoxSender.Size = new System.Drawing.Size(347, 31); + this.textBoxSender.TabIndex = 10; + // + // labelSender + // + this.labelSender.AutoSize = true; + this.labelSender.Location = new System.Drawing.Point(5, 14); + this.labelSender.Name = "labelSender"; + this.labelSender.Size = new System.Drawing.Size(117, 25); + this.labelSender.TabIndex = 9; + this.labelSender.Text = "Отправитель"; + // + // FormMail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(785, 455); + this.Controls.Add(this.buttonSend); + this.Controls.Add(this.labelReply); + this.Controls.Add(this.textBoxReply); + this.Controls.Add(this.textBoxBody); + this.Controls.Add(this.labelBody); + this.Controls.Add(this.textBoxSubject); + this.Controls.Add(this.labelSubject); + this.Controls.Add(this.textBoxSender); + this.Controls.Add(this.labelSender); + this.Name = "FormMail"; + this.Text = "Письмо"; + this.Load += new System.EventHandler(this.FormMessage_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Button buttonSend; + private Label labelReply; + private TextBox textBoxReply; + private TextBox textBoxBody; + private Label labelBody; + private TextBox textBoxSubject; + private Label labelSubject; + private TextBox textBoxSender; + private Label labelSender; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormMail.cs b/PlumbingRepair/PlumbingRepairView/FormMail.cs new file mode 100644 index 0000000..208c10d --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormMail.cs @@ -0,0 +1,113 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairBusinessLogic.MailWorker; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.SearchModels; +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 PlumbingRepairView +{ + public partial class FormMail : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + private readonly AbstractMailWorker _mailWorker; + private readonly IClientLogic _clientLogic; + private string? _id; + public string Id { set { _id = value; } } + public FormMail(ILogger logger, IMessageInfoLogic messageInfoLogic, AbstractMailWorker abstractMailWorker, IClientLogic clientLogic) + { + InitializeComponent(); + _logger = logger; + _logic = messageInfoLogic; + _clientLogic = clientLogic; + _mailWorker = abstractMailWorker; + } + private void ButtonSend_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxBody.Text)) + { + MessageBox.Show("Заполните содержимое письма", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Отправка ответа"); + try + { + var view = _logic.ReadElement(new() { MessageId = _id }); + if (view != null) + { + var operationResult = _logic.Update(new() + { + MessageId = view.MessageId, + IsRead = view.IsRead, + ReplyText = textBoxReply.Text + }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _mailWorker.MailSendAsync(new() + { + MailAddress = _clientLogic.ReadElement(new ClientSearchModel { Id = view.ClientId })!.Email, + Subject = textBoxSubject.Text, + Text = textBoxReply.Text, + }); + MessageBox.Show("Сохранение и отправление прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения исполнителя"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void FormMessage_Load(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(_id)) + { + try + { + _logger.LogInformation("Получение письма"); + var view = _logic.ReadElement(new MessageInfoSearchModel + { + MessageId = _id + }); + if (view == null) + { + return; + } + textBoxSender.Text = view.SenderName; + textBoxSubject.Text = view.Subject; + textBoxBody.Text = view.Body; + if (!view.IsRead) + { + var updateResult = _logic.Update(new() + { + MessageId = _id, + ReplyText = view.ReplyText, + IsRead = true, + }); + if (!updateResult) + { + throw new Exception("Ошибка при обновлении"); + } + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения письма"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + } +} diff --git a/PlumbingRepair/PlumbingRepairView/FormMail.resx b/PlumbingRepair/PlumbingRepairView/FormMail.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormMail.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormMails.Designer.cs b/PlumbingRepair/PlumbingRepairView/FormMails.Designer.cs new file mode 100644 index 0000000..790c354 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormMails.Designer.cs @@ -0,0 +1,125 @@ +namespace PlumbingRepairView +{ + partial class FormMails + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.panel = new System.Windows.Forms.Panel(); + this.buttonForward = new System.Windows.Forms.Button(); + this.buttonBack = new System.Windows.Forms.Button(); + this.buttonOpen = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.panel.SuspendLayout(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.RowHeadersWidth = 62; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(956, 455); + this.dataGridView.TabIndex = 7; + // + // panel + // + this.panel.Controls.Add(this.buttonForward); + this.panel.Controls.Add(this.buttonBack); + this.panel.Controls.Add(this.buttonOpen); + this.panel.Dock = System.Windows.Forms.DockStyle.Right; + this.panel.Location = new System.Drawing.Point(773, 0); + this.panel.Name = "panel"; + this.panel.Size = new System.Drawing.Size(183, 455); + this.panel.TabIndex = 8; + // + // buttonForward + // + this.buttonForward.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonForward.Location = new System.Drawing.Point(106, 409); + this.buttonForward.Name = "buttonForward"; + this.buttonForward.Size = new System.Drawing.Size(65, 34); + this.buttonForward.TabIndex = 4; + this.buttonForward.Text = ">"; + this.buttonForward.UseVisualStyleBackColor = true; + this.buttonForward.Click += new System.EventHandler(this.ButtonForward_Click); + // + // buttonBack + // + this.buttonBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonBack.Location = new System.Drawing.Point(14, 409); + this.buttonBack.Name = "buttonBack"; + this.buttonBack.Size = new System.Drawing.Size(65, 34); + this.buttonBack.TabIndex = 3; + this.buttonBack.Text = "<"; + this.buttonBack.UseVisualStyleBackColor = true; + this.buttonBack.Click += new System.EventHandler(this.ButtonBack_Click); + // + // buttonOpen + // + this.buttonOpen.Location = new System.Drawing.Point(14, 12); + this.buttonOpen.Name = "buttonOpen"; + this.buttonOpen.Size = new System.Drawing.Size(157, 34); + this.buttonOpen.TabIndex = 0; + this.buttonOpen.Text = "Открыть"; + this.buttonOpen.UseVisualStyleBackColor = true; + this.buttonOpen.Click += new System.EventHandler(this.ButtonOpen_Click); + // + // FormMails + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(956, 455); + this.Controls.Add(this.panel); + this.Controls.Add(this.dataGridView); + this.Name = "FormMails"; + this.Text = "Письма"; + this.Load += new System.EventHandler(this.FormMails_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.panel.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridView; + private Panel panel; + private Button buttonForward; + private Button buttonBack; + private Button buttonOpen; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormMails.cs b/PlumbingRepair/PlumbingRepairView/FormMails.cs new file mode 100644 index 0000000..c65c3e1 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormMails.cs @@ -0,0 +1,69 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BusinessLogicsContracts; + +namespace PlumbingRepairView +{ + public partial class FormMails : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + private readonly int pageSize = 5; + private int pageNumber = 0; + public FormMails(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + private void FormMails_Load(object sender, EventArgs e) + { + LoadData(0); + } + private void LoadData(int page) + { + try + { + var list = _logic.ReadList(new() { Page = page, PageSize = pageSize }); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + } + _logger.LogInformation("Загрузка сообщений"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки сообщений"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void ButtonBack_Click(object sender, EventArgs e) + { + if (pageNumber != 0) + { + pageNumber--; + } + LoadData(pageNumber); + } + private void ButtonForward_Click(object sender, EventArgs e) + { + pageNumber++; + LoadData(pageNumber); + } + private void ButtonOpen_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMail)); + if (service is FormMail form) + { + form.Id = dataGridView.SelectedRows[0].Cells["MessageId"].Value.ToString(); + form.ShowDialog(); + LoadData(0); + } + } + } + } +} diff --git a/PlumbingRepair/PlumbingRepairView/FormMails.resx b/PlumbingRepair/PlumbingRepairView/FormMails.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormMails.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormMain.Designer.cs b/PlumbingRepair/PlumbingRepairView/FormMain.Designer.cs index 5401a6b..6813d9d 100644 --- a/PlumbingRepair/PlumbingRepairView/FormMain.Designer.cs +++ b/PlumbingRepair/PlumbingRepairView/FormMain.Designer.cs @@ -40,15 +40,17 @@ this.пToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.продажаРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.клиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.исполнителиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.списокКомпонентовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.компонентыПоРаботамToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.списокМагазиновToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.работыПоМагазинамToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.списокВсехЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.выполнениеРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.исполнителиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.списокВсехЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.письмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.письмаToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -115,7 +117,8 @@ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.справочникиToolStripMenuItem, this.отчетыToolStripMenuItem, - this.выполнениеРаботToolStripMenuItem}); + this.выполнениеРаботToolStripMenuItem, + this.письмаToolStripMenuItem1}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(1377, 33); @@ -178,15 +181,21 @@ this.клиентыToolStripMenuItem.Text = "Клиенты"; this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click); // + // исполнителиToolStripMenuItem + // + this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; + this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(296, 34); + this.исполнителиToolStripMenuItem.Text = "Исполнители"; + this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.исполнителиToolStripMenuItem_Click); + // // отчетыToolStripMenuItem // this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.списокКомпонентовToolStripMenuItem, this.компонентыПоРаботамToolStripMenuItem, - this.списокЗаказовToolStripMenuItem, this.списокМагазиновToolStripMenuItem, this.работыПоМагазинамToolStripMenuItem, - this.списокВсехЗаказовToolStripMenuItem}); + this.списокЗаказовToolStripMenuItem}); this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(88, 29); this.отчетыToolStripMenuItem.Text = "Отчеты"; @@ -196,19 +205,14 @@ this.списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; this.списокКомпонентовToolStripMenuItem.Size = new System.Drawing.Size(319, 34); this.списокКомпонентовToolStripMenuItem.Text = "Список компонентов"; - this.списокКомпонентовToolStripMenuItem.Click += new System.EventHandler(this.списокКомпонентовToolStripMenuItem_Click); + this.списокКомпонентовToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click); // // компонентыПоРаботамToolStripMenuItem // this.компонентыПоРаботамToolStripMenuItem.Name = "компонентыПоРаботамToolStripMenuItem"; this.компонентыПоРаботамToolStripMenuItem.Size = new System.Drawing.Size(319, 34); this.компонентыПоРаботамToolStripMenuItem.Text = "Компоненты по работам"; - // - // списокЗаказовToolStripMenuItem - // - this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(319, 34); - this.списокЗаказовToolStripMenuItem.Text = "Список заказов"; + this.компонентыПоРаботамToolStripMenuItem.Click += new System.EventHandler(this.ComponentWorksToolStripMenuItem_Click); // // списокМагазиновToolStripMenuItem // @@ -224,12 +228,12 @@ this.работыПоМагазинамToolStripMenuItem.Text = "Работы по магазинам"; this.работыПоМагазинамToolStripMenuItem.Click += new System.EventHandler(this.ShopWorksToolStripMenuItem_Click); // - // списокВсехЗаказовToolStripMenuItem + // списокЗаказовToolStripMenuItem // - this.списокВсехЗаказовToolStripMenuItem.Name = "списокВсехЗаказовToolStripMenuItem"; - this.списокВсехЗаказовToolStripMenuItem.Size = new System.Drawing.Size(319, 34); - this.списокВсехЗаказовToolStripMenuItem.Text = "Список всех заказов"; - this.списокВсехЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersByDateToolStripMenuItem_Click); + this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(319, 34); + this.списокЗаказовToolStripMenuItem.Text = "Список заказов"; + this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click); // // выполнениеРаботToolStripMenuItem // @@ -238,12 +242,26 @@ this.выполнениеРаботToolStripMenuItem.Text = "Запуск работ"; this.выполнениеРаботToolStripMenuItem.Click += new System.EventHandler(this.выполнениеРаботToolStripMenuItem_Click); // - // исполнителиToolStripMenuItem + // списокВсехЗаказовToolStripMenuItem // - this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(296, 34); - this.исполнителиToolStripMenuItem.Text = "Исполнители"; - this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.исполнителиToolStripMenuItem_Click); + this.списокВсехЗаказовToolStripMenuItem.Name = "списокВсехЗаказовToolStripMenuItem"; + this.списокВсехЗаказовToolStripMenuItem.Size = new System.Drawing.Size(319, 34); + this.списокВсехЗаказовToolStripMenuItem.Text = "Список всех заказов"; + this.списокВсехЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersByDateToolStripMenuItem_Click); + // + // письмаToolStripMenuItem + // + this.письмаToolStripMenuItem.Name = "письмаToolStripMenuItem"; + this.письмаToolStripMenuItem.Size = new System.Drawing.Size(90, 29); + this.письмаToolStripMenuItem.Text = "Письма"; + this.письмаToolStripMenuItem.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click); + // + // письмаToolStripMenuItem1 + // + this.письмаToolStripMenuItem1.Name = "письмаToolStripMenuItem1"; + this.письмаToolStripMenuItem1.Size = new System.Drawing.Size(90, 29); + this.письмаToolStripMenuItem1.Text = "Письма"; + this.письмаToolStripMenuItem1.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click); // // FormMain // @@ -290,5 +308,7 @@ private ToolStripMenuItem клиентыToolStripMenuItem; private ToolStripMenuItem выполнениеРаботToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; + private ToolStripMenuItem письмаToolStripMenuItem; + private ToolStripMenuItem письмаToolStripMenuItem1; } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormMain.cs b/PlumbingRepair/PlumbingRepairView/FormMain.cs index 0e97bf3..78f57d7 100644 --- a/PlumbingRepair/PlumbingRepairView/FormMain.cs +++ b/PlumbingRepair/PlumbingRepairView/FormMain.cs @@ -225,5 +225,13 @@ namespace PlumbingRepairView form.ShowDialog(); } } + private void письмаToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + if (service is FormMails form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/Program.cs b/PlumbingRepair/PlumbingRepairView/Program.cs index 831a407..5171eee 100644 --- a/PlumbingRepair/PlumbingRepairView/Program.cs +++ b/PlumbingRepair/PlumbingRepairView/Program.cs @@ -7,6 +7,8 @@ using PlumbingRepairContracts.StoragesContracts; using PlumbingRepairDatabaseImplement.Implements; using PlumbingRepairBusinessLogic.OfficePackage; using PlumbingRepairBusinessLogic.OfficePackage.Implements; +using PlumbingRepairBusinessLogic.MailWorker; +using PlumbingRepairContracts.BindingModels; namespace PlumbingRepairView { @@ -27,10 +29,30 @@ namespace PlumbingRepairView var services = new ServiceCollection(); ConfigureServices(services); _serviceProvider = services.BuildServiceProvider(); - Application.Run(_serviceProvider.GetRequiredService()); - } + try + { + var mailSender = _serviceProvider.GetService(); + 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"]) + }); - private static void ConfigureServices(ServiceCollection services) + var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000); + } + catch (Exception ex) + { + var logger = _serviceProvider.GetService(); + logger?.LogError(ex, "Error during work with mail"); + } + Application.Run(_serviceProvider.GetRequiredService()); + } + private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void ConfigureServices(ServiceCollection services) { services.AddLogging(option => { @@ -44,9 +66,9 @@ namespace PlumbingRepairView services.AddTransient(); services.AddTransient(); services.AddTransient(); - + services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -54,12 +76,15 @@ namespace PlumbingRepairView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddSingleton(); + + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -79,6 +104,8 @@ namespace PlumbingRepairView services.AddTransient(); services.AddTransient(); services.AddTransient(); - } + services.AddTransient(); + services.AddTransient(); + } } } \ No newline at end of file