From b57409909f08e06c4b258be142b729fd5ad61623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=9F=D0=BE=D0=BB?= =?UTF-8?q?=D0=B5=D0=B2=D0=BE=D0=B9?= Date: Fri, 21 Apr 2023 01:09:51 +0400 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=E2=84=967:=20=D0=93=D0=BE=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0,=20=D0=B2=D1=80=D0=BE=D0=B4=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FlowerShop/FlowerShop/App.config | 11 + FlowerShop/FlowerShop/FlowerShop.csproj | 8 + FlowerShop/FlowerShop/FormMails.Designer.cs | 62 ++++ FlowerShop/FlowerShop/FormMails.cs | 41 +++ FlowerShop/FlowerShop/FormMails.resx | 60 ++++ FlowerShop/FlowerShop/FormMain.Designer.cs | 20 +- FlowerShop/FlowerShop/FormMain.cs | 9 + FlowerShop/FlowerShop/Program.cs | 32 ++ .../BusinessLogics/ClientLogic.cs | 11 + .../BusinessLogics/MessageInfoLogic.cs | 48 +++ .../BusinessLogics/OrderLogic.cs | 51 ++- .../FlowerShopBusinessLogic.csproj | 1 + .../MailWorker/AbstractMailWorker.cs | 90 ++++++ .../MailWorker/MailKitWorker.cs | 83 +++++ .../Controllers/HomeController.cs | 11 + .../Views/Home/Mails.cshtml | 54 ++++ .../Views/Shared/_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 + .../FlowerShopDatabase.cs | 1 + .../Implements/MessageInfoStorage.cs | 56 ++++ .../20230420190709_MailsAdded.Designer.cs | 298 ++++++++++++++++++ .../Migrations/20230420190709_MailsAdded.cs | 48 +++ .../FlowerShopDatabaseModelSnapshot.cs | 41 +++ .../Models/Client.cs | 3 + .../Models/MessageInfo.cs | 53 ++++ .../DataFileSingleton.cs | 6 + .../Implements/MessageInfoStorage.cs | 52 +++ .../Models/MessageInfo.cs | 77 +++++ .../DataListSingleton.cs | 2 + .../Implements/MessageInfoStorage.cs | 68 ++++ .../Models/MessageInfo.cs | 49 +++ .../Controllers/ClientController.cs | 28 +- FlowerShop/FlowerShopRestApi/Program.cs | 17 + FlowerShop/FlowerShopRestApi/appsettings.json | 8 +- 41 files changed, 1490 insertions(+), 18 deletions(-) create mode 100644 FlowerShop/FlowerShop/App.config create mode 100644 FlowerShop/FlowerShop/FormMails.Designer.cs create mode 100644 FlowerShop/FlowerShop/FormMails.cs create mode 100644 FlowerShop/FlowerShop/FormMails.resx create mode 100644 FlowerShop/FlowerShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs create mode 100644 FlowerShop/FlowerShopBusinessLogic/MailWorker/AbstractMailWorker.cs create mode 100644 FlowerShop/FlowerShopBusinessLogic/MailWorker/MailKitWorker.cs create mode 100644 FlowerShop/FlowerShopClientApp/Views/Home/Mails.cshtml create mode 100644 FlowerShop/FlowerShopContracts/BindingModels/MailConfigBindingModel.cs create mode 100644 FlowerShop/FlowerShopContracts/BindingModels/MailSendInfoBindingModel.cs create mode 100644 FlowerShop/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs create mode 100644 FlowerShop/FlowerShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs create mode 100644 FlowerShop/FlowerShopContracts/SearchModels/MessageInfoSearchModel.cs create mode 100644 FlowerShop/FlowerShopContracts/StoragesContracts/IMessageInfoStorage.cs create mode 100644 FlowerShop/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs create mode 100644 FlowerShop/FlowerShopDataModels/Models/IMessageInfoModel.cs create mode 100644 FlowerShop/FlowerShopDatabaseImplement/Implements/MessageInfoStorage.cs create mode 100644 FlowerShop/FlowerShopDatabaseImplement/Migrations/20230420190709_MailsAdded.Designer.cs create mode 100644 FlowerShop/FlowerShopDatabaseImplement/Migrations/20230420190709_MailsAdded.cs create mode 100644 FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs create mode 100644 FlowerShop/FlowerShopFileImplement/Implements/MessageInfoStorage.cs create mode 100644 FlowerShop/FlowerShopFileImplement/Models/MessageInfo.cs create mode 100644 FlowerShop/FlowerShopListImplement/Implements/MessageInfoStorage.cs create mode 100644 FlowerShop/FlowerShopListImplement/Models/MessageInfo.cs diff --git a/FlowerShop/FlowerShop/App.config b/FlowerShop/FlowerShop/App.config new file mode 100644 index 0000000..7d18493 --- /dev/null +++ b/FlowerShop/FlowerShop/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/FlowerShop/FlowerShop/FlowerShop.csproj b/FlowerShop/FlowerShop/FlowerShop.csproj index 2e0a216..a2de8e0 100644 --- a/FlowerShop/FlowerShop/FlowerShop.csproj +++ b/FlowerShop/FlowerShop/FlowerShop.csproj @@ -8,6 +8,14 @@ enable + + + + + + + + all diff --git a/FlowerShop/FlowerShop/FormMails.Designer.cs b/FlowerShop/FlowerShop/FormMails.Designer.cs new file mode 100644 index 0000000..948b588 --- /dev/null +++ b/FlowerShop/FlowerShop/FormMails.Designer.cs @@ -0,0 +1,62 @@ +namespace FlowerShop +{ + 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.Location = new Point(12, 12); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(776, 426); + dataGridView.TabIndex = 0; + // + // FormMails + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(dataGridView); + Name = "FormMails"; + Text = "Письма"; + Load += FormMails_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/FlowerShop/FlowerShop/FormMails.cs b/FlowerShop/FlowerShop/FormMails.cs new file mode 100644 index 0000000..b8fc97b --- /dev/null +++ b/FlowerShop/FlowerShop/FormMails.cs @@ -0,0 +1,41 @@ +using FlowerShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace FlowerShop +{ + 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("Loading mails"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Error during loading mails"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/FlowerShop/FlowerShop/FormMails.resx b/FlowerShop/FlowerShop/FormMails.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/FlowerShop/FlowerShop/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/FlowerShop/FlowerShop/FormMain.Designer.cs b/FlowerShop/FlowerShop/FormMain.Designer.cs index a9e934d..2ef7b9f 100644 --- a/FlowerShop/FlowerShop/FormMain.Designer.cs +++ b/FlowerShop/FlowerShop/FormMain.Designer.cs @@ -43,6 +43,7 @@ this.componentsByBouquetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.listOfOrdersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.doWorksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mailsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.menuStrip.SuspendLayout(); this.SuspendLayout(); @@ -111,7 +112,8 @@ this.componentsToolStripMenuItem, this.bouquetsToolStripMenuItem, this.clientsToolStripMenuItem, - this.implementersToolStripMenuItem}); + this.implementersToolStripMenuItem, + this.mailsToolStripMenuItem}); this.guidesToolStripMenuItem.Name = "guidesToolStripMenuItem"; this.guidesToolStripMenuItem.Size = new System.Drawing.Size(94, 22); this.guidesToolStripMenuItem.Text = "Справочники"; @@ -119,28 +121,28 @@ // componentsToolStripMenuItem // this.componentsToolStripMenuItem.Name = "componentsToolStripMenuItem"; - this.componentsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.componentsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.componentsToolStripMenuItem.Text = "Компоненты"; this.componentsToolStripMenuItem.Click += new System.EventHandler(this.componentsToolStripMenuItem_Click); // // bouquetsToolStripMenuItem // this.bouquetsToolStripMenuItem.Name = "bouquetsToolStripMenuItem"; - this.bouquetsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.bouquetsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.bouquetsToolStripMenuItem.Text = "Букеты"; this.bouquetsToolStripMenuItem.Click += new System.EventHandler(this.bouquetsToolStripMenuItem_Click); // // clientsToolStripMenuItem // this.clientsToolStripMenuItem.Name = "clientsToolStripMenuItem"; - this.clientsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.clientsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.clientsToolStripMenuItem.Text = "Клиенты"; this.clientsToolStripMenuItem.Click += new System.EventHandler(this.clientsToolStripMenuItem_Click); // // implementersToolStripMenuItem // this.implementersToolStripMenuItem.Name = "implementersToolStripMenuItem"; - this.implementersToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.implementersToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.implementersToolStripMenuItem.Text = "Исполнители"; this.implementersToolStripMenuItem.Click += new System.EventHandler(this.implementersToolStripMenuItem_Click); // @@ -182,6 +184,13 @@ this.doWorksToolStripMenuItem.Text = "Запуск работ"; this.doWorksToolStripMenuItem.Click += new System.EventHandler(this.doWorksToolStripMenuItem_Click); // + // mailsToolStripMenuItem + // + this.mailsToolStripMenuItem.Name = "mailsToolStripMenuItem"; + this.mailsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.mailsToolStripMenuItem.Text = "Письма"; + this.mailsToolStripMenuItem.Click += new System.EventHandler(this.mailsToolStripMenuItem_Click); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -222,5 +231,6 @@ private ToolStripMenuItem clientsToolStripMenuItem; private ToolStripMenuItem implementersToolStripMenuItem; private ToolStripMenuItem doWorksToolStripMenuItem; + private ToolStripMenuItem mailsToolStripMenuItem; } } \ No newline at end of file diff --git a/FlowerShop/FlowerShop/FormMain.cs b/FlowerShop/FlowerShop/FormMain.cs index b18c88a..58667d8 100644 --- a/FlowerShop/FlowerShop/FormMain.cs +++ b/FlowerShop/FlowerShop/FormMain.cs @@ -212,5 +212,14 @@ namespace FlowerShop form.ShowDialog(); } } + + private void mailsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + if (service is FormMails form) + { + form.ShowDialog(); + } + } } } diff --git a/FlowerShop/FlowerShop/Program.cs b/FlowerShop/FlowerShop/Program.cs index cc15ad6..c829707 100644 --- a/FlowerShop/FlowerShop/Program.cs +++ b/FlowerShop/FlowerShop/Program.cs @@ -7,6 +7,8 @@ using FlowerShopBusinessLogic.BusinessLogics; using FlowerShopContracts.BusinessLogicsContracts; using NLog.Extensions.Logging; using Microsoft.Extensions.Logging; +using FlowerShopBusinessLogic.MailWorker; +using FlowerShopContracts.BindingModels; namespace FlowerShop { @@ -22,8 +24,33 @@ namespace FlowerShop 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, "Error during work with mail"); + } + Application.Run(_serviceProvider.GetRequiredService()); } + + private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void ConfigureServices(ServiceCollection services) { services.AddLogging(option => @@ -36,6 +63,7 @@ namespace FlowerShop services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -44,11 +72,14 @@ namespace FlowerShop services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddSingleton(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -61,6 +92,7 @@ namespace FlowerShop services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/ClientLogic.cs b/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/ClientLogic.cs index b5e33f2..ecfb332 100644 --- a/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/ClientLogic.cs @@ -4,6 +4,7 @@ using FlowerShopContracts.SearchModels; using FlowerShopContracts.StoragesContracts; using FlowerShopContracts.ViewModels; using Microsoft.Extensions.Logging; +using System.Text.RegularExpressions; namespace FlowerShopBusinessLogic.BusinessLogics { @@ -113,6 +114,16 @@ namespace FlowerShopBusinessLogic.BusinessLogics throw new ArgumentNullException("Нет логина(почты) клиента", nameof(model.Email)); } + if (!Regex.IsMatch(model.Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$")) + { + throw new ArgumentException("Некорретно введен email клиента", nameof(model.Email)); + } + + if (!Regex.IsMatch(model.Password, @"^(?=.*\d)(?=.*\W)(?=.*[^\d\s]).+$")) + { + throw new ArgumentException("Некорректно введен пароль клиента", nameof(model.Password)); + } + _logger.LogInformation("Client. Id: {Id}, FIO: {fio}, email: {email}", model.Id, model.ClientFIO, model.Email); var element = _clientStorage.GetElement(new ClientSearchModel diff --git a/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs new file mode 100644 index 0000000..5ee15f5 --- /dev/null +++ b/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -0,0 +1,48 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.SearchModels; +using FlowerShopContracts.StoragesContracts; +using FlowerShopContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace FlowerShopBusinessLogic.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) + { + 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/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/OrderLogic.cs b/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/OrderLogic.cs index 966baba..ec0856e 100644 --- a/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -1,4 +1,5 @@ -using FlowerShopContracts.BindingModels; +using FlowerShopBusinessLogic.MailWorker; +using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; using FlowerShopContracts.SearchModels; using FlowerShopContracts.StoragesContracts; @@ -12,11 +13,15 @@ namespace FlowerShopBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; + private readonly AbstractMailWorker _mailWorker; + private readonly IClientLogic _clientLogic; - 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) @@ -67,12 +72,15 @@ namespace FlowerShopBusinessLogic.BusinessLogics 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, $"Новый заказ создан. Номер заказа #{result.Id}", $"Заказ #{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят"); + return true; } @@ -94,11 +102,15 @@ namespace FlowerShopBusinessLogic.BusinessLogics return false; } - if (_orderStorage.Update(model) == null) + var result = _orderStorage.Update(model); + if (result == null) { _logger.LogWarning("Update operation failed"); + return false; } + SendOrderStatusMail(result.ClientId, $"Изменен статус заказа #{result.Id}", $"Заказ #{result.Id} изменен статус на {result.Status}"); + return true; } public bool FinishOrder(OrderBindingModel model) @@ -114,11 +126,15 @@ namespace FlowerShopBusinessLogic.BusinessLogics model.Status = OrderStatus.Готов; model.DateImplement = DateTime.Now; - if (_orderStorage.Update(model) == null) + var result = _orderStorage.Update(model); + if (result == null) { _logger.LogWarning("Update operation failed"); + return false; } + SendOrderStatusMail(result.ClientId, $"Изменен статус заказа #{result.Id}", $"Заказ #{result.Id} изменен статус на {result.Status}"); + return true; } @@ -137,11 +153,34 @@ namespace FlowerShopBusinessLogic.BusinessLogics model.Status = OrderStatus.Выдан; model.DateImplement = order.DateImplement; - if (_orderStorage.Update(model) == null) + var result = _orderStorage.Update(model); + if (result == null) { _logger.LogWarning("Update operation failed"); + return false; } + SendOrderStatusMail(result.ClientId, $"Изменен статус заказа #{result.Id}", $"Заказ #{result.Id} изменен статус на {result.Status}"); + + return true; + } + + 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/FlowerShop/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj b/FlowerShop/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj index 2c7bf04..013b4ee 100644 --- a/FlowerShop/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj +++ b/FlowerShop/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj @@ -8,6 +8,7 @@ + diff --git a/FlowerShop/FlowerShopBusinessLogic/MailWorker/AbstractMailWorker.cs b/FlowerShop/FlowerShopBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..2e227f4 --- /dev/null +++ b/FlowerShop/FlowerShopBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,90 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace FlowerShopBusinessLogic.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/FlowerShop/FlowerShopBusinessLogic/MailWorker/MailKitWorker.cs b/FlowerShop/FlowerShopBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..43cadba --- /dev/null +++ b/FlowerShop/FlowerShopBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,83 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.BusinessLogicsContracts; +using MailKit.Net.Pop3; +using MailKit.Security; +using Microsoft.Extensions.Logging; +using System.Net.Mail; +using System.Net; +using System.Text; + +namespace FlowerShopBusinessLogic.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 != null ? message.TextBody : message.HtmlBody // Яндекс почта отправляет письма в виде html + }); + } + } + } + catch (AuthenticationException) + { + + } + finally + { + client.Disconnect(true); + } + }); + + return list; + } + } +} diff --git a/FlowerShop/FlowerShopClientApp/Controllers/HomeController.cs b/FlowerShop/FlowerShopClientApp/Controllers/HomeController.cs index 20e9ff7..17bbcc3 100644 --- a/FlowerShop/FlowerShopClientApp/Controllers/HomeController.cs +++ b/FlowerShop/FlowerShopClientApp/Controllers/HomeController.cs @@ -2,6 +2,7 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.ViewModels; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using System.Diagnostics; namespace FlowerShopClientApp.Controllers @@ -162,5 +163,15 @@ namespace FlowerShopClientApp.Controllers return count * (bouq?.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/FlowerShop/FlowerShopClientApp/Views/Home/Mails.cshtml b/FlowerShop/FlowerShopClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..41a3c3e --- /dev/null +++ b/FlowerShop/FlowerShopClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,54 @@ +@using FlowerShopContracts.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/FlowerShop/FlowerShopClientApp/Views/Shared/_Layout.cshtml b/FlowerShop/FlowerShopClientApp/Views/Shared/_Layout.cshtml index 0ac5133..70852a0 100644 --- a/FlowerShop/FlowerShopClientApp/Views/Shared/_Layout.cshtml +++ b/FlowerShop/FlowerShopClientApp/Views/Shared/_Layout.cshtml @@ -27,6 +27,9 @@
  • Личные данные
    • +
  • + Письма +
  • Вход
    • diff --git a/FlowerShop/FlowerShopContracts/BindingModels/MailConfigBindingModel.cs b/FlowerShop/FlowerShopContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..371d771 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,12 @@ +namespace FlowerShopContracts.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/FlowerShop/FlowerShopContracts/BindingModels/MailSendInfoBindingModel.cs b/FlowerShop/FlowerShopContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..1d00620 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,9 @@ +namespace FlowerShopContracts.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/FlowerShop/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs b/FlowerShop/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..17b59d5 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,19 @@ +using FlowerShopDataModels.Models; + +namespace FlowerShopContracts.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/FlowerShop/FlowerShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/FlowerShop/FlowerShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..306d62f --- /dev/null +++ b/FlowerShop/FlowerShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,12 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.SearchModels; +using FlowerShopContracts.ViewModels; + +namespace FlowerShopContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + bool Create(MessageInfoBindingModel model); + } +} diff --git a/FlowerShop/FlowerShopContracts/SearchModels/MessageInfoSearchModel.cs b/FlowerShop/FlowerShopContracts/SearchModels/MessageInfoSearchModel.cs new file mode 100644 index 0000000..ac9db6e --- /dev/null +++ b/FlowerShop/FlowerShopContracts/SearchModels/MessageInfoSearchModel.cs @@ -0,0 +1,8 @@ +namespace FlowerShopContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public int? ClientId { get; set; } + public string? MessageId { get; set; } + } +} diff --git a/FlowerShop/FlowerShopContracts/StoragesContracts/IMessageInfoStorage.cs b/FlowerShop/FlowerShopContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..04d916d --- /dev/null +++ b/FlowerShop/FlowerShopContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,14 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.SearchModels; +using FlowerShopContracts.ViewModels; + +namespace FlowerShopContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + } +} diff --git a/FlowerShop/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs b/FlowerShop/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..07a4dc7 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,20 @@ +using FlowerShopDataModels.Models; +using System.ComponentModel; + +namespace FlowerShopContracts.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/FlowerShop/FlowerShopDataModels/Models/IMessageInfoModel.cs b/FlowerShop/FlowerShopDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..1c244fe --- /dev/null +++ b/FlowerShop/FlowerShopDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,12 @@ +namespace FlowerShopDataModels.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/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabase.cs b/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabase.cs index 5c7b381..9a27d14 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabase.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabase.cs @@ -19,5 +19,6 @@ namespace FlowerShopDatabaseImplement 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/FlowerShop/FlowerShopDatabaseImplement/Implements/MessageInfoStorage.cs b/FlowerShop/FlowerShopDatabaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..9eebe49 --- /dev/null +++ b/FlowerShop/FlowerShopDatabaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,56 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.SearchModels; +using FlowerShopContracts.StoragesContracts; +using FlowerShopContracts.ViewModels; +using FlowerShopDatabaseImplement.Models; + +namespace FlowerShopDatabaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + using var context = new FlowerShopDatabase(); + + 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 FlowerShopDatabase(); + return context.Messages + .Where(x => x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + using var context = new FlowerShopDatabase(); + return context.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + using var context = new FlowerShopDatabase(); + + 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/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230420190709_MailsAdded.Designer.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230420190709_MailsAdded.Designer.cs new file mode 100644 index 0000000..a98d722 --- /dev/null +++ b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230420190709_MailsAdded.Designer.cs @@ -0,0 +1,298 @@ +// +using System; +using FlowerShopDatabaseImplement; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace FlowerShopDatabaseImplement.Migrations +{ + [DbContext(typeof(FlowerShopDatabase))] + [Migration("20230420190709_MailsAdded")] + partial class MailsAdded + { + /// + 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("FlowerShopDatabaseImplement.Models.Bouquet", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("BouquetName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Bouquets"); + }); + + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.BouquetComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("BouquetId") + .HasColumnType("int"); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BouquetId"); + + b.HasIndex("ComponentId"); + + b.ToTable("BouquetComponents"); + }); + + modelBuilder.Entity("FlowerShopDatabaseImplement.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("FlowerShopDatabaseImplement.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("FlowerShopDatabaseImplement.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("FlowerShopDatabaseImplement.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("FlowerShopDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("BouquetId") + .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("BouquetId"); + + b.HasIndex("ClientId"); + + b.HasIndex("ImplementerId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.BouquetComponent", b => + { + b.HasOne("FlowerShopDatabaseImplement.Models.Bouquet", "Bouquet") + .WithMany("Components") + .HasForeignKey("BouquetId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("FlowerShopDatabaseImplement.Models.Component", "Component") + .WithMany("BouquetComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bouquet"); + + b.Navigation("Component"); + }); + + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("FlowerShopDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Order", b => + { + b.HasOne("FlowerShopDatabaseImplement.Models.Bouquet", "Bouquet") + .WithMany("Orders") + .HasForeignKey("BouquetId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("FlowerShopDatabaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("FlowerShopDatabaseImplement.Models.Implementer", "Implementer") + .WithMany("Orders") + .HasForeignKey("ImplementerId"); + + b.Navigation("Bouquet"); + + b.Navigation("Client"); + + b.Navigation("Implementer"); + }); + + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Bouquet", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Client", b => + { + b.Navigation("Messages"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Component", b => + { + b.Navigation("BouquetComponents"); + }); + + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Implementer", b => + { + b.Navigation("Orders"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230420190709_MailsAdded.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230420190709_MailsAdded.cs new file mode 100644 index 0000000..b148c71 --- /dev/null +++ b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230420190709_MailsAdded.cs @@ -0,0 +1,48 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace FlowerShopDatabaseImplement.Migrations +{ + /// + public partial class MailsAdded : 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/FlowerShop/FlowerShopDatabaseImplement/Migrations/FlowerShopDatabaseModelSnapshot.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/FlowerShopDatabaseModelSnapshot.cs index a7b940b..bab40c8 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Migrations/FlowerShopDatabaseModelSnapshot.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Migrations/FlowerShopDatabaseModelSnapshot.cs @@ -140,6 +140,36 @@ namespace FlowerShopDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("FlowerShopDatabaseImplement.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("FlowerShopDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -202,6 +232,15 @@ namespace FlowerShopDatabaseImplement.Migrations b.Navigation("Component"); }); + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("FlowerShopDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Order", b => { b.HasOne("FlowerShopDatabaseImplement.Models.Bouquet", "Bouquet") @@ -236,6 +275,8 @@ namespace FlowerShopDatabaseImplement.Migrations modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Client", b => { + b.Navigation("Messages"); + b.Navigation("Orders"); }); diff --git a/FlowerShop/FlowerShopDatabaseImplement/Models/Client.cs b/FlowerShop/FlowerShopDatabaseImplement/Models/Client.cs index 5dd94b3..367405c 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Models/Client.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Models/Client.cs @@ -22,6 +22,9 @@ namespace FlowerShopDatabaseImplement.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/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs b/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..492729c --- /dev/null +++ b/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs @@ -0,0 +1,53 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.ViewModels; +using FlowerShopDataModels.Models; +using System.ComponentModel.DataAnnotations; + +namespace FlowerShopDatabaseImplement.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/FlowerShop/FlowerShopFileImplement/DataFileSingleton.cs b/FlowerShop/FlowerShopFileImplement/DataFileSingleton.cs index 3688e56..0397169 100644 --- a/FlowerShop/FlowerShopFileImplement/DataFileSingleton.cs +++ b/FlowerShop/FlowerShopFileImplement/DataFileSingleton.cs @@ -11,6 +11,8 @@ namespace FlowerShopFileImplement private readonly string BouquetFileName = "Bouquet.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; } @@ -22,6 +24,8 @@ namespace FlowerShopFileImplement public List Implementers { get; private set; } + public List Messages { get; private set; } + public static DataFileSingleton GetInstance() { if (instance == null) @@ -37,6 +41,7 @@ namespace FlowerShopFileImplement 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() { @@ -45,6 +50,7 @@ namespace FlowerShopFileImplement 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/FlowerShop/FlowerShopFileImplement/Implements/MessageInfoStorage.cs b/FlowerShop/FlowerShopFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..2bb30f6 --- /dev/null +++ b/FlowerShop/FlowerShopFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,52 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.SearchModels; +using FlowerShopContracts.StoragesContracts; +using FlowerShopContracts.ViewModels; +using FlowerShopFileImplement.Models; + +namespace FlowerShopFileImplement.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/FlowerShop/FlowerShopFileImplement/Models/MessageInfo.cs b/FlowerShop/FlowerShopFileImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..8cca586 --- /dev/null +++ b/FlowerShop/FlowerShopFileImplement/Models/MessageInfo.cs @@ -0,0 +1,77 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.ViewModels; +using FlowerShopDataModels.Models; +using System.Xml.Linq; + +namespace FlowerShopFileImplement.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/FlowerShop/FlowerShopListImplement/DataListSingleton.cs b/FlowerShop/FlowerShopListImplement/DataListSingleton.cs index 0c54fdb..f868007 100644 --- a/FlowerShop/FlowerShopListImplement/DataListSingleton.cs +++ b/FlowerShop/FlowerShopListImplement/DataListSingleton.cs @@ -10,6 +10,7 @@ namespace FlowerShopListImplement public List Bouquets { get; set; } public List Clients { get; set; } public List Implementers { get; set; } + public List Messages { get; set; } private DataListSingleton() { @@ -18,6 +19,7 @@ namespace FlowerShopListImplement Bouquets = new List(); Clients = new List(); Implementers = new List(); + Messages = new List(); } public static DataListSingleton GetInstance() diff --git a/FlowerShop/FlowerShopListImplement/Implements/MessageInfoStorage.cs b/FlowerShop/FlowerShopListImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..a7d71eb --- /dev/null +++ b/FlowerShop/FlowerShopListImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,68 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.SearchModels; +using FlowerShopContracts.StoragesContracts; +using FlowerShopContracts.ViewModels; +using FlowerShopListImplement.Models; + +namespace FlowerShopListImplement.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/FlowerShop/FlowerShopListImplement/Models/MessageInfo.cs b/FlowerShop/FlowerShopListImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..6a8df7e --- /dev/null +++ b/FlowerShop/FlowerShopListImplement/Models/MessageInfo.cs @@ -0,0 +1,49 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.ViewModels; +using FlowerShopDataModels.Models; + +namespace FlowerShopListImplement.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/FlowerShop/FlowerShopRestApi/Controllers/ClientController.cs b/FlowerShop/FlowerShopRestApi/Controllers/ClientController.cs index 2fff652..7f0f983 100644 --- a/FlowerShop/FlowerShopRestApi/Controllers/ClientController.cs +++ b/FlowerShop/FlowerShopRestApi/Controllers/ClientController.cs @@ -11,12 +11,14 @@ namespace FlowerShopRestApi.Controllers public class ClientController : Controller { private readonly ILogger _logger; - private readonly IClientLogic _logic; + private readonly IClientLogic _clientLogic; + private readonly IMessageInfoLogic _mailLogic; - public ClientController(IClientLogic logic, ILogger logger) + public ClientController(IClientLogic clientLogic, IMessageInfoLogic mailLogic, ILogger logger) { _logger = logger; - _logic = logic; + _clientLogic = clientLogic; + _mailLogic = mailLogic; } [HttpGet] @@ -24,7 +26,7 @@ namespace FlowerShopRestApi.Controllers { try { - return _logic.ReadElement(new ClientSearchModel + return _clientLogic.ReadElement(new ClientSearchModel { Email = login, Password = password @@ -42,7 +44,7 @@ namespace FlowerShopRestApi.Controllers { try { - _logic.Create(model); + _clientLogic.Create(model); } catch (Exception ex) { @@ -56,7 +58,7 @@ namespace FlowerShopRestApi.Controllers { try { - _logic.Update(model); + _clientLogic.Update(model); } catch (Exception ex) { @@ -64,5 +66,19 @@ namespace FlowerShopRestApi.Controllers throw; } } + + [HttpGet] + public List? GetMessages(int clientId) + { + try + { + return _mailLogic.ReadList(new MessageInfoSearchModel { ClientId = clientId }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Error during receiving client's mails"); + throw; + } + } } } diff --git a/FlowerShop/FlowerShopRestApi/Program.cs b/FlowerShop/FlowerShopRestApi/Program.cs index 3fe84e5..8675da6 100644 --- a/FlowerShop/FlowerShopRestApi/Program.cs +++ b/FlowerShop/FlowerShopRestApi/Program.cs @@ -1,4 +1,6 @@ using FlowerShopBusinessLogic.BusinessLogics; +using FlowerShopBusinessLogic.MailWorker; +using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; using FlowerShopContracts.StoragesContracts; using FlowerShopDatabaseImplement.Implements; @@ -12,9 +14,13 @@ builder.Logging.AddLog4Net("log4net.config"); 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.AddTransient(); builder.Services.AddControllers(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle @@ -30,6 +36,17 @@ builder.Services.AddSwaggerGen(c => var app = builder.Build(); +var mailSender = app.Services.GetService(); +mailSender?.MailConfig(new MailConfigBindingModel +{ + MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty, + MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty, + SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty, + SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()), + PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty, + PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString()) +}); + // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { diff --git a/FlowerShop/FlowerShopRestApi/appsettings.json b/FlowerShop/FlowerShopRestApi/appsettings.json index 10f68b8..0cb9470 100644 --- a/FlowerShop/FlowerShopRestApi/appsettings.json +++ b/FlowerShop/FlowerShopRestApi/appsettings.json @@ -5,5 +5,11 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "SmtpClientHost": "smtp.rambler.ru", + "SmtpClientPort": "587", + "PopHost": "pop.rambler.ru", + "PopPort": "995", + "MailLogin": "chelovek.labov@rambler.ru", + "MailPassword": "Iloverpp4real" }