diff --git a/TypographyBusinessLogic/BusinessLogics/ClientLogic.cs b/TypographyBusinessLogic/BusinessLogics/ClientLogic.cs index de9356c..e86ecc5 100644 --- a/TypographyBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/TypographyBusinessLogic/BusinessLogics/ClientLogic.cs @@ -9,8 +9,7 @@ using TypographyContracts.SearchModels; using TypographyContracts.StoragesContracts; using TypographyContracts.ViewModels; using Microsoft.Extensions.Logging; - - +using System.Text.RegularExpressions; namespace TypographyBusinessLogic.BusinessLogics { @@ -105,6 +104,16 @@ namespace TypographyBusinessLogic.BusinessLogics { throw new ArgumentNullException("Нет логина(почты) клиента", nameof(model.Email)); } + if (!Regex.IsMatch(model.Email, @"^(?!\.)(""([^""\r\\]|\\[""\r\\])*""|" + + @"([-a-z0-9!#$%&'*+/=?^_`{|}~]|(? logger, IMessageInfoStorage MessageInfoStorage) + { + _logger = logger; + _messageInfoStorage = MessageInfoStorage; + } + + public bool Create(MessageInfoBindingModel model) + { + if (_messageInfoStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public List? ReadList(MessageInfoSearchModel? model) + { + _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId} ", model?.MessageId, model?.ClientId); + var list = (model == null) ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + } +} diff --git a/TypographyBusinessLogic/BusinessLogics/OrderLogic.cs b/TypographyBusinessLogic/BusinessLogics/OrderLogic.cs index e977771..8a1e06e 100644 --- a/TypographyBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/TypographyBusinessLogic/BusinessLogics/OrderLogic.cs @@ -10,6 +10,7 @@ using TypographyContracts.StoragesContracts; using TypographyContracts.ViewModels; using TypographyDataModels.Enums; using Microsoft.Extensions.Logging; +using TypographyBusinessLogic.MailWorker; namespace TypographyBusinessLogic.BusinessLogics { @@ -17,12 +18,16 @@ namespace TypographyBusinessLogic.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 logger, IOrderStorage orderStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic) { _logger = logger; _orderStorage = orderStorage; + _mailWorker = mailWorker; + _clientLogic = clientLogic; } public List? ReadList(OrderSearchModel? model) @@ -59,11 +64,13 @@ namespace TypographyBusinessLogic.BusinessLogics CheckModel(model); if (model.Status != OrderStatus.Неизвестен) 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; } + SendOrderStatusMail(result.ClientId, $"A new order has been created. Order number #{result.Id}", $"Order #{result.Id} from {result.DateCreate} for the amount {result.Sum:0.00} {result.Status}"); return true; } @@ -87,12 +94,14 @@ namespace TypographyBusinessLogic.BusinessLogics model.Status = status; if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now; - if (_orderStorage.Update(model) == null) + var result = _orderStorage.Update(model); + if (result == null) { model.Status = oldStatus; _logger.LogWarning("Update operation failed"); return false; } + SendOrderStatusMail(result.ClientId, $"Status of order #{result.Id} has been changed", $"Order #{result.Id} status has been changed to {result.Status}"); return true; } @@ -142,5 +151,20 @@ namespace TypographyBusinessLogic.BusinessLogics } _logger.LogInformation("Order. Sum:{ Cost}. Id: { Id}", model.Sum, model.Id); } + private bool SendOrderStatusMail(int clientId, string subject, string text) + { + var client = _clientLogic.ReadElement(new() { Id = clientId }); + if (client == null) + { + return false; + } + _mailWorker.MailSendAsync(new() + { + MailAddress = client.Email, + Subject = subject, + Text = text + }); + return true; + } } } diff --git a/TypographyBusinessLogic/MailWorker/AbstractMailWorker.cs b/TypographyBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..bf61399 --- /dev/null +++ b/TypographyBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,80 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.BusinessLogicsContracts; + +namespace TypographyBusinessLogic.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 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(); + } +} diff --git a/TypographyBusinessLogic/MailWorker/MailKitWorker.cs b/TypographyBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..c366cb2 --- /dev/null +++ b/TypographyBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,81 @@ +using Microsoft.Extensions.Logging; +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 TypographyContracts.BindingModels; +using TypographyContracts.BusinessLogicsContracts; +using MailKit.Net.Pop3; +using MailKit.Security; + +namespace TypographyBusinessLogic.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 (MailKit.Security.AuthenticationException) + { } + finally + { + client.Disconnect(true); + } + }); + return list; + } + } +} diff --git a/TypographyBusinessLogic/TypographyBusinessLogic.csproj b/TypographyBusinessLogic/TypographyBusinessLogic.csproj index 302460c..0f0ded9 100644 --- a/TypographyBusinessLogic/TypographyBusinessLogic.csproj +++ b/TypographyBusinessLogic/TypographyBusinessLogic.csproj @@ -8,6 +8,7 @@ + diff --git a/TypographyClientApp/Controllers/HomeController.cs b/TypographyClientApp/Controllers/HomeController.cs index 9e072cf..3400cf4 100644 --- a/TypographyClientApp/Controllers/HomeController.cs +++ b/TypographyClientApp/Controllers/HomeController.cs @@ -143,5 +143,14 @@ namespace TypographyClientApp.Controllers 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}")); + } } } diff --git a/TypographyClientApp/Views/Home/Mails.cshtml b/TypographyClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..6318240 --- /dev/null +++ b/TypographyClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,54 @@ +@using TypographyContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "Письма"; +} + +
+

