From e7c191437a748c1614a1931bdc5290a7feb3e83b Mon Sep 17 00:00:00 2001 From: Timourka Date: Sun, 5 May 2024 00:23:11 +0400 Subject: [PATCH 1/6] =?UTF-8?q?=D1=87=D1=82=D0=BE=D0=B6=20=D0=B1=D0=B0?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=8F=207=20=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutomobilePlantBusinessLogic.csproj | 1 + .../BusinessLogics/ClientLogic.cs | 11 + .../BusinessLogics/MessageInfoLogic.cs | 43 +++ .../BusinessLogics/OrderLogic.cs | 33 +- .../MailWorker/AbstractMailWorker.cs | 77 +++++ .../MailWorker/MailKitWorker.cs | 75 +++++ .../Controllers/HomeController.cs | 9 + .../Views/Home/Mails.cshtml | 54 ++++ .../Views/Home/_Layout.cshtml | 3 + .../BindingModels/MailConfigBindingModel.cs | 12 + .../BindingModels/MailSendInfoBindingModel.cs | 9 + .../BindingModels/MessageInfoBindingModel.cs | 19 ++ .../IMessageInfoLogic.cs | 12 + .../SearchModels/MessageInfoSearchModel.cs | 8 + .../StoragesContracts/IMessageInfoStorage.cs | 14 + .../ViewModels/MessageInfoViewModel .cs | 20 ++ .../Models/IMessageInfoModel.cs | 12 + .../AutomobilePlantDatabase.cs | 1 + .../Implements/MessageInfoStorage.cs | 52 +++ .../20240504192703_MbINeedIt7Laba.Designer.cs | 298 ++++++++++++++++++ .../20240504192703_MbINeedIt7Laba.cs | 48 +++ .../AutomobilePlantDatabaseModelSnapshot.cs | 41 +++ .../Models/Client.cs | 3 + .../Models/MessageInfo.cs | 52 +++ .../DataFileSingleton.cs | 9 +- .../Implements/MessageInfoStorage.cs | 53 ++++ .../Models/MessageInfo.cs | 75 +++++ .../DataListSingleton.cs | 7 +- .../Implements/MessageInfoStorage.cs | 60 ++++ .../Models/MessageInfo.cs | 48 +++ .../Controllers/ClientController.cs | 20 +- .../AutomobilePlantRestApi/Program.cs | 16 + .../AutomobilePlantRestApi/appsettings.json | 10 +- .../AutomobilePlantView/App.config | 11 + .../AutomobilePlantView.csproj | 3 + .../AutomobilePlantView/FormMails.Designer.cs | 62 ++++ .../AutomobilePlantView/FormMails.cs | 40 +++ .../AutomobilePlantView/FormMails.resx | 120 +++++++ .../AutomobilePlantView/FormMain.Designer.cs | 23 +- .../AutomobilePlantView/FormMain.cs | 9 + .../AutomobilePlantView/Program.cs | 31 +- 41 files changed, 1480 insertions(+), 24 deletions(-) create mode 100644 AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/MessageInfoLogic.cs create mode 100644 AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/AbstractMailWorker.cs create mode 100644 AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/MailKitWorker.cs create mode 100644 AutomobilePlant/AutomobilePlantClientApp/Views/Home/Mails.cshtml create mode 100644 AutomobilePlant/AutomobilePlantContracts/BindingModels/MailConfigBindingModel.cs create mode 100644 AutomobilePlant/AutomobilePlantContracts/BindingModels/MailSendInfoBindingModel.cs create mode 100644 AutomobilePlant/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs create mode 100644 AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IMessageInfoLogic.cs create mode 100644 AutomobilePlant/AutomobilePlantContracts/SearchModels/MessageInfoSearchModel.cs create mode 100644 AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IMessageInfoStorage.cs create mode 100644 AutomobilePlant/AutomobilePlantContracts/ViewModels/MessageInfoViewModel .cs create mode 100644 AutomobilePlant/AutomobilePlantDataModels/Models/IMessageInfoModel.cs create mode 100644 AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs create mode 100644 AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240504192703_MbINeedIt7Laba.Designer.cs create mode 100644 AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240504192703_MbINeedIt7Laba.cs create mode 100644 AutomobilePlant/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs create mode 100644 AutomobilePlant/AutomobilePlantFileImplement/Models/MessageInfo.cs create mode 100644 AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs create mode 100644 AutomobilePlant/AutomobilePlantListImplement/Models/MessageInfo.cs create mode 100644 AutomobilePlant/AutomobilePlantView/App.config create mode 100644 AutomobilePlant/AutomobilePlantView/FormMails.Designer.cs create mode 100644 AutomobilePlant/AutomobilePlantView/FormMails.cs create mode 100644 AutomobilePlant/AutomobilePlantView/FormMails.resx diff --git a/AutomobilePlant/AutomobilePlantBusinessLogic/AutomobilePlantBusinessLogic.csproj b/AutomobilePlant/AutomobilePlantBusinessLogic/AutomobilePlantBusinessLogic.csproj index 369ff5a..a2b3c9f 100644 --- a/AutomobilePlant/AutomobilePlantBusinessLogic/AutomobilePlantBusinessLogic.csproj +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/AutomobilePlantBusinessLogic.csproj @@ -8,6 +8,7 @@ + diff --git a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs index a4035ed..a1c975f 100644 --- a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs @@ -4,6 +4,7 @@ using AutomobilePlantContracts.SearchModels; using AutomobilePlantContracts.StoragesContracts; using AutomobilePlantContracts.ViewModels; using Microsoft.Extensions.Logging; +using System.Text.RegularExpressions; namespace AutomobilePlantBusinessLogic.BusinessLogics { @@ -98,6 +99,16 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics { throw new ArgumentNullException("Нет логина(почты) клиента", nameof(model.Email)); } + if (!Regex.IsMatch(model.Email, @"^(?!\.)(""([^""\r\\]|\\[""\r\\])*""|" + + @"([-a-z0-9!#$%&'*+/=?^_`{|}~]|(? logger, IMessageInfoStorage MessageInfoStorage) + { + _logger = logger; + _messageInfoStorage = MessageInfoStorage; + } + + public bool Create(MessageInfoBindingModel model) + { + if (_messageInfoStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public List? ReadList(MessageInfoSearchModel? model) + { + _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId} ", model?.MessageId, model?.ClientId); + var list = (model == null) ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + } +} diff --git a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs index c559f6f..0ab1f78 100644 --- a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs @@ -1,4 +1,5 @@ -using AutomobilePlantContracts.BindingModels; +using AutomobilePlantBusinessLogic.MailWorker; +using AutomobilePlantContracts.BindingModels; using AutomobilePlantContracts.BusinessLogicsContracts; using AutomobilePlantContracts.SearchModels; using AutomobilePlantContracts.StoragesContracts; @@ -17,12 +18,16 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; + private readonly AbstractMailWorker _mailWorker; + private readonly IClientLogic _clientLogic; static readonly object locker = new object(); - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic) { _logger = logger; _orderStorage = orderStorage; + _mailWorker = mailWorker; + _clientLogic = clientLogic; } public List? ReadList(OrderSearchModel? model) @@ -60,11 +65,13 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics CheckModel(model); if (model.Status != OrderStatus.Неизвестен) return false; model.Status = OrderStatus.Принят; - if (_orderStorage.Insert(model) == null) + var result = _orderStorage.Insert(model); + if (result == null) { _logger.LogWarning("Insert operation failed"); return false; } + SendOrderStatusMail(result.ClientId, $"A new order has been created. Order number #{result.Id}", $"Order #{result.Id} from {result.DateCreate} for the amount {result.Sum:0.00} {result.Status}"); return true; } @@ -88,12 +95,14 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics model.Status = status; if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now; - if (_orderStorage.Update(model) == null) + var result = _orderStorage.Update(model); + if (result == null) { model.Status = oldStatus; _logger.LogWarning("Update operation failed"); return false; } + SendOrderStatusMail(result.ClientId, $"Status of order #{result.Id} has been changed", $"Order #{result.Id} status has been changed to {result.Status}"); return true; } @@ -143,5 +152,21 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics } _logger.LogInformation("Order. Sum:{ Cost}. Id: { Id}", model.Sum, model.Id); } + + private bool SendOrderStatusMail(int clientId, string subject, string text) + { + var client = _clientLogic.ReadElement(new() { Id = clientId }); + if (client == null) + { + return false; + } + _mailWorker.MailSendAsync(new() + { + MailAddress = client.Email, + Subject = subject, + Text = text + }); + return true; + } } } diff --git a/AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/AbstractMailWorker.cs b/AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..79e22c6 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,77 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace AutomobilePlantBusinessLogic.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/AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/MailKitWorker.cs b/AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..a20dd64 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,75 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.BusinessLogicsContracts; +using MailKit.Net.Pop3; +using MailKit.Security; +using Microsoft.Extensions.Logging; +using System.Net.Mail; +using System.Net; +using System.Text; + +namespace AutomobilePlantBusinessLogic.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 (MailKit.Security.AuthenticationException) + { } + finally + { + client.Disconnect(true); + } + }); + return list; + } + } +} diff --git a/AutomobilePlant/AutomobilePlantClientApp/Controllers/HomeController.cs b/AutomobilePlant/AutomobilePlantClientApp/Controllers/HomeController.cs index cafc601..d9ada7d 100644 --- a/AutomobilePlant/AutomobilePlantClientApp/Controllers/HomeController.cs +++ b/AutomobilePlant/AutomobilePlantClientApp/Controllers/HomeController.cs @@ -134,6 +134,15 @@ namespace AutomobilePlantClientApp.Controllers var c = APIClient.GetRequest($"api/main/getcar?carId={car}"); return count * (c?.Price ?? 1); } + [HttpGet] + public IActionResult Mails() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); + } } } diff --git a/AutomobilePlant/AutomobilePlantClientApp/Views/Home/Mails.cshtml b/AutomobilePlant/AutomobilePlantClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..b0d0028 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,54 @@ +@using AutomobilePlantContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "Mails"; +} + +
+

