diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs index 240bff3..a08eeec 100644 --- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs +++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -12,79 +12,111 @@ using System.Threading.Tasks; namespace PizzeriaBusinessLogic.BusinessLogics { - public class MessageInfoLogic : IMessageInfoLogic - { - private readonly ILogger _logger; - private readonly IMessageInfoStorage _messageInfoStorage; - private readonly IClientStorage _clientStorage; - public MessageInfoLogic(ILogger logger, IMessageInfoStorage messageInfoStorage, IClientStorage clientStorage) - { - _logger = logger; - _messageInfoStorage = messageInfoStorage; - _clientStorage = clientStorage; - } - 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; - } - public bool Create(MessageInfoBindingModel model) - { - CheckModel(model); - if (_messageInfoStorage.Insert(model) == null) - { - _logger.LogWarning("Insert operation failed"); - return false; - } - return true; - } - private void CheckModel(MessageInfoBindingModel model, bool withParams = true) - { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } - if (!withParams) - { - return; - } - if (string.IsNullOrEmpty(model.MessageId)) - { - throw new ArgumentNullException("Не указан id сообщения", nameof(model.MessageId)); - } - if (string.IsNullOrEmpty(model.SenderName)) - { - throw new ArgumentNullException("Не указао почта", nameof(model.SenderName)); - } - if (string.IsNullOrEmpty(model.Subject)) - { - throw new ArgumentNullException("Не указана тема", nameof(model.Subject)); - } - if (string.IsNullOrEmpty(model.Body)) - { - throw new ArgumentNullException("Не указан текст сообщения", nameof(model.Subject)); - } + public class MessageInfoLogic : IMessageInfoLogic + { + private readonly ILogger _logger; + private readonly IMessageInfoStorage _messageInfoStorage; + private readonly IClientStorage _clientStorage; + public MessageInfoLogic(ILogger logger, IMessageInfoStorage messageInfoStorage, IClientStorage clientStorage) + { + _logger = logger; + _messageInfoStorage = messageInfoStorage; + _clientStorage = clientStorage; + } + public List? ReadList(MessageInfoSearchModel? model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId}.PageLength:{PageLength}.PageCount:{PageIndex}", model?.MessageId, model?.ClientId, model?.PageLength, model?.PageIndex); + var list = _messageInfoStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + public bool Create(MessageInfoBindingModel model) + { + CheckModel(model); + var message = _messageInfoStorage.Insert(model); + if (message == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + private void CheckModel(MessageInfoBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (string.IsNullOrEmpty(model.MessageId)) + { + throw new ArgumentNullException("Не указан id сообщения", nameof(model.MessageId)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.SenderName)) + { + throw new ArgumentNullException("Не указао имя отправителя(электронная почта)", nameof(model.SenderName)); + } + if (string.IsNullOrEmpty(model.Subject)) + { + throw new ArgumentNullException("Не указана темма", nameof(model.Subject)); + } + if (string.IsNullOrEmpty(model.Body)) + { + throw new ArgumentNullException("Не указан текст сообщения", nameof(model.Subject)); + } + _logger.LogInformation("MessageInfo. MessageId:{MessageId}.SenderName:{SenderName}.Subject:{Subject}.Body:{Body}", model.MessageId, model.SenderName, model.Subject, model.Body); + var element = _clientStorage.GetElement(new ClientSearchModel + { + Email = model.SenderName + }); + if (element == null) + { + _logger.LogWarning("Не удалоссь найти клиента, отправившего письмо с адреса Email:{Email}", model.SenderName); + } + else + { + model.ClientId = element.Id; + } + } - _logger.LogInformation("MessageInfo. MessageId:{MessageId}.SenderName:{SenderName}.Subject:{Subject}.Body:{Body}", model.MessageId, model.SenderName, model.Subject, model.Body); - var element = _clientStorage.GetElement(new ClientSearchModel - { - Email = model.SenderName - }); - if (element == null) - { - _logger.LogWarning("Не удалоссь найти клиента, отправившего письмо с адреса Email:{Email}", model.SenderName); - } - else - { - model.ClientId = element.Id; - } - } - } -} + public MessageInfoViewModel? ReadElement(MessageInfoSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. MessageId:{MessageId}", model?.MessageId); + var element = _messageInfoStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.MessageId); + return element; + } + + public bool Update(MessageInfoBindingModel model) + { + CheckModel(model, withParams: false); + if (_messageInfoStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + } +} \ No newline at end of file diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs index 8f7f7ba..aaa5f24 100644 --- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs @@ -17,13 +17,12 @@ namespace PizzeriaBusinessLogic.BusinessLogics private readonly AbstractMailWorker _mailWorker; static readonly object _locker = new object(); private readonly IShopStorage _shopStorage; - - public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage, AbstractMailWorker mailWorker) { _logger = logger; _orderStorage = orderStorage; - _mailWorker = mailWorker; _shopStorage = shopStorage; + _mailWorker = mailWorker; } public OrderViewModel? ReadElement(OrderSearchModel model) @@ -96,7 +95,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics { lock (_locker) { - model = FillOrderBindingModel(model); + (model, var element) = FillOrderBindingModel(model); if (model.Status != OrderStatus.Готов && model.Status != OrderStatus.Ожидает) { _logger.LogWarning("Changing status operation faled: Current-{Status}:required-Выдан.", model.Status); @@ -108,14 +107,16 @@ namespace PizzeriaBusinessLogic.BusinessLogics Count = model.Count })) { - if (model.Status == OrderStatus.Готов || model.Status == OrderStatus.Ожидает) + if (model.Status == OrderStatus.Готов) { model.Status = OrderStatus.Ожидает; - return UpdateOrder(model); + + UpdateOrder(model, element); } + throw new ArgumentException("Недостаточно места в магазинах для поставки"); } model.Status = OrderStatus.Выдан; - return UpdateOrder(model); + return UpdateOrder(model, element); } } @@ -146,20 +147,20 @@ namespace PizzeriaBusinessLogic.BusinessLogics } private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus) { - model = FillOrderBindingModel(model); + (model, var element) = FillOrderBindingModel(model); if (requiredStatus - model.Status == 1) { model.Status = requiredStatus; if (model.Status == OrderStatus.Готов) model.DateImplement = DateTime.Now; - return UpdateOrder(model); + return UpdateOrder(model, element); } _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus); throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}"); } - private OrderBindingModel FillOrderBindingModel(OrderBindingModel model) + private (OrderBindingModel, OrderViewModel) FillOrderBindingModel(OrderBindingModel model) { CheckModel(model, false); var element = _orderStorage.GetElement(new OrderSearchModel() @@ -175,41 +176,17 @@ namespace PizzeriaBusinessLogic.BusinessLogics model.PizzaId = element.PizzaId; model.DateImplement = element.DateImplement; model.ClientId = element.ClientId; + model.Status = element.Status; + model.Count = element.Count; + model.Sum = element.Sum; if (!model.ImplementerId.HasValue) { model.ImplementerId = element.ImplementerId; } - model.Status = element.Status; - model.Count = element.Count; - model.Sum = element.Sum; - if (requiredStatus - model.Status == 1) - { - model.Status = requiredStatus; - if (model.Status == OrderStatus.Готов) - { - model.DateImplement = DateTime.Now; - } - if (_orderStorage.Update(model) == null) - { - _logger.LogWarning("Update operation failed"); - return false; - } - string DateInfo = model.DateImplement.HasValue ? $"Дата выполнения {model.DateImplement}" : ""; - Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel - { - MailAddress = element.ClientEmail, - Subject = $"Изменение статуса заказа номер {element.Id}", - Text = $"Ваш заказ номер {element.Id} на пиццу {element.PizzaName} от {element.DateCreate} на сумму {element.Sum} {model.Status}. {DateInfo}" - })); - return true; - } - _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus); - throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}"); - } - return model; + return (model, element); } - private bool UpdateOrder(OrderBindingModel model) + private bool UpdateOrder(OrderBindingModel model, OrderViewModel MailNotificationModel) { if (_orderStorage.Update(model) == null) { @@ -217,6 +194,14 @@ namespace PizzeriaBusinessLogic.BusinessLogics return false; } _logger.LogWarning("Update operation sucsess"); + string DateInfo = model.DateImplement.HasValue ? $"Дата выполнения {model.DateImplement}" : ""; + Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel + { + MailAddress = MailNotificationModel.ClientEmail, + Subject = $"Изменение статуса заказа номер {MailNotificationModel.Id}", + Text = $"Ваш заказ номер {MailNotificationModel.Id} на изделие {MailNotificationModel.PizzaName} от" + + $" {MailNotificationModel.DateCreate} на сумму {MailNotificationModel.Sum} {model.Status}. {DateInfo}" + })); return true; } } diff --git a/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs b/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs index ea79d1b..1744b18 100644 --- a/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs +++ b/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -9,77 +9,121 @@ using System.Threading.Tasks; namespace PizzeriaBusinessLogic.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 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.Length, _smtpClientHost, _smtpClientPort, _popHost, _popPort); - } - public async void MailSendAsync(MailSendInfoBindingModel info) - { - if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) - { - return; - } + 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.Length, _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(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } - if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text)) - { - 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; - } + _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 (string.IsNullOrEmpty(_popHost) || _popPort == 0) + { + return; + } - if (_messageInfoLogic == null) - { - 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(); - } + var list = await ReceiveMailAsync(); + _logger.LogDebug("Check Mail: {Count} new mails", list.Count); + foreach (var mail in list) + { + _messageInfoLogic.Create(mail); + } + } + + public async void MailSendReplyAsync(MailReplySendInfoBindingModel 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) || string.IsNullOrEmpty(info.ParentMessageId)) + { + return; + } + + _logger.LogDebug("Send Mail as reply: {To}, {Subject}, {parentId}", info.MailAddress, info.Subject, info.ParentMessageId); + + string? messageId = await SendMailAsync(info); + if (string.IsNullOrEmpty(messageId)) + { + throw new InvalidOperationException("Непредвиденная ошибка при отправке сообщения в ответ"); + } + if (_messageInfoLogic.Create(new MessageInfoBindingModel + { + MessageId = messageId, + DateDelivery = DateTime.Now, + SenderName = _mailLogin, + IsReply = true, + Subject = info.Subject, + Body = info.Text, + })) + { + _messageInfoLogic.Update(new MessageInfoBindingModel() + { + MessageId = info.ParentMessageId, + ReplyMessageId = messageId, + IsReaded = true + }); + } + } + + protected abstract Task SendMailAsync(MailSendInfoBindingModel info); + protected abstract Task> ReceiveMailAsync(); + } } diff --git a/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs b/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs index c6a170c..ef05116 100644 --- a/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs +++ b/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs @@ -13,70 +13,92 @@ using System.Threading.Tasks; namespace PizzeriaBusinessLogic.MailWorker { - public class MailKitWorker : AbstractMailWorker - { - public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { } + 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; + protected override async Task SendMailAsync(MailSendInfoBindingModel info) + { + string? resount = null; + using var objMailMessage = new MailMessage(); + using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort); + try + { + ConfigurateSmtpClient(objSmtpClient); + CreateMessage(objMailMessage, info); - objSmtpClient.UseDefaultCredentials = false; - objSmtpClient.EnableSsl = true; - objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; - objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + if (info is MailReplySendInfoBindingModel replyInfo) + { + objMailMessage.Headers.Add("In-Reply-To", replyInfo.ParentMessageId); + objMailMessage.Headers.Add("References", replyInfo.ParentMessageId); - await Task.Run(() => objSmtpClient.Send(objMailMessage)); - } - catch (Exception) - { - throw; - } - } + string messageGuid = Guid.NewGuid().ToString(); + objMailMessage.Headers.Add("Message-Id", messageGuid); + resount = messageGuid; + } - 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; - } - } + await Task.Run(() => objSmtpClient.Send(objMailMessage)); + } + catch (Exception) + { + throw; + } + return resount; + } + + 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; + } + + private void CreateMessage(MailMessage objMailMessage, MailSendInfoBindingModel info) + { + 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; + } + + private void ConfigurateSmtpClient(SmtpClient objSmtpClient) + { + + objSmtpClient.UseDefaultCredentials = false; + objSmtpClient.EnableSsl = true; + objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; + objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + } + } } diff --git a/Pizzeria/PizzeriaClientApp/APIClient.cs b/Pizzeria/PizzeriaClientApp/APIClient.cs index a929777..2e0f165 100644 --- a/Pizzeria/PizzeriaClientApp/APIClient.cs +++ b/Pizzeria/PizzeriaClientApp/APIClient.cs @@ -11,6 +11,8 @@ namespace PizzeriaClientApp public static ClientViewModel? Client { get; set; } = null; + public static int MailPage { get; set; } = 1; + public static void Connect(IConfiguration configuration) { _client.BaseAddress = new Uri(configuration["IPAddress"]); diff --git a/Pizzeria/PizzeriaClientApp/Controllers/HomeController.cs b/Pizzeria/PizzeriaClientApp/Controllers/HomeController.cs index 36aa238..91effaf 100644 --- a/Pizzeria/PizzeriaClientApp/Controllers/HomeController.cs +++ b/Pizzeria/PizzeriaClientApp/Controllers/HomeController.cs @@ -145,13 +145,15 @@ namespace PizzeriaClientApp.Controllers } [HttpGet] - public IActionResult Mails() + public IActionResult Mails(int page = 1) { if (APIClient.Client == null) { return Redirect("~/Home/Enter"); } - return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); + + page = Math.Max(page, 1); + return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}&page={page}")); } } } diff --git a/Pizzeria/PizzeriaClientApp/Views/Home/Mails.cshtml b/Pizzeria/PizzeriaClientApp/Views/Home/Mails.cshtml index 3ae6350..dd57b3e 100644 --- a/Pizzeria/PizzeriaClientApp/Views/Home/Mails.cshtml +++ b/Pizzeria/PizzeriaClientApp/Views/Home/Mails.cshtml @@ -1,6 +1,7 @@ -@using PizzeriaContracts.ViewModels +@using PizzeriaContracts.ViewModels @model List +@Url.ActionContext.RouteData.Values["page"] @{ ViewData["Title"] = "Mails"; @@ -51,5 +52,31 @@ } +
+ @{ + int page; + if (Context.Request.Query.TryGetValue("page", out var pageValue) && !string.IsNullOrEmpty(pageValue)) + { + page = int.Parse(pageValue); + } + else + { + page = 1; + } +
+ +
+ if (page > 1) + { + <- + } + else + { +

<-

+ } + + -> + } +
} \ No newline at end of file diff --git a/Pizzeria/PizzeriaContracts/BindingModels/MailReplySendInfoBindingModel.cs b/Pizzeria/PizzeriaContracts/BindingModels/MailReplySendInfoBindingModel.cs new file mode 100644 index 0000000..63f0f5a --- /dev/null +++ b/Pizzeria/PizzeriaContracts/BindingModels/MailReplySendInfoBindingModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaContracts.BindingModels +{ + public class MailReplySendInfoBindingModel : MailSendInfoBindingModel + { + public string ParentMessageId { get; set; } = string.Empty; + } +} diff --git a/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs b/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs index c941389..4b305d9 100644 --- a/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs +++ b/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs @@ -7,13 +7,16 @@ using System.Threading.Tasks; namespace PizzeriaContracts.BindingModels { - public class MessageInfoBindingModel : IMessageInfoModel - { - public string MessageId { get; set; } = string.Empty; - public int? ClientId { get; set; } - public string SenderName { get; set; } = string.Empty; - public string Subject { get; set; } = string.Empty; - public string Body { get; set; } = string.Empty; - public DateTime DateDelivery { get; set; } - } + public class MessageInfoBindingModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + public int? ClientId { get; set; } + public string SenderName { get; set; } = string.Empty; + public string Subject { get; set; } = string.Empty; + public string Body { get; set; } = string.Empty; + public DateTime DateDelivery { get; set; } + public bool IsReaded { get; set; } + public string? ReplyMessageId { get; set; } + public bool IsReply { get; set; } + } } diff --git a/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs index cdf8815..72b3c86 100644 --- a/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs +++ b/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -9,9 +9,11 @@ using System.Threading.Tasks; namespace PizzeriaContracts.BusinessLogicsContracts { - public interface IMessageInfoLogic - { - List? ReadList(MessageInfoSearchModel? model); - bool Create(MessageInfoBindingModel model); - } + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + MessageInfoViewModel? ReadElement(MessageInfoSearchModel model); + bool Create(MessageInfoBindingModel model); + bool Update(MessageInfoBindingModel model); + } } diff --git a/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs b/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs index b2f00e8..c7b999d 100644 --- a/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs +++ b/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs @@ -6,9 +6,11 @@ using System.Threading.Tasks; namespace PizzeriaContracts.SearchModels { - public class MessageInfoSearchModel - { - public int? ClientId { get; set; } - public string? MessageId { get; set; } - } + public class MessageInfoSearchModel + { + public int? ClientId { get; set; } + public string? MessageId { get; set; } + public int? PageLength { get; set; } + public int? PageIndex { get; set; } + } } diff --git a/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs b/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs index bd2eca5..e3d9aae 100644 --- a/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs +++ b/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs @@ -9,11 +9,12 @@ using System.Threading.Tasks; namespace PizzeriaContracts.StoragesContracts { - public interface IMessageInfoStorage - { - List GetFullList(); - List GetFilteredList(MessageInfoSearchModel model); - MessageInfoViewModel? GetElement(MessageInfoSearchModel model); - MessageInfoViewModel? Insert(MessageInfoBindingModel model); - } + public interface IMessageInfoStorage + { + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + MessageInfoViewModel? Update(MessageInfoBindingModel model); + } } diff --git a/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs b/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs index b47a3de..c27adbc 100644 --- a/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs +++ b/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs @@ -8,22 +8,31 @@ using System.Threading.Tasks; namespace PizzeriaContracts.ViewModels { - public class MessageInfoViewModel : IMessageInfoModel - { - public string MessageId { get; set; } = string.Empty; + public class MessageInfoViewModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; - public int? ClientId { get; set; } + public int? ClientId { get; set; } - [DisplayName("Отправитель")] - public string SenderName { get; set; } = string.Empty; + [DisplayName("Отправитель")] + public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата письма")] - public DateTime DateDelivery { get; set; } + [DisplayName("Дата письма")] + public DateTime DateDelivery { get; set; } - [DisplayName("Заголовок")] - public string Subject { get; set; } = string.Empty; + [DisplayName("Заголовок")] + public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] - public string Body { get; set; } = string.Empty; - } + [DisplayName("Текст")] + public string Body { get; set; } = string.Empty; + + [DisplayName("Прочитанно")] + public bool IsReaded { get; set; } + + public string? ReplyMessageId { get; set; } + + public IMessageInfoModel? Reply { get; set; } + + public bool IsReply { get; set; } + } } diff --git a/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs b/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs index 139e615..05d26e5 100644 --- a/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs +++ b/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs @@ -6,13 +6,16 @@ using System.Threading.Tasks; namespace PizzeriaDataModels.Models { - public interface IMessageInfoModel - { - string MessageId { get; } - int? ClientId { get; } - string SenderName { get; } - DateTime DateDelivery { get; } - string Subject { get; } - string Body { get; } - } + public interface IMessageInfoModel + { + string MessageId { get; } + int? ClientId { get; } + string SenderName { get; } + DateTime DateDelivery { get; } + string Subject { get; } + string Body { get; } + bool IsReaded { get; } + string? ReplyMessageId { get; } + bool IsReply { get; } + } } diff --git a/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs b/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs index a40c60d..b248003 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs @@ -11,42 +11,72 @@ using System.Threading.Tasks; namespace PizzeriaDatabaseImplement.Implements { - public class MessageInfoStorage : IMessageInfoStorage - { - public List GetFullList() - { - using var context = new PizzeriaDatabase(); - return context.MessageInfos.Select(x => x.GetViewModel).ToList(); - } - public List GetFilteredList(MessageInfoSearchModel model) - { - if (!model.ClientId.HasValue) - { - return new(); - } - using var context = new PizzeriaDatabase(); - return context.MessageInfos.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); - } - public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) - { - if (string.IsNullOrEmpty(model.MessageId)) - { - return new(); - } - using var context = new PizzeriaDatabase(); - return context.MessageInfos.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; - } - public MessageInfoViewModel? Insert(MessageInfoBindingModel model) - { - var newMessage = MessageInfo.Create(model); - if (newMessage == null) - { - return null; - } - using var context = new PizzeriaDatabase(); - context.MessageInfos.Add(newMessage); - context.SaveChanges(); - return newMessage.GetViewModel; - } - } + public class MessageInfoStorage : IMessageInfoStorage + { + public List GetFullList() + { + using var context = new PizzeriaDatabase(); + return context.MessageInfos.Select(x => x.GetViewModel).ToList(); + } + public List GetFilteredList(MessageInfoSearchModel model) + { + if (!model.ClientId.HasValue && !model.PageLength.HasValue && !model.PageIndex.HasValue) + { + return new(); + } + using var context = new PizzeriaDatabase(); + IEnumerable request = context.MessageInfos.Where(x => !x.IsReply); + if (model.ClientId.HasValue) + request = request.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId); + if (model.PageLength.HasValue) + { + int skipRows = model.PageIndex.HasValue ? (model.PageIndex.Value - 1) * model.PageLength.Value : 0; + request = request.Skip(skipRows).Take(model.PageLength.Value); + } + + return request.Select(x => x.GetViewModel).ToList(); + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (string.IsNullOrEmpty(model.MessageId)) + { + return new(); + } + using var context = new PizzeriaDatabase(); + return context.MessageInfos.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; + } + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + using var context = new PizzeriaDatabase(); + try + { + context.MessageInfos.Add(newMessage); + context.SaveChanges(); + return newMessage.GetViewModel; + } + catch (Exception ex) + { + return null; + } + } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + using var context = new PizzeriaDatabase(); + var message = context.MessageInfos.FirstOrDefault(x => x.MessageId == model.MessageId); + if (message == null) + { + return null; + } + message.Update(context, model); + context.SaveChanges(); + return message.GetViewModel; + } + } } diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20240402204158_Update.Designer.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20240402204158_Update.Designer.cs new file mode 100644 index 0000000..f15d894 --- /dev/null +++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20240402204158_Update.Designer.cs @@ -0,0 +1,392 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using PizzeriaDatabaseImplement; + +#nullable disable + +namespace PizzeriaDatabaseImplement.Migrations +{ + [DbContext(typeof(PizzeriaDatabase))] + [Migration("20240402204158_Update")] + partial class Update + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Cost") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Components"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Implementer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ImplementerFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Qualification") + .HasColumnType("int"); + + b.Property("WorkExperience") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("Implementers"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.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("IsReaded") + .HasColumnType("bit"); + + b.Property("IsReply") + .HasColumnType("bit"); + + b.Property("ReplyMessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.HasIndex("ReplyMessageId"); + + b.ToTable("MessageInfos"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DateCreate") + .HasColumnType("datetime2"); + + b.Property("DateImplement") + .HasColumnType("datetime2"); + + b.Property("ImplementerId") + .HasColumnType("int"); + + b.Property("PizzaId") + .HasColumnType("int"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("ImplementerId"); + + b.HasIndex("PizzaId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Pizza", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("PizzaName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Pizzas"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.PizzaComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("PizzaId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ComponentId"); + + b.HasIndex("PizzaId"); + + b.ToTable("PizzaComponents"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Adress") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("OpeningDate") + .HasColumnType("datetime2"); + + b.Property("PizzaMaxCount") + .HasColumnType("int"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("PizzaId") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("PizzaId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopPizzas"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") + .WithMany("ClientMessages") + .HasForeignKey("ClientId"); + + b.HasOne("PizzeriaDatabaseImplement.Models.MessageInfo", "Reply") + .WithMany() + .HasForeignKey("ReplyMessageId"); + + b.Navigation("Client"); + + b.Navigation("Reply"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") + .WithMany("ClientOrders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PizzeriaDatabaseImplement.Models.Implementer", "Implementer") + .WithMany("Order") + .HasForeignKey("ImplementerId"); + + b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza") + .WithMany("Orders") + .HasForeignKey("PizzaId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + + b.Navigation("Implementer"); + + b.Navigation("Pizza"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.PizzaComponent", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Component", "Component") + .WithMany("PizzaComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza") + .WithMany("Components") + .HasForeignKey("PizzaId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Component"); + + b.Navigation("Pizza"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza") + .WithMany() + .HasForeignKey("PizzaId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PizzeriaDatabaseImplement.Models.Shop", "Shop") + .WithMany("Pizzas") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Pizza"); + + b.Navigation("Shop"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b => + { + b.Navigation("ClientMessages"); + + b.Navigation("ClientOrders"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b => + { + b.Navigation("PizzaComponents"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Implementer", b => + { + b.Navigation("Order"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Pizza", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b => + { + b.Navigation("Pizzas"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20240402204158_Update.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20240402204158_Update.cs new file mode 100644 index 0000000..35105e7 --- /dev/null +++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20240402204158_Update.cs @@ -0,0 +1,70 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace PizzeriaDatabaseImplement.Migrations +{ + /// + public partial class Update : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "IsReaded", + table: "MessageInfos", + type: "bit", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "IsReply", + table: "MessageInfos", + type: "bit", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "ReplyMessageId", + table: "MessageInfos", + type: "nvarchar(450)", + nullable: true); + + migrationBuilder.CreateIndex( + name: "IX_MessageInfos_ReplyMessageId", + table: "MessageInfos", + column: "ReplyMessageId"); + + migrationBuilder.AddForeignKey( + name: "FK_MessageInfos_MessageInfos_ReplyMessageId", + table: "MessageInfos", + column: "ReplyMessageId", + principalTable: "MessageInfos", + principalColumn: "MessageId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_MessageInfos_MessageInfos_ReplyMessageId", + table: "MessageInfos"); + + migrationBuilder.DropIndex( + name: "IX_MessageInfos_ReplyMessageId", + table: "MessageInfos"); + + migrationBuilder.DropColumn( + name: "IsReaded", + table: "MessageInfos"); + + migrationBuilder.DropColumn( + name: "IsReply", + table: "MessageInfos"); + + migrationBuilder.DropColumn( + name: "ReplyMessageId", + table: "MessageInfos"); + } + } +} diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs index e9ff563..6c4e55a 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs @@ -109,6 +109,15 @@ namespace PizzeriaDatabaseImplement.Migrations b.Property("DateDelivery") .HasColumnType("datetime2"); + b.Property("IsReaded") + .HasColumnType("bit"); + + b.Property("IsReply") + .HasColumnType("bit"); + + b.Property("ReplyMessageId") + .HasColumnType("nvarchar(450)"); + b.Property("SenderName") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -121,6 +130,8 @@ namespace PizzeriaDatabaseImplement.Migrations b.HasIndex("ClientId"); + b.HasIndex("ReplyMessageId"); + b.ToTable("MessageInfos"); }); @@ -213,15 +224,6 @@ namespace PizzeriaDatabaseImplement.Migrations b.ToTable("PizzaComponents"); }); - modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => - { - b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") - .WithMany("ClientMessages") - .HasForeignKey("ClientId"); - - b.Navigation("Client"); - }); - modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b => { b.Property("Id") @@ -275,6 +277,21 @@ namespace PizzeriaDatabaseImplement.Migrations b.ToTable("ShopPizzas"); }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") + .WithMany("ClientMessages") + .HasForeignKey("ClientId"); + + b.HasOne("PizzeriaDatabaseImplement.Models.MessageInfo", "Reply") + .WithMany() + .HasForeignKey("ReplyMessageId"); + + b.Navigation("Client"); + + b.Navigation("Reply"); + }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => { b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") @@ -322,7 +339,7 @@ namespace PizzeriaDatabaseImplement.Migrations modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b => { b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza") - .WithMany("ShopPizzas") + .WithMany() .HasForeignKey("PizzaId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); diff --git a/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs b/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs index eb52485..3023f90 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs @@ -11,54 +11,85 @@ using System.Threading.Tasks; namespace PizzeriaDatabaseImplement.Models { - public class MessageInfo : IMessageInfoModel - { - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.None)] - public string MessageId { get; set; } = string.Empty; + public class MessageInfo : IMessageInfoModel + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public string MessageId { get; set; } = string.Empty; - public int? ClientId { get; set; } + public int? ClientId { get; set; } - public virtual Client? Client { get; set; } + public virtual Client? Client { get; set; } - [Required] - public string SenderName { get; set; } = string.Empty; + [Required] + public string SenderName { get; set; } = string.Empty; - [Required] - public DateTime DateDelivery { get; set; } + [Required] + public DateTime DateDelivery { get; set; } - [Required] - public string Subject { get; set; } = string.Empty; + [Required] + public string Subject { get; set; } = string.Empty; - [Required] - public string Body { 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() - { - MessageId = model.MessageId, - ClientId = model.ClientId, - SenderName = model.SenderName, - DateDelivery = model.DateDelivery, - Subject = model.Subject, - Body = model.Body, + [Required] + public bool IsReaded { get; set; } - }; - } + public string? ReplyMessageId { get; set; } - public MessageInfoViewModel GetViewModel => new() - { - MessageId = MessageId, - ClientId = ClientId, - SenderName = SenderName, - DateDelivery = DateDelivery, - Subject = Subject, - Body = Body - }; - } + [ForeignKey("ReplyMessageId")] + public virtual MessageInfo? Reply { get; set; } + + [Required] + public bool IsReply { get; set; } + + public static MessageInfo? Create(MessageInfoBindingModel? model) + { + if (model == null) + { + return null; + } + return new() + { + MessageId = model.MessageId, + ClientId = model.ClientId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + Subject = model.Subject, + Body = model.Body, + IsReaded = model.IsReaded, + ReplyMessageId = model.ReplyMessageId, + IsReply = model.IsReply + }; + } + + public void Update(PizzeriaDatabase context, MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + IsReaded = model.IsReaded; + ReplyMessageId = model.ReplyMessageId; + if (!string.IsNullOrEmpty(ReplyMessageId)) + { + Reply = context.MessageInfos.First(x => x.MessageId == ReplyMessageId); + } + } + + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + DateDelivery = DateDelivery, + Subject = Subject, + Body = Body, + IsReaded = IsReaded, + ReplyMessageId = ReplyMessageId, + Reply = Reply, + IsReply = IsReply + }; + } } diff --git a/Pizzeria/PizzeriaFileImplement/Implements/MessageInfoStorage.cs b/Pizzeria/PizzeriaFileImplement/Implements/MessageInfoStorage.cs index dfffe5b..ce35782 100644 --- a/Pizzeria/PizzeriaFileImplement/Implements/MessageInfoStorage.cs +++ b/Pizzeria/PizzeriaFileImplement/Implements/MessageInfoStorage.cs @@ -11,48 +11,61 @@ using System.Threading.Tasks; namespace PizzeriaFileImplement.Implements { - public class MessageInfoStorage : IMessageInfoStorage - { - private readonly DataFileSingleton _source; - public MessageInfoStorage() - { - _source = DataFileSingleton.GetInstance(); - } + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataFileSingleton _source; + public MessageInfoStorage() + { + _source = DataFileSingleton.GetInstance(); + } - public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) - { - if (model.MessageId != null) - { - return _source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; - } - return null; - } + public 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 GetFilteredList(MessageInfoSearchModel model) + { + var res = _source.Messages.Where(x => !model.ClientId.HasValue || x.ClientId == model.ClientId).Select(x => x.GetViewModel); + if (!(model.PageIndex.HasValue && model.PageLength.HasValue)) + { + return res.ToList(); + } + return res.Skip((model.PageIndex.Value - 1) * model.PageLength.Value).Take(model.PageLength.Value).ToList(); + } - public List GetFullList() - { - return _source.Messages - .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; - } - } + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + _source.Messages.Add(newMessage); + _source.SaveMessages(); + return newMessage.GetViewModel; + } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + var res = _source.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId)); + if (res != null) + { + res.Update(model); + _source.SaveMessages(); + } + return res?.GetViewModel; + } + } } diff --git a/Pizzeria/PizzeriaFileImplement/Models/MessageInfo.cs b/Pizzeria/PizzeriaFileImplement/Models/MessageInfo.cs index db302eb..51bff75 100644 --- a/Pizzeria/PizzeriaFileImplement/Models/MessageInfo.cs +++ b/Pizzeria/PizzeriaFileImplement/Models/MessageInfo.cs @@ -10,71 +10,96 @@ using System.Xml.Linq; namespace PizzeriaFileImplement.Models { - public class MessageInfo : IMessageInfoModel - { - public string MessageId { get; private set; } = string.Empty; + public class MessageInfo : IMessageInfoModel + { + public string MessageId { get; private set; } = string.Empty; - public int? ClientId { get; private set; } + public int? ClientId { get; private set; } - public string SenderName { get; private set; } = string.Empty; + public string SenderName { get; private set; } = string.Empty; - public DateTime DateDelivery { get; private set; } = DateTime.Now; + public DateTime DateDelivery { get; private set; } = DateTime.Now; - public string Subject { get; private set; } = string.Empty; + public string Subject { get; private set; } = string.Empty; - public string Body { get; private set; } = string.Empty; + public string Body { get; private set; } = string.Empty; + public bool IsReaded { get; private set; } + public bool IsReply { get; private set; } + public string? ReplyMessageId { 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(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + IsReply = model.IsReply, + IsReaded = model.IsReaded, + Subject = model.Subject, + ClientId = model.ClientId, + MessageId = model.MessageId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + ReplyMessageId = model.ReplyMessageId, + }; + } - 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 static MessageInfo? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + Body = element.Attribute("Body")!.Value, + IsReply = Convert.ToBoolean(element.Attribute("IsReply")!.Value), + IsReaded = Convert.ToBoolean(element.Attribute("HasRead")!.Value), + Subject = element.Attribute("Subject")!.Value, + ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), + MessageId = element.Attribute("MessageId")!.Value, + ReplyMessageId = element.Attribute("ReplyMessageId")!.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 void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + IsReply = model.IsReply; + IsReaded = model.IsReaded; + } - 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) - ); - } + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + IsReply = IsReply, + IsReaded = IsReaded, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + ReplyMessageId = ReplyMessageId, + }; + + public XElement GetXElement => new("MessageInfo", + new XAttribute("Body", Body), + new XAttribute("IsReply", IsReply), + new XAttribute("IsReaded", IsReaded), + new XAttribute("Subject", Subject), + new XAttribute("ClientId", ClientId), + new XAttribute("MessageId", MessageId), + new XAttribute("ReplyMessageId", ReplyMessageId), + new XAttribute("SenderName", SenderName), + new XAttribute("DateDelivery", DateDelivery) + ); + } } diff --git a/Pizzeria/PizzeriaListImplement/Implements/MessageInfoStorage.cs b/Pizzeria/PizzeriaListImplement/Implements/MessageInfoStorage.cs index 5c84f5d..f69c0af 100644 --- a/Pizzeria/PizzeriaListImplement/Implements/MessageInfoStorage.cs +++ b/Pizzeria/PizzeriaListImplement/Implements/MessageInfoStorage.cs @@ -11,58 +11,83 @@ using System.Threading.Tasks; namespace PizzeriaListImplement.Implements { - public class MessageInfoStorage : IMessageInfoStorage - { - private readonly DataListSingleton _source; - public MessageInfoStorage() - { - _source = DataListSingleton.GetInstance(); - } + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataListSingleton _source; + public MessageInfoStorage() + { + _source = DataListSingleton.GetInstance(); + } - public List GetFullList() - { - List result = new(); - foreach (var item in _source.Messages) - { - result.Add(item.GetViewModel); - } - return result; - } + 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 GetFilteredList(MessageInfoSearchModel model) + { + List result = new(); + foreach (var item in _source.Messages) + { + if (item.ClientId.HasValue && item.ClientId == model.ClientId) + { + result.Add(item.GetViewModel); + } + } - 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; - } + if (!(model.PageIndex.HasValue && model.PageLength.HasValue)) + { + return result; + } + if (model.PageIndex * model.PageLength >= result.Count) + { + return null; + } + List filteredResult = new(); + for (var i = (model.PageIndex.Value - 1) * model.PageLength.Value; i < model.PageIndex.Value * model.PageLength.Value; i++) + { + filteredResult.Add(result[i]); + } + return filteredResult; + } - public MessageInfoViewModel? Insert(MessageInfoBindingModel model) - { - var newMessage = MessageInfo.Create(model); - if (newMessage == null) - { - return null; - } - _source.Messages.Add(newMessage); - return newMessage.GetViewModel; - } - } + public List GetFullList() + { + List result = new(); + foreach (var item in _source.Messages) + { + result.Add(item.GetViewModel); + } + return result; + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + _source.Messages.Add(newMessage); + return newMessage.GetViewModel; + } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + foreach (var message in _source.Messages) + { + if (message.MessageId.Equals(model.MessageId)) + { + message.Update(model); + return message.GetViewModel; + } + } + return null; + } + } } diff --git a/Pizzeria/PizzeriaListImplement/Models/MessageInfo.cs b/Pizzeria/PizzeriaListImplement/Models/MessageInfo.cs index b95d32e..5245558 100644 --- a/Pizzeria/PizzeriaListImplement/Models/MessageInfo.cs +++ b/Pizzeria/PizzeriaListImplement/Models/MessageInfo.cs @@ -9,45 +9,64 @@ using System.Threading.Tasks; namespace PizzeriaListImplement.Models { - public class MessageInfo : IMessageInfoModel - { - public string MessageId { get; private set; } = string.Empty; + public class MessageInfo : IMessageInfoModel + { + public string MessageId { get; private set; } = string.Empty; - public int? ClientId { get; private set; } + public int? ClientId { get; private set; } - public string SenderName { get; private set; } = string.Empty; + public string SenderName { get; private set; } = string.Empty; - public DateTime DateDelivery { get; private set; } = DateTime.Now; + public DateTime DateDelivery { get; private set; } = DateTime.Now; - public string Subject { get; private set; } = string.Empty; + public string Subject { get; private set; } = string.Empty; - public string Body { get; private set; } = string.Empty; + public string Body { get; private set; } = string.Empty; + public bool IsReaded { get; private set; } + public bool IsReply { get; private set; } + public string? ReplyMessageId { 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 static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + IsReply = model.IsReply, + IsReaded = model.IsReaded, + Subject = model.Subject, + ClientId = model.ClientId, + MessageId = model.MessageId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + ReplyMessageId = model.ReplyMessageId, + }; + } - public MessageInfoViewModel GetViewModel => new() - { - Body = Body, - Subject = Subject, - ClientId = ClientId, - MessageId = MessageId, - SenderName = SenderName, - DateDelivery = DateDelivery, - }; - } + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + IsReply = model.IsReply; + IsReaded = model.IsReaded; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + IsReply = IsReply, + IsReaded = IsReaded, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + ReplyMessageId = ReplyMessageId, + }; + } } diff --git a/Pizzeria/PizzeriaRestApi/Controllers/ClientController.cs b/Pizzeria/PizzeriaRestApi/Controllers/ClientController.cs index 05889ac..098b42c 100644 --- a/Pizzeria/PizzeriaRestApi/Controllers/ClientController.cs +++ b/Pizzeria/PizzeriaRestApi/Controllers/ClientController.cs @@ -70,21 +70,23 @@ namespace PizzeriaRestApi.Controllers } } - [HttpGet] - public List? GetMessages(int clientId) - { - try - { - return _mailLogic.ReadList(new MessageInfoSearchModel - { - ClientId = clientId - }); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка получения писем клиента"); - throw; - } - } - } + [HttpGet] + public List? GetMessages(int clientId, int page, int pagesize = 1) + { + try + { + return _mailLogic.ReadList(new MessageInfoSearchModel + { + ClientId = clientId, + PageLength = pagesize, + PageIndex = page + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения писем клиента"); + throw; + } + } + } } diff --git a/Pizzeria/PizzeriaRestApi/appsettings.json b/Pizzeria/PizzeriaRestApi/appsettings.json index 64b5186..9a6228f 100644 --- a/Pizzeria/PizzeriaRestApi/appsettings.json +++ b/Pizzeria/PizzeriaRestApi/appsettings.json @@ -6,13 +6,11 @@ } }, "AllowedHosts": "*", - "SmtpClientHost": "smtp.gmail.com", "SmtpClientPort": "587", "PopHost": "pop.gmail.com", "PopPort": "995", "MailLogin": "laba46466@gmail.com", - "MailPassword": "iyin rgai wjdh ocmi" - "AllowedHosts": "*", + "MailPassword": "iyin rgai wjdh ocmi", "ShopAPIPassword": "123456" } \ No newline at end of file diff --git a/Pizzeria/PizzeriaView/FormLetter.Designer.cs b/Pizzeria/PizzeriaView/FormLetter.Designer.cs new file mode 100644 index 0000000..233c53a --- /dev/null +++ b/Pizzeria/PizzeriaView/FormLetter.Designer.cs @@ -0,0 +1,182 @@ +namespace PizzeriaView +{ + partial class FormLetter + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.textBoxEmail = new System.Windows.Forms.TextBox(); + this.labelAdress = new System.Windows.Forms.Label(); + this.labelSubject = new System.Windows.Forms.Label(); + this.textBoxSubject = new System.Windows.Forms.TextBox(); + this.labelBody = new System.Windows.Forms.Label(); + this.textBoxBody = new System.Windows.Forms.TextBox(); + this.buttonClose = new System.Windows.Forms.Button(); + this.buttonReply = new System.Windows.Forms.Button(); + this.labelDate = new System.Windows.Forms.Label(); + this.textBoxDate = new System.Windows.Forms.TextBox(); + this.buttonSend = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // textBoxEmail + // + this.textBoxEmail.Location = new System.Drawing.Point(72, 6); + this.textBoxEmail.Name = "textBoxEmail"; + this.textBoxEmail.ReadOnly = true; + this.textBoxEmail.Size = new System.Drawing.Size(186, 27); + this.textBoxEmail.TabIndex = 0; + // + // labelAdress + // + this.labelAdress.AutoSize = true; + this.labelAdress.Location = new System.Drawing.Point(12, 9); + this.labelAdress.Name = "labelAdress"; + this.labelAdress.Size = new System.Drawing.Size(54, 20); + this.labelAdress.TabIndex = 1; + this.labelAdress.Text = "Адрес:"; + // + // labelSubject + // + this.labelSubject.AutoSize = true; + this.labelSubject.Location = new System.Drawing.Point(12, 55); + this.labelSubject.Name = "labelSubject"; + this.labelSubject.Size = new System.Drawing.Size(47, 20); + this.labelSubject.TabIndex = 2; + this.labelSubject.Text = "Тема:"; + // + // textBoxSubject + // + this.textBoxSubject.Location = new System.Drawing.Point(72, 52); + this.textBoxSubject.Name = "textBoxSubject"; + this.textBoxSubject.ReadOnly = true; + this.textBoxSubject.Size = new System.Drawing.Size(552, 27); + this.textBoxSubject.TabIndex = 3; + // + // labelBody + // + this.labelBody.AutoSize = true; + this.labelBody.Location = new System.Drawing.Point(12, 96); + this.labelBody.Name = "labelBody"; + this.labelBody.Size = new System.Drawing.Size(104, 20); + this.labelBody.TabIndex = 4; + this.labelBody.Text = "Текст письма:"; + // + // textBoxBody + // + this.textBoxBody.Location = new System.Drawing.Point(12, 119); + this.textBoxBody.Multiline = true; + this.textBoxBody.Name = "textBoxBody"; + this.textBoxBody.ReadOnly = true; + this.textBoxBody.Size = new System.Drawing.Size(612, 186); + this.textBoxBody.TabIndex = 5; + // + // buttonClose + // + this.buttonClose.Location = new System.Drawing.Point(491, 326); + this.buttonClose.Name = "buttonClose"; + this.buttonClose.Size = new System.Drawing.Size(111, 39); + this.buttonClose.TabIndex = 6; + this.buttonClose.Text = "Закрыть"; + this.buttonClose.UseVisualStyleBackColor = true; + this.buttonClose.Click += new System.EventHandler(this.buttonClose_Click); + // + // buttonReply + // + this.buttonReply.Location = new System.Drawing.Point(290, 326); + this.buttonReply.Name = "buttonReply"; + this.buttonReply.Size = new System.Drawing.Size(177, 39); + this.buttonReply.TabIndex = 7; + this.buttonReply.Text = "Ответить"; + this.buttonReply.UseVisualStyleBackColor = true; + this.buttonReply.Click += new System.EventHandler(this.buttonReply_Click); + // + // labelDate + // + this.labelDate.AutoSize = true; + this.labelDate.Location = new System.Drawing.Point(278, 9); + this.labelDate.Name = "labelDate"; + this.labelDate.Size = new System.Drawing.Size(127, 20); + this.labelDate.TabIndex = 8; + this.labelDate.Text = "Дата получения: "; + // + // textBoxDate + // + this.textBoxDate.Location = new System.Drawing.Point(411, 6); + this.textBoxDate.Name = "textBoxDate"; + this.textBoxDate.ReadOnly = true; + this.textBoxDate.Size = new System.Drawing.Size(213, 27); + this.textBoxDate.TabIndex = 9; + // + // buttonSend + // + this.buttonSend.Location = new System.Drawing.Point(149, 326); + this.buttonSend.Name = "buttonSend"; + this.buttonSend.Size = new System.Drawing.Size(109, 39); + this.buttonSend.TabIndex = 10; + this.buttonSend.Text = "Отправить"; + this.buttonSend.UseVisualStyleBackColor = true; + this.buttonSend.Visible = false; + this.buttonSend.Click += new System.EventHandler(this.buttonSend_Click); + // + // FormLetter + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(636, 377); + this.Controls.Add(this.buttonSend); + this.Controls.Add(this.textBoxDate); + this.Controls.Add(this.labelDate); + this.Controls.Add(this.buttonReply); + this.Controls.Add(this.buttonClose); + this.Controls.Add(this.textBoxBody); + this.Controls.Add(this.labelBody); + this.Controls.Add(this.textBoxSubject); + this.Controls.Add(this.labelSubject); + this.Controls.Add(this.labelAdress); + this.Controls.Add(this.textBoxEmail); + this.Name = "FormLetter"; + this.Text = "Письмо"; + this.Load += new System.EventHandler(this.FormLetter_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private TextBox textBoxEmail; + private Label labelAdress; + private Label labelSubject; + private TextBox textBoxSubject; + private Label labelBody; + private TextBox textBoxBody; + private Button buttonClose; + private Button buttonReply; + private Label labelDate; + private TextBox textBoxDate; + private Button buttonSend; + } +} \ No newline at end of file diff --git a/Pizzeria/PizzeriaView/FormLetter.cs b/Pizzeria/PizzeriaView/FormLetter.cs new file mode 100644 index 0000000..1d4534f --- /dev/null +++ b/Pizzeria/PizzeriaView/FormLetter.cs @@ -0,0 +1,152 @@ +using Microsoft.Extensions.Logging; +using Pizzeria; +using PizzeriaBusinessLogic.MailWorker; +using PizzeriaContracts.BindingModels; +using PizzeriaContracts.BusinessLogicsContracts; +using PizzeriaContracts.SearchModels; +using PizzeriaContracts.ViewModels; +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; +using System.Windows.Forms.VisualStyles; + +namespace PizzeriaView +{ + public partial class FormLetter : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + private readonly AbstractMailWorker _worker; + + public MessageInfoViewModel? model; + public string? messageId; + + public FormLetter(ILogger logger, IMessageInfoLogic logic, AbstractMailWorker worker) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _worker = worker; + } + + private void FormLetter_Load(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(messageId)) + { + ReloadLetter(); + return; + } + else if (model != null) + { + ConfigurateToCreateAnsver(); + return; + } + _logger.LogError("Для формы не переданно сведений о письме, на которое отвечаем!"); + DialogResult = DialogResult.Abort; + Close(); + return; + } + + private void ReloadLetter() + { + _logger.LogInformation("Загрузка существующего письма с id:{}", messageId); + model = _logic.ReadElement(new MessageInfoSearchModel + { + MessageId = messageId + }); + if (model != null) + { + _logger.LogInformation("Письмо найдено"); + textBoxEmail.Text = model.SenderName; + textBoxDate.Text = model.DateDelivery.ToString(); + textBoxSubject.Text = model.Subject; + textBoxBody.Text = model.Body; + + + if (model.IsReply) + { + _logger.LogInformation("Письмо само и есть ответ"); + buttonReply.Visible = false; + } + else + { + if (!string.IsNullOrEmpty(model.ReplyMessageId)) + { + _logger.LogInformation("У письма есть ответ."); + buttonReply.Text = "Прочитать ответ"; + } + } + return; + } + _logger.LogWarning("Письмо с таким id не удалось найти"); + DialogResult = DialogResult.Abort; + Close(); + return; + } + + private void ConfigurateToCreateAnsver() + { + textBoxEmail.Text = model.SenderName; + labelDate.Visible = false; + textBoxDate.Visible = false; + textBoxSubject.Text = $"re: {model.Subject}"; + textBoxBody.ReadOnly = false; + buttonReply.Visible = false; + buttonSend.Visible = true; + _logger.LogInformation("Запущена форма создания нового письма - ответа"); + } + + private void buttonClose_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private void buttonReply_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormLetter)); + if (service is FormLetter form) + { + if (!string.IsNullOrEmpty(model.ReplyMessageId)) + { + form.messageId = model.ReplyMessageId; + } + else + { + form.model = model; + } + + if (form.ShowDialog() != DialogResult.Cancel) + { + buttonReply.Visible = false; + } + } + } + + private void buttonSend_Click(object sender, EventArgs e) + { + if (model == null) + { + return; + } + string subject = textBoxSubject.Text; + string text = textBoxBody.Text; + + Task.Run(() => _worker.MailSendReplyAsync(new MailReplySendInfoBindingModel + { + MailAddress = model.SenderName, + Subject = subject, + Text = text, + ParentMessageId = model.MessageId, + })); + DialogResult = DialogResult.OK; + Close(); + } + } +} diff --git a/Pizzeria/PizzeriaView/FormLetter.resx b/Pizzeria/PizzeriaView/FormLetter.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Pizzeria/PizzeriaView/FormLetter.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/Pizzeria/PizzeriaView/FormMail.Designer.cs b/Pizzeria/PizzeriaView/FormMail.Designer.cs index ac95a1d..ee0f138 100644 --- a/Pizzeria/PizzeriaView/FormMail.Designer.cs +++ b/Pizzeria/PizzeriaView/FormMail.Designer.cs @@ -28,10 +28,26 @@ /// private void InitializeComponent() { + this.panel1 = new System.Windows.Forms.Panel(); this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonOpen = new System.Windows.Forms.Button(); + this.numericUpDownPage = new System.Windows.Forms.NumericUpDown(); + this.buttonPreveous = new System.Windows.Forms.Button(); + this.buttonNext = new System.Windows.Forms.Button(); + this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownPage)).BeginInit(); this.SuspendLayout(); // + // panel1 + // + this.panel1.Controls.Add(this.dataGridView); + this.panel1.Location = new System.Drawing.Point(3, 1); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(795, 431); + this.panel1.TabIndex = 0; + // // dataGridView // this.dataGridView.AllowUserToAddRows = false; @@ -43,25 +59,75 @@ this.dataGridView.ReadOnly = true; this.dataGridView.RowHeadersWidth = 51; this.dataGridView.RowTemplate.Height = 29; - this.dataGridView.Size = new System.Drawing.Size(786, 270); - this.dataGridView.TabIndex = 0; + this.dataGridView.Size = new System.Drawing.Size(795, 431); + this.dataGridView.TabIndex = 2; + // + // buttonOpen + // + this.buttonOpen.Location = new System.Drawing.Point(806, 80); + this.buttonOpen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonOpen.Name = "buttonOpen"; + this.buttonOpen.Size = new System.Drawing.Size(107, 31); + this.buttonOpen.TabIndex = 1; + this.buttonOpen.Text = "Прочитать"; + this.buttonOpen.UseVisualStyleBackColor = true; + this.buttonOpen.Click += new System.EventHandler(this.buttonOpen_Click); + // + // numericUpDownPage + // + this.numericUpDownPage.Location = new System.Drawing.Point(825, 287); + this.numericUpDownPage.Name = "numericUpDownPage"; + this.numericUpDownPage.Size = new System.Drawing.Size(85, 27); + this.numericUpDownPage.TabIndex = 4; + this.numericUpDownPage.ValueChanged += new System.EventHandler(this.numericUpDownPage_ValueChanged); + // + // buttonPreveous + // + this.buttonPreveous.Location = new System.Drawing.Point(825, 323); + this.buttonPreveous.Name = "buttonPreveous"; + this.buttonPreveous.Size = new System.Drawing.Size(39, 29); + this.buttonPreveous.TabIndex = 5; + this.buttonPreveous.Text = "<-"; + this.buttonPreveous.UseVisualStyleBackColor = true; + this.buttonPreveous.Click += new System.EventHandler(this.buttonPreveous_Click); + // + // buttonNext + // + this.buttonNext.Location = new System.Drawing.Point(872, 323); + this.buttonNext.Name = "buttonNext"; + this.buttonNext.Size = new System.Drawing.Size(39, 29); + this.buttonNext.TabIndex = 6; + this.buttonNext.Text = "->"; + this.buttonNext.UseVisualStyleBackColor = true; + this.buttonNext.Click += new System.EventHandler(this.buttonNext_Click); // // FormMail // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(786, 270); - this.Controls.Add(this.dataGridView); + this.ClientSize = new System.Drawing.Size(925, 428); + this.Controls.Add(this.buttonNext); + this.Controls.Add(this.buttonPreveous); + this.Controls.Add(this.numericUpDownPage); + this.Controls.Add(this.buttonOpen); + this.Controls.Add(this.panel1); this.Name = "FormMail"; this.Text = "Письма"; this.Load += new System.EventHandler(this.FormMail_Load); + this.panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownPage)).EndInit(); this.ResumeLayout(false); } #endregion + private Panel panel1; private DataGridView dataGridView; + private Button buttonOpen; + private NumericUpDown numericUpDownPage; + private Button buttonPreveous; + private Button buttonNext; } } \ No newline at end of file diff --git a/Pizzeria/PizzeriaView/FormMail.cs b/Pizzeria/PizzeriaView/FormMail.cs index f87d86c..cc507e2 100644 --- a/Pizzeria/PizzeriaView/FormMail.cs +++ b/Pizzeria/PizzeriaView/FormMail.cs @@ -1,5 +1,10 @@ -using Microsoft.Extensions.Logging; +using DocumentFormat.OpenXml.Spreadsheet; +using Microsoft.Extensions.Logging; +using Pizzeria; +using PizzeriaBusinessLogic.BusinessLogics; +using PizzeriaContracts.BindingModels; using PizzeriaContracts.BusinessLogicsContracts; +using PizzeriaContracts.SearchModels; using System; using System.Collections.Generic; using System.ComponentModel; @@ -16,6 +21,8 @@ namespace PizzeriaView { private readonly ILogger _logger; private readonly IMessageInfoLogic _logic; + private int currentPage = 1; + private int pageLength = 2; public FormMail(ILogger logger, IMessageInfoLogic logic) { @@ -28,12 +35,21 @@ namespace PizzeriaView { try { - var list = _logic.ReadList(null); + var list = _logic.ReadList(new MessageInfoSearchModel() + { + PageLength = pageLength, + PageIndex = currentPage + + }); + numericUpDownPage.Value = pageLength; if (list != null) { dataGridView.DataSource = list; dataGridView.Columns["MessageId"].Visible = false; dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["ReplyMessageId"].Visible = false; + dataGridView.Columns["Reply"].Visible = false; + dataGridView.Columns["IsReply"].Visible = false; dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } @@ -50,5 +66,50 @@ namespace PizzeriaView { LoadData(); } + + private void buttonOpen_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count <= 0) + return; + + var service = Program.ServiceProvider?.GetService(typeof(FormLetter)); + if (service is FormLetter form) + { + string? messageId = dataGridView.SelectedRows[0].Cells["MessageId"].Value.ToString(); + if (messageId == null) return; + form.messageId = messageId; + + if (!Convert.ToBoolean(dataGridView.SelectedRows[0].Cells["IsReaded"].Value)) + { + _logic.Update(new MessageInfoBindingModel + { + MessageId = messageId, + IsReaded = true, + ReplyMessageId = dataGridView.SelectedRows[0].Cells["ReplyMessageId"].Value?.ToString() + }); + } + + form.ShowDialog(); + LoadData(); + } + } + + private void buttonPreveous_Click(object sender, EventArgs e) + { + currentPage = Math.Max(1, currentPage - 1); + LoadData(); + } + + private void buttonNext_Click(object sender, EventArgs e) + { + currentPage++; + LoadData(); + } + + private void numericUpDownPage_ValueChanged(object sender, EventArgs e) + { + pageLength = Math.Max(1, (int)numericUpDownPage.Value); + LoadData(); + } } } diff --git a/Pizzeria/PizzeriaView/FormMain.cs b/Pizzeria/PizzeriaView/FormMain.cs index c9cf833..4d7750e 100644 --- a/Pizzeria/PizzeriaView/FormMain.cs +++ b/Pizzeria/PizzeriaView/FormMain.cs @@ -250,7 +250,6 @@ namespace PizzeriaView form.ShowDialog(); } } - } private void InfoToolStripMenuItem_Click(object sender, EventArgs e) {