From 29675f3c80af773960cb0c8e760ee76d1f144b7e Mon Sep 17 00:00:00 2001 From: shadowik Date: Wed, 3 May 2023 22:06:56 +0400 Subject: [PATCH 1/3] Init --- Pizzeria/Pizzeria/App.config | 11 +++ Pizzeria/Pizzeria/FormMail.Designer.cs | 67 ++++++++++++++ Pizzeria/Pizzeria/FormMail.cs | 55 ++++++++++++ Pizzeria/Pizzeria/FormMail.resx | 60 +++++++++++++ Pizzeria/Pizzeria/FormMain.Designer.cs | 12 ++- Pizzeria/Pizzeria/FormMain.cs | 10 +++ Pizzeria/Pizzeria/Program.cs | 31 ++++++- .../BusinessLogics/ClientLogic.cs | 14 +-- .../BusinessLogics/MessageInfoLogic.cs | 90 +++++++++++++++++++ .../BusinessLogics/OrderLogic.cs | 28 +++++- .../MailWorker/AbstractMailWorker.cs | 85 ++++++++++++++++++ .../MailWorker/MailKitWorker.cs | 82 +++++++++++++++++ .../PizzeriaBusinessLogic.csproj | 1 + .../BindingModels/MailConfigBindingModel.cs | 18 ++++ .../BindingModels/MailSendInfoBindingModel.cs | 15 ++++ .../BindingModels/MessageInfoBindingModel.cs | 19 ++++ .../IMessageInfoLogic.cs | 17 ++++ .../SearchModels/MessageInfoSearchModel.cs | 14 +++ .../StoragesContracts/IMessageInfoStorage.cs | 19 ++++ .../ViewModels/MessageInfoViewModel.cs | 29 ++++++ .../ViewModels/OrderViewModel.cs | 2 + .../Models/IMessageInfoModel.cs | 18 ++++ .../Implements/ClientStorage.cs | 8 +- .../Implements/MessageInfoStorage.cs | 52 +++++++++++ ...ner.cs => 20230503155413_init.Designer.cs} | 58 +++++++++--- ...implementors.cs => 20230503155413_init.cs} | 48 ++++++---- .../PizzeriaDatabaseModelSnapshot.cs | 54 ++++++++--- .../Models/Client.cs | 15 ++-- .../Models/MessageInfo.cs | 64 +++++++++++++ .../PizzeriaDatabaseImplement/Models/Order.cs | 1 + .../PizzeriaDatabase.cs | 2 +- .../Controllers/ClientController.cs | 25 +++++- Pizzeria/PizzeriaShopRestApi/Program.cs | 17 ++++ Pizzeria/PizzeriaShopRestApi/appsettings.json | 7 ++ .../Controllers/HomeController.cs | 13 ++- .../Views/Home/Create.cshtml | 2 +- .../Views/Home/Mails.cshtml | 55 ++++++++++++ .../Views/Shared/_Layout.cshtml | 3 + 38 files changed, 1054 insertions(+), 67 deletions(-) create mode 100644 Pizzeria/Pizzeria/App.config create mode 100644 Pizzeria/Pizzeria/FormMail.Designer.cs create mode 100644 Pizzeria/Pizzeria/FormMail.cs create mode 100644 Pizzeria/Pizzeria/FormMail.resx create mode 100644 Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs create mode 100644 Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs create mode 100644 Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs create mode 100644 Pizzeria/PizzeriaContracts/BindingModels/MailConfigBindingModel.cs create mode 100644 Pizzeria/PizzeriaContracts/BindingModels/MailSendInfoBindingModel.cs create mode 100644 Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs create mode 100644 Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs create mode 100644 Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs create mode 100644 Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs create mode 100644 Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs create mode 100644 Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs create mode 100644 Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs rename Pizzeria/PizzeriaDatabaseImplement/Migrations/{20230418063952_implementors.Designer.cs => 20230503155413_init.Designer.cs} (87%) rename Pizzeria/PizzeriaDatabaseImplement/Migrations/{20230418063952_implementors.cs => 20230503155413_init.cs} (88%) create mode 100644 Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs create mode 100644 Pizzeria/PizzeriaShowClientApp/Views/Home/Mails.cshtml diff --git a/Pizzeria/Pizzeria/App.config b/Pizzeria/Pizzeria/App.config new file mode 100644 index 0000000..23af95f --- /dev/null +++ b/Pizzeria/Pizzeria/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Pizzeria/Pizzeria/FormMail.Designer.cs b/Pizzeria/Pizzeria/FormMail.Designer.cs new file mode 100644 index 0000000..31cbbad --- /dev/null +++ b/Pizzeria/Pizzeria/FormMail.Designer.cs @@ -0,0 +1,67 @@ +namespace PizzeriaView +{ + partial class FormMail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.dataGridView = new System.Windows.Forms.DataGridView(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + 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.ReadOnly = true; + this.dataGridView.RowHeadersWidth = 51; + this.dataGridView.RowTemplate.Height = 29; + this.dataGridView.Size = new System.Drawing.Size(786, 270); + this.dataGridView.TabIndex = 0; + // + // FormMail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(786, 270); + this.Controls.Add(this.dataGridView); + this.Name = "FormMail"; + this.Text = "Письма"; + this.Load += new System.EventHandler(this.FormMail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/Pizzeria/Pizzeria/FormMail.cs b/Pizzeria/Pizzeria/FormMail.cs new file mode 100644 index 0000000..550e925 --- /dev/null +++ b/Pizzeria/Pizzeria/FormMail.cs @@ -0,0 +1,55 @@ +using Microsoft.Extensions.Logging; +using PizzeriaBusinessLogic.BusinessLogics; +using PizzeriaContracts.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 PizzeriaView +{ + public partial class FormMail : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + + public FormMail(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = + DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка почтовых собщений"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки почтовых сообщений"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void FormMail_Load(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/Pizzeria/Pizzeria/FormMail.resx b/Pizzeria/Pizzeria/FormMail.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Pizzeria/Pizzeria/FormMail.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/Pizzeria/Pizzeria/FormMain.Designer.cs b/Pizzeria/Pizzeria/FormMain.Designer.cs index 370906e..520be00 100644 --- a/Pizzeria/Pizzeria/FormMain.Designer.cs +++ b/Pizzeria/Pizzeria/FormMain.Designer.cs @@ -45,6 +45,7 @@ this.buttonOrderReady = new System.Windows.Forms.Button(); this.buttonIssuedOrder = new System.Windows.Forms.Button(); this.buttonRef = new System.Windows.Forms.Button(); + this.почтаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -55,7 +56,8 @@ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bookToolStripMenuItem, this.отчётыToolStripMenuItem, - this.запускРаботToolStripMenuItem}); + this.запускРаботToolStripMenuItem, + this.почтаToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2); @@ -209,6 +211,13 @@ this.buttonRef.UseVisualStyleBackColor = true; this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); // + // почтаToolStripMenuItem + // + this.почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; + this.почтаToolStripMenuItem.Size = new System.Drawing.Size(53, 20); + this.почтаToolStripMenuItem.Text = "Почта"; + this.почтаToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -253,5 +262,6 @@ private ToolStripMenuItem клиентToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; + private ToolStripMenuItem почтаToolStripMenuItem; } } \ No newline at end of file diff --git a/Pizzeria/Pizzeria/FormMain.cs b/Pizzeria/Pizzeria/FormMain.cs index 268d2d3..890160f 100644 --- a/Pizzeria/Pizzeria/FormMain.cs +++ b/Pizzeria/Pizzeria/FormMain.cs @@ -34,6 +34,7 @@ namespace PizzeriaView dataGridView.DataSource = list; dataGridView.Columns["PizzaId"].Visible = false; dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["ClientEmail"].Visible = false; dataGridView.Columns["ImplementerId"].Visible = false; dataGridView.Columns["PizzaName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; @@ -203,5 +204,14 @@ namespace PizzeriaView _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } + + private void mailToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMail)); + if (service is FormMail form) + { + form.ShowDialog(); + } + } } } diff --git a/Pizzeria/Pizzeria/Program.cs b/Pizzeria/Pizzeria/Program.cs index 61ec8ca..a515b40 100644 --- a/Pizzeria/Pizzeria/Program.cs +++ b/Pizzeria/Pizzeria/Program.cs @@ -2,6 +2,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using PizzeriaBusinessLogic.BusinessLogics; +using PizzeriaBusinessLogic.MailWorker; +using PizzeriaContracts.BindingModels; using PizzeriaContracts.BusinessLogicsContracts; using PizzeriaContracts.StoragesContracts; using PizzeriaDatabaseImplement.Implements; @@ -30,6 +32,27 @@ namespace Pizzeria 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, "Mails Problem"); + } + Application.Run(_serviceProvider.GetRequiredService()); } private static void ConfigureServices(ServiceCollection services) @@ -45,20 +68,23 @@ namespace Pizzeria services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddSingleton(); services.AddTransient(); services.AddTransient(); @@ -73,6 +99,9 @@ namespace Pizzeria services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } + + private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); } } \ No newline at end of file diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ClientLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ClientLogic.cs index 43084a6..8ddf200 100644 --- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ClientLogic.cs @@ -5,7 +5,7 @@ using PizzeriaContracts.SearchModels; using PizzeriaContracts.StoragesContracts; using PizzeriaContracts.ViewModels; using PizzeriaBusinessLogic.BusinessLogics; -using System; +using System.Text.RegularExpressions; using System.Collections.Generic; using System.Linq; using System.Text; @@ -101,16 +101,16 @@ namespace PizzeriaBusinessLogic.BusinessLogics { throw new ArgumentNullException("Нет ФИО пользователя", nameof(model.ClientFIO)); } - if (string.IsNullOrEmpty(model.Email)) + if (string.IsNullOrEmpty(model.Email) || !Regex.IsMatch(model.Email, @"^[a-z0-9._%+-]+\@([a-z0-9-]+\.)+[a-z]{2,4}$")) { - throw new ArgumentNullException("Нет почты пользователя", nameof(model.Email)); + throw new ArgumentNullException("Не указана валидная почта", nameof(model.Email)); } - if (string.IsNullOrEmpty(model.Password)) + if (string.IsNullOrEmpty(model.Password) || !Regex.IsMatch(model.Password, @"^(?=.*[A-Za-z])(?=.*\d)(?=.*[^A-Za-z0-9\n]).{10,50}$")) { - throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password)); + throw new ArgumentNullException("Не указан правильный пароль", nameof(model.Password)); } - _logger.LogInformation("Client. ClientFIO:{ClientFIO}.Email:{Email}.Password:{Password}.Id:{Id}", - model.ClientFIO, model.Email, model.Password, model.Id); + _logger.LogInformation("Client. ClientFIO:{ClientFIO}.Email:{Email}.Id:{Id}", + model.ClientFIO, model.Email, model.Id); var element = _clientStorage.GetElement(new ClientSearchModel { ClientFIO = model.ClientFIO diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs new file mode 100644 index 0000000..4e08da7 --- /dev/null +++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -0,0 +1,90 @@ +using Microsoft.Extensions.Logging; +using PizzeriaContracts.BindingModels; +using PizzeriaContracts.BusinessLogicsContracts; +using PizzeriaContracts.SearchModels; +using PizzeriaContracts.StoragesContracts; +using PizzeriaContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaBusinessLogic.BusinessLogics +{ + public class MessageInfoLogic : IMessageInfoLogic + { + private readonly ILogger _logger; + private readonly IMessageInfoStorage _messageInfoStorage; + private readonly IClientStorage _clientStorage; + public MessageInfoLogic(ILogger logger, IMessageInfoStorage messageInfoStorage, IClientStorage clientStorage) + { + _logger = logger; + _messageInfoStorage = messageInfoStorage; + _clientStorage = clientStorage; + } + public List? ReadList(MessageInfoSearchModel? model) + { + _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId}", model?.MessageId, model?.ClientId); + var list = model == null ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + public bool Create(MessageInfoBindingModel model) + { + CheckModel(model); + if (_messageInfoStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + private void CheckModel(MessageInfoBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.MessageId)) + { + throw new ArgumentNullException("Не указан id сообщения", nameof(model.MessageId)); + } + if (string.IsNullOrEmpty(model.SenderName)) + { + throw new ArgumentNullException("Не указао почта", nameof(model.SenderName)); + } + if (string.IsNullOrEmpty(model.Subject)) + { + throw new ArgumentNullException("Не указана тема", nameof(model.Subject)); + } + if (string.IsNullOrEmpty(model.Body)) + { + throw new ArgumentNullException("Не указан текст сообщения", nameof(model.Subject)); + } + + _logger.LogInformation("MessageInfo. MessageId:{MessageId}.SenderName:{SenderName}.Subject:{Subject}.Body:{Body}", model.MessageId, model.SenderName, model.Subject, model.Body); + var element = _clientStorage.GetElement(new ClientSearchModel + { + Email = model.SenderName + }); + if (element == null) + { + _logger.LogWarning("Не удалоссь найти клиента, отправившего письмо с адреса Email:{Email}", model.SenderName); + } + else + { + model.ClientId = element.Id; + } + } + } +} diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs index 9dd588b..d40ad0a 100644 --- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs @@ -5,6 +5,8 @@ using PizzeriaContracts.BusinessLogicsContracts; using PizzeriaContracts.SearchModels; using PizzeriaContracts.StoragesContracts; using PizzeriaContracts.ViewModels; +using MigraDoc.Rendering; +using PizzeriaBusinessLogic.MailWorker; namespace PizzeriaBusinessLogic.BusinessLogics { @@ -12,11 +14,13 @@ namespace PizzeriaBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; + private readonly AbstractMailWorker _mailWorker; static readonly object _locker = new object(); - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker) { _logger = logger; _orderStorage = orderStorage; + _mailWorker = mailWorker; } public OrderViewModel? ReadElement(OrderSearchModel model) @@ -56,11 +60,18 @@ namespace PizzeriaBusinessLogic.BusinessLogics if (model.Status != OrderStatus.Неизвестен) return false; model.Status = OrderStatus.Принят; - if(_orderStorage.Insert(model) == null) + var element = _orderStorage.Insert(model); + if (element == null) { _logger.LogWarning("Insert operation failed"); return false; } + Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel + { + MailAddress = element.ClientEmail, + Subject = $"Изменение статуса заказа номер {element.Id}", + Text = $"Ваш заказ номер {element.Id} на пиццу {element.PizzaName} от {element.DateCreate} на сумму {element.Sum} принят." + })); return true; } public bool TakeOrderInWork(OrderBindingModel model) @@ -117,21 +128,30 @@ namespace PizzeriaBusinessLogic.BusinessLogics model.PizzaId = element.PizzaId; model.DateImplement = element.DateImplement; model.ClientId = element.ClientId; + if (!model.ImplementerId.HasValue) model.ImplementerId = element.ImplementerId; + model.Status = element.Status; model.Count = element.Count; model.Sum = element.Sum; - if(requiredStatus - model.Status == 1) + if (requiredStatus - model.Status == 1) { model.Status = requiredStatus; - if(model.Status == OrderStatus.Готов) + if (model.Status == OrderStatus.Готов) model.DateImplement = DateTime.Now; if (_orderStorage.Update(model) == null) { _logger.LogWarning("Update operation failed"); return false; } + string DateInfo = model.DateImplement.HasValue ? $"Дата выполнения {model.DateImplement}" : ""; + Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel + { + MailAddress = element.ClientEmail, + Subject = $"Изменение статуса заказа номер {element.Id}", + Text = $"Ваш заказ номер {element.Id} на пиццу {element.PizzaName} от {element.DateCreate} на сумму {element.Sum} {model.Status}. {DateInfo}" + })); return true; } _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus); diff --git a/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs b/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..82022af --- /dev/null +++ b/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,85 @@ +using Microsoft.Extensions.Logging; +using PizzeriaContracts.BindingModels; +using PizzeriaContracts.BusinessLogicsContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaBusinessLogic.MailWorker +{ + public abstract class AbstractMailWorker + { + protected string _mailLogin = string.Empty; + protected string _mailPassword = string.Empty; + protected string _smtpClientHost = string.Empty; + protected int _smtpClientPort; + protected string _popHost = string.Empty; + protected int _popPort; + private readonly IMessageInfoLogic _messageInfoLogic; + private readonly ILogger _logger; + + public AbstractMailWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) + { + _logger = logger; + _messageInfoLogic = messageInfoLogic; + } + public void MailConfig(MailConfigBindingModel config) + { + _mailLogin = config.MailLogin; + _mailPassword = config.MailPassword; + _smtpClientHost = config.SmtpClientHost; + _smtpClientPort = config.SmtpClientPort; + _popHost = config.PopHost; + _popPort = config.PopPort; + _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, {popHost}, {popPort}", _mailLogin, _mailPassword.Length, _smtpClientHost, _smtpClientPort, _popHost, _popPort); + } + public async void MailSendAsync(MailSendInfoBindingModel info) + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } + + if (string.IsNullOrEmpty(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/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs b/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..18fe11e --- /dev/null +++ b/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,82 @@ +using MailKit.Net.Pop3; +using MailKit.Security; +using Microsoft.Extensions.Logging; +using PizzeriaContracts.BindingModels; +using PizzeriaContracts.BusinessLogicsContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Mail; +using System.Net; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaBusinessLogic.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 (MailKit.Security.AuthenticationException) + { } + finally + { + client.Disconnect(true); + } + }); + return list; + } + } +} diff --git a/Pizzeria/PizzeriaBusinessLogic/PizzeriaBusinessLogic.csproj b/Pizzeria/PizzeriaBusinessLogic/PizzeriaBusinessLogic.csproj index c415f9f..c447d6f 100644 --- a/Pizzeria/PizzeriaBusinessLogic/PizzeriaBusinessLogic.csproj +++ b/Pizzeria/PizzeriaBusinessLogic/PizzeriaBusinessLogic.csproj @@ -8,6 +8,7 @@ + diff --git a/Pizzeria/PizzeriaContracts/BindingModels/MailConfigBindingModel.cs b/Pizzeria/PizzeriaContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..0f0c97d --- /dev/null +++ b/Pizzeria/PizzeriaContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaContracts.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/Pizzeria/PizzeriaContracts/BindingModels/MailSendInfoBindingModel.cs b/Pizzeria/PizzeriaContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..dba3663 --- /dev/null +++ b/Pizzeria/PizzeriaContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaContracts.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/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs b/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..21b5346 --- /dev/null +++ b/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,19 @@ +using PizzeriaDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaContracts.BindingModels +{ + public class MessageInfoBindingModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + public int? ClientId { get; set; } + public string SenderName { get; set; } = string.Empty; + public string Subject { get; set; } = string.Empty; + public string Body { get; set; } = string.Empty; + public DateTime DateDelivery { get; set; } + } +} diff --git a/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..e20bf6a --- /dev/null +++ b/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,17 @@ +using PizzeriaContracts.BindingModels; +using PizzeriaContracts.SearchModels; +using PizzeriaContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + bool Create(MessageInfoBindingModel model); + } +} diff --git a/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs b/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs new file mode 100644 index 0000000..bc5875f --- /dev/null +++ b/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public int? ClientId { get; set; } + public string? MessageId { get; set; } + } +} diff --git a/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs b/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..eef6930 --- /dev/null +++ b/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,19 @@ +using PizzeriaContracts.BindingModels; +using PizzeriaContracts.SearchModels; +using PizzeriaContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + } +} diff --git a/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs b/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..1e0912d --- /dev/null +++ b/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,29 @@ +using PizzeriaDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaContracts.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/Pizzeria/PizzeriaContracts/ViewModels/OrderViewModel.cs b/Pizzeria/PizzeriaContracts/ViewModels/OrderViewModel.cs index 80e155c..6a4dd8d 100644 --- a/Pizzeria/PizzeriaContracts/ViewModels/OrderViewModel.cs +++ b/Pizzeria/PizzeriaContracts/ViewModels/OrderViewModel.cs @@ -14,6 +14,8 @@ namespace PizzeriaContracts.ViewModels [DisplayName("Имя клиента")] public string? ClientFIO { get; set; } = string.Empty; + public string ClientEmail { get; set; } = string.Empty; + public int PizzaId { get; set; } [DisplayName("Пицца")] diff --git a/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs b/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..f029ed7 --- /dev/null +++ b/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaDataModels.Models +{ + public interface IMessageInfoModel + { + string MessageId { get; } + int? ClientId { get; } + string SenderName { get; } + DateTime DateDelivery { get; } + string Subject { get; } + string Body { get; } + } +} diff --git a/Pizzeria/PizzeriaDatabaseImplement/Implements/ClientStorage.cs b/Pizzeria/PizzeriaDatabaseImplement/Implements/ClientStorage.cs index 2644643..3a3c13c 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Implements/ClientStorage.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Implements/ClientStorage.cs @@ -34,10 +34,10 @@ namespace PizzeriaDatabaseImplement.Implements return null; } using var context = new PizzeriaDatabase(); - return context.Clients.FirstOrDefault(x => - (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) || - (model.Id.HasValue && x.Id == model.Id)) - ?.GetViewModel; + return context.Clients.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || + (!string.IsNullOrEmpty(model.ClientFIO) && x.ClientFIO == model.ClientFIO) || + (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && (string.IsNullOrEmpty(model.Password) || x.Password == model.Password)))?.GetViewModel; + } public List GetFilteredList(ClientSearchModel model) diff --git a/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs b/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..86ede19 --- /dev/null +++ b/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,52 @@ +using PizzeriaContracts.BindingModels; +using PizzeriaContracts.SearchModels; +using PizzeriaContracts.StoragesContracts; +using PizzeriaContracts.ViewModels; +using PizzeriaDatabaseImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaDatabaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public List GetFullList() + { + using var context = new PizzeriaDatabase(); + return context.MessageInfos.Select(x => x.GetViewModel).ToList(); + } + public List GetFilteredList(MessageInfoSearchModel model) + { + if (!model.ClientId.HasValue) + { + return new(); + } + using var context = new PizzeriaDatabase(); + return context.MessageInfos.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); + } + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (string.IsNullOrEmpty(model.MessageId)) + { + return new(); + } + using var context = new PizzeriaDatabase(); + return context.MessageInfos.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; + } + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + using var context = new PizzeriaDatabase(); + context.MessageInfos.Add(newMessage); + context.SaveChanges(); + return newMessage.GetViewModel; + } + } +} diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230418063952_implementors.Designer.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503155413_init.Designer.cs similarity index 87% rename from Pizzeria/PizzeriaDatabaseImplement/Migrations/20230418063952_implementors.Designer.cs rename to Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503155413_init.Designer.cs index 3b62ad2..6f88cbb 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230418063952_implementors.Designer.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503155413_init.Designer.cs @@ -12,8 +12,8 @@ using PizzeriaDatabaseImplement; namespace PizzeriaDatabaseImplement.Migrations { [DbContext(typeof(PizzeriaDatabase))] - [Migration("20230418063952_implementors")] - partial class implementors + [Migration("20230503155413_init")] + partial class init { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -97,6 +97,36 @@ namespace PizzeriaDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("MessageInfos"); + }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -168,9 +198,6 @@ namespace PizzeriaDatabaseImplement.Migrations SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("ClientId") - .HasColumnType("int"); - b.Property("ComponentId") .HasColumnType("int"); @@ -182,8 +209,6 @@ namespace PizzeriaDatabaseImplement.Migrations b.HasKey("Id"); - b.HasIndex("ClientId"); - b.HasIndex("ComponentId"); b.HasIndex("PizzaId"); @@ -191,10 +216,19 @@ namespace PizzeriaDatabaseImplement.Migrations b.ToTable("PizzaComponents"); }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") + .WithMany("ClientMessages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => { b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") - .WithMany() + .WithMany("ClientOrders") .HasForeignKey("ClientId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -218,10 +252,6 @@ namespace PizzeriaDatabaseImplement.Migrations modelBuilder.Entity("PizzeriaDatabaseImplement.Models.PizzaComponent", b => { - b.HasOne("PizzeriaDatabaseImplement.Models.Client", null) - .WithMany("Components") - .HasForeignKey("ClientId"); - b.HasOne("PizzeriaDatabaseImplement.Models.Component", "Component") .WithMany("PizzaComponents") .HasForeignKey("ComponentId") @@ -241,7 +271,9 @@ namespace PizzeriaDatabaseImplement.Migrations modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b => { - b.Navigation("Components"); + b.Navigation("ClientMessages"); + + b.Navigation("ClientOrders"); }); modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b => diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230418063952_implementors.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503155413_init.cs similarity index 88% rename from Pizzeria/PizzeriaDatabaseImplement/Migrations/20230418063952_implementors.cs rename to Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503155413_init.cs index 471b99e..8ebbd09 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230418063952_implementors.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503155413_init.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace PizzeriaDatabaseImplement.Migrations { /// - public partial class implementors : Migration + public partial class init : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -70,6 +70,27 @@ namespace PizzeriaDatabaseImplement.Migrations table.PrimaryKey("PK_Pizzas", x => x.Id); }); + migrationBuilder.CreateTable( + name: "MessageInfos", + 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_MessageInfos", x => x.MessageId); + table.ForeignKey( + name: "FK_MessageInfos_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id"); + }); + migrationBuilder.CreateTable( name: "Orders", columns: table => new @@ -115,17 +136,11 @@ namespace PizzeriaDatabaseImplement.Migrations .Annotation("SqlServer:Identity", "1, 1"), PizzaId = table.Column(type: "int", nullable: false), ComponentId = table.Column(type: "int", nullable: false), - Count = table.Column(type: "int", nullable: false), - ClientId = table.Column(type: "int", nullable: true) + Count = table.Column(type: "int", nullable: false) }, constraints: table => { table.PrimaryKey("PK_PizzaComponents", x => x.Id); - table.ForeignKey( - name: "FK_PizzaComponents_Clients_ClientId", - column: x => x.ClientId, - principalTable: "Clients", - principalColumn: "Id"); table.ForeignKey( name: "FK_PizzaComponents_Components_ComponentId", column: x => x.ComponentId, @@ -140,6 +155,11 @@ namespace PizzeriaDatabaseImplement.Migrations onDelete: ReferentialAction.Cascade); }); + migrationBuilder.CreateIndex( + name: "IX_MessageInfos_ClientId", + table: "MessageInfos", + column: "ClientId"); + migrationBuilder.CreateIndex( name: "IX_Orders_ClientId", table: "Orders", @@ -155,11 +175,6 @@ namespace PizzeriaDatabaseImplement.Migrations table: "Orders", column: "PizzaId"); - migrationBuilder.CreateIndex( - name: "IX_PizzaComponents_ClientId", - table: "PizzaComponents", - column: "ClientId"); - migrationBuilder.CreateIndex( name: "IX_PizzaComponents_ComponentId", table: "PizzaComponents", @@ -174,6 +189,9 @@ namespace PizzeriaDatabaseImplement.Migrations /// protected override void Down(MigrationBuilder migrationBuilder) { + migrationBuilder.DropTable( + name: "MessageInfos"); + migrationBuilder.DropTable( name: "Orders"); @@ -181,10 +199,10 @@ namespace PizzeriaDatabaseImplement.Migrations name: "PizzaComponents"); migrationBuilder.DropTable( - name: "Implementers"); + name: "Clients"); migrationBuilder.DropTable( - name: "Clients"); + name: "Implementers"); migrationBuilder.DropTable( name: "Components"); diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs index a3ca2af..dac013d 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs @@ -94,6 +94,36 @@ namespace PizzeriaDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("MessageInfos"); + }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -165,9 +195,6 @@ namespace PizzeriaDatabaseImplement.Migrations SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("ClientId") - .HasColumnType("int"); - b.Property("ComponentId") .HasColumnType("int"); @@ -179,8 +206,6 @@ namespace PizzeriaDatabaseImplement.Migrations b.HasKey("Id"); - b.HasIndex("ClientId"); - b.HasIndex("ComponentId"); b.HasIndex("PizzaId"); @@ -188,10 +213,19 @@ namespace PizzeriaDatabaseImplement.Migrations b.ToTable("PizzaComponents"); }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") + .WithMany("ClientMessages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => { b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") - .WithMany() + .WithMany("ClientOrders") .HasForeignKey("ClientId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -215,10 +249,6 @@ namespace PizzeriaDatabaseImplement.Migrations modelBuilder.Entity("PizzeriaDatabaseImplement.Models.PizzaComponent", b => { - b.HasOne("PizzeriaDatabaseImplement.Models.Client", null) - .WithMany("Components") - .HasForeignKey("ClientId"); - b.HasOne("PizzeriaDatabaseImplement.Models.Component", "Component") .WithMany("PizzaComponents") .HasForeignKey("ComponentId") @@ -238,7 +268,9 @@ namespace PizzeriaDatabaseImplement.Migrations modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b => { - b.Navigation("Components"); + b.Navigation("ClientMessages"); + + b.Navigation("ClientOrders"); }); modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b => diff --git a/Pizzeria/PizzeriaDatabaseImplement/Models/Client.cs b/Pizzeria/PizzeriaDatabaseImplement/Models/Client.cs index ce18966..8591ec2 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Models/Client.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Models/Client.cs @@ -17,16 +17,19 @@ namespace PizzeriaDatabaseImplement.Models public int Id { get; set; } [Required] - public string ClientFIO { get; set; } - - [Required] - public string Email { get; set; } + public string ClientFIO { get; set; } = string.Empty; [Required] - public string Password { get; set; } + public string Email { get; set; } = string.Empty; + + [Required] + public string Password { get; set; } = string.Empty; [ForeignKey("ClientId")] - public virtual List Components { get; set; } = new(); + public virtual List ClientOrders { get; set; } = new(); + + [ForeignKey("ClientId")] + public virtual List ClientMessages { get; set; } = new(); public ClientViewModel GetViewModel => new() { diff --git a/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs b/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..00bb1ee --- /dev/null +++ b/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs @@ -0,0 +1,64 @@ +using PizzeriaContracts.BindingModels; +using PizzeriaContracts.ViewModels; +using PizzeriaDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaDatabaseImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + public virtual Client? Client { get; set; } + + [Required] + public string SenderName { get; set; } = string.Empty; + + [Required] + public DateTime DateDelivery { get; set; } + + [Required] + public string Subject { get; set; } = string.Empty; + + [Required] + public string Body { get; set; } = string.Empty; + + public static MessageInfo? Create(MessageInfoBindingModel? model) + { + if (model == null) + { + return null; + } + return new() + { + MessageId = model.MessageId, + ClientId = model.ClientId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + Subject = model.Subject, + Body = model.Body, + + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + DateDelivery = DateDelivery, + Subject = Subject, + Body = Body + }; + } +} diff --git a/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs b/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs index 7ec99fa..b15dc81 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs @@ -79,6 +79,7 @@ namespace PizzeriaDatabaseImplement.Models Id = Id, ClientId = ClientId, ClientFIO = Client.ClientFIO, + ClientEmail = Client.Email, PizzaId = PizzaId, PizzaName = Pizza.PizzaName, ImplementerId = ImplementerId, diff --git a/Pizzeria/PizzeriaDatabaseImplement/PizzeriaDatabase.cs b/Pizzeria/PizzeriaDatabaseImplement/PizzeriaDatabase.cs index 265b3c1..d29adca 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/PizzeriaDatabase.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/PizzeriaDatabase.cs @@ -20,6 +20,6 @@ namespace PizzeriaDatabaseImplement public virtual DbSet Orders { set; get; } public virtual DbSet Clients { set; get; } public virtual DbSet Implementers { set; get; } - + public virtual DbSet MessageInfos { set; get; } } } \ No newline at end of file diff --git a/Pizzeria/PizzeriaShopRestApi/Controllers/ClientController.cs b/Pizzeria/PizzeriaShopRestApi/Controllers/ClientController.cs index 209e526..8f5a7bd 100644 --- a/Pizzeria/PizzeriaShopRestApi/Controllers/ClientController.cs +++ b/Pizzeria/PizzeriaShopRestApi/Controllers/ClientController.cs @@ -3,6 +3,7 @@ using PizzeriaContracts.BindingModels; using PizzeriaContracts.BusinessLogicsContracts; using PizzeriaContracts.SearchModels; using PizzeriaContracts.ViewModels; +using System.Net; namespace PizzeriaShopRestApi.Controllers { @@ -13,11 +14,13 @@ namespace PizzeriaShopRestApi.Controllers private readonly ILogger _logger; private readonly IClientLogic _logic; + private readonly IMessageInfoLogic _mailLogic; - public ClientController(IClientLogic logic, ILogger logger) + public ClientController(IClientLogic logic, ILogger logger, IMessageInfoLogic mailLogic) { _logger = logger; _logic = logic; + _mailLogic = mailLogic; } [HttpGet] @@ -48,7 +51,7 @@ namespace PizzeriaShopRestApi.Controllers catch (Exception ex) { _logger.LogError(ex, "Ошибка регистрации"); - throw; + Response.StatusCode = (int)HttpStatusCode.NotAcceptable; } } @@ -65,5 +68,23 @@ namespace PizzeriaShopRestApi.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/Pizzeria/PizzeriaShopRestApi/Program.cs b/Pizzeria/PizzeriaShopRestApi/Program.cs index 19dc3e7..8279a90 100644 --- a/Pizzeria/PizzeriaShopRestApi/Program.cs +++ b/Pizzeria/PizzeriaShopRestApi/Program.cs @@ -3,6 +3,8 @@ using PizzeriaContracts.BusinessLogicsContracts; using PizzeriaContracts.StoragesContracts; using PizzeriaDatabaseImplement.Implements; using Microsoft.OpenApi.Models; +using PizzeriaBusinessLogic.MailWorker; +using PizzeriaContracts.BindingModels; var builder = WebApplication.CreateBuilder(args); @@ -14,11 +16,15 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); + +builder.Services.AddSingleton(); builder.Services.AddControllers(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle @@ -30,6 +36,17 @@ builder.Services.AddSwaggerGen(c => var app = builder.Build(); +var mailSender = app.Services.GetService(); +mailSender?.MailConfig(new MailConfigBindingModel +{ + MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty, + MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty, + SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty, + SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()), + PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty, + PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString()) +}); + // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { diff --git a/Pizzeria/PizzeriaShopRestApi/appsettings.json b/Pizzeria/PizzeriaShopRestApi/appsettings.json index be2e30e..942a140 100644 --- a/Pizzeria/PizzeriaShopRestApi/appsettings.json +++ b/Pizzeria/PizzeriaShopRestApi/appsettings.json @@ -6,4 +6,11 @@ } }, "AllowedHosts": "*", + + "SmtpClientHost": "smtp.gmail.com", + "SmtpClientPort": "587", + "PopHost": "pop.gmail.com", + "PopPort": "995", + "MailLogin": "zahar230668@gmail.com", + "MailPassword": "klwy ypmv gefu yrug" } diff --git a/Pizzeria/PizzeriaShowClientApp/Controllers/HomeController.cs b/Pizzeria/PizzeriaShowClientApp/Controllers/HomeController.cs index c8204c7..05afdd2 100644 --- a/Pizzeria/PizzeriaShowClientApp/Controllers/HomeController.cs +++ b/Pizzeria/PizzeriaShowClientApp/Controllers/HomeController.cs @@ -2,6 +2,7 @@ using PizzeriaContracts.ViewModels; using PizzeriaShowClientApp.Models; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using System.Diagnostics; namespace PizzeriaShowClientApp.Controllers @@ -144,5 +145,15 @@ namespace PizzeriaShowClientApp.Controllers var piz = APIClient.GetRequest($"api/main/getpizza?pizzaId={pizza}"); return count * (piz?.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/Pizzeria/PizzeriaShowClientApp/Views/Home/Create.cshtml b/Pizzeria/PizzeriaShowClientApp/Views/Home/Create.cshtml index dc1dd1c..ac6013f 100644 --- a/Pizzeria/PizzeriaShowClientApp/Views/Home/Create.cshtml +++ b/Pizzeria/PizzeriaShowClientApp/Views/Home/Create.cshtml @@ -6,7 +6,7 @@
-
Изделие:
+
Пицца:
diff --git a/Pizzeria/PizzeriaShowClientApp/Views/Home/Mails.cshtml b/Pizzeria/PizzeriaShowClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..2a5b3be --- /dev/null +++ b/Pizzeria/PizzeriaShowClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,55 @@ +@using PizzeriaContracts.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/Pizzeria/PizzeriaShowClientApp/Views/Shared/_Layout.cshtml b/Pizzeria/PizzeriaShowClientApp/Views/Shared/_Layout.cshtml index a10b998..b6402a1 100644 --- a/Pizzeria/PizzeriaShowClientApp/Views/Shared/_Layout.cshtml +++ b/Pizzeria/PizzeriaShowClientApp/Views/Shared/_Layout.cshtml @@ -25,6 +25,9 @@
  • Личные данные
    • +
  • + Письма +
  • Вход
    • -- 2.25.1 From 482c968ec5135f5eb170f3695e6ece0be6684ebd Mon Sep 17 00:00:00 2001 From: shadowik Date: Thu, 18 May 2023 08:05:09 +0400 Subject: [PATCH 2/3] lab7 hfard init --- Pizzeria/Pizzeria/App.config | 2 +- Pizzeria/Pizzeria/FormLetter.Designer.cs | 182 ++++++++ Pizzeria/Pizzeria/FormLetter.cs | 150 +++++++ Pizzeria/Pizzeria/FormLetter.resx | 60 +++ Pizzeria/Pizzeria/FormMail.Designer.cs | 127 ++++-- Pizzeria/Pizzeria/FormMail.cs | 72 +++- Pizzeria/Pizzeria/Program.cs | 2 +- .../BusinessLogics/MessageInfoLogic.cs | 50 ++- .../BusinessLogics/OrderLogic.cs | 35 +- .../MailWorker/AbstractMailWorker.cs | 45 +- .../MailWorker/MailKitWorker.cs | 47 ++- .../MailReplySendInfoBindingModel.cs | 13 + .../BindingModels/MessageInfoBindingModel.cs | 3 + .../IMessageInfoLogic.cs | 3 + .../SearchModels/MessageInfoSearchModel.cs | 2 + .../StoragesContracts/IMessageInfoStorage.cs | 1 + .../ViewModels/MessageInfoViewModel.cs | 9 + .../Models/IMessageInfoModel.cs | 3 + .../Implements/MessageInfoStorage.cs | 37 +- .../20230517084350_init.Designer.cs | 392 ++++++++++++++++++ .../Migrations/20230517084350_init.cs | 286 +++++++++++++ .../PizzeriaDatabaseModelSnapshot.cs | 94 +++++ .../Models/MessageInfo.cs | 35 +- .../PizzeriaDatabaseImplement/Models/Order.cs | 3 +- .../Controllers/ClientController.cs | 6 +- Pizzeria/PizzeriaShopRestApi/appsettings.json | 2 +- Pizzeria/PizzeriaShowClientApp/ApiClient.cs | 1 + .../Controllers/HomeController.cs | 6 +- .../PizzeriaShowClientApp.csproj | 2 +- .../Views/Home/Mails.cshtml | 22 + .../Views/Shared/_Layout.cshtml | 2 +- .../PizzeriaShowClientApp/appsettings.json | 4 +- 32 files changed, 1612 insertions(+), 86 deletions(-) create mode 100644 Pizzeria/Pizzeria/FormLetter.Designer.cs create mode 100644 Pizzeria/Pizzeria/FormLetter.cs create mode 100644 Pizzeria/Pizzeria/FormLetter.resx create mode 100644 Pizzeria/PizzeriaContracts/BindingModels/MailReplySendInfoBindingModel.cs create mode 100644 Pizzeria/PizzeriaDatabaseImplement/Migrations/20230517084350_init.Designer.cs create mode 100644 Pizzeria/PizzeriaDatabaseImplement/Migrations/20230517084350_init.cs diff --git a/Pizzeria/Pizzeria/App.config b/Pizzeria/Pizzeria/App.config index 23af95f..e3b2ecd 100644 --- a/Pizzeria/Pizzeria/App.config +++ b/Pizzeria/Pizzeria/App.config @@ -6,6 +6,6 @@ - + \ No newline at end of file diff --git a/Pizzeria/Pizzeria/FormLetter.Designer.cs b/Pizzeria/Pizzeria/FormLetter.Designer.cs new file mode 100644 index 0000000..3f2f742 --- /dev/null +++ b/Pizzeria/Pizzeria/FormLetter.Designer.cs @@ -0,0 +1,182 @@ +namespace PizzeriaView +{ + partial class FormLetter + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.textBoxEmail = new System.Windows.Forms.TextBox(); + this.labelAdress = new System.Windows.Forms.Label(); + this.labelSubject = new System.Windows.Forms.Label(); + this.textBoxSubject = new System.Windows.Forms.TextBox(); + this.labelBody = new System.Windows.Forms.Label(); + this.textBoxBody = new System.Windows.Forms.TextBox(); + this.buttonClose = new System.Windows.Forms.Button(); + this.buttonReply = new System.Windows.Forms.Button(); + this.labelDate = new System.Windows.Forms.Label(); + this.textBoxDate = new System.Windows.Forms.TextBox(); + this.buttonSend = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // textBoxEmail + // + this.textBoxEmail.Location = new System.Drawing.Point(72, 6); + this.textBoxEmail.Name = "textBoxEmail"; + this.textBoxEmail.ReadOnly = true; + this.textBoxEmail.Size = new System.Drawing.Size(186, 27); + this.textBoxEmail.TabIndex = 0; + // + // labelAdress + // + this.labelAdress.AutoSize = true; + this.labelAdress.Location = new System.Drawing.Point(12, 9); + this.labelAdress.Name = "labelAdress"; + this.labelAdress.Size = new System.Drawing.Size(54, 20); + this.labelAdress.TabIndex = 1; + this.labelAdress.Text = "Адрес:"; + // + // labelSubject + // + this.labelSubject.AutoSize = true; + this.labelSubject.Location = new System.Drawing.Point(12, 55); + this.labelSubject.Name = "labelSubject"; + this.labelSubject.Size = new System.Drawing.Size(47, 20); + this.labelSubject.TabIndex = 2; + this.labelSubject.Text = "Тема:"; + // + // textBoxSubject + // + this.textBoxSubject.Location = new System.Drawing.Point(72, 52); + this.textBoxSubject.Name = "textBoxSubject"; + this.textBoxSubject.ReadOnly = true; + this.textBoxSubject.Size = new System.Drawing.Size(552, 27); + this.textBoxSubject.TabIndex = 3; + // + // labelBody + // + this.labelBody.AutoSize = true; + this.labelBody.Location = new System.Drawing.Point(12, 96); + this.labelBody.Name = "labelBody"; + this.labelBody.Size = new System.Drawing.Size(104, 20); + this.labelBody.TabIndex = 4; + this.labelBody.Text = "Текст письма:"; + // + // textBoxBody + // + this.textBoxBody.Location = new System.Drawing.Point(12, 119); + this.textBoxBody.Multiline = true; + this.textBoxBody.Name = "textBoxBody"; + this.textBoxBody.ReadOnly = true; + this.textBoxBody.Size = new System.Drawing.Size(612, 186); + this.textBoxBody.TabIndex = 5; + // + // buttonClose + // + this.buttonClose.Location = new System.Drawing.Point(491, 326); + this.buttonClose.Name = "buttonClose"; + this.buttonClose.Size = new System.Drawing.Size(111, 39); + this.buttonClose.TabIndex = 6; + this.buttonClose.Text = "Закрыть"; + this.buttonClose.UseVisualStyleBackColor = true; + this.buttonClose.Click += new System.EventHandler(this.buttonClose_Click); + // + // buttonReply + // + this.buttonReply.Location = new System.Drawing.Point(290, 326); + this.buttonReply.Name = "buttonReply"; + this.buttonReply.Size = new System.Drawing.Size(177, 39); + this.buttonReply.TabIndex = 7; + this.buttonReply.Text = "Ответить"; + this.buttonReply.UseVisualStyleBackColor = true; + this.buttonReply.Click += new System.EventHandler(this.buttonReply_Click); + // + // labelDate + // + this.labelDate.AutoSize = true; + this.labelDate.Location = new System.Drawing.Point(278, 9); + this.labelDate.Name = "labelDate"; + this.labelDate.Size = new System.Drawing.Size(127, 20); + this.labelDate.TabIndex = 8; + this.labelDate.Text = "Дата получения: "; + // + // textBoxDate + // + this.textBoxDate.Location = new System.Drawing.Point(411, 6); + this.textBoxDate.Name = "textBoxDate"; + this.textBoxDate.ReadOnly = true; + this.textBoxDate.Size = new System.Drawing.Size(213, 27); + this.textBoxDate.TabIndex = 9; + // + // buttonSend + // + this.buttonSend.Location = new System.Drawing.Point(149, 326); + this.buttonSend.Name = "buttonSend"; + this.buttonSend.Size = new System.Drawing.Size(109, 39); + this.buttonSend.TabIndex = 10; + this.buttonSend.Text = "Отправить"; + this.buttonSend.UseVisualStyleBackColor = true; + this.buttonSend.Visible = false; + this.buttonSend.Click += new System.EventHandler(this.buttonSend_Click); + // + // FormLetter + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(636, 377); + this.Controls.Add(this.buttonSend); + this.Controls.Add(this.textBoxDate); + this.Controls.Add(this.labelDate); + this.Controls.Add(this.buttonReply); + this.Controls.Add(this.buttonClose); + this.Controls.Add(this.textBoxBody); + this.Controls.Add(this.labelBody); + this.Controls.Add(this.textBoxSubject); + this.Controls.Add(this.labelSubject); + this.Controls.Add(this.labelAdress); + this.Controls.Add(this.textBoxEmail); + this.Name = "FormLetter"; + this.Text = "Письмо"; + this.Load += new System.EventHandler(this.FormLetter_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private TextBox textBoxEmail; + private Label labelAdress; + private Label labelSubject; + private TextBox textBoxSubject; + private Label labelBody; + private TextBox textBoxBody; + private Button buttonClose; + private Button buttonReply; + private Label labelDate; + private TextBox textBoxDate; + private Button buttonSend; + } +} \ No newline at end of file diff --git a/Pizzeria/Pizzeria/FormLetter.cs b/Pizzeria/Pizzeria/FormLetter.cs new file mode 100644 index 0000000..ab99227 --- /dev/null +++ b/Pizzeria/Pizzeria/FormLetter.cs @@ -0,0 +1,150 @@ +using Microsoft.Extensions.Logging; +using Pizzeria; +using PizzeriaBusinessLogic.MailWorker; +using PizzeriaContracts.BindingModels; +using PizzeriaContracts.BusinessLogicsContracts; +using PizzeriaContracts.SearchModels; +using PizzeriaContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace PizzeriaView +{ + public partial class FormLetter : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + private readonly AbstractMailWorker _worker; + + public MessageInfoViewModel? model; + public string? messageId; + + public FormLetter(ILogger logger, IMessageInfoLogic logic, AbstractMailWorker worker) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _worker = worker; + } + + private void FormLetter_Load(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(messageId)) + { + ReloadLetter(); + return; + } + else if (model != null) + { + ConfigurateToCreateAnsver(); + return; + } + _logger.LogError("Для формы не переданно сведений о письме, на которое отвечаем!"); + DialogResult = DialogResult.Abort; + Close(); + return; + } + + private void ReloadLetter() + { + _logger.LogInformation("Загрузка существующего письма с id:{}", messageId); + model = _logic.ReadElement(new MessageInfoSearchModel + { + MessageId = messageId + }); + if (model != null) + { + _logger.LogInformation("Письмо найдено"); + textBoxEmail.Text = model.SenderName; + textBoxDate.Text = model.DateDelivery.ToString(); + textBoxSubject.Text = model.Subject; + textBoxBody.Text = model.Body; + + + if (model.IsReply) + { + _logger.LogInformation("Письмо само и есть ответ"); + buttonReply.Visible = false; + } + else + { + if (!string.IsNullOrEmpty(model.ReplyMessageId)) + { + _logger.LogInformation("У письма есть ответ."); + buttonReply.Text = "Прочитать ответ"; + } + } + return; + } + _logger.LogWarning("Письмо с таким id не удалось найти"); + DialogResult = DialogResult.Abort; + Close(); + return; + } + + private void ConfigurateToCreateAnsver() + { + textBoxEmail.Text = model.SenderName; + labelDate.Visible = false; + textBoxDate.Visible = false; + textBoxSubject.Text = $"re: {model.Subject}"; + textBoxBody.ReadOnly = false; + buttonReply.Visible = false; + buttonSend.Visible = true; + _logger.LogInformation("Запущена форма создания нового письма - ответа"); + } + + private void buttonClose_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private void buttonReply_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormLetter)); + if (service is FormLetter form) + { + if(!string.IsNullOrEmpty(model.ReplyMessageId)) { + form.messageId = model.ReplyMessageId; + } + else + { + form.model = model; + } + + if(form.ShowDialog() != DialogResult.Cancel) + { + buttonReply.Visible = false; + } + } + } + + private void buttonSend_Click(object sender, EventArgs e) + { + if (model == null) + { + return; + } + string subject = textBoxSubject.Text; + string text = textBoxBody.Text; + + Task.Run(()=>_worker.MailSendReplyAsync(new MailReplySendInfoBindingModel + { + MailAddress = model.SenderName, + Subject = subject, + Text = text, + ParentMessageId= model.MessageId, + })); + DialogResult = DialogResult.OK; + Close(); + } + } +} diff --git a/Pizzeria/Pizzeria/FormLetter.resx b/Pizzeria/Pizzeria/FormLetter.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Pizzeria/Pizzeria/FormLetter.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/Pizzeria/Pizzeria/FormMail.Designer.cs b/Pizzeria/Pizzeria/FormMail.Designer.cs index 31cbbad..8a511d2 100644 --- a/Pizzeria/Pizzeria/FormMail.Designer.cs +++ b/Pizzeria/Pizzeria/FormMail.Designer.cs @@ -28,40 +28,109 @@ /// private void InitializeComponent() { - this.dataGridView = new System.Windows.Forms.DataGridView(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.SuspendLayout(); - // - // dataGridView - // - this.dataGridView.AllowUserToAddRows = false; - this.dataGridView.AllowUserToDeleteRows = false; - 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.ReadOnly = true; - this.dataGridView.RowHeadersWidth = 51; - this.dataGridView.RowTemplate.Height = 29; - this.dataGridView.Size = new System.Drawing.Size(786, 270); - this.dataGridView.TabIndex = 0; - // - // FormMail - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(786, 270); - this.Controls.Add(this.dataGridView); - this.Name = "FormMail"; - this.Text = "Письма"; - this.Load += new System.EventHandler(this.FormMail_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.ResumeLayout(false); + this.panel1 = new System.Windows.Forms.Panel(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonOpen = new System.Windows.Forms.Button(); + this.numericUpDownPage = new System.Windows.Forms.NumericUpDown(); + this.buttonPreveous = new System.Windows.Forms.Button(); + this.buttonNext = new System.Windows.Forms.Button(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownPage)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.Controls.Add(this.dataGridView); + this.panel1.Location = new System.Drawing.Point(3, 1); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(696, 323); + this.panel1.TabIndex = 0; + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersWidth = 51; + this.dataGridView.RowTemplate.Height = 29; + this.dataGridView.Size = new System.Drawing.Size(696, 323); + this.dataGridView.TabIndex = 2; + // + // buttonOpen + // + this.buttonOpen.Location = new System.Drawing.Point(722, 69); + this.buttonOpen.Name = "buttonOpen"; + this.buttonOpen.Size = new System.Drawing.Size(75, 23); + this.buttonOpen.TabIndex = 1; + this.buttonOpen.Text = "Прочитать"; + this.buttonOpen.UseVisualStyleBackColor = true; + this.buttonOpen.Click += new System.EventHandler(this.buttonOpen_Click); + // + // numericUpDownPage + // + this.numericUpDownPage.Location = new System.Drawing.Point(722, 215); + this.numericUpDownPage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.numericUpDownPage.Name = "numericUpDownPage"; + this.numericUpDownPage.Size = new System.Drawing.Size(74, 23); + this.numericUpDownPage.TabIndex = 4; + this.numericUpDownPage.ValueChanged += new System.EventHandler(this.numericUpDownPage_ValueChanged); + // + // buttonPreveous + // + this.buttonPreveous.Location = new System.Drawing.Point(722, 242); + this.buttonPreveous.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonPreveous.Name = "buttonPreveous"; + this.buttonPreveous.Size = new System.Drawing.Size(34, 22); + this.buttonPreveous.TabIndex = 5; + this.buttonPreveous.Text = "<-"; + this.buttonPreveous.UseVisualStyleBackColor = true; + this.buttonPreveous.Click += new System.EventHandler(this.buttonPreveous_Click); + // + // buttonNext + // + this.buttonNext.Location = new System.Drawing.Point(763, 242); + this.buttonNext.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonNext.Name = "buttonNext"; + this.buttonNext.Size = new System.Drawing.Size(34, 22); + this.buttonNext.TabIndex = 6; + this.buttonNext.Text = "->"; + this.buttonNext.UseVisualStyleBackColor = true; + this.buttonNext.Click += new System.EventHandler(this.buttonNext_Click); + // + // FormMail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(809, 321); + this.Controls.Add(this.buttonNext); + this.Controls.Add(this.buttonPreveous); + this.Controls.Add(this.numericUpDownPage); + this.Controls.Add(this.buttonOpen); + this.Controls.Add(this.panel1); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "FormMail"; + this.Text = "Письма"; + this.Load += new System.EventHandler(this.FormMail_Load); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownPage)).EndInit(); + this.ResumeLayout(false); } #endregion + private Panel panel1; private DataGridView dataGridView; + private Button buttonOpen; + private NumericUpDown numericUpDownPage; + private Button buttonPreveous; + private Button buttonNext; } } \ No newline at end of file diff --git a/Pizzeria/Pizzeria/FormMail.cs b/Pizzeria/Pizzeria/FormMail.cs index 550e925..533116f 100644 --- a/Pizzeria/Pizzeria/FormMail.cs +++ b/Pizzeria/Pizzeria/FormMail.cs @@ -1,6 +1,10 @@ -using Microsoft.Extensions.Logging; +using DocumentFormat.OpenXml.Spreadsheet; +using Microsoft.Extensions.Logging; +using Pizzeria; using PizzeriaBusinessLogic.BusinessLogics; +using PizzeriaContracts.BindingModels; using PizzeriaContracts.BusinessLogicsContracts; +using PizzeriaContracts.SearchModels; using System; using System.Collections.Generic; using System.ComponentModel; @@ -17,8 +21,10 @@ namespace PizzeriaView { private readonly ILogger _logger; private readonly IMessageInfoLogic _logic; + private int currentPage = 1; + private int pageLength = 2; - public FormMail(ILogger logger, IMessageInfoLogic logic) + public FormMail(ILogger logger, IMessageInfoLogic logic) { InitializeComponent(); _logger = logger; @@ -29,13 +35,22 @@ namespace PizzeriaView { try { - var list = _logic.ReadList(null); - if (list != null) + var list = _logic.ReadList(new MessageInfoSearchModel() + { + PageLength = pageLength, + PageIndex = currentPage + + }); + numericUpDownPage.Value = pageLength; + if (list != null) { dataGridView.DataSource = list; dataGridView.Columns["MessageId"].Visible = false; dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["Body"].AutoSizeMode = + dataGridView.Columns["ReplyMessageId"].Visible = false; + dataGridView.Columns["Reply"].Visible = false; + dataGridView.Columns["IsReply"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка почтовых собщений"); @@ -51,5 +66,50 @@ namespace PizzeriaView { LoadData(); } - } + + private void buttonOpen_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count <= 0) + return; + + var service = Program.ServiceProvider?.GetService(typeof(FormLetter)); + if (service is FormLetter form) + { + string? messageId = dataGridView.SelectedRows[0].Cells["MessageId"].Value.ToString(); + if (messageId == null) return; + form.messageId = messageId; + + if (!Convert.ToBoolean(dataGridView.SelectedRows[0].Cells["IsReaded"].Value)) + { + _logic.Update(new MessageInfoBindingModel + { + MessageId = messageId, + IsReaded = true, + ReplyMessageId = dataGridView.SelectedRows[0].Cells["ReplyMessageId"].Value?.ToString() + }); + } + + form.ShowDialog(); + LoadData(); + } + } + + private void buttonPreveous_Click(object sender, EventArgs e) + { + currentPage = Math.Max(1, currentPage - 1); + LoadData(); + } + + private void buttonNext_Click(object sender, EventArgs e) + { + currentPage++; + LoadData(); + } + + private void numericUpDownPage_ValueChanged(object sender, EventArgs e) + { + pageLength = Math.Max(1, (int)numericUpDownPage.Value); + LoadData(); + } + } } diff --git a/Pizzeria/Pizzeria/Program.cs b/Pizzeria/Pizzeria/Program.cs index cf337b6..a8afbee 100644 --- a/Pizzeria/Pizzeria/Program.cs +++ b/Pizzeria/Pizzeria/Program.cs @@ -73,7 +73,6 @@ namespace Pizzeria services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -110,6 +109,7 @@ namespace Pizzeria services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs index 4e08da7..4ed411f 100644 --- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs +++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -25,8 +25,10 @@ namespace PizzeriaBusinessLogic.BusinessLogics } 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 (model == null) + throw new ArgumentNullException(nameof(model)); + _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId}.PageLength:{PageLength}.PageCount:{PageIndex}", model?.MessageId, model?.ClientId, model?.PageLength, model?.PageIndex); + var list = _messageInfoStorage.GetFilteredList(model); if (list == null) { _logger.LogWarning("ReadList return null list"); @@ -38,7 +40,8 @@ namespace PizzeriaBusinessLogic.BusinessLogics public bool Create(MessageInfoBindingModel model) { CheckModel(model); - if (_messageInfoStorage.Insert(model) == null) + var message = _messageInfoStorage.Insert(model); + if (message == null) { _logger.LogWarning("Insert operation failed"); return false; @@ -51,27 +54,26 @@ namespace PizzeriaBusinessLogic.BusinessLogics { throw new ArgumentNullException(nameof(model)); } - if (!withParams) - { - return; - } if (string.IsNullOrEmpty(model.MessageId)) { throw new ArgumentNullException("Не указан id сообщения", nameof(model.MessageId)); } + if (!withParams) + { + return; + } if (string.IsNullOrEmpty(model.SenderName)) { - throw new ArgumentNullException("Не указао почта", nameof(model.SenderName)); + throw new ArgumentNullException("Не указао имя отправителя(электронная почта)", nameof(model.SenderName)); } if (string.IsNullOrEmpty(model.Subject)) { - throw new ArgumentNullException("Не указана тема", nameof(model.Subject)); + throw new ArgumentNullException("Не указана темма", nameof(model.Subject)); } if (string.IsNullOrEmpty(model.Body)) { throw new ArgumentNullException("Не указан текст сообщения", nameof(model.Subject)); } - _logger.LogInformation("MessageInfo. MessageId:{MessageId}.SenderName:{SenderName}.Subject:{Subject}.Body:{Body}", model.MessageId, model.SenderName, model.Subject, model.Body); var element = _clientStorage.GetElement(new ClientSearchModel { @@ -86,5 +88,33 @@ namespace PizzeriaBusinessLogic.BusinessLogics model.ClientId = element.Id; } } + + public MessageInfoViewModel? ReadElement(MessageInfoSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. MessageId:{MessageId}", model?.MessageId); + var element = _messageInfoStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.MessageId); + return element; + } + + public bool Update(MessageInfoBindingModel model) + { + CheckModel(model, withParams: false); + if (_messageInfoStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } } } diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs index 4a00365..b80bc33 100644 --- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs @@ -17,7 +17,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics private readonly AbstractMailWorker _mailWorker; static readonly object _locker = new object(); private readonly IShopStorage _shopStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage, AbstractMailWorker mailWorker) { _logger = logger; _orderStorage = orderStorage; @@ -92,26 +92,30 @@ namespace PizzeriaBusinessLogic.BusinessLogics { lock (_locker) { - model = FillOrderBindingModel(model); + //Создаём новую модель для обновления + (model, var element) = FillOrderBindingModel(model); if (model.Status != OrderStatus.Готов && model.Status != OrderStatus.Ожидает) { _logger.LogWarning("Changing status operation faled: Current-{Status}:required-Выдан.", model.Status); throw new InvalidOperationException($"Невозможно приствоить статус выдан заказу с текущим статусом {model.Status}"); } + //Пытаемся совершить поставку if (!_shopStorage.RestockingShops(new SupplyBindingModel { PizzaId = model.PizzaId, Count = model.Count })) { - if (model.Status == OrderStatus.Готов || model.Status == OrderStatus.Ожидает) + if (model.Status == OrderStatus.Готов) { model.Status = OrderStatus.Ожидает; - return UpdateOrder(model); + + UpdateOrder(model, element); } + throw new ArgumentException("Недостаточно места в магазинах для поставки"); } model.Status = OrderStatus.Выдан; - return UpdateOrder(model); + return UpdateOrder(model, element); } } private void CheckModel(OrderBindingModel model, bool withParams = true) @@ -140,21 +144,21 @@ namespace PizzeriaBusinessLogic.BusinessLogics model.PizzaId, model.Count,model.Sum, model.Id); } private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus) { - model = FillOrderBindingModel(model); + (model, var element) = FillOrderBindingModel(model); if (requiredStatus - model.Status == 1) { model.Status = requiredStatus; if (model.Status == OrderStatus.Готов) model.DateImplement = DateTime.Now; - return UpdateOrder(model); + return UpdateOrder(model, element); } _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus); throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}"); } - private OrderBindingModel FillOrderBindingModel(OrderBindingModel model) + private (OrderBindingModel, OrderViewModel) FillOrderBindingModel(OrderBindingModel model) { CheckModel(model, false); var element = _orderStorage.GetElement(new OrderSearchModel() @@ -170,16 +174,15 @@ namespace PizzeriaBusinessLogic.BusinessLogics model.PizzaId = element.PizzaId; model.DateImplement = element.DateImplement; model.ClientId = element.ClientId; - if (!model.ImplementerId.HasValue) - model.ImplementerId = element.ImplementerId; model.Status = element.Status; model.Count = element.Count; model.Sum = element.Sum; if (!model.ImplementerId.HasValue) model.ImplementerId = element.ImplementerId; - return model; + + return (model, element); } - private bool UpdateOrder(OrderBindingModel model) + private bool UpdateOrder(OrderBindingModel model, OrderViewModel MailNotificationModel) { if (_orderStorage.Update(model) == null) { @@ -187,6 +190,14 @@ namespace PizzeriaBusinessLogic.BusinessLogics return false; } _logger.LogWarning("Update operation sucsess"); + string DateInfo = model.DateImplement.HasValue ? $"Дата выполнения {model.DateImplement}" : ""; + Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel + { + MailAddress = MailNotificationModel.ClientEmail, + Subject = $"Изменение статуса заказа номер {MailNotificationModel.Id}", + Text = $"Ваш заказ номер {MailNotificationModel.Id} на изделие {MailNotificationModel.PizzaName} от" + + $" {MailNotificationModel.DateCreate} на сумму {MailNotificationModel.Sum} {model.Status}. {DateInfo}" + })); return true; } } diff --git a/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs b/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs index 82022af..abb6b5a 100644 --- a/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs +++ b/Pizzeria/PizzeriaBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -79,7 +79,50 @@ namespace PizzeriaBusinessLogic.MailWorker _messageInfoLogic.Create(mail); } } - protected abstract Task SendMailAsync(MailSendInfoBindingModel info); + + public async void MailSendReplyAsync(MailReplySendInfoBindingModel info) + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } + + if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text) || string.IsNullOrEmpty(info.ParentMessageId)) + { + return; + } + + _logger.LogDebug("Send Mail as reply: {To}, {Subject}, {parentId}", info.MailAddress, info.Subject, info.ParentMessageId); + + string? messageId = await SendMailAsync(info); + if (string.IsNullOrEmpty(messageId)) + { + throw new InvalidOperationException("Непредвиденная ошибка при отправке сообщения в ответ"); + } + if (_messageInfoLogic.Create(new MessageInfoBindingModel + { + MessageId = messageId, + DateDelivery = DateTime.Now, + SenderName = _mailLogin, + IsReply = true, + Subject = info.Subject, + Body = info.Text, + })) + { + _messageInfoLogic.Update(new MessageInfoBindingModel() + { + MessageId = info.ParentMessageId, + ReplyMessageId = messageId, + IsReaded = true + }); + } + } + protected abstract Task SendMailAsync(MailSendInfoBindingModel info); protected abstract Task> ReceiveMailAsync(); } } diff --git a/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs b/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs index 18fe11e..c26c421 100644 --- a/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs +++ b/Pizzeria/PizzeriaBusinessLogic/MailWorker/MailKitWorker.cs @@ -17,30 +17,36 @@ namespace PizzeriaBusinessLogic.MailWorker { public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { } - protected override async Task SendMailAsync(MailSendInfoBindingModel info) + protected override async Task SendMailAsync(MailSendInfoBindingModel info) { + string? resount = null; + 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; + ConfigurateSmtpClient(objSmtpClient); + CreateMessage(objMailMessage, info); - objSmtpClient.UseDefaultCredentials = false; - objSmtpClient.EnableSsl = true; - objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; - objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + if (info is MailReplySendInfoBindingModel replyInfo) + { + objMailMessage.Headers.Add("In-Reply-To", replyInfo.ParentMessageId); + objMailMessage.Headers.Add("References", replyInfo.ParentMessageId); + + string messageGuid = Guid.NewGuid().ToString(); + objMailMessage.Headers.Add("Message-Id", messageGuid); + resount = messageGuid; + } await Task.Run(() => objSmtpClient.Send(objMailMessage)); + } catch (Exception) { throw; } + + return resount; } protected override async Task> ReceiveMailAsync() @@ -78,5 +84,24 @@ namespace PizzeriaBusinessLogic.MailWorker }); return list; } + + private void CreateMessage(MailMessage objMailMessage, MailSendInfoBindingModel info) + { + objMailMessage.From = new MailAddress(_mailLogin); + objMailMessage.To.Add(new MailAddress(info.MailAddress)); + objMailMessage.Subject = info.Subject; + objMailMessage.Body = info.Text; + objMailMessage.SubjectEncoding = Encoding.UTF8; + objMailMessage.BodyEncoding = Encoding.UTF8; + } + + private void ConfigurateSmtpClient(SmtpClient objSmtpClient) + { + + objSmtpClient.UseDefaultCredentials = false; + objSmtpClient.EnableSsl = true; + objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; + objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + } } } diff --git a/Pizzeria/PizzeriaContracts/BindingModels/MailReplySendInfoBindingModel.cs b/Pizzeria/PizzeriaContracts/BindingModels/MailReplySendInfoBindingModel.cs new file mode 100644 index 0000000..63f0f5a --- /dev/null +++ b/Pizzeria/PizzeriaContracts/BindingModels/MailReplySendInfoBindingModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PizzeriaContracts.BindingModels +{ + public class MailReplySendInfoBindingModel : MailSendInfoBindingModel + { + public string ParentMessageId { get; set; } = string.Empty; + } +} diff --git a/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs b/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs index 21b5346..4b305d9 100644 --- a/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs +++ b/Pizzeria/PizzeriaContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,8 @@ namespace PizzeriaContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + public bool IsReaded { get; set; } + public string? ReplyMessageId { get; set; } + public bool IsReply { get; set; } } } diff --git a/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs index e20bf6a..99a7c10 100644 --- a/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs +++ b/Pizzeria/PizzeriaContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -11,6 +11,9 @@ namespace PizzeriaContracts.BusinessLogicsContracts { public interface IMessageInfoLogic { + MessageInfoViewModel? ReadElement(MessageInfoSearchModel model); + + bool Update(MessageInfoBindingModel model); List? ReadList(MessageInfoSearchModel? model); bool Create(MessageInfoBindingModel model); } diff --git a/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs b/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs index bc5875f..c7b999d 100644 --- a/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs +++ b/Pizzeria/PizzeriaContracts/SearchModels/MessageInfoSearchModel.cs @@ -10,5 +10,7 @@ namespace PizzeriaContracts.SearchModels { public int? ClientId { get; set; } public string? MessageId { get; set; } + public int? PageLength { get; set; } + public int? PageIndex { get; set; } } } diff --git a/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs b/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs index eef6930..e3d9aae 100644 --- a/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs +++ b/Pizzeria/PizzeriaContracts/StoragesContracts/IMessageInfoStorage.cs @@ -15,5 +15,6 @@ namespace PizzeriaContracts.StoragesContracts List GetFilteredList(MessageInfoSearchModel model); MessageInfoViewModel? GetElement(MessageInfoSearchModel model); MessageInfoViewModel? Insert(MessageInfoBindingModel model); + MessageInfoViewModel? Update(MessageInfoBindingModel model); } } diff --git a/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs b/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs index 1e0912d..c27adbc 100644 --- a/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs +++ b/Pizzeria/PizzeriaContracts/ViewModels/MessageInfoViewModel.cs @@ -25,5 +25,14 @@ namespace PizzeriaContracts.ViewModels [DisplayName("Текст")] public string Body { get; set; } = string.Empty; + + [DisplayName("Прочитанно")] + public bool IsReaded { get; set; } + + public string? ReplyMessageId { get; set; } + + public IMessageInfoModel? Reply { get; set; } + + public bool IsReply { get; set; } } } diff --git a/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs b/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs index f029ed7..05d26e5 100644 --- a/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs +++ b/Pizzeria/PizzeriaDataModels/Models/IMessageInfoModel.cs @@ -14,5 +14,8 @@ namespace PizzeriaDataModels.Models DateTime DateDelivery { get; } string Subject { get; } string Body { get; } + bool IsReaded { get; } + string? ReplyMessageId { get; } + bool IsReply { get; } } } diff --git a/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs b/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs index 86ede19..7a7cb04 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Implements/MessageInfoStorage.cs @@ -20,13 +20,23 @@ namespace PizzeriaDatabaseImplement.Implements } public List GetFilteredList(MessageInfoSearchModel model) { - if (!model.ClientId.HasValue) + if (!model.ClientId.HasValue && !model.PageLength.HasValue && !model.PageIndex.HasValue) { return new(); } using var context = new PizzeriaDatabase(); - return context.MessageInfos.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); + IEnumerable request = context.MessageInfos.Where(x => !x.IsReply); + if (model.ClientId.HasValue) + request = request.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId); + if (model.PageLength.HasValue) + { + int skipRows = model.PageIndex.HasValue ? (model.PageIndex.Value - 1) * model.PageLength.Value : 0; + request = request.Skip(skipRows).Take(model.PageLength.Value); + } + + return request.Select(x => x.GetViewModel).ToList(); } + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) { if (string.IsNullOrEmpty(model.MessageId)) @@ -38,15 +48,34 @@ namespace PizzeriaDatabaseImplement.Implements } public MessageInfoViewModel? Insert(MessageInfoBindingModel model) { + var newMessage = MessageInfo.Create(model); if (newMessage == null) { return null; } using var context = new PizzeriaDatabase(); - context.MessageInfos.Add(newMessage); + try { + context.MessageInfos.Add(newMessage); + context.SaveChanges(); + return newMessage.GetViewModel; + } + catch (Exception ex) { + return null; + } + } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + using var context = new PizzeriaDatabase(); + var message = context.MessageInfos.FirstOrDefault(x => x.MessageId == model.MessageId); + if (message == null) + { + return null; + } + message.Update(context, model); context.SaveChanges(); - return newMessage.GetViewModel; + return message.GetViewModel; } } } diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230517084350_init.Designer.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230517084350_init.Designer.cs new file mode 100644 index 0000000..bcbfdf6 --- /dev/null +++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230517084350_init.Designer.cs @@ -0,0 +1,392 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using PizzeriaDatabaseImplement; + +#nullable disable + +namespace PizzeriaDatabaseImplement.Migrations +{ + [DbContext(typeof(PizzeriaDatabase))] + [Migration("20230517084350_init")] + partial class init + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Cost") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Components"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Implementer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ImplementerFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Qualification") + .HasColumnType("int"); + + b.Property("WorkExperience") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("Implementers"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("IsReaded") + .HasColumnType("bit"); + + b.Property("IsReply") + .HasColumnType("bit"); + + b.Property("ReplyMessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.HasIndex("ReplyMessageId"); + + b.ToTable("MessageInfos"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DateCreate") + .HasColumnType("datetime2"); + + b.Property("DateImplement") + .HasColumnType("datetime2"); + + b.Property("ImplementerId") + .HasColumnType("int"); + + b.Property("PizzaId") + .HasColumnType("int"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("ImplementerId"); + + b.HasIndex("PizzaId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Pizza", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("PizzaName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Pizzas"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.PizzaComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("PizzaId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ComponentId"); + + b.HasIndex("PizzaId"); + + b.ToTable("PizzaComponents"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Adress") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("OpeningDate") + .HasColumnType("datetime2"); + + b.Property("PizzaMaxCount") + .HasColumnType("int"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("PizzaId") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("PizzaId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopPizzas"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") + .WithMany("ClientMessages") + .HasForeignKey("ClientId"); + + b.HasOne("PizzeriaDatabaseImplement.Models.MessageInfo", "Reply") + .WithMany() + .HasForeignKey("ReplyMessageId"); + + b.Navigation("Client"); + + b.Navigation("Reply"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") + .WithMany("ClientOrders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PizzeriaDatabaseImplement.Models.Implementer", "Implementer") + .WithMany("Order") + .HasForeignKey("ImplementerId"); + + b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza") + .WithMany("Orders") + .HasForeignKey("PizzaId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + + b.Navigation("Implementer"); + + b.Navigation("Pizza"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.PizzaComponent", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Component", "Component") + .WithMany("PizzaComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza") + .WithMany("Components") + .HasForeignKey("PizzaId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Component"); + + b.Navigation("Pizza"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza") + .WithMany() + .HasForeignKey("PizzaId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PizzeriaDatabaseImplement.Models.Shop", "Shop") + .WithMany("Pizzas") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Pizza"); + + b.Navigation("Shop"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b => + { + b.Navigation("ClientMessages"); + + b.Navigation("ClientOrders"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Component", b => + { + b.Navigation("PizzaComponents"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Implementer", b => + { + b.Navigation("Order"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Pizza", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b => + { + b.Navigation("Pizzas"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230517084350_init.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230517084350_init.cs new file mode 100644 index 0000000..5ed70e4 --- /dev/null +++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230517084350_init.cs @@ -0,0 +1,286 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace PizzeriaDatabaseImplement.Migrations +{ + /// + public partial class init : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Clients", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ClientFIO = table.Column(type: "nvarchar(max)", nullable: false), + Email = table.Column(type: "nvarchar(max)", nullable: false), + Password = table.Column(type: "nvarchar(max)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Clients", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Components", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ComponentName = table.Column(type: "nvarchar(max)", nullable: false), + Cost = table.Column(type: "float", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Components", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Implementers", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ImplementerFIO = table.Column(type: "nvarchar(max)", nullable: false), + Password = table.Column(type: "nvarchar(max)", nullable: false), + WorkExperience = table.Column(type: "int", nullable: false), + Qualification = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Implementers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Pizzas", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + PizzaName = table.Column(type: "nvarchar(max)", nullable: false), + Price = table.Column(type: "float", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Pizzas", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Shops", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ShopName = table.Column(type: "nvarchar(max)", nullable: false), + Adress = table.Column(type: "nvarchar(max)", nullable: false), + OpeningDate = table.Column(type: "datetime2", nullable: false), + PizzaMaxCount = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Shops", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "MessageInfos", + 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), + IsReaded = table.Column(type: "bit", nullable: false), + ReplyMessageId = table.Column(type: "nvarchar(450)", nullable: true), + IsReply = table.Column(type: "bit", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_MessageInfos", x => x.MessageId); + table.ForeignKey( + name: "FK_MessageInfos_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id"); + table.ForeignKey( + name: "FK_MessageInfos_MessageInfos_ReplyMessageId", + column: x => x.ReplyMessageId, + principalTable: "MessageInfos", + principalColumn: "MessageId"); + }); + + migrationBuilder.CreateTable( + name: "Orders", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ClientId = table.Column(type: "int", nullable: false), + PizzaId = table.Column(type: "int", nullable: false), + ImplementerId = table.Column(type: "int", nullable: true), + Count = table.Column(type: "int", nullable: false), + Sum = table.Column(type: "float", nullable: false), + Status = table.Column(type: "int", nullable: false), + DateCreate = table.Column(type: "datetime2", nullable: false), + DateImplement = table.Column(type: "datetime2", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Orders", x => x.Id); + table.ForeignKey( + name: "FK_Orders_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Orders_Implementers_ImplementerId", + column: x => x.ImplementerId, + principalTable: "Implementers", + principalColumn: "Id"); + table.ForeignKey( + name: "FK_Orders_Pizzas_PizzaId", + column: x => x.PizzaId, + principalTable: "Pizzas", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "PizzaComponents", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + PizzaId = table.Column(type: "int", nullable: false), + ComponentId = table.Column(type: "int", nullable: false), + Count = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_PizzaComponents", x => x.Id); + table.ForeignKey( + name: "FK_PizzaComponents_Components_ComponentId", + column: x => x.ComponentId, + principalTable: "Components", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_PizzaComponents_Pizzas_PizzaId", + column: x => x.PizzaId, + principalTable: "Pizzas", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "ShopPizzas", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + PizzaId = table.Column(type: "int", nullable: false), + ShopId = table.Column(type: "int", nullable: false), + Count = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ShopPizzas", x => x.Id); + table.ForeignKey( + name: "FK_ShopPizzas_Pizzas_PizzaId", + column: x => x.PizzaId, + principalTable: "Pizzas", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_ShopPizzas_Shops_ShopId", + column: x => x.ShopId, + principalTable: "Shops", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_MessageInfos_ClientId", + table: "MessageInfos", + column: "ClientId"); + + migrationBuilder.CreateIndex( + name: "IX_MessageInfos_ReplyMessageId", + table: "MessageInfos", + column: "ReplyMessageId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_ClientId", + table: "Orders", + column: "ClientId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_ImplementerId", + table: "Orders", + column: "ImplementerId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_PizzaId", + table: "Orders", + column: "PizzaId"); + + migrationBuilder.CreateIndex( + name: "IX_PizzaComponents_ComponentId", + table: "PizzaComponents", + column: "ComponentId"); + + migrationBuilder.CreateIndex( + name: "IX_PizzaComponents_PizzaId", + table: "PizzaComponents", + column: "PizzaId"); + + migrationBuilder.CreateIndex( + name: "IX_ShopPizzas_PizzaId", + table: "ShopPizzas", + column: "PizzaId"); + + migrationBuilder.CreateIndex( + name: "IX_ShopPizzas_ShopId", + table: "ShopPizzas", + column: "ShopId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "MessageInfos"); + + migrationBuilder.DropTable( + name: "Orders"); + + migrationBuilder.DropTable( + name: "PizzaComponents"); + + migrationBuilder.DropTable( + name: "ShopPizzas"); + + migrationBuilder.DropTable( + name: "Clients"); + + migrationBuilder.DropTable( + name: "Implementers"); + + migrationBuilder.DropTable( + name: "Components"); + + migrationBuilder.DropTable( + name: "Pizzas"); + + migrationBuilder.DropTable( + name: "Shops"); + } + } +} diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs index dac013d..6c4e55a 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/PizzeriaDatabaseModelSnapshot.cs @@ -109,6 +109,15 @@ namespace PizzeriaDatabaseImplement.Migrations b.Property("DateDelivery") .HasColumnType("datetime2"); + b.Property("IsReaded") + .HasColumnType("bit"); + + b.Property("IsReply") + .HasColumnType("bit"); + + b.Property("ReplyMessageId") + .HasColumnType("nvarchar(450)"); + b.Property("SenderName") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -121,6 +130,8 @@ namespace PizzeriaDatabaseImplement.Migrations b.HasIndex("ClientId"); + b.HasIndex("ReplyMessageId"); + b.ToTable("MessageInfos"); }); @@ -213,13 +224,72 @@ namespace PizzeriaDatabaseImplement.Migrations b.ToTable("PizzaComponents"); }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Adress") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("OpeningDate") + .HasColumnType("datetime2"); + + b.Property("PizzaMaxCount") + .HasColumnType("int"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("PizzaId") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("PizzaId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopPizzas"); + }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.MessageInfo", b => { b.HasOne("PizzeriaDatabaseImplement.Models.Client", "Client") .WithMany("ClientMessages") .HasForeignKey("ClientId"); + b.HasOne("PizzeriaDatabaseImplement.Models.MessageInfo", "Reply") + .WithMany() + .HasForeignKey("ReplyMessageId"); + b.Navigation("Client"); + + b.Navigation("Reply"); }); modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Order", b => @@ -266,6 +336,25 @@ namespace PizzeriaDatabaseImplement.Migrations b.Navigation("Pizza"); }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.ShopPizzas", b => + { + b.HasOne("PizzeriaDatabaseImplement.Models.Pizza", "Pizza") + .WithMany() + .HasForeignKey("PizzaId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("PizzeriaDatabaseImplement.Models.Shop", "Shop") + .WithMany("Pizzas") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Pizza"); + + b.Navigation("Shop"); + }); + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Client", b => { b.Navigation("ClientMessages"); @@ -289,6 +378,11 @@ namespace PizzeriaDatabaseImplement.Migrations b.Navigation("Orders"); }); + + modelBuilder.Entity("PizzeriaDatabaseImplement.Models.Shop", b => + { + b.Navigation("Pizzas"); + }); #pragma warning restore 612, 618 } } diff --git a/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs b/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs index 00bb1ee..3023f90 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Models/MessageInfo.cs @@ -33,6 +33,17 @@ namespace PizzeriaDatabaseImplement.Models [Required] public string Body { get; set; } = string.Empty; + [Required] + public bool IsReaded { get; set; } + + public string? ReplyMessageId { get; set; } + + [ForeignKey("ReplyMessageId")] + public virtual MessageInfo? Reply { get; set; } + + [Required] + public bool IsReply { get; set; } + public static MessageInfo? Create(MessageInfoBindingModel? model) { if (model == null) @@ -47,10 +58,26 @@ namespace PizzeriaDatabaseImplement.Models DateDelivery = model.DateDelivery, Subject = model.Subject, Body = model.Body, - + IsReaded = model.IsReaded, + ReplyMessageId = model.ReplyMessageId, + IsReply = model.IsReply }; } + public void Update(PizzeriaDatabase context, MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + IsReaded = model.IsReaded; + ReplyMessageId = model.ReplyMessageId; + if (!string.IsNullOrEmpty(ReplyMessageId)) + { + Reply = context.MessageInfos.First(x => x.MessageId == ReplyMessageId); + } + } + public MessageInfoViewModel GetViewModel => new() { MessageId = MessageId, @@ -58,7 +85,11 @@ namespace PizzeriaDatabaseImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, Subject = Subject, - Body = Body + Body = Body, + IsReaded = IsReaded, + ReplyMessageId = ReplyMessageId, + Reply = Reply, + IsReply = IsReply }; } } diff --git a/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs b/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs index b15dc81..9592cbe 100644 --- a/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs +++ b/Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs @@ -1,6 +1,7 @@ using PizzeriaContracts.BindingModels; using PizzeriaContracts.ViewModels; using PizzeriaDataModels.Enums; +using PizzeriaDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -11,7 +12,7 @@ using System.Threading.Tasks; namespace PizzeriaDatabaseImplement.Models { - public class Order + public class Order : IOrderModel { public int Id { get; private set; } diff --git a/Pizzeria/PizzeriaShopRestApi/Controllers/ClientController.cs b/Pizzeria/PizzeriaShopRestApi/Controllers/ClientController.cs index 8f5a7bd..9fd50fc 100644 --- a/Pizzeria/PizzeriaShopRestApi/Controllers/ClientController.cs +++ b/Pizzeria/PizzeriaShopRestApi/Controllers/ClientController.cs @@ -70,13 +70,15 @@ namespace PizzeriaShopRestApi.Controllers } [HttpGet] - public List? GetMessages(int clientId) + public List? GetMessages(int clientId, int page, int pagesize = 1) { try { return _mailLogic.ReadList(new MessageInfoSearchModel { - ClientId = clientId + ClientId = clientId, + PageLength = pagesize, + PageIndex = page }); } catch (Exception ex) diff --git a/Pizzeria/PizzeriaShopRestApi/appsettings.json b/Pizzeria/PizzeriaShopRestApi/appsettings.json index ef944b3..3f3c7bd 100644 --- a/Pizzeria/PizzeriaShopRestApi/appsettings.json +++ b/Pizzeria/PizzeriaShopRestApi/appsettings.json @@ -12,6 +12,6 @@ "PopHost": "pop.gmail.com", "PopPort": "995", "MailLogin": "zahar230668@gmail.com", - "MailPassword": "klwy ypmv gefu yrug" + "MailPassword": "mdvt hqni jfqf frme", "ShopAPIPassword": "123456" } diff --git a/Pizzeria/PizzeriaShowClientApp/ApiClient.cs b/Pizzeria/PizzeriaShowClientApp/ApiClient.cs index 6cca5d6..6e672db 100644 --- a/Pizzeria/PizzeriaShowClientApp/ApiClient.cs +++ b/Pizzeria/PizzeriaShowClientApp/ApiClient.cs @@ -10,6 +10,7 @@ namespace PizzeriaShowClientApp private static readonly HttpClient _client = new(); public static ClientViewModel? Client { get; set; } = null; + public static int MailPage { get; set; } = 1; public static void Connect(IConfiguration configuration) { diff --git a/Pizzeria/PizzeriaShowClientApp/Controllers/HomeController.cs b/Pizzeria/PizzeriaShowClientApp/Controllers/HomeController.cs index 05afdd2..a28603b 100644 --- a/Pizzeria/PizzeriaShowClientApp/Controllers/HomeController.cs +++ b/Pizzeria/PizzeriaShowClientApp/Controllers/HomeController.cs @@ -147,13 +147,15 @@ namespace PizzeriaShowClientApp.Controllers } [HttpGet] - public IActionResult Mails() + public IActionResult Mails(int page = 1) { if (APIClient.Client == null) { return Redirect("~/Home/Enter"); } - return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); + + page = Math.Max(page, 1); + return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}&page={page}")); } } } \ No newline at end of file diff --git a/Pizzeria/PizzeriaShowClientApp/PizzeriaShowClientApp.csproj b/Pizzeria/PizzeriaShowClientApp/PizzeriaShowClientApp.csproj index 166145e..205aa56 100644 --- a/Pizzeria/PizzeriaShowClientApp/PizzeriaShowClientApp.csproj +++ b/Pizzeria/PizzeriaShowClientApp/PizzeriaShowClientApp.csproj @@ -1,4 +1,4 @@ - + net6.0 diff --git a/Pizzeria/PizzeriaShowClientApp/Views/Home/Mails.cshtml b/Pizzeria/PizzeriaShowClientApp/Views/Home/Mails.cshtml index 2a5b3be..3b3a484 100644 --- a/Pizzeria/PizzeriaShowClientApp/Views/Home/Mails.cshtml +++ b/Pizzeria/PizzeriaShowClientApp/Views/Home/Mails.cshtml @@ -1,6 +1,7 @@ @using PizzeriaContracts.ViewModels @model List +@Url.ActionContext.RouteData.Values["page"] @{ ViewData["Title"] = "Mails"; @@ -51,5 +52,26 @@ } +
    + @{ + int page = int.Parse(Context.Request.Query["page"]); +
    + +
    + if(page > 1) + { + <- + } + else + { +

    <-

    + } + + -> + } + + + +
    }
    \ No newline at end of file diff --git a/Pizzeria/PizzeriaShowClientApp/Views/Shared/_Layout.cshtml b/Pizzeria/PizzeriaShowClientApp/Views/Shared/_Layout.cshtml index b6402a1..7ec787d 100644 --- a/Pizzeria/PizzeriaShowClientApp/Views/Shared/_Layout.cshtml +++ b/Pizzeria/PizzeriaShowClientApp/Views/Shared/_Layout.cshtml @@ -26,7 +26,7 @@ Личные данные
  • - Письма + Письма
  • Вход diff --git a/Pizzeria/PizzeriaShowClientApp/appsettings.json b/Pizzeria/PizzeriaShowClientApp/appsettings.json index 5b53bfe..197673c 100644 --- a/Pizzeria/PizzeriaShowClientApp/appsettings.json +++ b/Pizzeria/PizzeriaShowClientApp/appsettings.json @@ -6,5 +6,7 @@ } }, "AllowedHosts": "*", - "IPAddress": "http://localhost:5175" + "IPAddress": "http://localhost:5175", + } + -- 2.25.1 From 50ca7e45883653a9b2aa612160b99a1cd1bf0af4 Mon Sep 17 00:00:00 2001 From: shadowik Date: Thu, 18 May 2023 10:03:08 +0400 Subject: [PATCH 3/3] fix --- Pizzeria/Pizzeria/FormMail.Designer.cs | 31 ++++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/Pizzeria/Pizzeria/FormMail.Designer.cs b/Pizzeria/Pizzeria/FormMail.Designer.cs index 8a511d2..048dfa9 100644 --- a/Pizzeria/Pizzeria/FormMail.Designer.cs +++ b/Pizzeria/Pizzeria/FormMail.Designer.cs @@ -43,8 +43,9 @@ // this.panel1.Controls.Add(this.dataGridView); this.panel1.Location = new System.Drawing.Point(3, 1); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(696, 323); + this.panel1.Size = new System.Drawing.Size(795, 431); this.panel1.TabIndex = 0; // // dataGridView @@ -54,19 +55,19 @@ 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dataGridView.Name = "dataGridView"; this.dataGridView.ReadOnly = true; this.dataGridView.RowHeadersWidth = 51; this.dataGridView.RowTemplate.Height = 29; - this.dataGridView.Size = new System.Drawing.Size(696, 323); + this.dataGridView.Size = new System.Drawing.Size(795, 431); this.dataGridView.TabIndex = 2; // // buttonOpen // - this.buttonOpen.Location = new System.Drawing.Point(722, 69); + this.buttonOpen.Location = new System.Drawing.Point(806, 80); + this.buttonOpen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.buttonOpen.Name = "buttonOpen"; - this.buttonOpen.Size = new System.Drawing.Size(75, 23); + this.buttonOpen.Size = new System.Drawing.Size(107, 31); this.buttonOpen.TabIndex = 1; this.buttonOpen.Text = "Прочитать"; this.buttonOpen.UseVisualStyleBackColor = true; @@ -74,19 +75,17 @@ // // numericUpDownPage // - this.numericUpDownPage.Location = new System.Drawing.Point(722, 215); - this.numericUpDownPage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.numericUpDownPage.Location = new System.Drawing.Point(825, 287); this.numericUpDownPage.Name = "numericUpDownPage"; - this.numericUpDownPage.Size = new System.Drawing.Size(74, 23); + this.numericUpDownPage.Size = new System.Drawing.Size(85, 27); this.numericUpDownPage.TabIndex = 4; this.numericUpDownPage.ValueChanged += new System.EventHandler(this.numericUpDownPage_ValueChanged); // // buttonPreveous // - this.buttonPreveous.Location = new System.Drawing.Point(722, 242); - this.buttonPreveous.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonPreveous.Location = new System.Drawing.Point(825, 323); this.buttonPreveous.Name = "buttonPreveous"; - this.buttonPreveous.Size = new System.Drawing.Size(34, 22); + this.buttonPreveous.Size = new System.Drawing.Size(39, 29); this.buttonPreveous.TabIndex = 5; this.buttonPreveous.Text = "<-"; this.buttonPreveous.UseVisualStyleBackColor = true; @@ -94,10 +93,9 @@ // // buttonNext // - this.buttonNext.Location = new System.Drawing.Point(763, 242); - this.buttonNext.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonNext.Location = new System.Drawing.Point(872, 323); this.buttonNext.Name = "buttonNext"; - this.buttonNext.Size = new System.Drawing.Size(34, 22); + this.buttonNext.Size = new System.Drawing.Size(39, 29); this.buttonNext.TabIndex = 6; this.buttonNext.Text = "->"; this.buttonNext.UseVisualStyleBackColor = true; @@ -105,15 +103,14 @@ // // FormMail // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(809, 321); + this.ClientSize = new System.Drawing.Size(925, 428); this.Controls.Add(this.buttonNext); this.Controls.Add(this.buttonPreveous); this.Controls.Add(this.numericUpDownPage); this.Controls.Add(this.buttonOpen); this.Controls.Add(this.panel1); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormMail"; this.Text = "Письма"; this.Load += new System.EventHandler(this.FormMail_Load); -- 2.25.1