Mails

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

Login bobr!

+ return; + } + + + + + + + + + + + @foreach (var item in Model) + { + + + + + + } + +
+ Mail's date' + + Title + + Text +
+ @Html.DisplayFor(modelItem => item.DateDelivery) + + @Html.DisplayFor(modelItem => item.Subject) + + @Html.DisplayFor(modelItem => item.Body) +
+ } +
\ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantClientApp/Views/Home/_Layout.cshtml b/AutomobilePlant/AutomobilePlantClientApp/Views/Home/_Layout.cshtml index 85e5902..e2bc066 100644 --- a/AutomobilePlant/AutomobilePlantClientApp/Views/Home/_Layout.cshtml +++ b/AutomobilePlant/AutomobilePlantClientApp/Views/Home/_Layout.cshtml @@ -27,6 +27,9 @@
  • Privacy data
    • +
  • + Письма +
  • Enter
    • diff --git a/AutomobilePlant/AutomobilePlantContracts/BindingModels/MailConfigBindingModel.cs b/AutomobilePlant/AutomobilePlantContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..54d306b --- /dev/null +++ b/AutomobilePlant/AutomobilePlantContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,12 @@ +namespace AutomobilePlantContracts.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/AutomobilePlant/AutomobilePlantContracts/BindingModels/MailSendInfoBindingModel.cs b/AutomobilePlant/AutomobilePlantContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..563ec4e --- /dev/null +++ b/AutomobilePlant/AutomobilePlantContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,9 @@ +namespace AutomobilePlantContracts.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/AutomobilePlant/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs b/AutomobilePlant/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..7ded981 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,19 @@ +using AutomobilePlantDataModels.Models; + +namespace AutomobilePlantContracts.BindingModels +{ + public class MessageInfoBindingModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + public string SenderName { get; set; } = string.Empty; + + public DateTime DateDelivery { get; set; } + + public string Subject { get; set; } = string.Empty; + + public string Body { get; set; } = string.Empty; + } +} diff --git a/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..5941616 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,12 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.SearchModels; +using AutomobilePlantContracts.ViewModels; + +namespace AutomobilePlantContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + bool Create(MessageInfoBindingModel model); + } +} diff --git a/AutomobilePlant/AutomobilePlantContracts/SearchModels/MessageInfoSearchModel.cs b/AutomobilePlant/AutomobilePlantContracts/SearchModels/MessageInfoSearchModel.cs new file mode 100644 index 0000000..62d4ec2 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantContracts/SearchModels/MessageInfoSearchModel.cs @@ -0,0 +1,8 @@ +namespace AutomobilePlantContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public int? ClientId { get; set; } + public string? MessageId { get; set; } + } +} diff --git a/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IMessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..5573493 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,14 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.SearchModels; +using AutomobilePlantContracts.ViewModels; + +namespace AutomobilePlantContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + } +} diff --git a/AutomobilePlant/AutomobilePlantContracts/ViewModels/MessageInfoViewModel .cs b/AutomobilePlant/AutomobilePlantContracts/ViewModels/MessageInfoViewModel .cs new file mode 100644 index 0000000..93c9422 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantContracts/ViewModels/MessageInfoViewModel .cs @@ -0,0 +1,20 @@ +using AutomobilePlantDataModels.Models; +using System.ComponentModel; + +namespace AutomobilePlantContracts.ViewModels +{ + public class MessageInfoViewModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + [DisplayName("Sender")] + public string SenderName { get; set; } = string.Empty; + [DisplayName("Delivery Date")] + public DateTime DateDelivery { get; set; } + [DisplayName("Subject")] + public string Subject { get; set; } = string.Empty; + [DisplayName("Body")] + public string Body { get; set; } = string.Empty; + } +} diff --git a/AutomobilePlant/AutomobilePlantDataModels/Models/IMessageInfoModel.cs b/AutomobilePlant/AutomobilePlantDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..ca34e78 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,12 @@ +namespace AutomobilePlantDataModels.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/AutomobilePlant/AutomobilePlantDatabaseImplement/AutomobilePlantDatabase.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/AutomobilePlantDatabase.cs index 0ee34d3..da30ddf 100644 --- a/AutomobilePlant/AutomobilePlantDatabaseImplement/AutomobilePlantDatabase.cs +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/AutomobilePlantDatabase.cs @@ -19,5 +19,6 @@ namespace AutomobilePlantDatabaseImplement 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/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..65237ac --- /dev/null +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,52 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.SearchModels; +using AutomobilePlantContracts.StoragesContracts; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantDatabaseImplement.Models; + +namespace AutomobilePlantDatabaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + using var context = new AutomobilePlantDatabase(); + if (model.MessageId != null) + { + return context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; + } + return null; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + using var context = new AutomobilePlantDatabase(); + return context.Messages + .Where(x => x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + using var context = new AutomobilePlantDatabase(); + return context.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + using var context = new AutomobilePlantDatabase(); + var newMessage = MessageInfo.Create(model); + if (newMessage == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId))) + { + return null; + } + context.Messages.Add(newMessage); + context.SaveChanges(); + return newMessage.GetViewModel; + } + } +} diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240504192703_MbINeedIt7Laba.Designer.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240504192703_MbINeedIt7Laba.Designer.cs new file mode 100644 index 0000000..be279f1 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240504192703_MbINeedIt7Laba.Designer.cs @@ -0,0 +1,298 @@ +// +using System; +using AutomobilePlantDatabaseImplement; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace AutomobilePlantDatabaseImplement.Migrations +{ + [DbContext(typeof(AutomobilePlantDatabase))] + [Migration("20240504192703_MbINeedIt7Laba")] + partial class MbINeedIt7Laba + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.16") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Car", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Cars"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.CarComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarId") + .HasColumnType("int"); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.HasIndex("ComponentId"); + + b.ToTable("CarComponents"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.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("AutomobilePlantDatabaseImplement.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("AutomobilePlantDatabaseImplement.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("AutomobilePlantDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarId") + .HasColumnType("int"); + + 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("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.HasIndex("ClientId"); + + b.HasIndex("ImplementerId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.CarComponent", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Car", "Car") + .WithMany("Components") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Component", "Component") + .WithMany("CarComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + + b.Navigation("Component"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Order", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Car", "Car") + .WithMany("Orders") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Implementer", "Implementer") + .WithMany("Orders") + .HasForeignKey("ImplementerId"); + + b.Navigation("Car"); + + b.Navigation("Client"); + + b.Navigation("Implementer"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Car", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Client", b => + { + b.Navigation("Messages"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Component", b => + { + b.Navigation("CarComponents"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Implementer", b => + { + b.Navigation("Orders"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240504192703_MbINeedIt7Laba.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240504192703_MbINeedIt7Laba.cs new file mode 100644 index 0000000..8192518 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240504192703_MbINeedIt7Laba.cs @@ -0,0 +1,48 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace AutomobilePlantDatabaseImplement.Migrations +{ + /// + public partial class MbINeedIt7Laba : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Messages", + columns: table => new + { + MessageId = table.Column(type: "nvarchar(450)", nullable: false), + ClientId = table.Column(type: "int", nullable: true), + SenderName = table.Column(type: "nvarchar(max)", nullable: false), + DateDelivery = table.Column(type: "datetime2", nullable: false), + Subject = table.Column(type: "nvarchar(max)", nullable: false), + Body = table.Column(type: "nvarchar(max)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Messages", x => x.MessageId); + table.ForeignKey( + name: "FK_Messages_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id"); + }); + + migrationBuilder.CreateIndex( + name: "IX_Messages_ClientId", + table: "Messages", + column: "ClientId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Messages"); + } + } +} diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/AutomobilePlantDatabaseModelSnapshot.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/AutomobilePlantDatabaseModelSnapshot.cs index 234f032..3f33212 100644 --- a/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/AutomobilePlantDatabaseModelSnapshot.cs +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/AutomobilePlantDatabaseModelSnapshot.cs @@ -140,6 +140,36 @@ namespace AutomobilePlantDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -202,6 +232,15 @@ namespace AutomobilePlantDatabaseImplement.Migrations b.Navigation("Component"); }); + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Order", b => { b.HasOne("AutomobilePlantDatabaseImplement.Models.Car", "Car") @@ -236,6 +275,8 @@ namespace AutomobilePlantDatabaseImplement.Migrations modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Client", b => { + b.Navigation("Messages"); + b.Navigation("Orders"); }); diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/Client.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/Client.cs index 8973482..fb52417 100644 --- a/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/Client.cs +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/Client.cs @@ -22,6 +22,9 @@ namespace AutomobilePlantDatabaseImplement.Models [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); + [ForeignKey("ClientId")] + public virtual List Messages { get; set; } = new(); + public static Client? Create(ClientBindingModel model) { if (model == null) diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..804ddec --- /dev/null +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs @@ -0,0 +1,52 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantDataModels.Models; +using System.ComponentModel.DataAnnotations; + +namespace AutomobilePlantDatabaseImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + [Key] + public string MessageId { get; private set; } = string.Empty; + + public int? ClientId { get; private set; } + + public string SenderName { get; private set; } = string.Empty; + + public DateTime DateDelivery { get; private set; } = DateTime.Now; + + public string Subject { get; private set; } = string.Empty; + + public string Body { get; private set; } = string.Empty; + + public virtual Client? Client { get; private set; } + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + Subject = model.Subject, + ClientId = model.ClientId, + MessageId = model.MessageId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + }; + } +} diff --git a/AutomobilePlant/AutomobilePlantFileImplement/DataFileSingleton.cs b/AutomobilePlant/AutomobilePlantFileImplement/DataFileSingleton.cs index bdf8668..0b13c50 100644 --- a/AutomobilePlant/AutomobilePlantFileImplement/DataFileSingleton.cs +++ b/AutomobilePlant/AutomobilePlantFileImplement/DataFileSingleton.cs @@ -1,9 +1,4 @@ using AutomobilePlantFileImplement.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Xml.Linq; namespace AutomobilePlantFileImplement @@ -16,11 +11,13 @@ namespace AutomobilePlantFileImplement private readonly string CarFileName = "Car.xml"; private readonly string ClientFileName = "Client.xml"; private readonly string ImplementerFileName = "Implementer.xml"; + private readonly string MessageInfoFileName = "MessageInfo.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Cars { get; private set; } public List Clients { get; private set; } public List Implementers { get; private set; } + public List Messages { get; private set; } public static DataFileSingleton GetInstance() { if (instance == null) @@ -34,6 +31,7 @@ namespace AutomobilePlantFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveImplementers() => SaveData(Orders, ImplementerFileName, "Implementers", x => x.GetXElement); + public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement); private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; @@ -41,6 +39,7 @@ namespace AutomobilePlantFileImplement Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Implementers = LoadData(ImplementerFileName, "Impleneter", x => Implementer.Create(x)!)!; + Messages = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..2d9ea4f --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,53 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.SearchModels; +using AutomobilePlantContracts.StoragesContracts; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantFileImplement.Models; + +namespace AutomobilePlantFileImplement.Implements +{ + 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 List GetFilteredList(MessageInfoSearchModel model) + { + return _source.Messages + .Where(x => x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + return _source.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + _source.Messages.Add(newMessage); + _source.SaveMessages(); + return newMessage.GetViewModel; + } + } +} diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Models/MessageInfo.cs b/AutomobilePlant/AutomobilePlantFileImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..f1aacf7 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantFileImplement/Models/MessageInfo.cs @@ -0,0 +1,75 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantDataModels.Models; +using System.Xml.Linq; + +namespace AutomobilePlantFileImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + public string MessageId { get; private set; } = string.Empty; + + public int? ClientId { get; private set; } + + public string SenderName { get; private set; } = string.Empty; + + public DateTime DateDelivery { get; private set; } = DateTime.Now; + + public string Subject { get; private set; } = string.Empty; + + public string Body { get; private set; } = string.Empty; + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + Subject = model.Subject, + ClientId = model.ClientId, + MessageId = model.MessageId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + }; + } + + public static MessageInfo? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + Body = element.Attribute("Body")!.Value, + Subject = element.Attribute("Subject")!.Value, + ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), + MessageId = element.Attribute("MessageId")!.Value, + SenderName = element.Attribute("SenderName")!.Value, + DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value), + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + }; + + public XElement GetXElement => new("MessageInfo", + new XAttribute("Body", Body), + new XAttribute("Subject", Subject), + new XAttribute("ClientId", ClientId), + new XAttribute("MessageId", MessageId), + new XAttribute("SenderName", SenderName), + new XAttribute("DateDelivery", DateDelivery) + ); + } +} diff --git a/AutomobilePlant/AutomobilePlantListImplement/DataListSingleton.cs b/AutomobilePlant/AutomobilePlantListImplement/DataListSingleton.cs index 70e9927..3730ebe 100644 --- a/AutomobilePlant/AutomobilePlantListImplement/DataListSingleton.cs +++ b/AutomobilePlant/AutomobilePlantListImplement/DataListSingleton.cs @@ -1,9 +1,4 @@ using AutomobilePlantListImplement.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AutomobilePlantListImplement { @@ -15,6 +10,7 @@ namespace AutomobilePlantListImplement public List Cars { get; set; } public List Clients { get; set; } public List Implementers { get; set; } + public List Messages { get; set; } private DataListSingleton() { Components = new List(); @@ -22,6 +18,7 @@ namespace AutomobilePlantListImplement Cars = new List(); Clients = new List(); Implementers = new List(); + Messages = new List(); } public static DataListSingleton GetInstance() { diff --git a/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..85b9633 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,60 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.SearchModels; +using AutomobilePlantContracts.StoragesContracts; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantListImplement.Models; + +namespace AutomobilePlantListImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataListSingleton _source; + public MessageInfoStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + foreach (var message in _source.Messages) + { + if (model.MessageId != null && model.MessageId.Equals(message.MessageId)) return message.GetViewModel; + } + return null; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + List result = new(); + foreach (var item in _source.Messages) + { + if (item.ClientId.HasValue && item.ClientId == model.ClientId) + { + result.Add(item.GetViewModel); + } + } + return result; + } + + public List GetFullList() + { + List result = new(); + foreach (var item in _source.Messages) + { + result.Add(item.GetViewModel); + } + return result; + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + _source.Messages.Add(newMessage); + return newMessage.GetViewModel; + } + } +} diff --git a/AutomobilePlant/AutomobilePlantListImplement/Models/MessageInfo.cs b/AutomobilePlant/AutomobilePlantListImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..269cd8c --- /dev/null +++ b/AutomobilePlant/AutomobilePlantListImplement/Models/MessageInfo.cs @@ -0,0 +1,48 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.ViewModels; +using AutomobilePlantDataModels.Models; + +namespace AutomobilePlantListImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + public string MessageId { get; private set; } = string.Empty; + + public int? ClientId { get; private set; } + + public string SenderName { get; private set; } = string.Empty; + + public DateTime DateDelivery { get; private set; } = DateTime.Now; + + public string Subject { get; private set; } = string.Empty; + + public string Body { get; private set; } = string.Empty; + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + Subject = model.Subject, + ClientId = model.ClientId, + MessageId = model.MessageId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + }; + } +} diff --git a/AutomobilePlant/AutomobilePlantRestApi/Controllers/ClientController.cs b/AutomobilePlant/AutomobilePlantRestApi/Controllers/ClientController.cs index 3e59ee4..a96b3ee 100644 --- a/AutomobilePlant/AutomobilePlantRestApi/Controllers/ClientController.cs +++ b/AutomobilePlant/AutomobilePlantRestApi/Controllers/ClientController.cs @@ -12,10 +12,12 @@ namespace AutomobilePlantRestApi.Controllers { private readonly ILogger _logger; private readonly IClientLogic _logic; - public ClientController(IClientLogic logic, ILogger logger) + private readonly IMessageInfoLogic _mailLogic; + public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger logger) { _logger = logger; _logic = logic; + _mailLogic = mailLogic; } [HttpGet] public ClientViewModel? Login(string login, string password) @@ -60,5 +62,21 @@ namespace AutomobilePlantRestApi.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/AutomobilePlant/AutomobilePlantRestApi/Program.cs b/AutomobilePlant/AutomobilePlantRestApi/Program.cs index 15027a0..abd40e1 100644 --- a/AutomobilePlant/AutomobilePlantRestApi/Program.cs +++ b/AutomobilePlant/AutomobilePlantRestApi/Program.cs @@ -1,4 +1,6 @@ using AutomobilePlantBusinessLogic.BusinessLogics; +using AutomobilePlantBusinessLogic.MailWorker; +using AutomobilePlantContracts.BindingModels; using AutomobilePlantContracts.BusinessLogicsContracts; using AutomobilePlantContracts.StoragesContracts; using AutomobilePlantDatabaseImplement.Implements; @@ -13,10 +15,13 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddSingleton(); builder.Services.AddControllers(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle @@ -32,6 +37,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/AutomobilePlant/AutomobilePlantRestApi/appsettings.json b/AutomobilePlant/AutomobilePlantRestApi/appsettings.json index 10f68b8..60a17eb 100644 --- a/AutomobilePlant/AutomobilePlantRestApi/appsettings.json +++ b/AutomobilePlant/AutomobilePlantRestApi/appsettings.json @@ -5,5 +5,13 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + + "SmtpClientHost": "smtp.gmail.com", + "SmtpClientPort": "587", + "PopHost": "pop.gmail.com", + "PopPort": "995", + "MailLogin": "bes1s1uden1@gmail.com", + "MailPassword": "+bes1s1uden1+" + } diff --git a/AutomobilePlant/AutomobilePlantView/App.config b/AutomobilePlant/AutomobilePlantView/App.config new file mode 100644 index 0000000..aebe1cd --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantView/AutomobilePlantView.csproj b/AutomobilePlant/AutomobilePlantView/AutomobilePlantView.csproj index dc9eee4..570dc6c 100644 --- a/AutomobilePlant/AutomobilePlantView/AutomobilePlantView.csproj +++ b/AutomobilePlant/AutomobilePlantView/AutomobilePlantView.csproj @@ -27,6 +27,9 @@ + + PreserveNewest + Always diff --git a/AutomobilePlant/AutomobilePlantView/FormMails.Designer.cs b/AutomobilePlant/AutomobilePlantView/FormMails.Designer.cs new file mode 100644 index 0000000..ce19819 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/FormMails.Designer.cs @@ -0,0 +1,62 @@ +namespace AutomobilePlantView +{ + 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.RowTemplate.Height = 25; + dataGridView.Size = new Size(800, 450); + dataGridView.TabIndex = 0; + // + // FormMails + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(dataGridView); + Name = "FormMails"; + Text = "Mails"; + Load += FormMails_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantView/FormMails.cs b/AutomobilePlant/AutomobilePlantView/FormMails.cs new file mode 100644 index 0000000..5ed0215 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/FormMails.cs @@ -0,0 +1,40 @@ +using AutomobilePlantContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace AutomobilePlantView +{ + public partial class FormMails : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + + public FormMails(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormMails_Load(object sender, EventArgs e) + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка писем"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки писем"); + MessageBox.Show(ex.Message, "Eror", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } +} diff --git a/AutomobilePlant/AutomobilePlantView/FormMails.resx b/AutomobilePlant/AutomobilePlantView/FormMails.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/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/AutomobilePlant/AutomobilePlantView/FormMain.Designer.cs b/AutomobilePlant/AutomobilePlantView/FormMain.Designer.cs index 39d8b53..1d2d841 100644 --- a/AutomobilePlant/AutomobilePlantView/FormMain.Designer.cs +++ b/AutomobilePlant/AutomobilePlantView/FormMain.Designer.cs @@ -38,11 +38,12 @@ carsListToolStripMenuItem = new ToolStripMenuItem(); componentsByCarsToolStripMenuItem = new ToolStripMenuItem(); ordersListToolStripMenuItem = new ToolStripMenuItem(); + startWorkingsToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonIssuedOrder = new Button(); buttonRefresh = new Button(); - startWorkingsToolStripMenuItem = new ToolStripMenuItem(); + mailsToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -58,7 +59,7 @@ // // toolStripMenuItemCatalogs // - toolStripMenuItemCatalogs.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemComponents, toolStripMenuItemCars, clientsToolStripMenuItem, implementersToolStripMenuItem }); + toolStripMenuItemCatalogs.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemComponents, toolStripMenuItemCars, clientsToolStripMenuItem, implementersToolStripMenuItem, mailsToolStripMenuItem }); toolStripMenuItemCatalogs.Name = "toolStripMenuItemCatalogs"; toolStripMenuItemCatalogs.Size = new Size(65, 20); toolStripMenuItemCatalogs.Text = "Catalogs"; @@ -119,6 +120,13 @@ ordersListToolStripMenuItem.Text = "Orders' list"; ordersListToolStripMenuItem.Click += ordersListToolStripMenuItem_Click; // + // startWorkingsToolStripMenuItem + // + startWorkingsToolStripMenuItem.Name = "startWorkingsToolStripMenuItem"; + startWorkingsToolStripMenuItem.Size = new Size(94, 20); + startWorkingsToolStripMenuItem.Text = "Start workings"; + startWorkingsToolStripMenuItem.Click += startWorkingsToolStripMenuItem_Click; + // // dataGridView // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -158,12 +166,12 @@ buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.Click += ButtonRef_Click; // - // startWorkingsToolStripMenuItem + // mailsToolStripMenuItem // - startWorkingsToolStripMenuItem.Name = "startWorkingsToolStripMenuItem"; - startWorkingsToolStripMenuItem.Size = new Size(94, 20); - startWorkingsToolStripMenuItem.Text = "Start workings"; - startWorkingsToolStripMenuItem.Click += startWorkingsToolStripMenuItem_Click; + mailsToolStripMenuItem.Name = "mailsToolStripMenuItem"; + mailsToolStripMenuItem.Size = new Size(180, 22); + mailsToolStripMenuItem.Text = "mails"; + mailsToolStripMenuItem.Click += mailsToolStripMenuItem_Click; // // FormMain // @@ -202,5 +210,6 @@ private ToolStripMenuItem clientsToolStripMenuItem; private ToolStripMenuItem implementersToolStripMenuItem; private ToolStripMenuItem startWorkingsToolStripMenuItem; + private ToolStripMenuItem mailsToolStripMenuItem; } } \ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantView/FormMain.cs b/AutomobilePlant/AutomobilePlantView/FormMain.cs index df3fffc..d1962d0 100644 --- a/AutomobilePlant/AutomobilePlantView/FormMain.cs +++ b/AutomobilePlant/AutomobilePlantView/FormMain.cs @@ -80,6 +80,15 @@ namespace AutomobilePlantView } } + private void mailsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + if (service is FormMails form) + { + form.ShowDialog(); + } + } + private void carsListToolStripMenuItem_Click(object sender, EventArgs e) { using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; diff --git a/AutomobilePlant/AutomobilePlantView/Program.cs b/AutomobilePlant/AutomobilePlantView/Program.cs index 28b7d4e..522f2ab 100644 --- a/AutomobilePlant/AutomobilePlantView/Program.cs +++ b/AutomobilePlant/AutomobilePlantView/Program.cs @@ -1,4 +1,4 @@ -using AutomobilePlantBusinessLogic.BusinessLogics; +using AutomobilePlantBusinessLogic.BusinessLogics; using AutomobilePlantBusinessLogic.OfficePackage.Implements; using AutomobilePlantBusinessLogic.OfficePackage; using AutomobilePlantContracts.BusinessLogicsContracts; @@ -7,6 +7,8 @@ using AutomobilePlantDatabaseImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; +using AutomobilePlantBusinessLogic.MailWorker; +using AutomobilePlantContracts.BindingModels; namespace AutomobilePlantView { @@ -26,8 +28,31 @@ namespace AutomobilePlantView var services = new ServiceCollection(); ConfigureServices(services); _serviceProvider = services.BuildServiceProvider(); + + try + { + var mailSender = _serviceProvider.GetService(); + mailSender?.MailConfig(new MailConfigBindingModel + { + MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, + MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty, + SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty, + SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]), + PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty, + PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"]) + }); + // создаем таймер + var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000); + } + catch (Exception ex) + { + var logger = _serviceProvider.GetService(); + logger?.LogError(ex, "Ошибка работы с почтой"); + } + Application.Run(_serviceProvider.GetRequiredService()); } + private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); private static void ConfigureServices(ServiceCollection services) { services.AddLogging(option => @@ -40,16 +65,19 @@ namespace AutomobilePlantView 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.AddTransient(); + services.AddSingleton(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -62,6 +90,7 @@ namespace AutomobilePlantView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file -- 2.25.1 From bf9c48b0e750eb00d6923ed2b72ad1515172b7f4 Mon Sep 17 00:00:00 2001 From: Timourka Date: Sun, 5 May 2024 17:40:48 +0400 Subject: [PATCH 2/6] =?UTF-8?q?7=D0=BB=D0=B0=D0=B1=D0=B0=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=B1=D1=83=D0=BA=D0=B2=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81?= =?UTF-8?q?=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs index a1c975f..b65ad0b 100644 --- a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs @@ -105,7 +105,7 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics { throw new ArgumentException("Некорретно введен email клиента", nameof(model.Email)); } - if (!Regex.IsMatch(model.Password, @"^(?=.*\d)(?=.*[^\d\s]).+$")) + if (!Regex.IsMatch(model.Password, @"^(?=.*\d)(?=.*\W)(?=.*[^\d\s]).+$")) { throw new ArgumentException("Некорректно введен пароль клиента", nameof(model.Password)); } -- 2.25.1 From 9b9945840d2bf0157b4fa7bc2bc11f0e06ae3852 Mon Sep 17 00:00:00 2001 From: Timourka Date: Sun, 5 May 2024 17:59:03 +0400 Subject: [PATCH 3/6] =?UTF-8?q?LC7=20=D0=B1=D0=B0=D0=B7=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs index 2906b2a..0fbd6f9 100644 --- a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs @@ -194,7 +194,6 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics var result = _orderStorage.Update(model); if (result == null) { - model.Status = oldStatus; _logger.LogWarning("Update operation failed"); return false; } -- 2.25.1 From b4c17e17cdf8e5c19053596eee2078bbcb95ff3e Mon Sep 17 00:00:00 2001 From: Timourka Date: Sun, 5 May 2024 23:46:21 +0400 Subject: [PATCH 4/6] Laba 7 complicated done --- .../BusinessLogics/MessageInfoLogic.cs | 23 +- .../Controllers/HomeController.cs | 7 +- .../Views/Home/Mails.cshtml | 109 ++--- .../BindingModels/MessageInfoBindingModel.cs | 2 + .../IMessageInfoLogic.cs | 2 + .../SearchModels/MessageInfoSearchModel.cs | 2 + .../StoragesContracts/IMessageInfoStorage.cs | 1 + .../ViewModels/MessageInfoViewModel .cs | 4 + .../Models/IMessageInfoModel.cs | 2 + .../Implements/MessageInfoStorage.cs | 19 +- .../20240505173052_MbINeedItLC7.Designer.cs | 381 ++++++++++++++++++ .../Migrations/20240505173052_MbINeedItLC7.cs | 39 ++ .../AutomobilePlantDatabaseModelSnapshot.cs | 16 +- .../Models/MessageInfo.cs | 16 + .../Implements/MessageInfoStorage.cs | 18 +- .../Models/MessageInfo.cs | 24 +- .../Implements/MessageInfoStorage.cs | 18 +- .../Models/MessageInfo.cs | 18 + .../Controllers/ClientController.cs | 6 +- .../AutomobilePlantView/FormMail.Designer.cs | 195 +++++++++ .../AutomobilePlantView/FormMail.cs | 79 ++++ .../AutomobilePlantView/FormMail.resx | 120 ++++++ .../AutomobilePlantView/FormMails.Designer.cs | 148 +++++-- .../AutomobilePlantView/FormMails.cs | 97 +++-- .../AutomobilePlantView/Program.cs | 3 +- 25 files changed, 1223 insertions(+), 126 deletions(-) create mode 100644 AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240505173052_MbINeedItLC7.Designer.cs create mode 100644 AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240505173052_MbINeedItLC7.cs create mode 100644 AutomobilePlant/AutomobilePlantView/FormMail.Designer.cs create mode 100644 AutomobilePlant/AutomobilePlantView/FormMail.cs create mode 100644 AutomobilePlant/AutomobilePlantView/FormMail.resx diff --git a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/MessageInfoLogic.cs index 509f358..cb3ee9b 100644 --- a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/MessageInfoLogic.cs +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -29,7 +29,7 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics public List? ReadList(MessageInfoSearchModel? model) { - _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId} ", model?.MessageId, model?.ClientId); + _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId}.Page:{Page}.PageSize:{PageSize}", model?.MessageId, model?.ClientId, model?.Page, model?.PageSize); var list = (model == null) ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model); if (list == null) { @@ -39,5 +39,26 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics _logger.LogInformation("ReadList. Count:{Count}", list.Count); return list; } + + public MessageInfoViewModel? ReadElement(MessageInfoSearchModel model) + { + var message = _messageInfoStorage.GetElement(model); + if (message == null) + { + _logger.LogWarning("Read message operation failed"); + return null; + } + return message; + } + + public bool Update(MessageInfoBindingModel model) + { + if (_messageInfoStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } } } diff --git a/AutomobilePlant/AutomobilePlantClientApp/Controllers/HomeController.cs b/AutomobilePlant/AutomobilePlantClientApp/Controllers/HomeController.cs index d9ada7d..54f9a46 100644 --- a/AutomobilePlant/AutomobilePlantClientApp/Controllers/HomeController.cs +++ b/AutomobilePlant/AutomobilePlantClientApp/Controllers/HomeController.cs @@ -141,7 +141,12 @@ namespace AutomobilePlantClientApp.Controllers { return Redirect("~/Home/Enter"); } - return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); + return View(); + } + [HttpPost] + public List LoadMails(int pageNum, int pageSize) + { + return APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}&pageNum={pageNum}&pageSize={pageSize}"); } } diff --git a/AutomobilePlant/AutomobilePlantClientApp/Views/Home/Mails.cshtml b/AutomobilePlant/AutomobilePlantClientApp/Views/Home/Mails.cshtml index b0d0028..02a7553 100644 --- a/AutomobilePlant/AutomobilePlantClientApp/Views/Home/Mails.cshtml +++ b/AutomobilePlant/AutomobilePlantClientApp/Views/Home/Mails.cshtml @@ -1,54 +1,73 @@ -@using AutomobilePlantContracts.ViewModels - -@model List - -@{ +@{ ViewData["Title"] = "Mails"; }

    Mails

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

    Login bobr!

    - return; + + + + + + + + + + +
    + Mail's date' + + Title + + Text +
    +
    +
    + Page: Page Size: +
    +
    +
    + diff --git a/AutomobilePlant/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs b/AutomobilePlant/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs index 7ded981..4fa62c2 100644 --- a/AutomobilePlant/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs +++ b/AutomobilePlant/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,7 @@ namespace AutomobilePlantContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; + public bool IsReaded { get; set; } + public string? Reply { get; set; } } } diff --git a/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IMessageInfoLogic.cs index 5941616..0e7d831 100644 --- a/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IMessageInfoLogic.cs +++ b/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -8,5 +8,7 @@ namespace AutomobilePlantContracts.BusinessLogicsContracts { List? ReadList(MessageInfoSearchModel? model); bool Create(MessageInfoBindingModel model); + bool Update(MessageInfoBindingModel model); + MessageInfoViewModel? ReadElement(MessageInfoSearchModel model); } } diff --git a/AutomobilePlant/AutomobilePlantContracts/SearchModels/MessageInfoSearchModel.cs b/AutomobilePlant/AutomobilePlantContracts/SearchModels/MessageInfoSearchModel.cs index 62d4ec2..bb9ab9b 100644 --- a/AutomobilePlant/AutomobilePlantContracts/SearchModels/MessageInfoSearchModel.cs +++ b/AutomobilePlant/AutomobilePlantContracts/SearchModels/MessageInfoSearchModel.cs @@ -4,5 +4,7 @@ { public int? ClientId { get; set; } public string? MessageId { get; set; } + public int? Page { get; set; } + public int? PageSize { get; set; } } } diff --git a/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IMessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IMessageInfoStorage.cs index 5573493..bbeddd0 100644 --- a/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IMessageInfoStorage.cs +++ b/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IMessageInfoStorage.cs @@ -10,5 +10,6 @@ namespace AutomobilePlantContracts.StoragesContracts List GetFilteredList(MessageInfoSearchModel model); MessageInfoViewModel? GetElement(MessageInfoSearchModel model); MessageInfoViewModel? Insert(MessageInfoBindingModel model); + MessageInfoViewModel? Update(MessageInfoBindingModel model); } } diff --git a/AutomobilePlant/AutomobilePlantContracts/ViewModels/MessageInfoViewModel .cs b/AutomobilePlant/AutomobilePlantContracts/ViewModels/MessageInfoViewModel .cs index 93c9422..d784f73 100644 --- a/AutomobilePlant/AutomobilePlantContracts/ViewModels/MessageInfoViewModel .cs +++ b/AutomobilePlant/AutomobilePlantContracts/ViewModels/MessageInfoViewModel .cs @@ -16,5 +16,9 @@ namespace AutomobilePlantContracts.ViewModels public string Subject { get; set; } = string.Empty; [DisplayName("Body")] public string Body { get; set; } = string.Empty; + [DisplayName("Readed")] + public bool IsReaded { get; set; } + [DisplayName("Reply")] + public string? Reply { get; set; } } } diff --git a/AutomobilePlant/AutomobilePlantDataModels/Models/IMessageInfoModel.cs b/AutomobilePlant/AutomobilePlantDataModels/Models/IMessageInfoModel.cs index ca34e78..6ef6b61 100644 --- a/AutomobilePlant/AutomobilePlantDataModels/Models/IMessageInfoModel.cs +++ b/AutomobilePlant/AutomobilePlantDataModels/Models/IMessageInfoModel.cs @@ -8,5 +8,7 @@ DateTime DateDelivery { get; } string Subject { get; } string Body { get; } + bool IsReaded { get; } + string? Reply { get; } } } diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs index 65237ac..92f3b92 100644 --- a/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs @@ -22,10 +22,15 @@ namespace AutomobilePlantDatabaseImplement.Implements public List GetFilteredList(MessageInfoSearchModel model) { using var context = new AutomobilePlantDatabase(); - return context.Messages + var messages = context.Messages .Where(x => x.ClientId == model.ClientId) .Select(x => x.GetViewModel) .ToList(); + if (!model.Page.HasValue || !model.PageSize.HasValue) + { + return messages.ToList(); + } + return messages.Skip((model.Page.Value - 1) * model.PageSize.Value).Take(model.PageSize.Value).ToList(); } public List GetFullList() @@ -48,5 +53,17 @@ namespace AutomobilePlantDatabaseImplement.Implements context.SaveChanges(); return newMessage.GetViewModel; } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + using var context = new AutomobilePlantDatabase(); + var message = context.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId)); + if (message != null) + { + message.Update(model); + context.SaveChanges(); + } + return message?.GetViewModel; + } } } diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240505173052_MbINeedItLC7.Designer.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240505173052_MbINeedItLC7.Designer.cs new file mode 100644 index 0000000..5ff561e --- /dev/null +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240505173052_MbINeedItLC7.Designer.cs @@ -0,0 +1,381 @@ +// +using System; +using AutomobilePlantDatabaseImplement; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace AutomobilePlantDatabaseImplement.Migrations +{ + [DbContext(typeof(AutomobilePlantDatabase))] + [Migration("20240505173052_MbINeedItLC7")] + partial class MbINeedItLC7 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.16") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Car", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Cars"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.CarComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarId") + .HasColumnType("int"); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.HasIndex("ComponentId"); + + b.ToTable("CarComponents"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.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("AutomobilePlantDatabaseImplement.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("AutomobilePlantDatabaseImplement.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("AutomobilePlantDatabaseImplement.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("Reply") + .HasColumnType("nvarchar(max)"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarId") + .HasColumnType("int"); + + 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("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.HasIndex("ClientId"); + + b.HasIndex("ImplementerId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("MaxCountCars") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("OpeningDate") + .HasColumnType("datetime2"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.ShopCar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopCars"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.CarComponent", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Car", "Car") + .WithMany("Components") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Component", "Component") + .WithMany("CarComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + + b.Navigation("Component"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Order", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Car", "Car") + .WithMany("Orders") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Implementer", "Implementer") + .WithMany("Orders") + .HasForeignKey("ImplementerId"); + + b.Navigation("Car"); + + b.Navigation("Client"); + + b.Navigation("Implementer"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.ShopCar", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Car", "Car") + .WithMany() + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Shop", "Shop") + .WithMany("Cars") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + + b.Navigation("Shop"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Car", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Client", b => + { + b.Navigation("Messages"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Component", b => + { + b.Navigation("CarComponents"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Implementer", b => + { + b.Navigation("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Shop", b => + { + b.Navigation("Cars"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240505173052_MbINeedItLC7.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240505173052_MbINeedItLC7.cs new file mode 100644 index 0000000..3039c43 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/20240505173052_MbINeedItLC7.cs @@ -0,0 +1,39 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace AutomobilePlantDatabaseImplement.Migrations +{ + /// + public partial class MbINeedItLC7 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "IsReaded", + table: "Messages", + type: "bit", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "Reply", + table: "Messages", + type: "nvarchar(max)", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "IsReaded", + table: "Messages"); + + migrationBuilder.DropColumn( + name: "Reply", + table: "Messages"); + } + } +} diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/AutomobilePlantDatabaseModelSnapshot.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/AutomobilePlantDatabaseModelSnapshot.cs index a8074c2..b7dd66f 100644 --- a/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/AutomobilePlantDatabaseModelSnapshot.cs +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Migrations/AutomobilePlantDatabaseModelSnapshot.cs @@ -155,6 +155,12 @@ namespace AutomobilePlantDatabaseImplement.Migrations b.Property("DateDelivery") .HasColumnType("datetime2"); + b.Property("IsReaded") + .HasColumnType("bit"); + + b.Property("Reply") + .HasColumnType("nvarchar(max)"); + b.Property("SenderName") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -357,15 +363,15 @@ namespace AutomobilePlantDatabaseImplement.Migrations b.Navigation("CarComponents"); }); - modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Shop", b => - { - b.Navigation("Cars"); - }); - modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Implementer", b => { b.Navigation("Orders"); }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Shop", b => + { + b.Navigation("Cars"); + }); #pragma warning restore 612, 618 } } diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs index 804ddec..c78144a 100644 --- a/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs @@ -19,6 +19,8 @@ namespace AutomobilePlantDatabaseImplement.Models public string Subject { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty; + public bool IsReaded { get; private set; } + public string? Reply { get; private set; } public virtual Client? Client { get; private set; } @@ -36,9 +38,21 @@ namespace AutomobilePlantDatabaseImplement.Models MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, + IsReaded = model.IsReaded, + Reply = model.Reply }; } + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + Reply = model.Reply; + IsReaded = model.IsReaded; + } + public MessageInfoViewModel GetViewModel => new() { Body = Body, @@ -47,6 +61,8 @@ namespace AutomobilePlantDatabaseImplement.Models MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, + Reply = Reply, + IsReaded = IsReaded, }; } } diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs index 2d9ea4f..f852696 100644 --- a/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs +++ b/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs @@ -25,10 +25,15 @@ namespace AutomobilePlantFileImplement.Implements public List GetFilteredList(MessageInfoSearchModel model) { - return _source.Messages + var messages = _source.Messages .Where(x => x.ClientId == model.ClientId) .Select(x => x.GetViewModel) .ToList(); + if (!model.Page.HasValue || !model.PageSize.HasValue) + { + return messages.ToList(); + } + return messages.Skip((model.Page.Value - 1) * model.PageSize.Value).Take(model.PageSize.Value).ToList(); } public List GetFullList() @@ -49,5 +54,16 @@ namespace AutomobilePlantFileImplement.Implements _source.SaveMessages(); return newMessage.GetViewModel; } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + var message = _source.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId)); + if (message != null) + { + message.Update(model); + _source.SaveMessages(); + } + return message?.GetViewModel; + } } } diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Models/MessageInfo.cs b/AutomobilePlant/AutomobilePlantFileImplement/Models/MessageInfo.cs index f1aacf7..23bd9ad 100644 --- a/AutomobilePlant/AutomobilePlantFileImplement/Models/MessageInfo.cs +++ b/AutomobilePlant/AutomobilePlantFileImplement/Models/MessageInfo.cs @@ -19,6 +19,10 @@ namespace AutomobilePlantFileImplement.Models public string Body { get; private set; } = string.Empty; + public bool IsReaded { get; private set; } + + public string? Reply { get; private set; } + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) @@ -33,6 +37,8 @@ namespace AutomobilePlantFileImplement.Models MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, + Reply = model.Reply, + IsReaded = model.IsReaded, }; } @@ -50,9 +56,21 @@ namespace AutomobilePlantFileImplement.Models MessageId = element.Attribute("MessageId")!.Value, SenderName = element.Attribute("SenderName")!.Value, DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value), + Reply = element.Attribute("Reply")!.Value, + IsReaded = Convert.ToBoolean(element.Attribute("IsReaded")!.Value), }; } + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + Reply = model.Reply; + IsReaded = model.IsReaded; + } + public MessageInfoViewModel GetViewModel => new() { Body = Body, @@ -61,6 +79,8 @@ namespace AutomobilePlantFileImplement.Models MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, + Reply = Reply, + IsReaded = IsReaded, }; public XElement GetXElement => new("MessageInfo", @@ -69,7 +89,9 @@ namespace AutomobilePlantFileImplement.Models new XAttribute("ClientId", ClientId), new XAttribute("MessageId", MessageId), new XAttribute("SenderName", SenderName), - new XAttribute("DateDelivery", DateDelivery) + new XAttribute("DateDelivery", DateDelivery), + new XAttribute("Reply", Reply), + new XAttribute("HasRead", IsReaded) ); } } diff --git a/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs index 85b9633..bddb30f 100644 --- a/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs +++ b/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs @@ -33,7 +33,11 @@ namespace AutomobilePlantListImplement.Implements result.Add(item.GetViewModel); } } - return result; + if (!model.Page.HasValue || !model.PageSize.HasValue) + { + return result; + } + return result.Skip((model.Page.Value - 1) * model.PageSize.Value).Take(model.PageSize.Value).ToList(); } public List GetFullList() @@ -56,5 +60,17 @@ namespace AutomobilePlantListImplement.Implements _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/AutomobilePlant/AutomobilePlantListImplement/Models/MessageInfo.cs b/AutomobilePlant/AutomobilePlantListImplement/Models/MessageInfo.cs index 269cd8c..268cf9c 100644 --- a/AutomobilePlant/AutomobilePlantListImplement/Models/MessageInfo.cs +++ b/AutomobilePlant/AutomobilePlantListImplement/Models/MessageInfo.cs @@ -18,6 +18,10 @@ namespace AutomobilePlantListImplement.Models public string Body { get; private set; } = string.Empty; + public bool IsReaded { get; private set; } + + public string? Reply { get; private set; } + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) @@ -32,9 +36,21 @@ namespace AutomobilePlantListImplement.Models MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, + Reply = model.Reply, + IsReaded = model.IsReaded, }; } + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + Reply = model.Reply; + IsReaded = model.IsReaded; + } + public MessageInfoViewModel GetViewModel => new() { Body = Body, @@ -43,6 +59,8 @@ namespace AutomobilePlantListImplement.Models MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, + Reply = Reply, + IsReaded = IsReaded, }; } } diff --git a/AutomobilePlant/AutomobilePlantRestApi/Controllers/ClientController.cs b/AutomobilePlant/AutomobilePlantRestApi/Controllers/ClientController.cs index a96b3ee..9b30462 100644 --- a/AutomobilePlant/AutomobilePlantRestApi/Controllers/ClientController.cs +++ b/AutomobilePlant/AutomobilePlantRestApi/Controllers/ClientController.cs @@ -63,13 +63,15 @@ namespace AutomobilePlantRestApi.Controllers } } [HttpGet] - public List? GetMessages(int clientId) + public List? GetMessages(int clientId, int pageNum, int pageSize) { try { return _mailLogic.ReadList(new MessageInfoSearchModel { - ClientId = clientId + ClientId = clientId, + Page = pageNum, + PageSize = pageSize }); } catch (Exception ex) diff --git a/AutomobilePlant/AutomobilePlantView/FormMail.Designer.cs b/AutomobilePlant/AutomobilePlantView/FormMail.Designer.cs new file mode 100644 index 0000000..83fecf4 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/FormMail.Designer.cs @@ -0,0 +1,195 @@ +namespace AutomobilePlantView +{ + partial class FormMail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + textBoxHead = new TextBox(); + textBoxBody = new TextBox(); + labelHead = new Label(); + labelBody = new Label(); + labelFrom = new Label(); + labelHeadReply = new Label(); + labelBoryReply = new Label(); + labelMessage = new Label(); + labelHeadMessage = new Label(); + label1 = new Label(); + buttonCancel = new Button(); + buttonSave = new Button(); + SuspendLayout(); + // + // textBoxHead + // + textBoxHead.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + textBoxHead.Location = new Point(85, 256); + textBoxHead.Name = "textBoxHead"; + textBoxHead.Size = new Size(703, 23); + textBoxHead.TabIndex = 0; + // + // textBoxBody + // + textBoxBody.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + textBoxBody.Location = new Point(85, 285); + textBoxBody.Multiline = true; + textBoxBody.Name = "textBoxBody"; + textBoxBody.Size = new Size(703, 153); + textBoxBody.TabIndex = 1; + // + // labelHead + // + labelHead.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + labelHead.Location = new Point(103, 32); + labelHead.Name = "labelHead"; + labelHead.Size = new Size(685, 61); + labelHead.TabIndex = 2; + labelHead.Text = "Head"; + // + // labelBody + // + labelBody.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + labelBody.Location = new Point(103, 93); + labelBody.Name = "labelBody"; + labelBody.Size = new Size(685, 160); + labelBody.TabIndex = 3; + labelBody.Text = "Body"; + // + // labelFrom + // + labelFrom.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + labelFrom.Location = new Point(103, 9); + labelFrom.Name = "labelFrom"; + labelFrom.Size = new Size(685, 23); + labelFrom.TabIndex = 4; + labelFrom.Text = "From"; + // + // labelHeadReply + // + labelHeadReply.AutoSize = true; + labelHeadReply.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + labelHeadReply.Location = new Point(12, 259); + labelHeadReply.Name = "labelHeadReply"; + labelHeadReply.Size = new Size(67, 15); + labelHeadReply.TabIndex = 5; + labelHeadReply.Text = "Head reply:"; + // + // labelBoryReply + // + labelBoryReply.AutoSize = true; + labelBoryReply.Location = new Point(12, 288); + labelBoryReply.Name = "labelBoryReply"; + labelBoryReply.Size = new Size(66, 15); + labelBoryReply.TabIndex = 6; + labelBoryReply.Text = "Body reply:"; + // + // labelMessage + // + labelMessage.AutoSize = true; + labelMessage.Location = new Point(12, 93); + labelMessage.Name = "labelMessage"; + labelMessage.Size = new Size(86, 15); + labelMessage.TabIndex = 8; + labelMessage.Text = "Body message:"; + // + // labelHeadMessage + // + labelHeadMessage.AutoSize = true; + labelHeadMessage.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + labelHeadMessage.Location = new Point(12, 32); + labelHeadMessage.Name = "labelHeadMessage"; + labelHeadMessage.Size = new Size(87, 15); + labelHeadMessage.TabIndex = 7; + labelHeadMessage.Text = "Head message:"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(12, 9); + label1.Name = "label1"; + label1.Size = new Size(85, 15); + label1.TabIndex = 9; + label1.Text = "Message from:"; + // + // buttonCancel + // + buttonCancel.Location = new Point(713, 449); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(75, 23); + buttonCancel.TabIndex = 10; + buttonCancel.Text = "Cancel"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // buttonSave + // + buttonSave.Location = new Point(632, 449); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(75, 23); + buttonSave.TabIndex = 11; + buttonSave.Text = "Save"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // FormMail + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 484); + Controls.Add(buttonSave); + Controls.Add(buttonCancel); + Controls.Add(label1); + Controls.Add(labelMessage); + Controls.Add(labelHeadMessage); + Controls.Add(labelBoryReply); + Controls.Add(labelHeadReply); + Controls.Add(labelFrom); + Controls.Add(labelBody); + Controls.Add(labelHead); + Controls.Add(textBoxBody); + Controls.Add(textBoxHead); + Name = "FormMail"; + Text = "Mail"; + Load += FormMail_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private TextBox textBoxHead; + private TextBox textBoxBody; + private Label labelHead; + private Label labelBody; + private Label labelFrom; + private Label labelHeadReply; + private Label labelBoryReply; + private Label labelMessage; + private Label labelHeadMessage; + private Label label1; + private Button buttonCancel; + private Button buttonSave; + } +} \ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantView/FormMail.cs b/AutomobilePlant/AutomobilePlantView/FormMail.cs new file mode 100644 index 0000000..e52040a --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/FormMail.cs @@ -0,0 +1,79 @@ +using AutomobilePlantBusinessLogic.MailWorker; +using AutomobilePlantContracts.BusinessLogicsContracts; +using AutomobilePlantContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace AutomobilePlantView +{ + public partial class FormMail : Form + { + private readonly ILogger _logger; + private readonly AbstractMailWorker _mailWorker; + private readonly IMessageInfoLogic _logic; + private MessageInfoViewModel _message; + public string MessageId { get; set; } = string.Empty; + + public FormMail(ILogger logger, AbstractMailWorker mailWorker, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _mailWorker = mailWorker; + _logic = logic; + } + + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private void buttonSave_Click(object sender, EventArgs e) + { + _mailWorker.MailSendAsync(new() + { + MailAddress = _message.SenderName, + Subject = textBoxHead.Text, + Text = textBoxBody.Text, + }); + _logic.Update(new() + { + MessageId = MessageId, + Reply = textBoxBody.Text, + IsReaded = true, + }); + MessageBox.Show("Успешно отправлен ответ", "Отправлен ответ", MessageBoxButtons.OK); + DialogResult = DialogResult.OK; + Close(); + } + + private void FormMail_Load(object sender, EventArgs e) + { + try + { + _message = _logic.ReadElement(new() { MessageId = MessageId }); + if (_message == null) throw new ArgumentNullException("Письма с таким Id не существует"); + + _logic.Update(new() + { + MessageId = MessageId, + Reply = _message.Reply, + IsReaded = true, + }); + + labelHead.Text = _message.Subject; + labelBody.Text = _message.Body; + labelFrom.Text = $"From: {_message.SenderName}"; + + if (_message.IsReaded is false) + { + _logic.Update(new() { MessageId = MessageId, IsReaded = true, Reply = _message.Reply }); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения собщения"); + MessageBox.Show(ex.Message, "Eror", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/AutomobilePlant/AutomobilePlantView/FormMail.resx b/AutomobilePlant/AutomobilePlantView/FormMail.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/FormMail.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/AutomobilePlant/AutomobilePlantView/FormMails.Designer.cs b/AutomobilePlant/AutomobilePlantView/FormMails.Designer.cs index ce19819..65ff6aa 100644 --- a/AutomobilePlant/AutomobilePlantView/FormMails.Designer.cs +++ b/AutomobilePlant/AutomobilePlantView/FormMails.Designer.cs @@ -20,43 +20,121 @@ base.Dispose(disposing); } - #region Windows Form Designer generated code + #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.RowTemplate.Height = 25; - dataGridView.Size = new Size(800, 450); - dataGridView.TabIndex = 0; - // - // FormMails - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); - Controls.Add(dataGridView); - Name = "FormMails"; - Text = "Mails"; - Load += FormMails_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + panel1 = new Panel(); + numericUpDownPageSize = new NumericUpDown(); + labelPageSize = new Label(); + numericUpDownPage = new NumericUpDown(); + labelPage = new Label(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownPageSize).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownPage).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.AllowUserToResizeColumns = false; + dataGridView.AllowUserToResizeRows = false; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Fill; + dataGridView.Location = new Point(0, 0); + dataGridView.Name = "dataGridView"; + dataGridView.RowTemplate.Height = 25; + dataGridView.Size = new Size(800, 450); + dataGridView.TabIndex = 0; + dataGridView.RowHeaderMouseDoubleClick += dataGridView_RowHeaderMouseDoubleClick; + // + // panel1 + // + panel1.Controls.Add(numericUpDownPageSize); + panel1.Controls.Add(labelPageSize); + panel1.Controls.Add(numericUpDownPage); + panel1.Controls.Add(labelPage); + panel1.Dock = DockStyle.Bottom; + panel1.Location = new Point(0, 395); + panel1.Name = "panel1"; + panel1.Size = new Size(800, 55); + panel1.TabIndex = 1; + // + // numericUpDownPageSize + // + numericUpDownPageSize.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point); + numericUpDownPageSize.Location = new Point(229, 14); + numericUpDownPageSize.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + numericUpDownPageSize.Name = "numericUpDownPageSize"; + numericUpDownPageSize.Size = new Size(67, 29); + numericUpDownPageSize.TabIndex = 6; + numericUpDownPageSize.Value = new decimal(new int[] { 2, 0, 0, 0 }); + numericUpDownPageSize.ValueChanged += numericUpDownPageSize_ValueChanged; + // + // labelPageSize + // + labelPageSize.AutoSize = true; + labelPageSize.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point); + labelPageSize.Location = new Point(137, 16); + labelPageSize.Name = "labelPageSize"; + labelPageSize.Padding = new Padding(10, 0, 0, 0); + labelPageSize.Size = new Size(86, 21); + labelPageSize.TabIndex = 5; + labelPageSize.Text = "Page size:"; + // + // numericUpDownPage + // + numericUpDownPage.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point); + numericUpDownPage.Location = new Point(64, 14); + numericUpDownPage.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + numericUpDownPage.Name = "numericUpDownPage"; + numericUpDownPage.Size = new Size(67, 29); + numericUpDownPage.TabIndex = 4; + numericUpDownPage.Value = new decimal(new int[] { 1, 0, 0, 0 }); + numericUpDownPage.ValueChanged += numericUpDownPage_ValueChanged; + // + // labelPage + // + labelPage.AutoSize = true; + labelPage.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point); + labelPage.Location = new Point(12, 16); + labelPage.Name = "labelPage"; + labelPage.Size = new Size(46, 21); + labelPage.TabIndex = 1; + labelPage.Text = "Page:"; + // + // FormMails + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(panel1); + Controls.Add(dataGridView); + Name = "FormMails"; + Text = "Mails"; + Load += FormMails_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + panel1.ResumeLayout(false); + panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownPageSize).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownPage).EndInit(); + ResumeLayout(false); + } - #endregion + #endregion - private DataGridView dataGridView; + private DataGridView dataGridView; + private Panel panel1; + private Label labelPage; + private NumericUpDown numericUpDownPage; + private NumericUpDown numericUpDownPageSize; + private Label labelPageSize; } } \ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantView/FormMails.cs b/AutomobilePlant/AutomobilePlantView/FormMails.cs index 5ed0215..6636315 100644 --- a/AutomobilePlant/AutomobilePlantView/FormMails.cs +++ b/AutomobilePlant/AutomobilePlantView/FormMails.cs @@ -3,38 +3,71 @@ using Microsoft.Extensions.Logging; namespace AutomobilePlantView { - public partial class FormMails : Form - { - private readonly ILogger _logger; - private readonly IMessageInfoLogic _logic; + public partial class FormMails : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; - public FormMails(ILogger logger, IMessageInfoLogic logic) - { - InitializeComponent(); - _logger = logger; - _logic = logic; - } + public FormMails(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } - private void FormMails_Load(object sender, EventArgs e) - { - try - { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["MessageId"].Visible = false; - dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка писем"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки писем"); - MessageBox.Show(ex.Message, "Eror", MessageBoxButtons.OK, - MessageBoxIcon.Error); - } - } - } + void LoadData() + { + try + { + var list = _logic.ReadList(new() + { + Page = ((int)numericUpDownPage.Value), + PageSize = ((int)numericUpDownPageSize.Value), + }); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка писем"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки писем"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + + private void FormMails_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void numericUpDownPage_ValueChanged(object sender, EventArgs e) + { + LoadData(); + } + + private void numericUpDownPageSize_ValueChanged(object sender, EventArgs e) + { + LoadData(); + } + + private void dataGridView_RowHeaderMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMail)); + if (service is FormMail form) + { + form.MessageId = (string)(dataGridView.SelectedRows[0].Cells["MessageId"].Value); + form.ShowDialog(); + LoadData(); + } + } + } + } } diff --git a/AutomobilePlant/AutomobilePlantView/Program.cs b/AutomobilePlant/AutomobilePlantView/Program.cs index 17f4888..78afc1c 100644 --- a/AutomobilePlant/AutomobilePlantView/Program.cs +++ b/AutomobilePlant/AutomobilePlantView/Program.cs @@ -99,6 +99,7 @@ namespace AutomobilePlantView services.AddTransient(); services.AddTransient(); services.AddTransient(); - } + services.AddTransient(); + } } } \ No newline at end of file -- 2.25.1 From 19bcb89902f6a18df01175702f998cc69cff4763 Mon Sep 17 00:00:00 2001 From: Timourka Date: Mon, 6 May 2024 00:55:51 +0400 Subject: [PATCH 5/6] =?UTF-8?q?laba=207=20=D1=84=D0=B8=D0=BA=D1=81=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F=20=D0=B2=20=D1=80=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BF=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutomobilePlant/AutomobilePlantRestApi/appsettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutomobilePlant/AutomobilePlantRestApi/appsettings.json b/AutomobilePlant/AutomobilePlantRestApi/appsettings.json index 60a17eb..32a6dbc 100644 --- a/AutomobilePlant/AutomobilePlantRestApi/appsettings.json +++ b/AutomobilePlant/AutomobilePlantRestApi/appsettings.json @@ -12,6 +12,6 @@ "PopHost": "pop.gmail.com", "PopPort": "995", "MailLogin": "bes1s1uden1@gmail.com", - "MailPassword": "+bes1s1uden1+" + "MailPassword": "wxwq srug vuhi dwoq" } -- 2.25.1 From 09ad9b86abeb88fe4bc8e6dfdd384fc11d2838a6 Mon Sep 17 00:00:00 2001 From: Timourka Date: Mon, 6 May 2024 10:30:28 +0400 Subject: [PATCH 6/6] =?UTF-8?q?LC=207=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B5=D0=B4=D0=BB=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=B0=20=D0=BD=D0=B0=20=D0=BF=D0=BE=D1=87=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/MessageInfoStorage.cs | 2 +- .../Implements/MessageInfoStorage.cs | 2 +- .../Implements/MessageInfoStorage.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs index 92f3b92..e4dbd89 100644 --- a/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs +++ b/AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/MessageInfoStorage.cs @@ -23,7 +23,7 @@ namespace AutomobilePlantDatabaseImplement.Implements { using var context = new AutomobilePlantDatabase(); var messages = context.Messages - .Where(x => x.ClientId == model.ClientId) + .Where(x => !model.ClientId.HasValue || x.ClientId == model.ClientId) .Select(x => x.GetViewModel) .ToList(); if (!model.Page.HasValue || !model.PageSize.HasValue) diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs index f852696..b6a46eb 100644 --- a/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs +++ b/AutomobilePlant/AutomobilePlantFileImplement/Implements/MessageInfoStorage.cs @@ -26,7 +26,7 @@ namespace AutomobilePlantFileImplement.Implements public List GetFilteredList(MessageInfoSearchModel model) { var messages = _source.Messages - .Where(x => x.ClientId == model.ClientId) + .Where(x => !model.ClientId.HasValue || x.ClientId == model.ClientId) .Select(x => x.GetViewModel) .ToList(); if (!model.Page.HasValue || !model.PageSize.HasValue) diff --git a/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs b/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs index bddb30f..7df915f 100644 --- a/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs +++ b/AutomobilePlant/AutomobilePlantListImplement/Implements/MessageInfoStorage.cs @@ -28,7 +28,7 @@ namespace AutomobilePlantListImplement.Implements List result = new(); foreach (var item in _source.Messages) { - if (item.ClientId.HasValue && item.ClientId == model.ClientId) + if (!model.ClientId.HasValue || item.ClientId == model.ClientId) { result.Add(item.GetViewModel); } -- 2.25.1