From e11bd06c3b8d7554d8eb9563191e919e9f7e46f3 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Tue, 18 Apr 2023 14:56:57 +0400 Subject: [PATCH 1/9] =?UTF-8?q?lab7=20base=20=D0=BF=D0=BE=20=D0=B2=D0=B8?= =?UTF-8?q?=D0=B4=D0=B5=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shipyard/Shipyard/App.config | 11 +++ Shipyard/Shipyard/Program.cs | 27 +++++- Shipyard/Shipyard/ShipyardView.csproj | 3 + .../BusinessLogics/MessageInfoLogic.cs | 25 +++++ .../MailWorker/AbstractMailWorker.cs | 97 +++++++++++++++++++ .../MailWorker/MailKitWorker.cs | 78 +++++++++++++++ .../ShipyardBusinessLogic.csproj | 1 + .../Controllers/HomeController.cs | 9 ++ .../ShipyardClientApp/Views/Home/Mails.cshtml | 53 ++++++++++ .../Views/Shared/_Layout.cshtml | 3 + .../BindingModels/MailConfigBindingModel.cs | 23 +++++ .../BindingModels/MailSendInfoBindingModel.cs | 17 ++++ .../BindingModels/MessageInfoBindingModel.cs | 24 +++++ .../IMessageInfoLogic.cs | 18 ++++ .../SearchModels/MessageInfoSearchModel.cs | 15 +++ .../StoragesContracts/IMessageInfoStorage.cs | 22 +++++ .../ViewModels/MessageInfoViewModel.cs | 29 ++++++ .../Implements/MessageInfoStorage.cs | 35 +++++++ .../Models/IMessageInfoModel.cs | 23 +++++ .../Implements/MessageInfoStorage.cs | 35 +++++++ .../Implements/MessageInfoStorage.cs | 35 +++++++ .../Controllers/ClientController.cs | 21 +++- Shipyard/ShipyardRestApi/Program.cs | 15 +++ Shipyard/ShipyardRestApi/appsettings.json | 9 +- 24 files changed, 625 insertions(+), 3 deletions(-) create mode 100644 Shipyard/Shipyard/App.config create mode 100644 Shipyard/ShipyardBusinessLogic/BusinessLogics/MessageInfoLogic.cs create mode 100644 Shipyard/ShipyardBusinessLogic/MailWorker/AbstractMailWorker.cs create mode 100644 Shipyard/ShipyardBusinessLogic/MailWorker/MailKitWorker.cs create mode 100644 Shipyard/ShipyardClientApp/Views/Home/Mails.cshtml create mode 100644 Shipyard/ShipyardContracts/BindingModels/MailConfigBindingModel.cs create mode 100644 Shipyard/ShipyardContracts/BindingModels/MailSendInfoBindingModel.cs create mode 100644 Shipyard/ShipyardContracts/BindingModels/MessageInfoBindingModel.cs create mode 100644 Shipyard/ShipyardContracts/BusinessLogicsContracts/IMessageInfoLogic.cs create mode 100644 Shipyard/ShipyardContracts/SearchModels/MessageInfoSearchModel.cs create mode 100644 Shipyard/ShipyardContracts/StoragesContracts/IMessageInfoStorage.cs create mode 100644 Shipyard/ShipyardContracts/ViewModels/MessageInfoViewModel.cs create mode 100644 Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs create mode 100644 Shipyard/ShipyardDataModels/Models/IMessageInfoModel.cs create mode 100644 Shipyard/ShipyardFileImplement/Implements/MessageInfoStorage.cs create mode 100644 Shipyard/ShipyardListImplement»/Implements/MessageInfoStorage.cs diff --git a/Shipyard/Shipyard/App.config b/Shipyard/Shipyard/App.config new file mode 100644 index 0000000..4a2acbe --- /dev/null +++ b/Shipyard/Shipyard/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Shipyard/Shipyard/Program.cs b/Shipyard/Shipyard/Program.cs index d222948..45865ed 100644 --- a/Shipyard/Shipyard/Program.cs +++ b/Shipyard/Shipyard/Program.cs @@ -7,7 +7,8 @@ using ShipyardBusinessLogic.OfficePackage; using ShipyardContracts.BusinessLogicsContracts; using ShipyardContracts.StoragesContracts; using ShipyardDataBaseImplement.Implements; - +using ShipyardBusinessLogic.MailWorker; +using ShipyardContracts.BindingModels; namespace ShipyardView { @@ -28,7 +29,26 @@ namespace ShipyardView 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()); } @@ -44,6 +64,7 @@ namespace ShipyardView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -51,11 +72,14 @@ namespace ShipyardView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddSingleton(); services.AddTransient(); services.AddTransient(); @@ -70,6 +94,7 @@ namespace ShipyardView services.AddTransient(); services.AddTransient(); } + private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); } diff --git a/Shipyard/Shipyard/ShipyardView.csproj b/Shipyard/Shipyard/ShipyardView.csproj index cba14a2..c0d8727 100644 --- a/Shipyard/Shipyard/ShipyardView.csproj +++ b/Shipyard/Shipyard/ShipyardView.csproj @@ -34,6 +34,9 @@ + + Always + Always diff --git a/Shipyard/ShipyardBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/Shipyard/ShipyardBusinessLogic/BusinessLogics/MessageInfoLogic.cs new file mode 100644 index 0000000..cb31562 --- /dev/null +++ b/Shipyard/ShipyardBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -0,0 +1,25 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.BusinessLogicsContracts; +using ShipyardContracts.SearchModels; +using ShipyardContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardBusinessLogic.BusinessLogics +{ + public class MessageInfoLogic : IMessageInfoLogic + { + public bool Create(MessageInfoBindingModel model) + { + throw new NotImplementedException(); + } + + public List? ReadList(MessageInfoSearchModel? model) + { + throw new NotImplementedException(); + } + } +} diff --git a/Shipyard/ShipyardBusinessLogic/MailWorker/AbstractMailWorker.cs b/Shipyard/ShipyardBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..94ff59b --- /dev/null +++ b/Shipyard/ShipyardBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,97 @@ +using Microsoft.Extensions.Logging; +using ShipyardContracts.BindingModels; +using ShipyardContracts.BusinessLogicsContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardBusinessLogic.MailWorker +{ + public abstract class AbstractMailWorker + { + protected string _mailLogin = string.Empty; + + protected string _mailPassword = string.Empty; + + protected string _smtpClientHost = string.Empty; + + protected int _smtpClientPort; + + protected string _popHost = string.Empty; + + protected int _popPort; + + private readonly IMessageInfoLogic _messageInfoLogic; + + private readonly ILogger _logger; + + public AbstractMailWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) + { + _logger = logger; + _messageInfoLogic = messageInfoLogic; + } + + public void MailConfig(MailConfigBindingModel config) + { + _mailLogin = config.MailLogin; + _mailPassword = config.MailPassword; + _smtpClientHost = config.SmtpClientHost; + _smtpClientPort = config.SmtpClientPort; + _popHost = config.PopHost; + _popPort = config.PopPort; + _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, {popHost}, {popPort}", _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort); + } + + public async void MailSendAsync(MailSendInfoBindingModel info) + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } + + if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text)) + { + return; + } + + _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject); + await SendMailAsync(info); + } + + public async void MailCheck() + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + + if (string.IsNullOrEmpty(_popHost) || _popPort == 0) + { + return; + } + + if (_messageInfoLogic == null) + { + return; + } + + var list = await ReceiveMailAsync(); + _logger.LogDebug("Check Mail: {Count} new mails", list.Count); + foreach (var mail in list) + { + _messageInfoLogic.Create(mail); + } + } + + protected abstract Task SendMailAsync(MailSendInfoBindingModel info); + + protected abstract Task> ReceiveMailAsync(); + } +} diff --git a/Shipyard/ShipyardBusinessLogic/MailWorker/MailKitWorker.cs b/Shipyard/ShipyardBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..aee57a8 --- /dev/null +++ b/Shipyard/ShipyardBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,78 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.BusinessLogicsContracts; +using MailKit.Net.Pop3; +using MailKit.Security; +using Microsoft.Extensions.Logging; +using System.Net; +using System.Net.Mail; +using System.Text; + +namespace ShipyardBusinessLogic.MailWorker +{ + public class MailKitWorker : AbstractMailWorker + { + public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { } + + protected override async Task SendMailAsync(MailSendInfoBindingModel info) + { + using var objMailMessage = new MailMessage(); + using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort); + try + { + objMailMessage.From = new MailAddress(_mailLogin); + objMailMessage.To.Add(new MailAddress(info.MailAddress)); + objMailMessage.Subject = info.Subject; + objMailMessage.Body = info.Text; + objMailMessage.SubjectEncoding = Encoding.UTF8; + objMailMessage.BodyEncoding = Encoding.UTF8; + + objSmtpClient.UseDefaultCredentials = false; + objSmtpClient.EnableSsl = true; + objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; + objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + + await Task.Run(() => objSmtpClient.Send(objMailMessage)); + } + catch (Exception) + { + throw; + } + } + + protected override async Task> ReceiveMailAsync() + { + var list = new List(); + using var client = new Pop3Client(); + await Task.Run(() => + { + try + { + client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect); + client.Authenticate(_mailLogin, _mailPassword); + for (int i = 0; i < client.Count; i++) + { + var message = client.GetMessage(i); + foreach (var mail in message.From.Mailboxes) + { + list.Add(new MessageInfoBindingModel + { + DateDelivery = message.Date.DateTime, + MessageId = message.MessageId, + SenderName = mail.Address, + Subject = message.Subject, + Body = message.TextBody + }); + } + } + } + catch (AuthenticationException) + { } + finally + { + client.Disconnect(true); + } + }); + return list; + } + } +} diff --git a/Shipyard/ShipyardBusinessLogic/ShipyardBusinessLogic.csproj b/Shipyard/ShipyardBusinessLogic/ShipyardBusinessLogic.csproj index 894ac61..90f653f 100644 --- a/Shipyard/ShipyardBusinessLogic/ShipyardBusinessLogic.csproj +++ b/Shipyard/ShipyardBusinessLogic/ShipyardBusinessLogic.csproj @@ -8,6 +8,7 @@ + diff --git a/Shipyard/ShipyardClientApp/Controllers/HomeController.cs b/Shipyard/ShipyardClientApp/Controllers/HomeController.cs index e8381b9..1896225 100644 --- a/Shipyard/ShipyardClientApp/Controllers/HomeController.cs +++ b/Shipyard/ShipyardClientApp/Controllers/HomeController.cs @@ -143,5 +143,14 @@ namespace ShipyardClientApp.Controllers var prod = APIClient.GetRequest($"api/main/getship?shipId={ship}"); return count * (prod?.Price ?? 1); } + [HttpGet] + public IActionResult Mails() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); + } } } \ No newline at end of file diff --git a/Shipyard/ShipyardClientApp/Views/Home/Mails.cshtml b/Shipyard/ShipyardClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..b358fb7 --- /dev/null +++ b/Shipyard/ShipyardClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,53 @@ +@using ShipyardContracts.ViewModels +@model List + +@{ + ViewData["Title"] = "Mails"; +} + +
+

Заказы

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

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

+ return; + } + + + + + + + + + + + @foreach (var item in Model) + { + + + + + + } + +
+ Дата письма + + Заголовок + + Текст +
+ @Html.DisplayFor(modelItem => item.DateDelivery) + + @Html.DisplayFor(modelItem => item.Subject) + + @Html.DisplayFor(modelItem => item.Body) +
+ } +
\ No newline at end of file diff --git a/Shipyard/ShipyardClientApp/Views/Shared/_Layout.cshtml b/Shipyard/ShipyardClientApp/Views/Shared/_Layout.cshtml index 2b0271b..98cde30 100644 --- a/Shipyard/ShipyardClientApp/Views/Shared/_Layout.cshtml +++ b/Shipyard/ShipyardClientApp/Views/Shared/_Layout.cshtml @@ -25,6 +25,9 @@
  • Личные данные
    • +
  • + Письма +
  • Вход
    • diff --git a/Shipyard/ShipyardContracts/BindingModels/MailConfigBindingModel.cs b/Shipyard/ShipyardContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..46b6076 --- /dev/null +++ b/Shipyard/ShipyardContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.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/Shipyard/ShipyardContracts/BindingModels/MailSendInfoBindingModel.cs b/Shipyard/ShipyardContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..a7c7947 --- /dev/null +++ b/Shipyard/ShipyardContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.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/Shipyard/ShipyardContracts/BindingModels/MessageInfoBindingModel.cs b/Shipyard/ShipyardContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..8a0e5f1 --- /dev/null +++ b/Shipyard/ShipyardContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,24 @@ +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.BindingModels +{ + public class MessageInfoBindingModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + public string SenderName { get; set; } = string.Empty; + + public string Subject { get; set; } = string.Empty; + + public string Body { get; set; } = string.Empty; + + public DateTime DateDelivery { get; set; } + } +} diff --git a/Shipyard/ShipyardContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/Shipyard/ShipyardContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..2832358 --- /dev/null +++ b/Shipyard/ShipyardContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,18 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.SearchModels; +using ShipyardContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + + bool Create(MessageInfoBindingModel model); + } +} diff --git a/Shipyard/ShipyardContracts/SearchModels/MessageInfoSearchModel.cs b/Shipyard/ShipyardContracts/SearchModels/MessageInfoSearchModel.cs new file mode 100644 index 0000000..12a7f8b --- /dev/null +++ b/Shipyard/ShipyardContracts/SearchModels/MessageInfoSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public int? ClientId { get; set; } + + public string? MessageId { get; set; } + } +} diff --git a/Shipyard/ShipyardContracts/StoragesContracts/IMessageInfoStorage.cs b/Shipyard/ShipyardContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..5ab5d6f --- /dev/null +++ b/Shipyard/ShipyardContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,22 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.SearchModels; +using ShipyardContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + + List GetFilteredList(MessageInfoSearchModel model); + + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + } +} diff --git a/Shipyard/ShipyardContracts/ViewModels/MessageInfoViewModel.cs b/Shipyard/ShipyardContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..416f0d9 --- /dev/null +++ b/Shipyard/ShipyardContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,29 @@ +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.ViewModels +{ + public class MessageInfoViewModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + [DisplayName("Отправитель")] + public string SenderName { get; set; } = string.Empty; + + [DisplayName("Дата письма")] + public DateTime DateDelivery { get; set; } + + [DisplayName("Заголовок")] + public string Subject { get; set; } = string.Empty; + + [DisplayName("Текст")] + public string Body { get; set; } = string.Empty; + } +} diff --git a/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs b/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..d0320a9 --- /dev/null +++ b/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,35 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.SearchModels; +using ShipyardContracts.StoragesContracts; +using ShipyardContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardDataBaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + throw new NotImplementedException(); + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + throw new NotImplementedException(); + } + + public List GetFullList() + { + throw new NotImplementedException(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + throw new NotImplementedException(); + } + } +} diff --git a/Shipyard/ShipyardDataModels/Models/IMessageInfoModel.cs b/Shipyard/ShipyardDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..02063dd --- /dev/null +++ b/Shipyard/ShipyardDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardDataModels.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/Shipyard/ShipyardFileImplement/Implements/MessageInfoStorage.cs b/Shipyard/ShipyardFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..406b62f --- /dev/null +++ b/Shipyard/ShipyardFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,35 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.SearchModels; +using ShipyardContracts.StoragesContracts; +using ShipyardContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardFileImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + throw new NotImplementedException(); + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + throw new NotImplementedException(); + } + + public List GetFullList() + { + throw new NotImplementedException(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + throw new NotImplementedException(); + } + } +} diff --git a/Shipyard/ShipyardListImplement»/Implements/MessageInfoStorage.cs b/Shipyard/ShipyardListImplement»/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..c551bca --- /dev/null +++ b/Shipyard/ShipyardListImplement»/Implements/MessageInfoStorage.cs @@ -0,0 +1,35 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.SearchModels; +using ShipyardContracts.StoragesContracts; +using ShipyardContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardListImplement_.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + throw new NotImplementedException(); + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + throw new NotImplementedException(); + } + + public List GetFullList() + { + throw new NotImplementedException(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + throw new NotImplementedException(); + } + } +} diff --git a/Shipyard/ShipyardRestApi/Controllers/ClientController.cs b/Shipyard/ShipyardRestApi/Controllers/ClientController.cs index 709aeec..3686a77 100644 --- a/Shipyard/ShipyardRestApi/Controllers/ClientController.cs +++ b/Shipyard/ShipyardRestApi/Controllers/ClientController.cs @@ -14,10 +14,13 @@ namespace ShipyardRestApi.Controllers 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] @@ -65,5 +68,21 @@ namespace ShipyardRestApi.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/Shipyard/ShipyardRestApi/Program.cs b/Shipyard/ShipyardRestApi/Program.cs index 13042fc..1ad3164 100644 --- a/Shipyard/ShipyardRestApi/Program.cs +++ b/Shipyard/ShipyardRestApi/Program.cs @@ -1,5 +1,7 @@ using Microsoft.OpenApi.Models; using ShipyardBusinessLogic.BusinessLogics; +using ShipyardBusinessLogic.MailWorker; +using ShipyardContracts.BindingModels; using ShipyardContracts.BusinessLogicsContracts; using ShipyardContracts.StoragesContracts; using ShipyardDataBaseImplement.Implements; @@ -14,7 +16,9 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddSingleton(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); @@ -30,6 +34,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/Shipyard/ShipyardRestApi/appsettings.json b/Shipyard/ShipyardRestApi/appsettings.json index 10f68b8..d252f8b 100644 --- a/Shipyard/ShipyardRestApi/appsettings.json +++ b/Shipyard/ShipyardRestApi/appsettings.json @@ -5,5 +5,12 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + + "SmtpClientHost": "smtp.gmail.com", + "SmtpClientPort": "587", + "PopHost": "pop.gmail.com", + "PopPort": "995", + "MailLogin": "labwork15kafis@gmail.com", + "MailPassword": "xlmo gisw flzo kvam" } From 9078f365d45ff01519a916769a4813ebbcd061ab Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Wed, 19 Apr 2023 16:24:43 +0400 Subject: [PATCH 2/9] fix --- .../Implements/OrderStorage.cs | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/Shipyard/ShipyardDataBaseImplement/Implements/OrderStorage.cs b/Shipyard/ShipyardDataBaseImplement/Implements/OrderStorage.cs index 03bbfc9..d23caf5 100644 --- a/Shipyard/ShipyardDataBaseImplement/Implements/OrderStorage.cs +++ b/Shipyard/ShipyardDataBaseImplement/Implements/OrderStorage.cs @@ -36,22 +36,38 @@ namespace ShipyardDataBaseImplement.Implements public OrderViewModel? GetElement(OrderSearchModel model) { + using var context = new ShipyardDataBase(); + if (model.ImplementerId.HasValue && model.Status.HasValue) + { + return context.Orders + .Include(x => x.Ship) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => x.ImplementerId == model.ImplementerId && x.Status == model.Status) + ?.GetViewModel; + } + if (model.ImplementerId.HasValue) + { + return context.Orders + .Include(x => x.Ship) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => x.ImplementerId == model.ImplementerId) + ?.GetViewModel; + } if (!model.Id.HasValue) { return null; } - using var context = new ShipyardDataBase(); return context.Orders - .Include(x=>x.Ship) - .Include(x=>x.Client) - .Include(x=>x.Implementer) - .FirstOrDefault(x => (model.Status == null || model.Status != null && model.Status == x.Status) && - model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId || - model.Id.HasValue && x.Id == model.Id) + .Include(x => x.Ship) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id) ?.GetViewModel; } - public List GetFilteredList(OrderSearchModel model) + public List GetFilteredList(OrderSearchModel model) { using var context = new ShipyardDataBase(); if (model.Id.HasValue) From a4a273decb8826597c50e016a541256c744b8da3 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Thu, 20 Apr 2023 14:31:36 +0400 Subject: [PATCH 3/9] =?UTF-8?q?6=20=D0=B8=207=20=D0=BF=D1=83=D0=BD=D0=BA?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/MessageInfoLogic.cs | 28 ++++++- .../Implements/MessageInfoStorage.cs | 38 +++++++-- .../Models/Message.cs | 56 +++++++++++++ .../ShipyardDataBase.cs | 1 + .../DataFileSingleton.cs | 6 ++ .../Implements/MessageInfoStorage.cs | 31 +++++++- .../ShipyardFileImplement/Models/Message.cs | 79 +++++++++++++++++++ .../DataListSingleton.cs | 3 + .../Implements/MessageInfoStorage.cs | 49 +++++++++++- .../ShipyardListImplement»/Models/Message.cs | 53 +++++++++++++ 10 files changed, 328 insertions(+), 16 deletions(-) create mode 100644 Shipyard/ShipyardDataBaseImplement/Models/Message.cs create mode 100644 Shipyard/ShipyardFileImplement/Models/Message.cs create mode 100644 Shipyard/ShipyardListImplement»/Models/Message.cs diff --git a/Shipyard/ShipyardBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/Shipyard/ShipyardBusinessLogic/BusinessLogics/MessageInfoLogic.cs index cb31562..2a7e8d1 100644 --- a/Shipyard/ShipyardBusinessLogic/BusinessLogics/MessageInfoLogic.cs +++ b/Shipyard/ShipyardBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -1,6 +1,8 @@ -using ShipyardContracts.BindingModels; +using Microsoft.Extensions.Logging; +using ShipyardContracts.BindingModels; using ShipyardContracts.BusinessLogicsContracts; using ShipyardContracts.SearchModels; +using ShipyardContracts.StoragesContracts; using ShipyardContracts.ViewModels; using System; using System.Collections.Generic; @@ -12,14 +14,34 @@ namespace ShipyardBusinessLogic.BusinessLogics { public class MessageInfoLogic : IMessageInfoLogic { + private readonly ILogger _logger; + private readonly IMessageInfoStorage _messageInfoStorage; + public MessageInfoLogic(ILogger logger, IMessageInfoStorage messageInfoStorage) + { + _logger = logger; + _messageInfoStorage = messageInfoStorage; + } public bool Create(MessageInfoBindingModel model) { - throw new NotImplementedException(); + if (_messageInfoStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; } public List? ReadList(MessageInfoSearchModel? model) { - throw new NotImplementedException(); + _logger.LogInformation("ReadList. ClientId:{ClientId}. MessageId:{MessageId}", model?.ClientId, model?.MessageId); + var list = model == null ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; } } } diff --git a/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs b/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs index d0320a9..3d9a45d 100644 --- a/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs +++ b/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs @@ -1,7 +1,9 @@ -using ShipyardContracts.BindingModels; +using Microsoft.EntityFrameworkCore; +using ShipyardContracts.BindingModels; using ShipyardContracts.SearchModels; using ShipyardContracts.StoragesContracts; using ShipyardContracts.ViewModels; +using ShipyardDataBaseImplement.Models; using System; using System.Collections.Generic; using System.Linq; @@ -14,22 +16,48 @@ namespace ShipyardDataBaseImplement.Implements { public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) { - throw new NotImplementedException(); + if (string.IsNullOrEmpty(model.MessageId)) + { + return null; + } + using var context = new ShipyardDataBase(); + return context.Messages + .FirstOrDefault(x => x.MessageId == model.MessageId)? + .GetViewModel; } public List GetFilteredList(MessageInfoSearchModel model) { - throw new NotImplementedException(); + if (string.IsNullOrEmpty(model.MessageId)) + { + return new(); + } + using var context = new ShipyardDataBase(); + return context.Messages + .Where(x => x.ClientId==model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); } public List GetFullList() { - throw new NotImplementedException(); + using var context = new ShipyardDataBase(); + return context.Messages + .Select(x => x.GetViewModel) + .ToList(); } public MessageInfoViewModel? Insert(MessageInfoBindingModel model) { - throw new NotImplementedException(); + using var context = new ShipyardDataBase(); + var newMessage= Message.Create(model); + if (newMessage == null) + { + return null; + } + context.Messages.Add(newMessage); + context.SaveChanges(); + return newMessage.GetViewModel; } } } diff --git a/Shipyard/ShipyardDataBaseImplement/Models/Message.cs b/Shipyard/ShipyardDataBaseImplement/Models/Message.cs new file mode 100644 index 0000000..28ee70f --- /dev/null +++ b/Shipyard/ShipyardDataBaseImplement/Models/Message.cs @@ -0,0 +1,56 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.ViewModels; +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardDataBaseImplement.Models +{ + public class Message: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 static Message? 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/Shipyard/ShipyardDataBaseImplement/ShipyardDataBase.cs b/Shipyard/ShipyardDataBaseImplement/ShipyardDataBase.cs index 227a4e4..a2bd159 100644 --- a/Shipyard/ShipyardDataBaseImplement/ShipyardDataBase.cs +++ b/Shipyard/ShipyardDataBaseImplement/ShipyardDataBase.cs @@ -25,6 +25,7 @@ namespace ShipyardDataBaseImplement public virtual DbSet Orders { set; get; } public virtual DbSet Clients { set; get; } + public virtual DbSet Messages { set; get; } public virtual DbSet Implementers { set; get; } } diff --git a/Shipyard/ShipyardFileImplement/DataFileSingleton.cs b/Shipyard/ShipyardFileImplement/DataFileSingleton.cs index 43a3da0..dfbd9f2 100644 --- a/Shipyard/ShipyardFileImplement/DataFileSingleton.cs +++ b/Shipyard/ShipyardFileImplement/DataFileSingleton.cs @@ -16,6 +16,7 @@ namespace ShipyardFileImplement private readonly string OrderFileName = "Order.xml"; private readonly string ShipFileName = "Ship.xml"; private readonly string ClientFileName = "Client.xml"; + private readonly string MessageFileName = "Message.xml"; private readonly string ImplementerFileName = "Implementer.xml"; public List Details { get; private set; } @@ -23,6 +24,8 @@ namespace ShipyardFileImplement public List Ships { 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) @@ -36,6 +39,8 @@ namespace ShipyardFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x=> x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); + + public void SaveMessages() => SaveData(Messages, MessageFileName, "Messages", x => x.GetXElement); private DataFileSingleton() { Details = LoadData(DetailFileName, "Detail", x => Detail.Create(x)!)!; @@ -43,6 +48,7 @@ namespace ShipyardFileImplement Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; + Messages = LoadData(MessageFileName, "Message", x => Message.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/Shipyard/ShipyardFileImplement/Implements/MessageInfoStorage.cs b/Shipyard/ShipyardFileImplement/Implements/MessageInfoStorage.cs index 406b62f..f63ec69 100644 --- a/Shipyard/ShipyardFileImplement/Implements/MessageInfoStorage.cs +++ b/Shipyard/ShipyardFileImplement/Implements/MessageInfoStorage.cs @@ -2,6 +2,7 @@ using ShipyardContracts.SearchModels; using ShipyardContracts.StoragesContracts; using ShipyardContracts.ViewModels; +using ShipyardFileImplement.Models; using System; using System.Collections.Generic; using System.Linq; @@ -12,24 +13,46 @@ namespace ShipyardFileImplement.Implements { public class MessageInfoStorage : IMessageInfoStorage { + private readonly DataFileSingleton source; + public MessageInfoStorage() + { + source = DataFileSingleton.GetInstance(); + } public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) { - throw new NotImplementedException(); + if (string.IsNullOrEmpty(model.MessageId)) + { + return null; + } + return source.Messages.FirstOrDefault(x => + x.MessageId == model.MessageId)?.GetViewModel; } public List GetFilteredList(MessageInfoSearchModel model) { - throw new NotImplementedException(); + if (string.IsNullOrEmpty(model.MessageId)) + { + return new(); + } + return source.Messages.Where(x => + x.ClientId==model.ClientId).Select(x => x.GetViewModel).ToList(); } public List GetFullList() { - throw new NotImplementedException(); + return source.Messages.Select(x => x.GetViewModel).ToList(); } public MessageInfoViewModel? Insert(MessageInfoBindingModel model) { - throw new NotImplementedException(); + var newMessage = Message.Create(model); + if (newMessage == null) + { + return null; + } + source.Messages.Add(newMessage); + source.SaveMessages(); + return newMessage.GetViewModel; } } } diff --git a/Shipyard/ShipyardFileImplement/Models/Message.cs b/Shipyard/ShipyardFileImplement/Models/Message.cs new file mode 100644 index 0000000..6804164 --- /dev/null +++ b/Shipyard/ShipyardFileImplement/Models/Message.cs @@ -0,0 +1,79 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.ViewModels; +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ShipyardFileImplement.Models +{ + public class Message : 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 Message? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + Subject = model.Subject, + DateDelivery = model.DateDelivery, + SenderName = model.SenderName, + ClientId = model.ClientId, + MessageId = model.MessageId + }; + } + + public static Message? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + Body = element.Attribute("Body")!.Value, + Subject = element.Attribute("Subject")!.Value, + DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value), + SenderName = element.Attribute("SenderName")!.Value, + ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), + MessageId = element.Attribute("MessageId")!.Value, + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + DateDelivery = DateDelivery, + SenderName = SenderName, + ClientId = ClientId, + MessageId = MessageId + }; + + public XElement GetXElement => new("MessageInfo", + new XAttribute("Subject", Subject), + new XAttribute("Body", Body), + new XAttribute("ClientId", ClientId), + new XAttribute("MessageId", MessageId), + new XAttribute("SenderName", SenderName), + new XAttribute("DateDelivery", DateDelivery) + ); + } +} diff --git a/Shipyard/ShipyardListImplement»/DataListSingleton.cs b/Shipyard/ShipyardListImplement»/DataListSingleton.cs index 7e12966..38b889c 100644 --- a/Shipyard/ShipyardListImplement»/DataListSingleton.cs +++ b/Shipyard/ShipyardListImplement»/DataListSingleton.cs @@ -12,6 +12,8 @@ namespace ShipyardListImplement public List Clients { get; set; } public List Implementers { get; set; } + + public List Messages { get; set; } private DataListSingleton() { Details = new List(); @@ -19,6 +21,7 @@ namespace ShipyardListImplement Ships = new List(); Clients = new List(); Implementers = new List(); + Messages = new List(); } public static DataListSingleton GetInstance() { diff --git a/Shipyard/ShipyardListImplement»/Implements/MessageInfoStorage.cs b/Shipyard/ShipyardListImplement»/Implements/MessageInfoStorage.cs index c551bca..f66f60d 100644 --- a/Shipyard/ShipyardListImplement»/Implements/MessageInfoStorage.cs +++ b/Shipyard/ShipyardListImplement»/Implements/MessageInfoStorage.cs @@ -2,6 +2,8 @@ using ShipyardContracts.SearchModels; using ShipyardContracts.StoragesContracts; using ShipyardContracts.ViewModels; +using ShipyardListImplement; +using ShipyardListImplement_.Models; using System; using System.Collections.Generic; using System.Linq; @@ -12,24 +14,63 @@ namespace ShipyardListImplement_.Implements { public class MessageInfoStorage : IMessageInfoStorage { + private readonly DataListSingleton _source; + public MessageInfoStorage() + { + _source=DataListSingleton.GetInstance(); + } public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) { - throw new NotImplementedException(); + if (string.IsNullOrEmpty(model.MessageId)) + { + return null; + } + foreach (var message in _source.Messages) + { + if(message.MessageId==model.MessageId) + { + return message.GetViewModel; + } + } + return null; } public List GetFilteredList(MessageInfoSearchModel model) { - throw new NotImplementedException(); + var result = new List(); + if (string.IsNullOrEmpty(model.MessageId)) + { + return result; + } + foreach (var message in _source.Messages) + { + if (message.ClientId==model.ClientId) + { + result.Add(message.GetViewModel); + } + } + return result; } public List GetFullList() { - throw new NotImplementedException(); + var result = new List(); + foreach (var message in _source.Messages) + { + result.Add(message.GetViewModel); + } + return result; } public MessageInfoViewModel? Insert(MessageInfoBindingModel model) { - throw new NotImplementedException(); + var newMessage = Message.Create(model); + if (newMessage == null) + { + return null; + } + _source.Messages.Add(newMessage); + return newMessage.GetViewModel; } } } diff --git a/Shipyard/ShipyardListImplement»/Models/Message.cs b/Shipyard/ShipyardListImplement»/Models/Message.cs new file mode 100644 index 0000000..99d8e1c --- /dev/null +++ b/Shipyard/ShipyardListImplement»/Models/Message.cs @@ -0,0 +1,53 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.ViewModels; +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardListImplement_.Models +{ + public class Message : 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 Message? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + Subject = model.Subject, + DateDelivery = model.DateDelivery, + SenderName = model.SenderName, + ClientId = model.ClientId, + MessageId = model.MessageId + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + DateDelivery = DateDelivery, + SenderName = SenderName, + ClientId = ClientId, + MessageId = MessageId + }; + } +} From 08916daca61e1fbb4e6645710e30f959514d65ad Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Thu, 20 Apr 2023 15:45:27 +0400 Subject: [PATCH 4/9] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D1=82=D0=B8....?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shipyard/Shipyard/App.config | 4 +- .../BusinessLogics/OrderLogic.cs | 31 +- .../MailWorker/AbstractMailWorker.cs | 5 +- .../MailWorker/MailKitWorker.cs | 2 +- ...0230420113733_MessageMigration.Designer.cs | 285 ++++++++++++++++++ .../20230420113733_MessageMigration.cs | 38 +++ .../ShipyardDataBaseModelSnapshot.cs | 28 ++ Shipyard/ShipyardRestApi/appsettings.json | 4 +- 8 files changed, 388 insertions(+), 9 deletions(-) create mode 100644 Shipyard/ShipyardDataBaseImplement/Migrations/20230420113733_MessageMigration.Designer.cs create mode 100644 Shipyard/ShipyardDataBaseImplement/Migrations/20230420113733_MessageMigration.cs diff --git a/Shipyard/Shipyard/App.config b/Shipyard/Shipyard/App.config index 4a2acbe..cdcd2f2 100644 --- a/Shipyard/Shipyard/App.config +++ b/Shipyard/Shipyard/App.config @@ -5,7 +5,7 @@ - - + + \ No newline at end of file diff --git a/Shipyard/ShipyardBusinessLogic/BusinessLogics/OrderLogic.cs b/Shipyard/ShipyardBusinessLogic/BusinessLogics/OrderLogic.cs index 422364a..a6a5f54 100644 --- a/Shipyard/ShipyardBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/Shipyard/ShipyardBusinessLogic/BusinessLogics/OrderLogic.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.Logging; +using ShipyardBusinessLogic.MailWorker; using ShipyardContracts.BindingModels; using ShipyardContracts.BusinessLogicsContracts; using ShipyardContracts.SearchModels; @@ -17,10 +18,14 @@ namespace ShipyardBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + private readonly AbstractMailWorker _mailWorker; + private readonly IClientLogic _clientLogic; + public OrderLogic(ILogger logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker,IClientLogic clientLogic) { _logger = logger; _orderStorage = orderStorage; + _mailWorker = mailWorker; + _clientLogic = clientLogic; } public List? ReadList(OrderSearchModel? model) { @@ -43,11 +48,14 @@ namespace ShipyardBusinessLogic.BusinessLogics return false; } model.Status = OrderStatus.Принят; - if (_orderStorage.Insert(model) == null) + var result = _orderStorage.Insert(model); + if (result == null) { + model.Status = OrderStatus.Неизвестен; _logger.LogWarning("Insert operation failed"); return false; } + SendOrderMessage(result.ClientId, $"Верфь, Заказ №{result.Id}", $"Заказ №{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят"); return true; } private void CheckModel(OrderBindingModel model, bool withParams = true) @@ -93,12 +101,14 @@ namespace ShipyardBusinessLogic.BusinessLogics model.DateImplement = viewModel.DateImplement; } CheckModel(model,false); - if (_orderStorage.Update(model) == null) + var result = _orderStorage.Update(model); + if (result == null) { model.Status--; _logger.LogWarning("Update operation failed"); return false; } + SendOrderMessage(result.ClientId, $"Верфь, Заказ №{result.Id}", $"Заказ №{model.Id} изменен статус на {result.Status}"); return true; } @@ -134,5 +144,20 @@ namespace ShipyardBusinessLogic.BusinessLogics _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); return element; } + private bool SendOrderMessage(int clientId, string subject, string text) + { + var client = _clientLogic.ReadElement(new() { Id = clientId }); + if (client == null) + { + return false; + } + _mailWorker.MailSendAsync(new() + { + MailAddress = client.Email, + Subject = subject, + Text = text + }); + return true; + } } } diff --git a/Shipyard/ShipyardBusinessLogic/MailWorker/AbstractMailWorker.cs b/Shipyard/ShipyardBusinessLogic/MailWorker/AbstractMailWorker.cs index 94ff59b..5bb0cec 100644 --- a/Shipyard/ShipyardBusinessLogic/MailWorker/AbstractMailWorker.cs +++ b/Shipyard/ShipyardBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -24,13 +24,15 @@ namespace ShipyardBusinessLogic.MailWorker protected int _popPort; private readonly IMessageInfoLogic _messageInfoLogic; + private readonly IClientLogic _clientLogic; private readonly ILogger _logger; - public AbstractMailWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) + public AbstractMailWorker(ILogger logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) { _logger = logger; _messageInfoLogic = messageInfoLogic; + _clientLogic = clientLogic; } public void MailConfig(MailConfigBindingModel config) @@ -86,6 +88,7 @@ namespace ShipyardBusinessLogic.MailWorker _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); } } diff --git a/Shipyard/ShipyardBusinessLogic/MailWorker/MailKitWorker.cs b/Shipyard/ShipyardBusinessLogic/MailWorker/MailKitWorker.cs index aee57a8..9a8a0fd 100644 --- a/Shipyard/ShipyardBusinessLogic/MailWorker/MailKitWorker.cs +++ b/Shipyard/ShipyardBusinessLogic/MailWorker/MailKitWorker.cs @@ -11,7 +11,7 @@ namespace ShipyardBusinessLogic.MailWorker { public class MailKitWorker : AbstractMailWorker { - public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { } + public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) : base(logger, messageInfoLogic,clientLogic) { } protected override async Task SendMailAsync(MailSendInfoBindingModel info) { diff --git a/Shipyard/ShipyardDataBaseImplement/Migrations/20230420113733_MessageMigration.Designer.cs b/Shipyard/ShipyardDataBaseImplement/Migrations/20230420113733_MessageMigration.Designer.cs new file mode 100644 index 0000000..c99ce97 --- /dev/null +++ b/Shipyard/ShipyardDataBaseImplement/Migrations/20230420113733_MessageMigration.Designer.cs @@ -0,0 +1,285 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using ShipyardDataBaseImplement; + +#nullable disable + +namespace ShipyardDataBaseImplement.Migrations +{ + [DbContext(typeof(ShipyardDataBase))] + [Migration("20230420113733_MessageMigration")] + partial class MessageMigration + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("ShipyardDataBaseImplement.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("ShipyardDataBaseImplement.Models.Detail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Cost") + .HasColumnType("float"); + + b.Property("DetailName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Details"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.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("ShipyardDataBaseImplement.Models.Message", 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.ToTable("Messages"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DateCreate") + .HasColumnType("datetime2"); + + b.Property("DateImplement") + .HasColumnType("datetime2"); + + b.Property("ImplementerId") + .HasColumnType("int"); + + b.Property("ShipId") + .HasColumnType("int"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("ImplementerId"); + + b.HasIndex("ShipId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.Models.Ship", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Price") + .HasColumnType("float"); + + b.Property("ShipName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Ships"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.Models.ShipDetail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DetailId") + .HasColumnType("int"); + + b.Property("ShipId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("DetailId"); + + b.HasIndex("ShipId"); + + b.ToTable("ShipDetails"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.Models.Order", b => + { + b.HasOne("ShipyardDataBaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("ShipyardDataBaseImplement.Models.Implementer", "Implementer") + .WithMany("Orders") + .HasForeignKey("ImplementerId"); + + b.HasOne("ShipyardDataBaseImplement.Models.Ship", "Ship") + .WithMany("Orders") + .HasForeignKey("ShipId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + + b.Navigation("Implementer"); + + b.Navigation("Ship"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.Models.ShipDetail", b => + { + b.HasOne("ShipyardDataBaseImplement.Models.Detail", "Detail") + .WithMany("ShipDetails") + .HasForeignKey("DetailId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("ShipyardDataBaseImplement.Models.Ship", "Ship") + .WithMany("Details") + .HasForeignKey("ShipId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Detail"); + + b.Navigation("Ship"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.Models.Client", b => + { + b.Navigation("Orders"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.Models.Detail", b => + { + b.Navigation("ShipDetails"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.Models.Implementer", b => + { + b.Navigation("Orders"); + }); + + modelBuilder.Entity("ShipyardDataBaseImplement.Models.Ship", b => + { + b.Navigation("Details"); + + b.Navigation("Orders"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Shipyard/ShipyardDataBaseImplement/Migrations/20230420113733_MessageMigration.cs b/Shipyard/ShipyardDataBaseImplement/Migrations/20230420113733_MessageMigration.cs new file mode 100644 index 0000000..e0105c8 --- /dev/null +++ b/Shipyard/ShipyardDataBaseImplement/Migrations/20230420113733_MessageMigration.cs @@ -0,0 +1,38 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace ShipyardDataBaseImplement.Migrations +{ + /// + public partial class MessageMigration : 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); + }); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Messages"); + } + } +} diff --git a/Shipyard/ShipyardDataBaseImplement/Migrations/ShipyardDataBaseModelSnapshot.cs b/Shipyard/ShipyardDataBaseImplement/Migrations/ShipyardDataBaseModelSnapshot.cs index 5476258..5da398e 100644 --- a/Shipyard/ShipyardDataBaseImplement/Migrations/ShipyardDataBaseModelSnapshot.cs +++ b/Shipyard/ShipyardDataBaseImplement/Migrations/ShipyardDataBaseModelSnapshot.cs @@ -94,6 +94,34 @@ namespace ShipyardDataBaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("ShipyardDataBaseImplement.Models.Message", 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.ToTable("Messages"); + }); + modelBuilder.Entity("ShipyardDataBaseImplement.Models.Order", b => { b.Property("Id") diff --git a/Shipyard/ShipyardRestApi/appsettings.json b/Shipyard/ShipyardRestApi/appsettings.json index d252f8b..67a40ff 100644 --- a/Shipyard/ShipyardRestApi/appsettings.json +++ b/Shipyard/ShipyardRestApi/appsettings.json @@ -11,6 +11,6 @@ "SmtpClientPort": "587", "PopHost": "pop.gmail.com", "PopPort": "995", - "MailLogin": "labwork15kafis@gmail.com", - "MailPassword": "xlmo gisw flzo kvam" + "MailLogin": "forrpplabsorokin@gmail.com", + "MailPassword": "gngm qlov ivuz okqj" } From 572943313d48ed8ec3d831fa544ec45c70659fde Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Thu, 20 Apr 2023 15:55:16 +0400 Subject: [PATCH 5/9] =?UTF-8?q?=D0=9E=D1=81=D1=82=D0=B0=D0=BB=D1=81=D1=8F?= =?UTF-8?q?=20=D0=B2=D0=B5=D0=B1=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shipyard/Shipyard/FormMails.Designer.cs | 64 +++++++++++++++++++ Shipyard/Shipyard/FormMails.cs | 50 +++++++++++++++ Shipyard/Shipyard/FormMails.resx | 60 +++++++++++++++++ Shipyard/Shipyard/FormMain.Designer.cs | 32 ++++++---- Shipyard/Shipyard/FormMain.cs | 9 +++ Shipyard/Shipyard/Program.cs | 1 + .../BusinessLogics/ClientLogic.cs | 9 +++ 7 files changed, 214 insertions(+), 11 deletions(-) create mode 100644 Shipyard/Shipyard/FormMails.Designer.cs create mode 100644 Shipyard/Shipyard/FormMails.cs create mode 100644 Shipyard/Shipyard/FormMails.resx diff --git a/Shipyard/Shipyard/FormMails.Designer.cs b/Shipyard/Shipyard/FormMails.Designer.cs new file mode 100644 index 0000000..536e064 --- /dev/null +++ b/Shipyard/Shipyard/FormMails.Designer.cs @@ -0,0 +1,64 @@ +namespace ShipyardView +{ + partial class FormMails + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.dataGridView = new System.Windows.Forms.DataGridView(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersWidth = 51; + this.dataGridView.RowTemplate.Height = 29; + this.dataGridView.Size = new System.Drawing.Size(800, 450); + this.dataGridView.TabIndex = 0; + // + // FormMails + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.dataGridView); + this.Name = "FormMails"; + this.Text = "Письма"; + this.Load += new System.EventHandler(this.FormMails_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/Shipyard/Shipyard/FormMails.cs b/Shipyard/Shipyard/FormMails.cs new file mode 100644 index 0000000..2010045 --- /dev/null +++ b/Shipyard/Shipyard/FormMails.cs @@ -0,0 +1,50 @@ +using Microsoft.Extensions.Logging; +using ShipyardContracts.BusinessLogicsContracts; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ShipyardView +{ + 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, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } +} + diff --git a/Shipyard/Shipyard/FormMails.resx b/Shipyard/Shipyard/FormMails.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Shipyard/Shipyard/FormMails.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Shipyard/Shipyard/FormMain.Designer.cs b/Shipyard/Shipyard/FormMain.Designer.cs index f22d685..594c98a 100644 --- a/Shipyard/Shipyard/FormMain.Designer.cs +++ b/Shipyard/Shipyard/FormMain.Designer.cs @@ -41,8 +41,9 @@ this.ShipsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.shipsDetailsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dataGridView = new System.Windows.Forms.DataGridView(); this.запускаРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.письмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -86,7 +87,8 @@ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ToolStripMenuItem, this.отчетыToolStripMenuItem, - this.запускаРаботToolStripMenuItem}); + this.запускаРаботToolStripMenuItem, + this.письмаToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(1160, 28); @@ -107,28 +109,28 @@ // ДеталиToolStripMenuItem // this.ДеталиToolStripMenuItem.Name = "ДеталиToolStripMenuItem"; - this.ДеталиToolStripMenuItem.Size = new System.Drawing.Size(185, 26); + this.ДеталиToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.ДеталиToolStripMenuItem.Text = "Детали"; this.ДеталиToolStripMenuItem.Click += new System.EventHandler(this.ДеталиToolStripMenuItem_Click); // // КораблиToolStripMenuItem // this.КораблиToolStripMenuItem.Name = "КораблиToolStripMenuItem"; - this.КораблиToolStripMenuItem.Size = new System.Drawing.Size(185, 26); + this.КораблиToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.КораблиToolStripMenuItem.Text = "Корабли"; this.КораблиToolStripMenuItem.Click += new System.EventHandler(this.КораблиToolStripMenuItem_Click); // // клиентыToolStripMenuItem // this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26); + this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.клиентыToolStripMenuItem.Text = "Клиенты"; this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.КлиентыToolStripMenuItem_Click); // // исполнителиToolStripMenuItem // this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(185, 26); + this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.исполнителиToolStripMenuItem.Text = "Исполнители"; this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.ИсполнителиToolStripMenuItem_Click); // @@ -163,6 +165,13 @@ this.ordersToolStripMenuItem.Text = "Список заказов"; this.ordersToolStripMenuItem.Click += new System.EventHandler(this.ordersToolStripMenuItem_Click); // + // запускаРаботToolStripMenuItem + // + this.запускаРаботToolStripMenuItem.Name = "запускаРаботToolStripMenuItem"; + this.запускаРаботToolStripMenuItem.Size = new System.Drawing.Size(114, 24); + this.запускаРаботToolStripMenuItem.Text = "Запуск работ"; + this.запускаРаботToolStripMenuItem.Click += new System.EventHandler(this.ЗапускРаботToolStripMenuItem_Click); + // // dataGridView // this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -174,12 +183,12 @@ this.dataGridView.Size = new System.Drawing.Size(933, 446); this.dataGridView.TabIndex = 6; // - // запускаРаботToolStripMenuItem + // письмаToolStripMenuItem // - this.запускаРаботToolStripMenuItem.Name = "запускаРаботToolStripMenuItem"; - this.запускаРаботToolStripMenuItem.Size = new System.Drawing.Size(114, 24); - this.запускаРаботToolStripMenuItem.Text = "Запуск работ"; - this.запускаРаботToolStripMenuItem.Click += new System.EventHandler(this.ЗапускРаботToolStripMenuItem_Click); + this.письмаToolStripMenuItem.Name = "письмаToolStripMenuItem"; + this.письмаToolStripMenuItem.Size = new System.Drawing.Size(77, 24); + this.письмаToolStripMenuItem.Text = "Письма"; + this.письмаToolStripMenuItem.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click); // // FormMain // @@ -220,5 +229,6 @@ private ToolStripMenuItem клиентыToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускаРаботToolStripMenuItem; + private ToolStripMenuItem письмаToolStripMenuItem; } } \ No newline at end of file diff --git a/Shipyard/Shipyard/FormMain.cs b/Shipyard/Shipyard/FormMain.cs index 5fd1d43..40e39df 100644 --- a/Shipyard/Shipyard/FormMain.cs +++ b/Shipyard/Shipyard/FormMain.cs @@ -214,5 +214,14 @@ namespace ShipyardView MessageBox.Show("Передано на работу","произведен запуск", MessageBoxButtons.OK, MessageBoxIcon.Information); } + + private void письмаToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + if (service is FormMails form) + { + form.ShowDialog(); + } + } } } diff --git a/Shipyard/Shipyard/Program.cs b/Shipyard/Shipyard/Program.cs index 45865ed..bc00fda 100644 --- a/Shipyard/Shipyard/Program.cs +++ b/Shipyard/Shipyard/Program.cs @@ -93,6 +93,7 @@ namespace ShipyardView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); diff --git a/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs index ea5b3bf..121244b 100644 --- a/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Text.RegularExpressions; namespace ShipyardBusinessLogic.BusinessLogics { @@ -107,6 +108,14 @@ namespace ShipyardBusinessLogic.BusinessLogics { throw new ArgumentNullException("У клиента отсутствует пароль", nameof(model.Email)); } + if (!Regex.IsMatch(model.Email, @"^[^@\s]+@[^@\s]+\.[^@\s]+$", RegexOptions.IgnoreCase)) + { + throw new ArgumentException("Неправильно введенный email", nameof(model.Email)); + } + if (!Regex.IsMatch(model.Password, @"^^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase)) + { + throw new ArgumentException("Неправильно введенный пароль", nameof(model.Password)); + } _logger.LogInformation("Client. ClientID:{Id}. ClientFIO: {ClientFIO}. Email:{ Email}. Password: { Password}", model.Id, model.ClientFIO, model.Email,model.Password); var element = _clientStorage.GetElement(new ClientSearchModel { From dbbac3a2ffb5293e02764b2ab3bae208c3239171 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Thu, 20 Apr 2023 16:57:04 +0400 Subject: [PATCH 6/9] =?UTF-8?q?=D0=9D=D1=83=20=D1=82=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=B2=20=D0=B2=D0=B5=D0=B1=D0=B5=20=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D1=8C=D0=BC=D0=B0=20=D0=B4=D0=BE=20=D1=81=D0=B8=D1=85=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=80=20=D0=BD=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B0=D0=B5=D1=82=20=D1=8D=D1=85...=20=D0=B1?= =?UTF-8?q?=D0=B5=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ClientLogic.cs | 4 ++-- .../ShipyardClientApp/Views/Home/Mails.cshtml | 2 +- .../Implements/ClientStorage.cs | 22 +++++++++---------- Shipyard/ShipyardRestApi/Program.cs | 2 ++ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs index 121244b..8260b88 100644 --- a/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs @@ -112,10 +112,10 @@ namespace ShipyardBusinessLogic.BusinessLogics { throw new ArgumentException("Неправильно введенный email", nameof(model.Email)); } - if (!Regex.IsMatch(model.Password, @"^^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase)) + /*if (!Regex.IsMatch(model.Password, @"^^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase)) { throw new ArgumentException("Неправильно введенный пароль", nameof(model.Password)); - } + }*/ _logger.LogInformation("Client. ClientID:{Id}. ClientFIO: {ClientFIO}. Email:{ Email}. Password: { Password}", model.Id, model.ClientFIO, model.Email,model.Password); var element = _clientStorage.GetElement(new ClientSearchModel { diff --git a/Shipyard/ShipyardClientApp/Views/Home/Mails.cshtml b/Shipyard/ShipyardClientApp/Views/Home/Mails.cshtml index b358fb7..77d719f 100644 --- a/Shipyard/ShipyardClientApp/Views/Home/Mails.cshtml +++ b/Shipyard/ShipyardClientApp/Views/Home/Mails.cshtml @@ -6,7 +6,7 @@ }
    -

    Заказы

    +

    Письма

    diff --git a/Shipyard/ShipyardDataBaseImplement/Implements/ClientStorage.cs b/Shipyard/ShipyardDataBaseImplement/Implements/ClientStorage.cs index eee1427..b232d07 100644 --- a/Shipyard/ShipyardDataBaseImplement/Implements/ClientStorage.cs +++ b/Shipyard/ShipyardDataBaseImplement/Implements/ClientStorage.cs @@ -45,21 +45,19 @@ namespace ShipyardDataBaseImplement.Implements { using var context = new ShipyardDataBase(); if (model.Id.HasValue) - { return context.Clients - .FirstOrDefault(x => (x.Id == model.Id))?.GetViewModel; - } - else if (!string.IsNullOrEmpty(model.Email) && !string.IsNullOrEmpty(model.Password)) - { + .FirstOrDefault(x => x.Id == model.Id)? + .GetViewModel; + if (!string.IsNullOrEmpty(model.Email) && !string.IsNullOrEmpty(model.Password)) return context.Clients - .FirstOrDefault(x => (x.Email == model.Email && x.Password == model.Password))?.GetViewModel; - } - else if (!string.IsNullOrEmpty(model.Email)) - { + .FirstOrDefault(x => x.Email + .Equals(model.Email) && x.Password + .Equals(model.Password))? + .GetViewModel; + if (!string.IsNullOrEmpty(model.Email)) return context.Clients - .FirstOrDefault(x => (x.Email == model.Email))?.GetViewModel; - } - return new(); + .FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel; + return null; } public ClientViewModel? Insert(ClientBindingModel model) diff --git a/Shipyard/ShipyardRestApi/Program.cs b/Shipyard/ShipyardRestApi/Program.cs index 1ad3164..7a95c8a 100644 --- a/Shipyard/ShipyardRestApi/Program.cs +++ b/Shipyard/ShipyardRestApi/Program.cs @@ -16,6 +16,8 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); + builder.Services.AddTransient(); builder.Services.AddSingleton(); From 2ba48e1ac5f6a4cd9054266647ad5ce84635fd3f Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Thu, 20 Apr 2023 17:42:04 +0400 Subject: [PATCH 7/9] its work --- .../Implements/MessageInfoStorage.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs b/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs index 3d9a45d..f14a1e8 100644 --- a/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs +++ b/Shipyard/ShipyardDataBaseImplement/Implements/MessageInfoStorage.cs @@ -28,15 +28,13 @@ namespace ShipyardDataBaseImplement.Implements public List GetFilteredList(MessageInfoSearchModel model) { - if (string.IsNullOrEmpty(model.MessageId)) - { + if (!model.ClientId.HasValue) return new(); - } using var context = new ShipyardDataBase(); return context.Messages - .Where(x => x.ClientId==model.ClientId) - .Select(x => x.GetViewModel) - .ToList(); + .Where(x => x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); } public List GetFullList() From ab4cbc06a2bc183a72ed9f62ff9bc38d6e9200e5 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Mon, 24 Apr 2023 21:26:21 +0400 Subject: [PATCH 8/9] fix --- Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs index 8260b88..121244b 100644 --- a/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs @@ -112,10 +112,10 @@ namespace ShipyardBusinessLogic.BusinessLogics { throw new ArgumentException("Неправильно введенный email", nameof(model.Email)); } - /*if (!Regex.IsMatch(model.Password, @"^^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase)) + if (!Regex.IsMatch(model.Password, @"^^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase)) { throw new ArgumentException("Неправильно введенный пароль", nameof(model.Password)); - }*/ + } _logger.LogInformation("Client. ClientID:{Id}. ClientFIO: {ClientFIO}. Email:{ Email}. Password: { Password}", model.Id, model.ClientFIO, model.Email,model.Password); var element = _clientStorage.GetElement(new ClientSearchModel { From de1103b4be792fbd8810949f95c3c14a8523e30f Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Sun, 30 Apr 2023 18:02:43 +0400 Subject: [PATCH 9/9] fix --- Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs index 121244b..38dffbd 100644 --- a/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs @@ -108,11 +108,11 @@ namespace ShipyardBusinessLogic.BusinessLogics { throw new ArgumentNullException("У клиента отсутствует пароль", nameof(model.Email)); } - if (!Regex.IsMatch(model.Email, @"^[^@\s]+@[^@\s]+\.[^@\s]+$", RegexOptions.IgnoreCase)) + if (!Regex.IsMatch(model.Email, @"^[^@\s]+@[^@\s]+\.[^@\s]+$") { throw new ArgumentException("Неправильно введенный email", nameof(model.Email)); } - if (!Regex.IsMatch(model.Password, @"^^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase)) + if (!Regex.IsMatch(model.Password, @"^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$") || model.Password.Length < 10 || model.Password.Length > 50) { throw new ArgumentException("Неправильно введенный пароль", nameof(model.Password)); }