Письма

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

Login bobr!

+ 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/TypographyClientApp/Views/Home/_Layout.cshtml b/TypographyClientApp/Views/Home/_Layout.cshtml index 9e6d0de..3e42c8b 100644 --- a/TypographyClientApp/Views/Home/_Layout.cshtml +++ b/TypographyClientApp/Views/Home/_Layout.cshtml @@ -23,6 +23,9 @@
  • Заказы
    • +
  • + Письма +
  • Личные данные
    • diff --git a/TypographyClientApp/Views/Shared/_Layout.cshtml b/TypographyClientApp/Views/Shared/_Layout.cshtml index 0da6c15..f902182 100644 --- a/TypographyClientApp/Views/Shared/_Layout.cshtml +++ b/TypographyClientApp/Views/Shared/_Layout.cshtml @@ -22,6 +22,7 @@
  • Home
    • +
  • Privacy
    • diff --git a/TypographyContracts/BindingModels/MailConfigBindingModel.cs b/TypographyContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..2dacc21 --- /dev/null +++ b/TypographyContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TypographyContracts.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; } + } +} diff --git a/TypographyContracts/BindingModels/MailSendInfoBindingModel.cs b/TypographyContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..26c3434 --- /dev/null +++ b/TypographyContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TypographyContracts.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; + } +} diff --git a/TypographyContracts/BindingModels/MessageInfoBindingModel.cs b/TypographyContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..f909b6c --- /dev/null +++ b/TypographyContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyDataModels.Models; + +namespace TypographyContracts.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; + } +} diff --git a/TypographyContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/TypographyContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..ab46fea --- /dev/null +++ b/TypographyContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.ViewModels; + +namespace TypographyContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + bool Create(MessageInfoBindingModel model); + } +} diff --git a/TypographyContracts/SearchModels/MessageInfoSearchModel.cs b/TypographyContracts/SearchModels/MessageInfoSearchModel.cs new file mode 100644 index 0000000..3a4a4b5 --- /dev/null +++ b/TypographyContracts/SearchModels/MessageInfoSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TypographyContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public int? ClientId { get; set; } + public string? MessageId { get; set; } + } +} diff --git a/TypographyContracts/StoragesContracts/IMessageInfoStorage.cs b/TypographyContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..472983d --- /dev/null +++ b/TypographyContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.ViewModels; + +namespace TypographyContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + } +} diff --git a/TypographyContracts/ViewModels/MessageInfoViewModel.cs b/TypographyContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..72d2b58 --- /dev/null +++ b/TypographyContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyDataModels.Models; + +namespace TypographyContracts.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; + } +} diff --git a/TypographyDataModels/Models/IMessageInfoModel.cs b/TypographyDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..6d319eb --- /dev/null +++ b/TypographyDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TypographyDataModels.Models +{ + public interface IMessageInfoModel + { + string MessageId { get; } + int? ClientId { get; } + string SenderName { get; } + DateTime DateDelivery { get; } + string Subject { get; } + string Body { get; } + } +} diff --git a/TypographyFileImplement/DataFileSingleton.cs b/TypographyFileImplement/DataFileSingleton.cs index 7e8dc72..f032552 100644 --- a/TypographyFileImplement/DataFileSingleton.cs +++ b/TypographyFileImplement/DataFileSingleton.cs @@ -20,12 +20,14 @@ namespace TypographyFileImplement private readonly string PrintedFileName = "Printed.xml"; private readonly string ClientFileName = "Client.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 Printeds { 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() { @@ -41,6 +43,7 @@ namespace TypographyFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveImplementers() => SaveData(Orders, ImplementerFileName, "Implementers", x => x.GetXElement); + public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement); private DataFileSingleton() { @@ -49,6 +52,7 @@ namespace TypographyFileImplement Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Implementers = LoadData(ImplementerFileName, "Impleneter", 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/TypographyFileImplement/Implements/MessageInfoStorage.cs b/TypographyFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..cbac29a --- /dev/null +++ b/TypographyFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.ViewModels; +using TypographyFileImplement.Models; + +namespace TypographyFileImplement.Implements +{ + public class MessageInfoStorage + { + private readonly DataFileSingleton _source; + public MessageInfoStorage() + { + _source = DataFileSingleton.GetInstance(); + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (model.MessageId != null) + { + return _source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; + } + return null; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + return _source.Messages + .Where(x => x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + return _source.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + _source.Messages.Add(newMessage); + _source.SaveMessages(); + return newMessage.GetViewModel; + } + } +} + diff --git a/TypographyFileImplement/Models/MessageInfo.cs b/TypographyFileImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..fa79870 --- /dev/null +++ b/TypographyFileImplement/Models/MessageInfo.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; +using TypographyContracts.BindingModels; +using TypographyContracts.ViewModels; +using TypographyDataModels.Models; + +namespace TypographyFileImplement.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 static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + Subject = model.Subject, + ClientId = model.ClientId, + MessageId = model.MessageId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + }; + } + + public static MessageInfo? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + Body = element.Attribute("Body")!.Value, + Subject = element.Attribute("Subject")!.Value, + ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), + MessageId = element.Attribute("MessageId")!.Value, + SenderName = element.Attribute("SenderName")!.Value, + DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value), + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + }; + + public XElement GetXElement => new("MessageInfo", + new XAttribute("Body", Body), + new XAttribute("Subject", Subject), + new XAttribute("ClientId", ClientId), + new XAttribute("MessageId", MessageId), + new XAttribute("SenderName", SenderName), + new XAttribute("DateDelivery", DateDelivery) + ); + } +} diff --git a/TypographyListImplement/DataListSingleton.cs b/TypographyListImplement/DataListSingleton.cs index 12260f4..d40df75 100644 --- a/TypographyListImplement/DataListSingleton.cs +++ b/TypographyListImplement/DataListSingleton.cs @@ -15,6 +15,7 @@ namespace TypographyListImplement public List Printeds { get; set; } public List Clients { get; set; } public List Implementers { get; set; } + public List Messages { get; set; } private DataListSingleton() { Components = new List(); @@ -22,6 +23,7 @@ namespace TypographyListImplement Printeds = new List(); Clients = new List(); Implementers = new List(); + Messages = new List(); } public static DataListSingleton GetInstance() { diff --git a/TypographyListImplement/Implements/MessageInfoStorage.cs b/TypographyListImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..89ad383 --- /dev/null +++ b/TypographyListImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.StoragesContracts; +using TypographyContracts.ViewModels; +using TypographyListImplement.Models; + +namespace TypographyListImplement.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); + } + } + return result; + } + + 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; + } + } +} diff --git a/TypographyListImplement/Models/MessageInfo.cs b/TypographyListImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..a0300c6 --- /dev/null +++ b/TypographyListImplement/Models/MessageInfo.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.ViewModels; +using TypographyDataModels.Models; + +namespace TypographyListImplement.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 static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + Subject = model.Subject, + ClientId = model.ClientId, + MessageId = model.MessageId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + }; + } +} diff --git a/TypographyRestApi/Controllers/ClientController.cs b/TypographyRestApi/Controllers/ClientController.cs index 67af6d3..c2ec41e 100644 --- a/TypographyRestApi/Controllers/ClientController.cs +++ b/TypographyRestApi/Controllers/ClientController.cs @@ -12,10 +12,12 @@ namespace TypographyRestApi.Controllers { private readonly ILogger _logger; private readonly IClientLogic _logic; - public ClientController(IClientLogic logic, ILogger logger) + private readonly IMessageInfoLogic _mailLogic; + public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger logger) { _logger = logger; _logic = logic; + _mailLogic = mailLogic; } [HttpGet] public ClientViewModel? Login(string login, string password) @@ -60,5 +62,21 @@ namespace TypographyRestApi.Controllers throw; } } + [HttpGet] + public List? GetMessages(int clientId) + { + try + { + return _mailLogic.ReadList(new MessageInfoSearchModel + { + ClientId = clientId + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения писем клиента"); + throw; + } + } } } diff --git a/TypographyRestApi/Program.cs b/TypographyRestApi/Program.cs index 2570b9a..b0b148c 100644 --- a/TypographyRestApi/Program.cs +++ b/TypographyRestApi/Program.cs @@ -1,5 +1,7 @@ using Microsoft.OpenApi.Models; using TypographyBusinessLogic.BusinessLogics; +using TypographyBusinessLogic.MailWorker; +using TypographyContracts.BindingModels; using TypographyContracts.BusinessLogicsContracts; using TypographyContracts.StoragesContracts; using TypographyDatabaseImplements.Implements; @@ -15,10 +17,13 @@ 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(); @@ -35,6 +40,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/TypographyRestApi/appsettings.json b/TypographyRestApi/appsettings.json index 10f68b8..4190ba3 100644 --- a/TypographyRestApi/appsettings.json +++ b/TypographyRestApi/appsettings.json @@ -5,5 +5,11 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "SmtpClientHost": "smtp.gmail.com", + "SmtpClientPort": "587", + "PopHost": "pop.gmail.com", + "PopPort": "995", + "MailLogin": "rpplabs6@gmail.com", + "MailPassword": "dkjl fzkt rmjk izpn" } diff --git a/TypographyShopDatabaseImplements/Implements/MessageInfoStorage.cs b/TypographyShopDatabaseImplements/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..cfd0b16 --- /dev/null +++ b/TypographyShopDatabaseImplements/Implements/MessageInfoStorage.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.StoragesContracts; +using TypographyContracts.ViewModels; +using TypographyDatabaseImplements.Models; + +namespace TypographyDatabaseImplements.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + using var context = new TypographyDatabase(); + if (model.MessageId != null) + { + return context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; + } + return null; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + using var context = new TypographyDatabase(); + return context.Messages + .Where(x => x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + using var context = new TypographyDatabase(); + return context.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + using var context = new TypographyDatabase(); + var newMessage = MessageInfo.Create(model); + if (newMessage == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId))) + { + return null; + } + context.Messages.Add(newMessage); + context.SaveChanges(); + return newMessage.GetViewModel; + } + } +} diff --git a/TypographyShopDatabaseImplements/Migrations/20240422043507_InitialCreate.Designer.cs b/TypographyShopDatabaseImplements/Migrations/20240505144029_Initial.Designer.cs similarity index 86% rename from TypographyShopDatabaseImplements/Migrations/20240422043507_InitialCreate.Designer.cs rename to TypographyShopDatabaseImplements/Migrations/20240505144029_Initial.Designer.cs index 95bac54..63de747 100644 --- a/TypographyShopDatabaseImplements/Migrations/20240422043507_InitialCreate.Designer.cs +++ b/TypographyShopDatabaseImplements/Migrations/20240505144029_Initial.Designer.cs @@ -12,8 +12,8 @@ using TypographyDatabaseImplements; namespace TypographyDatabaseImplements.Migrations { [DbContext(typeof(TypographyDatabase))] - [Migration("20240422043507_InitialCreate")] - partial class InitialCreate + [Migration("20240505144029_Initial")] + partial class Initial { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -140,6 +140,36 @@ namespace TypographyDatabaseImplements.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("TypographyDatabaseImplements.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("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + modelBuilder.Entity("TypographyDatabaseImplements.Models.Printed", b => { b.Property("Id") @@ -211,6 +241,15 @@ namespace TypographyDatabaseImplements.Migrations b.Navigation("Printed"); }); + modelBuilder.Entity("TypographyDatabaseImplements.Models.MessageInfo", b => + { + b.HasOne("TypographyDatabaseImplements.Models.Client", "Client") + .WithMany() + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("TypographyDatabaseImplements.Models.PrintedComponent", b => { b.HasOne("TypographyDatabaseImplement.Models.Component", "Component") diff --git a/TypographyShopDatabaseImplements/Migrations/20240422043507_InitialCreate.cs b/TypographyShopDatabaseImplements/Migrations/20240505144029_Initial.cs similarity index 85% rename from TypographyShopDatabaseImplements/Migrations/20240422043507_InitialCreate.cs rename to TypographyShopDatabaseImplements/Migrations/20240505144029_Initial.cs index e176365..feeea00 100644 --- a/TypographyShopDatabaseImplements/Migrations/20240422043507_InitialCreate.cs +++ b/TypographyShopDatabaseImplements/Migrations/20240505144029_Initial.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace TypographyDatabaseImplements.Migrations { /// - public partial class InitialCreate : Migration + public partial class Initial : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -70,6 +70,27 @@ namespace TypographyDatabaseImplements.Migrations table.PrimaryKey("PK_Printeds", 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) + }, + 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 @@ -134,6 +155,11 @@ namespace TypographyDatabaseImplements.Migrations onDelete: ReferentialAction.Cascade); }); + migrationBuilder.CreateIndex( + name: "IX_Messages_ClientId", + table: "Messages", + column: "ClientId"); + migrationBuilder.CreateIndex( name: "IX_Orders_ClientId", table: "Orders", @@ -163,6 +189,9 @@ namespace TypographyDatabaseImplements.Migrations /// protected override void Down(MigrationBuilder migrationBuilder) { + migrationBuilder.DropTable( + name: "Messages"); + migrationBuilder.DropTable( name: "Orders"); diff --git a/TypographyShopDatabaseImplements/Migrations/TypographyDatabaseModelSnapshot.cs b/TypographyShopDatabaseImplements/Migrations/TypographyDatabaseModelSnapshot.cs index bd6bd95..677d31b 100644 --- a/TypographyShopDatabaseImplements/Migrations/TypographyDatabaseModelSnapshot.cs +++ b/TypographyShopDatabaseImplements/Migrations/TypographyDatabaseModelSnapshot.cs @@ -137,6 +137,36 @@ namespace TypographyDatabaseImplements.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("TypographyDatabaseImplements.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("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + modelBuilder.Entity("TypographyDatabaseImplements.Models.Printed", b => { b.Property("Id") @@ -208,6 +238,15 @@ namespace TypographyDatabaseImplements.Migrations b.Navigation("Printed"); }); + modelBuilder.Entity("TypographyDatabaseImplements.Models.MessageInfo", b => + { + b.HasOne("TypographyDatabaseImplements.Models.Client", "Client") + .WithMany() + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("TypographyDatabaseImplements.Models.PrintedComponent", b => { b.HasOne("TypographyDatabaseImplement.Models.Component", "Component") diff --git a/TypographyShopDatabaseImplements/Models/Client.cs b/TypographyShopDatabaseImplements/Models/Client.cs index b1818aa..9515f8f 100644 --- a/TypographyShopDatabaseImplements/Models/Client.cs +++ b/TypographyShopDatabaseImplements/Models/Client.cs @@ -29,6 +29,9 @@ namespace TypographyDatabaseImplements.Models [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); + [ForeignKey("ClientId")] + public virtual List Messages { get; set; } = new(); + public static Client? Create(ClientBindingModel model) { if (model == null) diff --git a/TypographyShopDatabaseImplements/Models/MessageInfo.cs b/TypographyShopDatabaseImplements/Models/MessageInfo.cs new file mode 100644 index 0000000..c963287 --- /dev/null +++ b/TypographyShopDatabaseImplements/Models/MessageInfo.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.ViewModels; +using TypographyDataModels.Models; + +namespace TypographyDatabaseImplements.Models +{ + public class MessageInfo : IMessageInfoModel + { + [Key] + 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 virtual Client? Client { get; private set; } + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + Subject = model.Subject, + ClientId = model.ClientId, + MessageId = model.MessageId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + }; + } +} diff --git a/TypographyShopDatabaseImplements/TypographyDatabase.cs b/TypographyShopDatabaseImplements/TypographyDatabase.cs index 7d30b2d..9b4d83c 100644 --- a/TypographyShopDatabaseImplements/TypographyDatabase.cs +++ b/TypographyShopDatabaseImplements/TypographyDatabase.cs @@ -16,7 +16,7 @@ namespace TypographyDatabaseImplements if (optionsBuilder.IsConfigured == false) { optionsBuilder.UseSqlServer(@"Data Source = .\SQLEXPRESS; - Initial Catalog=TypographyDatabaseFullBaseNew; + Initial Catalog=TypographyDatabaseFullBaseNew1; Integrated Security=True;MultipleActiveResultSets=True;; TrustServerCertificate=True"); } @@ -28,5 +28,6 @@ namespace TypographyDatabaseImplements public virtual DbSet Orders { set; get; } public virtual DbSet Clients { set; get; } public virtual DbSet Implementers { set; get; } + public virtual DbSet Messages { set; get; } } } diff --git a/TypographyView/App.config b/TypographyView/App.config new file mode 100644 index 0000000..cc0005f --- /dev/null +++ b/TypographyView/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/TypographyView/FormMails.Designer.cs b/TypographyView/FormMails.Designer.cs new file mode 100644 index 0000000..726454a --- /dev/null +++ b/TypographyView/FormMails.Designer.cs @@ -0,0 +1,66 @@ +namespace TypographyView +{ + 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() + { + dataGridView = new DataGridView(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.BackgroundColor = SystemColors.ButtonHighlight; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Fill; + dataGridView.Location = new Point(0, 0); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 25; + dataGridView.Size = new Size(914, 600); + dataGridView.TabIndex = 0; + // + // FormMails + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(914, 600); + Controls.Add(dataGridView); + Margin = new Padding(3, 4, 3, 4); + Name = "FormMails"; + Text = "Сообщения"; + Load += FormMails_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/TypographyView/FormMails.cs b/TypographyView/FormMails.cs new file mode 100644 index 0000000..0684000 --- /dev/null +++ b/TypographyView/FormMails.cs @@ -0,0 +1,40 @@ +using TypographyContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace TypographyView +{ + public partial class FormMails : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + + public FormMails(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormMails_Load(object sender, EventArgs e) + { + 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, "Eror", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } +} diff --git a/TypographyView/FormMails.resx b/TypographyView/FormMails.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/TypographyView/FormMails.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/TypographyView/FormMain.Designer.cs b/TypographyView/FormMain.Designer.cs index 1b96b74..42bd8b1 100644 --- a/TypographyView/FormMain.Designer.cs +++ b/TypographyView/FormMain.Designer.cs @@ -45,6 +45,7 @@ buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonUpd = new Button(); + почтаToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -61,7 +62,7 @@ // // справочникиToolStripMenuItem // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделиеToolStripMenuItem, клиентыToolStripMenuItem, сотрудникиToolStripMenuItem }); + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделиеToolStripMenuItem, клиентыToolStripMenuItem, сотрудникиToolStripMenuItem, почтаToolStripMenuItem }); справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Text = "Справочники"; @@ -191,6 +192,13 @@ buttonUpd.UseVisualStyleBackColor = true; buttonUpd.Click += ButtonUpd_Click; // + // почтаToolStripMenuItem + // + почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; + почтаToolStripMenuItem.Size = new Size(224, 26); + почтаToolStripMenuItem.Text = "Почта"; + почтаToolStripMenuItem.Click += почтаToolStripMenuItem_Click; + // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -233,5 +241,6 @@ private ToolStripMenuItem клиентыToolStripMenuItem; private ToolStripMenuItem сотрудникиToolStripMenuItem; private ToolStripMenuItem началоРаботыToolStripMenuItem; + private ToolStripMenuItem почтаToolStripMenuItem; } } \ No newline at end of file diff --git a/TypographyView/FormMain.cs b/TypographyView/FormMain.cs index 071742f..936cb7f 100644 --- a/TypographyView/FormMain.cs +++ b/TypographyView/FormMain.cs @@ -224,5 +224,14 @@ e) DateCreate = (System.DateTime)dataGridView.SelectedRows[0].Cells["DateCreate"].Value, }; } + + private void почтаToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + if (service is FormMails form) + { + form.ShowDialog(); + } + } } } diff --git a/TypographyView/Program.cs b/TypographyView/Program.cs index 702692b..2dbc18b 100644 --- a/TypographyView/Program.cs +++ b/TypographyView/Program.cs @@ -8,6 +8,8 @@ using NLog.Extensions.Logging; using TypographyBusinessLogic.OfficePackage.Implements; using TypographyBusinessLogic.OfficePackage; using AbstractShopView; +using TypographyBusinessLogic.MailWorker; +using TypographyContracts.BindingModels; namespace TypographyView @@ -28,8 +30,29 @@ namespace TypographyView var services = new ServiceCollection(); ConfigureServices(services); _serviceProvider = services.BuildServiceProvider(); + 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"]) + }); + // + var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000); + } + catch (Exception ex) + { + var logger = _serviceProvider.GetService(); + logger?.LogError(ex, " "); + } Application.Run(_serviceProvider.GetRequiredService()); } + private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); private static void ConfigureServices(ServiceCollection services) { services.AddLogging(option => @@ -42,6 +65,7 @@ namespace TypographyView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -49,13 +73,16 @@ namespace TypographyView services.AddTransient(); services.AddTransient(); services.AddTransient(); - + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddSingleton(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -68,6 +95,7 @@ namespace TypographyView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/TypographyView/TypographyView.csproj b/TypographyView/TypographyView.csproj index d98fb09..71179a5 100644 --- a/TypographyView/TypographyView.csproj +++ b/TypographyView/TypographyView.csproj @@ -33,9 +33,15 @@     + + PreserveNewest + Always + + Always + \ No newline at end of file