From c2bdb40a32128f7c605566255b8e208375224b8a Mon Sep 17 00:00:00 2001 From: goblinrf Date: Tue, 7 May 2024 00:29:58 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=B4=D0=BE=20=D0=B1=D1=83=D0=B4?= =?UTF-8?q?=D0=B5=D1=82=20=D0=BF=D0=BE=D1=82=D0=B5=D1=82=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ClientLogic.cs | 15 ++- .../BusinessLogics/MessageInfoLogic.cs | 56 ++++++++ .../BusinessLogics/OrderLogic.cs | 40 ++++-- .../DinerBusinessLogic.csproj | 1 + .../MailWorker/AbstractMailWorker.cs | 107 ++++++++++++++++ .../MailWorker/MailKitWorker.cs | 87 +++++++++++++ .../BindingModels/MailConfigBindingModel.cs | 23 ++++ .../BindingModels/MailSendInfoBindingModel.cs | 17 +++ .../BindingModels/MessageInfoBindingModel.cs | 24 ++++ .../IMessageInfoLogic.cs | 18 +++ .../SearchModels/MessageInfoSearchModel.cs | 15 +++ .../StoragesContracts/IMessageInfoStorage.cs | 22 ++++ .../ViewModels/MessageInfoViewModel.cs | 23 ++++ .../Models/IMessageInfoModel.cs | 23 ++++ .../DataListSingleton.cs | 6 +- .../DinerListImplement.csproj | 1 + .../Implements/MessageInfoStorage.cs | 87 +++++++++++++ .../Models/MessageInfo.cs | 66 ++++++++++ Diner/Diner/App.config | 11 ++ Diner/Diner/FormMails.Designer.cs | 64 ++++++++++ Diner/Diner/FormMails.cs | 59 +++++++++ Diner/Diner/FormMails.resx | 120 ++++++++++++++++++ Diner/Diner/FormMain.Designer.cs | 34 +++-- Diner/Diner/FormMain.cs | 9 ++ Diner/Diner/FormMain.resx | 73 ++++++++++- Diner/Diner/Program.cs | 40 +++++- .../Controllers/HomeController.cs | 12 +- Diner/DinerClientApp/Views/Home/Mails.cshtml | 51 ++++++++ .../Views/Shared/_Layout.cshtml | 3 + Diner/DinerDataBaseImplement/DinerDatabase.cs | 3 +- .../Implements/MessageInfoStorage.cs | 61 +++++++++ Diner/DinerDataBaseImplement/Models/Client.cs | 5 +- .../Models/MessageInfo.cs | 62 +++++++++ Diner/DinerFileImplement/DataFileSingleton.cs | 21 ++- .../DinerFileImplement/Models/MessageInfo.cs | 88 +++++++++++++ .../Controllers/ClientController.cs | 20 ++- Diner/DinerRestApi/Program.cs | 17 +++ Diner/DinerRestApi/appsettings.json | 8 +- 38 files changed, 1351 insertions(+), 41 deletions(-) create mode 100644 AbstractShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs create mode 100644 AbstractShopBusinessLogic/MailWorker/AbstractMailWorker.cs create mode 100644 AbstractShopBusinessLogic/MailWorker/MailKitWorker.cs create mode 100644 AbstractShopContracts/BindingModels/MailConfigBindingModel.cs create mode 100644 AbstractShopContracts/BindingModels/MailSendInfoBindingModel.cs create mode 100644 AbstractShopContracts/BindingModels/MessageInfoBindingModel.cs create mode 100644 AbstractShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs create mode 100644 AbstractShopContracts/SearchModels/MessageInfoSearchModel.cs create mode 100644 AbstractShopContracts/StoragesContracts/IMessageInfoStorage.cs create mode 100644 AbstractShopContracts/ViewModels/MessageInfoViewModel.cs create mode 100644 AbstractShopDataModels/Models/IMessageInfoModel.cs create mode 100644 Diner/AbstractShopListImplement/Implements/MessageInfoStorage.cs create mode 100644 Diner/AbstractShopListImplement/Models/MessageInfo.cs create mode 100644 Diner/Diner/App.config create mode 100644 Diner/Diner/FormMails.Designer.cs create mode 100644 Diner/Diner/FormMails.cs create mode 100644 Diner/Diner/FormMails.resx create mode 100644 Diner/DinerClientApp/Views/Home/Mails.cshtml create mode 100644 Diner/DinerDataBaseImplement/Implements/MessageInfoStorage.cs create mode 100644 Diner/DinerDataBaseImplement/Models/MessageInfo.cs create mode 100644 Diner/DinerFileImplement/Models/MessageInfo.cs diff --git a/AbstractShopBusinessLogic/BusinessLogics/ClientLogic.cs b/AbstractShopBusinessLogic/BusinessLogics/ClientLogic.cs index a866bcb..7f916f0 100644 --- a/AbstractShopBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/AbstractShopBusinessLogic/BusinessLogics/ClientLogic.cs @@ -4,6 +4,7 @@ using DinerContracts.SearchModels; using DinerContracts.StoragesContracts; using DinerContracts.ViewModels; using Microsoft.Extensions.Logging; +using System.Text.RegularExpressions; namespace DinerBusinessLogic.BusinessLogics { @@ -103,8 +104,18 @@ namespace DinerBusinessLogic.BusinessLogics throw new ArgumentNullException("Отсутствие пароля в учётной записи", nameof(model.Password)); } - _logger.LogInformation("WorkPiece. ClientFIO:{ClientFIO}. Email:{Email}. Password:{Password}. Id:{Id}", - model.ClientFIO, model.Email, model.Password, model.Id); + if (!Regex.IsMatch(model.Email, @"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$", RegexOptions.IgnoreCase)) + { + throw new ArgumentException("Некорректная почта", nameof(model.Email)); + } + + if (!Regex.IsMatch(model.Password, @"^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase) && model.Password.Length < 10 && model.Password.Length > 50) + { + throw new ArgumentException("Необходимо придумать другой пароль", nameof(model.Password)); + } + + _logger.LogInformation("WorkPiece. ClientFIO:{ClientFIO}. Email:{Email}. Password:{Password}. Id:{Id}", + model.ClientFIO, model.Email, model.Password, model.Id); var element = _clientStorage.GetElement(new ClientSearchModel { Email = model.Email, diff --git a/AbstractShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/AbstractShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs new file mode 100644 index 0000000..53ac6dd --- /dev/null +++ b/AbstractShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -0,0 +1,56 @@ +using DinerContracts.BindingModels; +using DinerContracts.BusinessLogicsContracts; +using DinerContracts.SearchModels; +using DinerContracts.StoragesContracts; +using DinerContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerBusinessLogic.BusinessLogics +{ + public class MessageInfoLogic : IMessageInfoLogic + { + private readonly ILogger _logger; + + private readonly IMessageInfoStorage _messageInfoStorage; + + public MessageInfoLogic(ILogger logger, IMessageInfoStorage messageInfoStorage) + { + _logger = logger; + _messageInfoStorage = messageInfoStorage; + } + + public List? ReadList(MessageInfoSearchModel? model) + { + _logger.LogInformation("ReadList. MessageId:{MessageId}", model?.MessageId); + + 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.OrderByDescending(x => x.DateDelivery).ToList(); + } + + public bool Create(MessageInfoBindingModel model) + { + if (_messageInfoStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + + return false; + } + + return true; + } + } +} diff --git a/AbstractShopBusinessLogic/BusinessLogics/OrderLogic.cs b/AbstractShopBusinessLogic/BusinessLogics/OrderLogic.cs index eb5ac9e..dc3a04b 100644 --- a/AbstractShopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/AbstractShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -1,4 +1,5 @@ using DinerContracts.BindingModels; +using DinerBusinessLogic.MailWorker; using DinerContracts.BusinessLogicsContracts; using DinerContracts.SearchModels; using DinerContracts.StoragesContracts; @@ -12,11 +13,15 @@ namespace DinerBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) - { + private readonly AbstractMailWorker _mailWorker; + private readonly IClientLogic _clientLogic; + public OrderLogic(ILogger logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic) + { _logger = logger; _orderStorage = orderStorage; - } + _mailWorker = mailWorker; + _clientLogic = clientLogic; + } public List? ReadList(OrderSearchModel? model) { _logger.LogInformation("ReadList. Id:{Id}", model?.Id); @@ -57,12 +62,14 @@ namespace DinerBusinessLogic.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; } - return true; + SendOrderMessage(result.ClientId, $"Закусочная, Заказ №{result.Id}", $"Заказ №{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят"); + return true; } @@ -140,8 +147,8 @@ namespace DinerBusinessLogic.BusinessLogics } CheckModel(model, false); - - if (_orderStorage.Update(model) == null) + var result = _orderStorage.Update(model); + if (result == null) { model.Status--; @@ -149,7 +156,24 @@ namespace DinerBusinessLogic.BusinessLogics return false; } + SendOrderMessage(result.ClientId, $"Закусочная, Заказ №{result.Id}", $"Заказ №{model.Id} изменен статус на {result.Status}"); + return true; + } + private bool SendOrderMessage(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; } public bool TakeOrderInWork(OrderBindingModel model) diff --git a/AbstractShopBusinessLogic/DinerBusinessLogic.csproj b/AbstractShopBusinessLogic/DinerBusinessLogic.csproj index 38b61e5..7e21018 100644 --- a/AbstractShopBusinessLogic/DinerBusinessLogic.csproj +++ b/AbstractShopBusinessLogic/DinerBusinessLogic.csproj @@ -8,6 +8,7 @@ + diff --git a/AbstractShopBusinessLogic/MailWorker/AbstractMailWorker.cs b/AbstractShopBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..6aa373a --- /dev/null +++ b/AbstractShopBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,107 @@ +using DinerContracts.BindingModels; +using DinerContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerBusinessLogic.MailWorker +{ + public abstract class AbstractMailWorker + { + protected string _mailLogin = string.Empty; + + protected string _mailPassword = string.Empty; + + protected string _smtpClientHost = string.Empty; + + protected int _smtpClientPort; + + protected string _popHost = string.Empty; + + protected int _popPort; + + private readonly IMessageInfoLogic _messageInfoLogic; + + private readonly IClientLogic _clientLogic; + + private readonly ILogger _logger; + + public AbstractMailWorker(ILogger logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) + { + _logger = logger; + _messageInfoLogic = messageInfoLogic; + _clientLogic = clientLogic; + } + + public void MailConfig(MailConfigBindingModel config) + { + _mailLogin = config.MailLogin; + _mailPassword = config.MailPassword; + _smtpClientHost = config.SmtpClientHost; + _smtpClientPort = config.SmtpClientPort; + _popHost = config.PopHost; + _popPort = config.PopPort; + + _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, { popHost}, { popPort}", + _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort); + } + + public async void MailSendAsync(MailSendInfoBindingModel info) + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } + + if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text)) + { + return; + } + + _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject); + + await SendMailAsync(info); + } + + public async void MailCheck() + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + + if (string.IsNullOrEmpty(_popHost) || _popPort == 0) + { + return; + } + + if (_messageInfoLogic == null) + { + return; + } + + var list = await ReceiveMailAsync(); + + _logger.LogDebug("Check Mail: {Count} new mails", list.Count); + + foreach (var mail in list) + { + mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id; + + _messageInfoLogic.Create(mail); + } + } + + protected abstract Task SendMailAsync(MailSendInfoBindingModel info); + + protected abstract Task> ReceiveMailAsync(); + } +} diff --git a/AbstractShopBusinessLogic/MailWorker/MailKitWorker.cs b/AbstractShopBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..e4b35b6 --- /dev/null +++ b/AbstractShopBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,87 @@ +using DinerContracts.BindingModels; +using DinerContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System.Net.Mail; +using System.Net; +using System.Text; +using MailKit.Net.Pop3; +using MailKit.Security; + +namespace DinerBusinessLogic.MailWorker +{ + public class MailKitWorker : AbstractMailWorker + { + public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) + : base(logger, messageInfoLogic, clientLogic) { } + + protected override async Task SendMailAsync(MailSendInfoBindingModel info) + { + using var objMailMessage = new MailMessage(); + + using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort); + + try + { + objMailMessage.From = new MailAddress(_mailLogin); + objMailMessage.To.Add(new MailAddress(info.MailAddress)); + objMailMessage.Subject = info.Subject; + objMailMessage.Body = info.Text; + objMailMessage.SubjectEncoding = Encoding.UTF8; + objMailMessage.BodyEncoding = Encoding.UTF8; + + objSmtpClient.UseDefaultCredentials = false; + objSmtpClient.EnableSsl = true; + objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; + objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + + await Task.Run(() => objSmtpClient.Send(objMailMessage)); + } + catch (Exception) + { + throw; + } + } + + protected override async Task> 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; + } + } +} diff --git a/AbstractShopContracts/BindingModels/MailConfigBindingModel.cs b/AbstractShopContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..317d6a9 --- /dev/null +++ b/AbstractShopContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerContracts.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/AbstractShopContracts/BindingModels/MailSendInfoBindingModel.cs b/AbstractShopContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..e33741c --- /dev/null +++ b/AbstractShopContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerContracts.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/AbstractShopContracts/BindingModels/MessageInfoBindingModel.cs b/AbstractShopContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..96a226f --- /dev/null +++ b/AbstractShopContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,24 @@ +using DinerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerContracts.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; } = DateTime.Now; + + public string Subject { get; set; } = string.Empty; + + public string Body { get; set; } = string.Empty; + } +} diff --git a/AbstractShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/AbstractShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..e83b304 --- /dev/null +++ b/AbstractShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,18 @@ +using DinerContracts.BindingModels; +using DinerContracts.SearchModels; +using DinerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + + bool Create(MessageInfoBindingModel model); + } +} diff --git a/AbstractShopContracts/SearchModels/MessageInfoSearchModel.cs b/AbstractShopContracts/SearchModels/MessageInfoSearchModel.cs new file mode 100644 index 0000000..2d948b7 --- /dev/null +++ b/AbstractShopContracts/SearchModels/MessageInfoSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public string? MessageId { get; set; } + + public int? ClientId { get; set; } + } +} diff --git a/AbstractShopContracts/StoragesContracts/IMessageInfoStorage.cs b/AbstractShopContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..0d785a1 --- /dev/null +++ b/AbstractShopContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,22 @@ +using DinerContracts.BindingModels; +using DinerContracts.SearchModels; +using DinerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + + List GetFilteredList(MessageInfoSearchModel model); + + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + } +} diff --git a/AbstractShopContracts/ViewModels/MessageInfoViewModel.cs b/AbstractShopContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..94bb898 --- /dev/null +++ b/AbstractShopContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,23 @@ +using System.ComponentModel; + +namespace DinerContracts.ViewModels +{ + public class MessageInfoViewModel + { + 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; } = DateTime.Now; + + [DisplayName("Заголовок")] + public string Subject { get; set; } = string.Empty; + + [DisplayName("Текст")] + public string Body { get; set; } = string.Empty; + } +} diff --git a/AbstractShopDataModels/Models/IMessageInfoModel.cs b/AbstractShopDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..f216605 --- /dev/null +++ b/AbstractShopDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerDataModels.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/Diner/AbstractShopListImplement/DataListSingleton.cs b/Diner/AbstractShopListImplement/DataListSingleton.cs index 6da64ea..0198a1a 100644 --- a/Diner/AbstractShopListImplement/DataListSingleton.cs +++ b/Diner/AbstractShopListImplement/DataListSingleton.cs @@ -15,14 +15,16 @@ namespace DinerListImplement public List Products { get; set; } public List Clients { get; set; } public List Implementers { get; set; } - private DataListSingleton() + public List MessageInfos { get; set; } + private DataListSingleton() { Components = new List(); Orders = new List(); Products = new List(); Clients = new List(); Implementers = new List(); - } + MessageInfos = new List(); + } public static DataListSingleton GetInstance() { if (_instance == null) diff --git a/Diner/AbstractShopListImplement/DinerListImplement.csproj b/Diner/AbstractShopListImplement/DinerListImplement.csproj index 85bb64d..11e82ff 100644 --- a/Diner/AbstractShopListImplement/DinerListImplement.csproj +++ b/Diner/AbstractShopListImplement/DinerListImplement.csproj @@ -7,6 +7,7 @@ + diff --git a/Diner/AbstractShopListImplement/Implements/MessageInfoStorage.cs b/Diner/AbstractShopListImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..3ce2db4 --- /dev/null +++ b/Diner/AbstractShopListImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,87 @@ +using DinerContracts.BindingModels; +using DinerContracts.SearchModels; +using DinerContracts.StoragesContracts; +using DinerContracts.ViewModels; +using DinerListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerListImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataListSingleton _source; + + public MessageInfoStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + + foreach (var messageInfo in _source.MessageInfos) + { + result.Add(messageInfo.GetViewModel); + } + + return result; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + var result = new List(); + + if (string.IsNullOrEmpty(model.MessageId)) + { + return result; + } + + foreach (var messageInfo in _source.MessageInfos) + { + if (messageInfo.ClientId == model.ClientId) + { + result.Add(messageInfo.GetViewModel); + } + } + + return result; + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (string.IsNullOrEmpty(model.MessageId)) + { + return null; + } + + foreach (var messageInfo in _source.MessageInfos) + { + if (messageInfo.MessageId == model.MessageId) + { + return messageInfo.GetViewModel; + } + } + + return null; + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + + if (newMessage == null) + { + return null; + } + + _source.MessageInfos.Add(newMessage); + + return newMessage.GetViewModel; + } + } +} diff --git a/Diner/AbstractShopListImplement/Models/MessageInfo.cs b/Diner/AbstractShopListImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..19fde4e --- /dev/null +++ b/Diner/AbstractShopListImplement/Models/MessageInfo.cs @@ -0,0 +1,66 @@ +using DinerContracts.BindingModels; +using DinerContracts.ViewModels; +using DinerDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerListImplement.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 MessageInfo() + { + MessageId = model.MessageId, + ClientId = model.ClientId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + Subject = model.Subject, + Body = model.Body + }; + } + public void Update(MessageInfoBindingModel? model) + { + if (model == null) + { + return; + } + + MessageId = model.MessageId; + ClientId = model.ClientId; + SenderName = model.SenderName; + DateDelivery = model.DateDelivery; + Subject = model.Subject; + Body = model.Body; + } + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + DateDelivery = DateDelivery, + Subject = Subject, + Body = Body + }; + } +} diff --git a/Diner/Diner/App.config b/Diner/Diner/App.config new file mode 100644 index 0000000..336f029 --- /dev/null +++ b/Diner/Diner/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Diner/Diner/FormMails.Designer.cs b/Diner/Diner/FormMails.Designer.cs new file mode 100644 index 0000000..ce5b67e --- /dev/null +++ b/Diner/Diner/FormMails.Designer.cs @@ -0,0 +1,64 @@ +using System.Windows.Forms; + +namespace Diner +{ + 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.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Fill; + dataGridView.Location = new Point(0, 0); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(800, 450); + dataGridView.TabIndex = 0; + // + // FormMails + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(dataGridView); + Name = "FormMails"; + Text = "Письма"; + Load += FormMails_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/Diner/Diner/FormMails.cs b/Diner/Diner/FormMails.cs new file mode 100644 index 0000000..4a29d12 --- /dev/null +++ b/Diner/Diner/FormMails.cs @@ -0,0 +1,59 @@ +using DinerContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +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 Diner +{ + public partial class FormMails : Form + { + private readonly ILogger _logger; + + private readonly IMessageInfoLogic _messageLogic; + + public FormMails(ILogger logger, IMessageInfoLogic messageLogic) + { + InitializeComponent(); + + _logger = logger; + _messageLogic = messageLogic; + } + + private void FormMails_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + _logger.LogInformation("Загрузка писем"); + + try + { + var list = _messageLogic.ReadList(null); + + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + + _logger.LogInformation("Успешная загрузка писем"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки писем"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/Diner/Diner/FormMails.resx b/Diner/Diner/FormMails.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Diner/Diner/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/Diner/Diner/FormMain.Designer.cs b/Diner/Diner/FormMain.Designer.cs index f0eb3da..97f758d 100644 --- a/Diner/Diner/FormMain.Designer.cs +++ b/Diner/Diner/FormMain.Designer.cs @@ -43,8 +43,9 @@ listComponentsToolStripMenuItem = new ToolStripMenuItem(); componentSnacksToolStripMenuItem = new ToolStripMenuItem(); ordersToolStripMenuItem = new ToolStripMenuItem(); - workWithClientsToolStripMenuItem = new ToolStripMenuItem(); toolStripDropDownButton1 = new ToolStripDropDownButton(); + workWithClientsToolStripMenuItem = new ToolStripMenuItem(); + toolStripDropDownButtonMails = new ToolStripDropDownButton(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); toolStrip.SuspendLayout(); SuspendLayout(); @@ -93,7 +94,7 @@ // toolStrip // toolStrip.ImageScalingSize = new Size(20, 20); - toolStrip.Items.AddRange(new ToolStripItem[] { manualsToolStripLabel, manualsStripDropDownButton, toolStripDropDownButton1 }); + toolStrip.Items.AddRange(new ToolStripItem[] { manualsToolStripLabel, manualsStripDropDownButton, toolStripDropDownButton1, toolStripDropDownButtonMails }); toolStrip.Location = new Point(0, 0); toolStrip.Name = "toolStrip"; toolStrip.Size = new Size(1280, 27); @@ -110,28 +111,28 @@ // componentsToolStripMenuItem // componentsToolStripMenuItem.Name = "componentsToolStripMenuItem"; - componentsToolStripMenuItem.Size = new Size(224, 26); + componentsToolStripMenuItem.Size = new Size(185, 26); componentsToolStripMenuItem.Text = "Компоненты"; componentsToolStripMenuItem.Click += ComponentToolStripMenuItem_Click; // // snacksToolStripMenuItem // snacksToolStripMenuItem.Name = "snacksToolStripMenuItem"; - snacksToolStripMenuItem.Size = new Size(224, 26); + snacksToolStripMenuItem.Size = new Size(185, 26); snacksToolStripMenuItem.Text = "Закуски"; snacksToolStripMenuItem.Click += ProductToolStripMenuItem_Click; // // clientsToolStripMenuItem // clientsToolStripMenuItem.Name = "clientsToolStripMenuItem"; - clientsToolStripMenuItem.Size = new Size(224, 26); + clientsToolStripMenuItem.Size = new Size(185, 26); clientsToolStripMenuItem.Text = "Клиенты"; clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(224, 26); + исполнителиToolStripMenuItem.Size = new Size(185, 26); исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click; // @@ -163,11 +164,6 @@ ordersToolStripMenuItem.Text = "Список заказов"; ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // - // workWithClientsToolStripMenuItem - // - workWithClientsToolStripMenuItem.Name = "workWithClientsToolStripMenuItem"; - workWithClientsToolStripMenuItem.Size = new Size(32, 19); - // // toolStripDropDownButton1 // toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text; @@ -178,6 +174,21 @@ toolStripDropDownButton1.Text = "Запуск работ"; toolStripDropDownButton1.Click += WorkProcessToolStripDropDownButton1_Click; // + // workWithClientsToolStripMenuItem + // + workWithClientsToolStripMenuItem.Name = "workWithClientsToolStripMenuItem"; + workWithClientsToolStripMenuItem.Size = new Size(32, 19); + // + // toolStripDropDownButtonMails + // + toolStripDropDownButtonMails.DisplayStyle = ToolStripItemDisplayStyle.Text; + toolStripDropDownButtonMails.Image = (Image)resources.GetObject("toolStripDropDownButtonMails.Image"); + toolStripDropDownButtonMails.ImageTransparentColor = Color.Magenta; + toolStripDropDownButtonMails.Name = "toolStripDropDownButtonMails"; + toolStripDropDownButtonMails.Size = new Size(77, 24); + toolStripDropDownButtonMails.Text = "Письма"; + toolStripDropDownButtonMails.Click += WorkProcessToolStripDropDownButtonMails_Click; + // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -216,5 +227,6 @@ private ToolStripMenuItem clientsToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripDropDownButton toolStripDropDownButton1; + private ToolStripDropDownButton toolStripDropDownButtonMails; } } \ No newline at end of file diff --git a/Diner/Diner/FormMain.cs b/Diner/Diner/FormMain.cs index 53bb1bf..e5a8eaa 100644 --- a/Diner/Diner/FormMain.cs +++ b/Diner/Diner/FormMain.cs @@ -159,5 +159,14 @@ namespace Diner MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } + private void WorkProcessToolStripDropDownButtonMails_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + + if (service is FormMails form) + { + form.ShowDialog(); + } + } } } diff --git a/Diner/Diner/FormMain.resx b/Diner/Diner/FormMain.resx index 5b7c32f..6602630 100644 --- a/Diner/Diner/FormMain.resx +++ b/Diner/Diner/FormMain.resx @@ -1,4 +1,64 @@ - + + + @@ -62,6 +122,17 @@ + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw + 6CYmNoMYJJ0NBiFFIoIytOuf0+TeXP3yde+iyS+3OcP53Z4y3/dJJ4HAsiwyTVMp6BQCBIZhKAWdEcHV + vSlBmeB82NFy1KLluEWOPRC5MoHdMWhazwi4RJlALgf4EuT6BI+5kCsTrGddUY658E+QvyXYHq9UnRyC + U87f4aUApcXhnrI9Jzg/laQKFntXlHM+lSQK5psL5fvbp/JvJLGCQqmSWM5JkiCT84igXGtSrruKLQ0T + luAdmZxHBG37FFuWBC/j5XKOmX8WAH7rcI6ZMffPgjQwN2bXJgDo/COBTpjneQ2dML0PY3cISreGe8HM + qgAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEISURBVEhL3ZErDsJAGIR7DlA47oArV8CDR9RiSDAQPBcA diff --git a/Diner/Diner/Program.cs b/Diner/Diner/Program.cs index 9c90461..aca355a 100644 --- a/Diner/Diner/Program.cs +++ b/Diner/Diner/Program.cs @@ -7,7 +7,8 @@ using NLog.Extensions.Logging; using DinerBusinessLogic.BusinessLogics; using DinerBusinessLogic.OfficePackage; using DinerBusinessLogic.OfficePackage.Implements; -using DinerListImplement.Implements; +using DinerBusinessLogic.MailWorker; +using DinerContracts.BindingModels; namespace Diner { @@ -27,7 +28,28 @@ namespace Diner 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"]) + }); + + 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 ConfigureServices(ServiceCollection services) { @@ -41,17 +63,19 @@ namespace Diner services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); - services.AddTransient(); + 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(); @@ -67,6 +91,8 @@ namespace Diner services.AddTransient(); services.AddTransient(); services.AddTransient(); - } - } + services.AddTransient(); + } + private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + } } \ No newline at end of file diff --git a/Diner/DinerClientApp/Controllers/HomeController.cs b/Diner/DinerClientApp/Controllers/HomeController.cs index 6f05959..4114bc4 100644 --- a/Diner/DinerClientApp/Controllers/HomeController.cs +++ b/Diner/DinerClientApp/Controllers/HomeController.cs @@ -163,5 +163,15 @@ namespace DinerClientApp.Controllers return count * (_snack?.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/Diner/DinerClientApp/Views/Home/Mails.cshtml b/Diner/DinerClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..200577e --- /dev/null +++ b/Diner/DinerClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,51 @@ +@using DinerContracts.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) +
+ } +
diff --git a/Diner/DinerClientApp/Views/Shared/_Layout.cshtml b/Diner/DinerClientApp/Views/Shared/_Layout.cshtml index 3ae117a..cfb700d 100644 --- a/Diner/DinerClientApp/Views/Shared/_Layout.cshtml +++ b/Diner/DinerClientApp/Views/Shared/_Layout.cshtml @@ -27,6 +27,9 @@
  • Личные данные
    • +
  • + Письма +
  • Вход
    • diff --git a/Diner/DinerDataBaseImplement/DinerDatabase.cs b/Diner/DinerDataBaseImplement/DinerDatabase.cs index 17479f6..43c4d45 100644 --- a/Diner/DinerDataBaseImplement/DinerDatabase.cs +++ b/Diner/DinerDataBaseImplement/DinerDatabase.cs @@ -19,5 +19,6 @@ namespace DinerDataBaseImplement 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/Diner/DinerDataBaseImplement/Implements/MessageInfoStorage.cs b/Diner/DinerDataBaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..63f0116 --- /dev/null +++ b/Diner/DinerDataBaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,61 @@ +using DinerContracts.BindingModels; +using DinerContracts.SearchModels; +using DinerContracts.StoragesContracts; +using DinerContracts.ViewModels; +using DinerDataBaseImplement.Models; + +namespace DinerDataBaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (string.IsNullOrEmpty(model.MessageId)) + { + return null; + } + + using var context = new DinerDatabase(); + + return context.Messages + .FirstOrDefault(x => (x.MessageId == model.MessageId)) + ?.GetViewModel; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + using var context = new DinerDatabase(); + + return context.Messages + .Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + using var context = new DinerDatabase(); + + return context.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + using var context = new DinerDatabase(); + + var newMessage = MessageInfo.Create(model); + + if (newMessage == null) + { + return null; + } + + context.Messages.Add(newMessage); + context.SaveChanges(); + + return newMessage.GetViewModel; + } + } +} diff --git a/Diner/DinerDataBaseImplement/Models/Client.cs b/Diner/DinerDataBaseImplement/Models/Client.cs index 8d6d159..0e294f2 100644 --- a/Diner/DinerDataBaseImplement/Models/Client.cs +++ b/Diner/DinerDataBaseImplement/Models/Client.cs @@ -26,8 +26,11 @@ namespace DinerDataBaseImplement.Models [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); + [ForeignKey("ClientId")] + public virtual List MessageInfos { get; set; } = new(); - public static Client? Create(ClientBindingModel model) + + public static Client? Create(ClientBindingModel model) { if (model == null) { diff --git a/Diner/DinerDataBaseImplement/Models/MessageInfo.cs b/Diner/DinerDataBaseImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..1561811 --- /dev/null +++ b/Diner/DinerDataBaseImplement/Models/MessageInfo.cs @@ -0,0 +1,62 @@ +using DinerContracts.BindingModels; +using DinerContracts.ViewModels; +using DinerDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DinerDataBaseImplement.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; + + public virtual Client? Client { get; set; } + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + + return new MessageInfo() + { + MessageId = model.MessageId, + ClientId = model.ClientId, + SenderName = model.SenderName, + Body = model.Body, + DateDelivery = model.DateDelivery, + Subject = model.Subject + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + Body = Body, + DateDelivery = DateDelivery, + Subject = Subject + }; + } +} diff --git a/Diner/DinerFileImplement/DataFileSingleton.cs b/Diner/DinerFileImplement/DataFileSingleton.cs index 0ea0996..f30e1e4 100644 --- a/Diner/DinerFileImplement/DataFileSingleton.cs +++ b/Diner/DinerFileImplement/DataFileSingleton.cs @@ -1,5 +1,12 @@ -using DinerFileImplement.Models; +using DinerDataBaseImplement.Models; +using DinerFileImplement.Models; using System.Xml.Linq; +using Client = DinerFileImplement.Models.Client; +using Component = DinerFileImplement.Models.Component; +using Implementer = DinerFileImplement.Models.Implementer; +using Order = DinerFileImplement.Models.Order; +using Snack = DinerFileImplement.Models.Snack; + namespace DinerFileImplement { @@ -11,12 +18,14 @@ namespace DinerFileImplement private readonly string ProductFileName = "Snack.xml"; private readonly string ClientFileName = "Client.xml"; private readonly string ImplementerFileName = "Implementer.xml"; - public List Components { get; private set; } + private readonly string MessageFileName = "Message.xml"; + public List Components { get; private set; } public List Orders { get; private set; } public List Snacks { get; private set; } public List Clients { get; private set; } public List Implementers { get; private set; } - public static DataFileSingleton GetInstance() + public List Messages { get; private set; } + public static DataFileSingleton GetInstance() { if (instance == null) { @@ -29,14 +38,16 @@ namespace DinerFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); - private DataFileSingleton() + public void SaveMessages() => SaveData(Messages, MessageFileName, "Messages", x => x.GetXElement); + private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Snacks = LoadData(ProductFileName, "Snack", x => Snack.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; - } + Messages = LoadData(MessageFileName, "Messages", x => MessageInfo.Create(x)!)!; + } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { if (File.Exists(filename)) diff --git a/Diner/DinerFileImplement/Models/MessageInfo.cs b/Diner/DinerFileImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..1992938 --- /dev/null +++ b/Diner/DinerFileImplement/Models/MessageInfo.cs @@ -0,0 +1,88 @@ +using DinerContracts.BindingModels; +using DinerContracts.ViewModels; +using DinerDataModels.Models; +using DinerFileImplement.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + + +namespace DinerDataBaseImplement.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; + + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + + return new MessageInfo() + { + MessageId = model.MessageId, + ClientId = model.ClientId, + SenderName = model.SenderName, + Body = model.Body, + DateDelivery = model.DateDelivery, + Subject = model.Subject + }; + } + 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() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + Body = Body, + DateDelivery = DateDelivery, + Subject = Subject + }; + 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/Diner/DinerRestApi/Controllers/ClientController.cs b/Diner/DinerRestApi/Controllers/ClientController.cs index 5d1ff6f..db12f1f 100644 --- a/Diner/DinerRestApi/Controllers/ClientController.cs +++ b/Diner/DinerRestApi/Controllers/ClientController.cs @@ -13,11 +13,13 @@ namespace DinerRestApi.Controllers private readonly ILogger _logger; private readonly IClientLogic _logic; + private readonly IMessageInfoLogic _mailLogic; - public ClientController(IClientLogic logic, ILogger logger) + public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger logger) { _logger = logger; _logic = logic; + _mailLogic = mailLogic; } [HttpGet] @@ -65,5 +67,21 @@ namespace DinerRestApi.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/Diner/DinerRestApi/Program.cs b/Diner/DinerRestApi/Program.cs index 12e5e8a..65379b2 100644 --- a/Diner/DinerRestApi/Program.cs +++ b/Diner/DinerRestApi/Program.cs @@ -3,6 +3,8 @@ using DinerContracts.BusinessLogicsContracts; using DinerContracts.StoragesContracts; using DinerDataBaseImplement.Implements; using Microsoft.OpenApi.Models; +using DinerBusinessLogic.MailWorker; +using DinerContracts.BindingModels; var builder = WebApplication.CreateBuilder(args); @@ -14,11 +16,15 @@ 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 @@ -30,6 +36,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/Diner/DinerRestApi/appsettings.json b/Diner/DinerRestApi/appsettings.json index 10f68b8..e2bc0fe 100644 --- a/Diner/DinerRestApi/appsettings.json +++ b/Diner/DinerRestApi/appsettings.json @@ -5,5 +5,11 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "SmtpClientHost": "smtp.gmail.com", + "SmtpClientPort": "587", + "PopHost": "pop.gmail.com", + "PopPort": "995", + "MailLogin": "labwork07pass@gmail.com", + "MailPassword": "passlab07" }