diff --git a/SushiBar/App.config b/SushiBar/App.config new file mode 100644 index 0000000..92d5f0a --- /dev/null +++ b/SushiBar/App.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/SushiBar/FormMails.Designer.cs b/SushiBar/FormMails.Designer.cs new file mode 100644 index 0000000..9216fe6 --- /dev/null +++ b/SushiBar/FormMails.Designer.cs @@ -0,0 +1,65 @@ +namespace SushiBarView +{ + partial class FormMails + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.BackgroundColor = Color.SkyBlue; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Fill; + dataGridView.Location = new Point(0, 0); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(800, 450); + dataGridView.TabIndex = 0; + // + // FormMails + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(dataGridView); + Name = "FormMails"; + Text = "Список писем"; + Load += FormMails_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/SushiBar/FormMails.cs b/SushiBar/FormMails.cs new file mode 100644 index 0000000..2d64b6f --- /dev/null +++ b/SushiBar/FormMails.cs @@ -0,0 +1,44 @@ +using Microsoft.Extensions.Logging; +using SushiBarContracts.BusinessLogicsContracts; + +namespace SushiBarView +{ + public partial class FormMails : Form + { + private readonly ILogger logger; + private readonly IMessageInfoLogic messageInfoLogic; + public FormMails(ILogger logger, IMessageInfoLogic messageInfoLogic) + { + this.logger = logger; + this.messageInfoLogic = messageInfoLogic; + InitializeComponent(); + } + + private void LoadData() + { + try + { + var list = messageInfoLogic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + logger.LogInformation("Load list of mails"); + + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK); + logger.LogError("Load list of mails failed"); + } + } + + private void FormMails_Load(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/SushiBar/FormMails.resx b/SushiBar/FormMails.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SushiBar/FormMails.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SushiBar/FormMain.Designer.cs b/SushiBar/FormMain.Designer.cs index f9c2517..e35c723 100644 --- a/SushiBar/FormMain.Designer.cs +++ b/SushiBar/FormMain.Designer.cs @@ -43,6 +43,7 @@ buttonCreateOrder = new Button(); buttonOrderIssued = new Button(); buttonRefreshOrders = new Button(); + списокПисемToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -50,7 +51,7 @@ // menuStrip1 // menuStrip1.ImageScalingSize = new Size(20, 20); - menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenuItemRef, отчетыToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem, запускРаботToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenuItemRef, отчетыToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem, запускРаботToolStripMenuItem, списокПисемToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new Size(1316, 28); @@ -174,6 +175,13 @@ buttonRefreshOrders.UseVisualStyleBackColor = true; buttonRefreshOrders.Click += ButtonRef_Click; // + // списокПисемToolStripMenuItem + // + списокПисемToolStripMenuItem.Name = "списокПисемToolStripMenuItem"; + списокПисемToolStripMenuItem.Size = new Size(121, 24); + списокПисемToolStripMenuItem.Text = "Список писем"; + списокПисемToolStripMenuItem.Click += списокПисемToolStripMenuItem_Click; + // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -214,5 +222,6 @@ private ToolStripMenuItem клиентыToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; + private ToolStripMenuItem списокПисемToolStripMenuItem; } } \ No newline at end of file diff --git a/SushiBar/FormMain.cs b/SushiBar/FormMain.cs index a439311..edcb1d9 100644 --- a/SushiBar/FormMain.cs +++ b/SushiBar/FormMain.cs @@ -162,5 +162,14 @@ namespace SushiBarView _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } + + private void списокПисемToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + if(service is FormMails form) + { + form.ShowDialog(); + } + } } } diff --git a/SushiBar/Program.cs b/SushiBar/Program.cs index f5e29b8..35cf6d1 100644 --- a/SushiBar/Program.cs +++ b/SushiBar/Program.cs @@ -1,10 +1,13 @@ +using DocumentFormat.OpenXml.Wordprocessing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using SushiBarBusinessLogic; using SushiBarBusinessLogic.BusinessLogic; +using SushiBarBusinessLogic.MailWorker; using SushiBarBusinessLogic.OfficePackage; using SushiBarBusinessLogic.OfficePackage.Implements; +using SushiBarContracts.BindingModel; using SushiBarContracts.BusinessLogicsContracts; using SushiBarContracts.StoragesContracts; using SushiBarDatabaseImplement.Implements; @@ -30,11 +33,28 @@ namespace SushiBar // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); var services = new ServiceCollection(); - // PDF - // NuGet System.Text.Encoding.CodePages - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); 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, 5000); + } + catch (Exception ex) + { + var logger = _serviceProvider.GetService(); + logger?.LogError(ex, " "); + } Application.Run(_serviceProvider.GetRequiredService()); } @@ -50,6 +70,7 @@ namespace SushiBar services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -58,7 +79,9 @@ namespace SushiBar services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddSingleton(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -75,7 +98,8 @@ namespace SushiBar 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/SushiBarBusinessLogic/ClientLogic.cs b/SushiBarBusinessLogic/ClientLogic.cs index 4e68d36..7879890 100644 --- a/SushiBarBusinessLogic/ClientLogic.cs +++ b/SushiBarBusinessLogic/ClientLogic.cs @@ -4,6 +4,7 @@ using SushiBarContracts.BusinessLogicsContracts; using SushiBarContracts.SearchModel; using SushiBarContracts.StoragesContracts; using SushiBarContracts.ViewModels; +using System.Text.RegularExpressions; namespace SushiBarBusinessLogic { @@ -92,11 +93,11 @@ namespace SushiBarBusinessLogic { throw new ArgumentNullException("Invalid fullname of user", nameof(model.ClientFIO)); } - if (string.IsNullOrEmpty(model.Email)) + if (string.IsNullOrEmpty(model.Email) || !Regex.IsMatch(model.Email, @"^([\w\.\-]+)@([\w\-]+)((\.(\w){2,3})+)$", RegexOptions.IgnoreCase)) { throw new ArgumentNullException("Invalid email of user", nameof(model.Email)); } - if (string.IsNullOrEmpty(model.Password)) + if (string.IsNullOrEmpty(model.Password) || !Regex.IsMatch(model.Password, @"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$")) { throw new ArgumentNullException("Invalid password of user", nameof(model.Password)); } diff --git a/SushiBarBusinessLogic/MailWorker/AbstractMailWorker.cs b/SushiBarBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..77a797b --- /dev/null +++ b/SushiBarBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,77 @@ +using Microsoft.Extensions.Logging; +using SushiBarContracts.BindingModel; +using SushiBarContracts.BusinessLogicsContracts; + +namespace SushiBarBusinessLogic.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: {_mailLogin}, {_mailPassword}, " + + $"{_smtpClientHost}, {_smtpClientPort}, {_popHost}, {_popPort}"); + } + public async void MailSendAsync(MailSendInfoBindingModel info) + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } + if (string.IsNullOrEmpty(info.MailAddress) || + string.IsNullOrEmpty(info.Subject) || + string.IsNullOrEmpty(info.Text)) + { + return; + } + _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject); + await SendMailAsync(info); + } + public async void MailCheck() + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + if (string.IsNullOrEmpty(_popHost) || _popPort == 0) + { + return; + } + if (_messageInfoLogic == null) + { + return; + } + var list = await ReceiveMailAsync(); + _logger.LogDebug("Check Mail: {Count} new mails", list.Count); + foreach (var mail in list) + { + _messageInfoLogic.Create(mail); + } + } + protected abstract Task SendMailAsync(MailSendInfoBindingModel info); + protected abstract Task> ReceiveMailAsync(); + } +} diff --git a/SushiBarBusinessLogic/MailWorker/MailKitWorker.cs b/SushiBarBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..4d359e8 --- /dev/null +++ b/SushiBarBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,75 @@ +using Microsoft.Extensions.Logging; +using SushiBarContracts.BindingModel; +using SushiBarContracts.BusinessLogicsContracts; +using MailKit.Net.Pop3; +using MailKit.Security; +using System.Net.Mail; +using System.Text; +using System.Net; + +namespace SushiBarBusinessLogic.MailWorker +{ + public class MailKitWorker : AbstractMailWorker + { + public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) + : base(logger, messageInfoLogic) { } + protected override async Task SendMailAsync(MailSendInfoBindingModel info) + { + using var objMailMessage = new MailMessage(); + using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort); + try + { + objMailMessage.From = new MailAddress(_mailLogin); + objMailMessage.To.Add(new MailAddress(info.MailAddress)); + objMailMessage.Subject = info.Subject; + objMailMessage.Body = info.Text; + objMailMessage.SubjectEncoding = Encoding.UTF8; + objMailMessage.BodyEncoding = Encoding.UTF8; + objSmtpClient.UseDefaultCredentials = false; + objSmtpClient.EnableSsl = true; + objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; + objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + await Task.Run(() => objSmtpClient.Send(objMailMessage)); + } + catch (Exception) + { + throw; + } + } + protected override async Task> ReceiveMailAsync() + { + var list = new List(); + using var client = new Pop3Client(); + await Task.Run(() => + { + try + { + client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect); + client.Authenticate(_mailLogin, _mailPassword); + for (int i = 0; i < client.Count; i++) + { + var message = client.GetMessage(i); + foreach (var mail in message.From.Mailboxes) + { + list.Add(new MessageInfoBindingModel + { + DateDelivery = message.Date.DateTime, + MessageId = message.MessageId, + SenderName = mail.Address, + Subject = message.Subject, + Body = message.TextBody + }); + } + } + } + catch (AuthenticationException) + { } + finally + { + client.Disconnect(true); + } + }); + return list; + } + } +} diff --git a/SushiBarBusinessLogic/MessageInfoLogic.cs b/SushiBarBusinessLogic/MessageInfoLogic.cs new file mode 100644 index 0000000..18ec050 --- /dev/null +++ b/SushiBarBusinessLogic/MessageInfoLogic.cs @@ -0,0 +1,53 @@ +using Microsoft.Extensions.Logging; +using SushiBarContracts.BindingModel; +using SushiBarContracts.BusinessLogicsContracts; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; + +namespace SushiBarBusinessLogic +{ + public class MessageInfoLogic : IMessageInfoLogic + { + + private readonly ILogger logger; + private readonly IMessageInfoStorage messageStorage; + private readonly IClientLogic clientLogic; + + public MessageInfoLogic(ILogger logger, IMessageInfoStorage messageStorage, IClientLogic clientLogic) + { + this.logger = logger; + this.messageStorage = messageStorage; + this.clientLogic = clientLogic; + } + + public bool Create(MessageInfoBindingModel model) + { + var message = messageStorage.GetElement(new MessageInfoSearchModel { MessageId = model.MessageId}); + if (message != null) return false; + var client = clientLogic.ReadElement(new ClientSearchModel{ Email = model.SenderName }); + if (client != null) + { + model.ClientId = client.Id; + } + if (messageStorage.Insert(model) == null) + { + logger.LogWarning("Insert message operation failed"); + return false; + } + return true; + } + + public List? ReadList(MessageInfoSearchModel? model) + { + var list = model == null ? messageStorage.GetFullList() : messageStorage.GetFilteredList(model); + if (list == null) + { + logger.LogWarning("ReadList had returned a null list"); + return null; + } + logger.LogInformation($"ReadList. Count of elements: {list.Count}"); + return list; + } + } +} diff --git a/SushiBarBusinessLogic/OrderLogic.cs b/SushiBarBusinessLogic/OrderLogic.cs index 7eb9afc..2c7b393 100644 --- a/SushiBarBusinessLogic/OrderLogic.cs +++ b/SushiBarBusinessLogic/OrderLogic.cs @@ -6,6 +6,7 @@ using SushiBarContracts.ViewModels; using Microsoft.Extensions.Logging; using SushiBarDataModels.Enums; using System.Xml.Linq; +using SushiBarBusinessLogic.MailWorker; namespace SushiBarBusinessLogic.BusinessLogic { @@ -13,12 +14,17 @@ namespace SushiBarBusinessLogic.BusinessLogic { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; + private readonly IClientStorage clientStorage; + private readonly AbstractMailWorker abstractMailWorker; static readonly object blocking = new object(); - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, + IClientStorage clientStorage, AbstractMailWorker abstractMailWorker) { _logger = logger; _orderStorage = orderStorage; + this.clientStorage = clientStorage; + this.abstractMailWorker = abstractMailWorker; } public OrderViewModel? ReadElement(OrderSearchModel model) @@ -54,13 +60,22 @@ namespace SushiBarBusinessLogic.BusinessLogic public bool CreateOrder(OrderBindingModel model) { CheckModel(model); - if (model.Status != OrderStatus.Неизвестен) return false; + if (model.Status != OrderStatus.Неизвестен) + { + return false; + } model.Status = OrderStatus.Принят; - if (_orderStorage.Insert(model) == null) + var order = _orderStorage.Insert(model); + if (order == null) { _logger.LogWarning("Insert operation failed"); return false; } + + var clientView = clientStorage.GetElement(new ClientSearchModel() { Id = order.ClientId }); + + if (clientView != null) + SendMail(clientView, order); return true; } @@ -86,8 +101,7 @@ namespace SushiBarBusinessLogic.BusinessLogic { CheckModel(model, false); var order = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); - if (order.ImplementerId.HasValue) - model.ImplementerId = order.ImplementerId; + if (order == null) { _logger.LogWarning("Change status operation failed. Order not found"); @@ -100,6 +114,9 @@ namespace SushiBarBusinessLogic.BusinessLogic return false; } + if (order.ImplementerId.HasValue) + model.ImplementerId = order.ImplementerId; + model.Status = orderStatus; if (model.Status == OrderStatus.Готов) @@ -115,9 +132,45 @@ namespace SushiBarBusinessLogic.BusinessLogic _logger.LogWarning("Change status operation failed"); return false; } + + var client = clientStorage.GetElement(new ClientSearchModel { Id = order.ClientId }); + if (client != null) + SendMail(client, order); return true; } + public void SendMail(ClientViewModel clientView, OrderViewModel orderView) + { + if (clientView == null && orderView == null) + { + return; + } + + MailSendInfoBindingModel mailSendInfoBindingModel; + + if (orderView.Status == OrderStatus.Принят) + { + mailSendInfoBindingModel = new MailSendInfoBindingModel + { + MailAddress = clientView!.Email, + Subject = $"Заказ под номером {orderView.Id}", + Text = $"Ваш заказ под номером {orderView.Id} от {orderView.DateCreate} ценой в {orderView.Sum} тыщ долларов" + + $"был принят" + }; + } + else + { + mailSendInfoBindingModel = new MailSendInfoBindingModel + { + MailAddress = clientView!.Email, + Subject = $"Заказ под номером {orderView.Id}", + Text = $"Ваш заказ под номером {orderView.Id} от {orderView.DateCreate} ценой в {orderView.Sum} тыщ долларов " + + $"поменял статус на {orderView.Status}" + }; + } + abstractMailWorker.MailSendAsync(mailSendInfoBindingModel); + } + private void CheckModel(OrderBindingModel model, bool withParams = true) { if (model == null) @@ -137,8 +190,8 @@ namespace SushiBarBusinessLogic.BusinessLogic if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate) throw new ArithmeticException("Заказ должен быть выдан позже, чем был создан"); - _logger.LogInformation("Sushi. SushiId:{SushiId}. Count:{ Count}. Sum:{ Sum}. Id: { Id}", - model.SushiId, model.Count, model.Sum, model.Id); + _logger.LogInformation("Sushi. SushiId:{SushiId}. Count:{ Count}. Sum:{ Sum}. Id: { Id}", + model.SushiId, model.Count, model.Sum, model.Id); } } } diff --git a/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj b/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj index e4a0150..b359ab8 100644 --- a/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj +++ b/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj @@ -8,6 +8,7 @@ + diff --git a/SushiBarClientApp/Controllers/HomeController.cs b/SushiBarClientApp/Controllers/HomeController.cs index 07ba9b2..5e90f4a 100644 --- a/SushiBarClientApp/Controllers/HomeController.cs +++ b/SushiBarClientApp/Controllers/HomeController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using SushiBarClientApp.Models; using SushiBarContracts.BindingModel; using SushiBarContracts.ViewModels; @@ -136,5 +137,16 @@ namespace SushiBarClientApp.Controllers ); return count * (prod?.Price ?? 1); } + + [HttpGet] + public IActionResult Mails() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); +} + } } diff --git a/SushiBarClientApp/SushiBarClientApp.csproj b/SushiBarClientApp/SushiBarClientApp.csproj index b6bd040..3deaf26 100644 --- a/SushiBarClientApp/SushiBarClientApp.csproj +++ b/SushiBarClientApp/SushiBarClientApp.csproj @@ -18,4 +18,16 @@ + + + + + + <_ContentIncludedByDefault Remove="Views\Home\Mails.cshtml" /> + + + + + + diff --git a/SushiBarClientApp/Views/Home/Mails.cshtml b/SushiBarClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..394cf54 --- /dev/null +++ b/SushiBarClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,51 @@ +@using SushiBarContracts.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/SushiBarClientApp/Views/Shared/_Layout.cshtml b/SushiBarClientApp/Views/Shared/_Layout.cshtml index a6faae0..98ea206 100644 --- a/SushiBarClientApp/Views/Shared/_Layout.cshtml +++ b/SushiBarClientApp/Views/Shared/_Layout.cshtml @@ -32,6 +32,9 @@
  • Регистрация
    • +
  • + Письма +
    • diff --git a/SushiBarContracts/BindingModel/MailConfigBindingModel.cs b/SushiBarContracts/BindingModel/MailConfigBindingModel.cs new file mode 100644 index 0000000..4089651 --- /dev/null +++ b/SushiBarContracts/BindingModel/MailConfigBindingModel.cs @@ -0,0 +1,12 @@ +namespace SushiBarContracts.BindingModel +{ + 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/SushiBarContracts/BindingModel/MailSendInfoBindingModel.cs b/SushiBarContracts/BindingModel/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..fd6a821 --- /dev/null +++ b/SushiBarContracts/BindingModel/MailSendInfoBindingModel.cs @@ -0,0 +1,9 @@ +namespace SushiBarContracts.BindingModel +{ + 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/SushiBarContracts/BindingModel/MessageInfoBindingModel.cs b/SushiBarContracts/BindingModel/MessageInfoBindingModel.cs new file mode 100644 index 0000000..9e4b824 --- /dev/null +++ b/SushiBarContracts/BindingModel/MessageInfoBindingModel.cs @@ -0,0 +1,18 @@ +using SushiBarDataModels; +namespace SushiBarContracts.BindingModel +{ + public class MessageInfoBindingModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + public string SenderName { get; set; } = string.Empty; + + public DateTime DateDelivery { get; set; } = DateTime.Now; + + public string Subject { get; set; } = string.Empty; + + public string Body { get; set; } = string.Empty; + } +} diff --git a/SushiBarContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/SushiBarContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..4e84fd0 --- /dev/null +++ b/SushiBarContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,12 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.ViewModels; + +namespace SushiBarContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + bool Create(MessageInfoBindingModel model); + } +} diff --git a/SushiBarContracts/SearchModel/MessageInfoSearchModel.cs b/SushiBarContracts/SearchModel/MessageInfoSearchModel.cs new file mode 100644 index 0000000..3e8e798 --- /dev/null +++ b/SushiBarContracts/SearchModel/MessageInfoSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SushiBarContracts.SearchModel +{ + public class MessageInfoSearchModel + { + public string? MessageId { get; set; } + + public int? ClientId { get; set; } + } +} diff --git a/SushiBarContracts/StoragesContracts/IMessageInfoStorage.cs b/SushiBarContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..e074994 --- /dev/null +++ b/SushiBarContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,14 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.ViewModels; + +namespace SushiBarContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + } +} diff --git a/SushiBarContracts/ViewModels/ClientViewModel.cs b/SushiBarContracts/ViewModels/ClientViewModel.cs index f034cbd..94b3770 100644 --- a/SushiBarContracts/ViewModels/ClientViewModel.cs +++ b/SushiBarContracts/ViewModels/ClientViewModel.cs @@ -20,7 +20,5 @@ namespace SushiBarContracts.ViewModels [DisplayName("Пароль")] public string Password { get; set; } = string.Empty; - - } } diff --git a/SushiBarContracts/ViewModels/MessageInfoViewModel.cs b/SushiBarContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..42740e8 --- /dev/null +++ b/SushiBarContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,30 @@ +using SushiBarDataModels; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SushiBarContracts.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; } = DateTime.Now; + + [DisplayName("Тема письма")] + public string Subject { get; set; } = string.Empty; + + [DisplayName("Душа письма...")] + public string Body { get; set; } = string.Empty; + } +} diff --git a/SushiBarDataModels/IMessageInfoModel.cs b/SushiBarDataModels/IMessageInfoModel.cs new file mode 100644 index 0000000..e922f0d --- /dev/null +++ b/SushiBarDataModels/IMessageInfoModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SushiBarDataModels +{ + public interface IMessageInfoModel + { + string MessageId { get; } + int? ClientId { get; } + string SenderName { get; } + DateTime DateDelivery { get; } + string Subject { get; } + string Body { get; } + + } +} diff --git a/SushiBarDatabaseImplement/Implements/ClientStorage.cs b/SushiBarDatabaseImplement/Implements/ClientStorage.cs index 810380f..7224912 100644 --- a/SushiBarDatabaseImplement/Implements/ClientStorage.cs +++ b/SushiBarDatabaseImplement/Implements/ClientStorage.cs @@ -37,14 +37,15 @@ namespace SushiBarDatabaseImplement.Implements public ClientViewModel? Delete(ClientBindingModel model) { using var context = new SushiBarDatabase(); - var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id); - if (element != null) + var element = context.Clients.FirstOrDefault(c => c.Id == model.Id); + if (element == null) { - context.Clients.Remove(element); - context.SaveChanges(); - return element.GetViewModel; + return null; + } - return null; + context.Clients.Remove(element); + context.SaveChanges(); + return element.GetViewModel; } public ClientViewModel? GetElement(ClientSearchModel model) diff --git a/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs b/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..8a0ddfc --- /dev/null +++ b/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,63 @@ +using Microsoft.EntityFrameworkCore; +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarDatabaseImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SushiBarDatabaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + using var context = new SushiBarDatabase(); + if(string.IsNullOrEmpty(model.MessageId)) return null; + return context.Messages + .Include(x => x.Client) + .FirstOrDefault(x => x.MessageId == model.MessageId)? + .GetViewModel; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + using var context = new SushiBarDatabase(); + if (model.ClientId.HasValue) + { + return context.Messages + .Include(x => x.Client) + .Where(x => x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + } + return new(); + } + + public List GetFullList() + { + using var context = new SushiBarDatabase(); + return context.Messages + .Include(x => x.Client) + .Select(x => x.GetViewModel) + .ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + using var context = new SushiBarDatabase(); + var message = MessageInfo.Create(model); + if (message == null) + { + return null; + } + context.Messages.Add(message); + context.SaveChanges(); + return message.GetViewModel; + } + } +} diff --git a/SushiBarDatabaseImplement/Migrations/20240421075923_InitCreate.Designer.cs b/SushiBarDatabaseImplement/Migrations/20240505111335_InitCreate.Designer.cs similarity index 86% rename from SushiBarDatabaseImplement/Migrations/20240421075923_InitCreate.Designer.cs rename to SushiBarDatabaseImplement/Migrations/20240505111335_InitCreate.Designer.cs index c2f8037..f6d647f 100644 --- a/SushiBarDatabaseImplement/Migrations/20240421075923_InitCreate.Designer.cs +++ b/SushiBarDatabaseImplement/Migrations/20240505111335_InitCreate.Designer.cs @@ -12,7 +12,7 @@ using SushiBarDatabaseImplement; namespace SushiBarDatabaseImplement.Migrations { [DbContext(typeof(SushiBarDatabase))] - [Migration("20240421075923_InitCreate")] + [Migration("20240505111335_InitCreate")] partial class InitCreate { /// @@ -97,6 +97,36 @@ namespace SushiBarDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -186,6 +216,15 @@ namespace SushiBarDatabaseImplement.Migrations b.ToTable("SushiComponents"); }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client") + .WithMany() + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b => { b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client") diff --git a/SushiBarDatabaseImplement/Migrations/20240421075923_InitCreate.cs b/SushiBarDatabaseImplement/Migrations/20240505111335_InitCreate.cs similarity index 85% rename from SushiBarDatabaseImplement/Migrations/20240421075923_InitCreate.cs rename to SushiBarDatabaseImplement/Migrations/20240505111335_InitCreate.cs index 8eacfca..c55165f 100644 --- a/SushiBarDatabaseImplement/Migrations/20240421075923_InitCreate.cs +++ b/SushiBarDatabaseImplement/Migrations/20240505111335_InitCreate.cs @@ -70,6 +70,27 @@ namespace SushiBarDatabaseImplement.Migrations table.PrimaryKey("PK_Sushis", x => x.Id); }); + migrationBuilder.CreateTable( + name: "Messages", + columns: table => new + { + MessageId = table.Column(type: "nvarchar(450)", nullable: false), + ClientId = table.Column(type: "int", nullable: true), + SenderName = table.Column(type: "nvarchar(max)", nullable: false), + DateDelivery = table.Column(type: "datetime2", nullable: false), + Subject = table.Column(type: "nvarchar(max)", nullable: false), + Body = table.Column(type: "nvarchar(max)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Messages", x => x.MessageId); + table.ForeignKey( + name: "FK_Messages_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id"); + }); + migrationBuilder.CreateTable( name: "Orders", columns: table => new @@ -134,6 +155,11 @@ namespace SushiBarDatabaseImplement.Migrations onDelete: ReferentialAction.Cascade); }); + migrationBuilder.CreateIndex( + name: "IX_Messages_ClientId", + table: "Messages", + column: "ClientId"); + migrationBuilder.CreateIndex( name: "IX_Orders_ClientId", table: "Orders", @@ -163,6 +189,9 @@ namespace SushiBarDatabaseImplement.Migrations /// protected override void Down(MigrationBuilder migrationBuilder) { + migrationBuilder.DropTable( + name: "Messages"); + migrationBuilder.DropTable( name: "Orders"); diff --git a/SushiBarDatabaseImplement/Migrations/20240422075953_ClearOrders.Designer.cs b/SushiBarDatabaseImplement/Migrations/20240505151023_forMistake.Designer.cs similarity index 85% rename from SushiBarDatabaseImplement/Migrations/20240422075953_ClearOrders.Designer.cs rename to SushiBarDatabaseImplement/Migrations/20240505151023_forMistake.Designer.cs index fd25ff4..e09f058 100644 --- a/SushiBarDatabaseImplement/Migrations/20240422075953_ClearOrders.Designer.cs +++ b/SushiBarDatabaseImplement/Migrations/20240505151023_forMistake.Designer.cs @@ -12,8 +12,8 @@ using SushiBarDatabaseImplement; namespace SushiBarDatabaseImplement.Migrations { [DbContext(typeof(SushiBarDatabase))] - [Migration("20240422075953_ClearOrders")] - partial class ClearOrders + [Migration("20240505151023_forMistake")] + partial class forMistake { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -97,6 +97,36 @@ namespace SushiBarDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -186,6 +216,15 @@ namespace SushiBarDatabaseImplement.Migrations b.ToTable("SushiComponents"); }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b => { b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client") @@ -232,6 +271,8 @@ namespace SushiBarDatabaseImplement.Migrations modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b => { + b.Navigation("Messages"); + b.Navigation("Orders"); }); diff --git a/SushiBarDatabaseImplement/Migrations/20240422075953_ClearOrders.cs b/SushiBarDatabaseImplement/Migrations/20240505151023_forMistake.cs similarity index 79% rename from SushiBarDatabaseImplement/Migrations/20240422075953_ClearOrders.cs rename to SushiBarDatabaseImplement/Migrations/20240505151023_forMistake.cs index a4e3d64..b58697c 100644 --- a/SushiBarDatabaseImplement/Migrations/20240422075953_ClearOrders.cs +++ b/SushiBarDatabaseImplement/Migrations/20240505151023_forMistake.cs @@ -5,12 +5,11 @@ namespace SushiBarDatabaseImplement.Migrations { /// - public partial class ClearOrders : Migration + public partial class forMistake : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) { - migrationBuilder.Sql("DELETE FROM Orders"); } diff --git a/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs b/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs index 7ebf781..e1e62a8 100644 --- a/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs +++ b/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs @@ -94,6 +94,36 @@ namespace SushiBarDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -183,6 +213,15 @@ namespace SushiBarDatabaseImplement.Migrations b.ToTable("SushiComponents"); }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b => { b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client") @@ -229,6 +268,8 @@ namespace SushiBarDatabaseImplement.Migrations modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b => { + b.Navigation("Messages"); + b.Navigation("Orders"); }); diff --git a/SushiBarDatabaseImplement/Models/Client.cs b/SushiBarDatabaseImplement/Models/Client.cs index b550c3f..e911434 100644 --- a/SushiBarDatabaseImplement/Models/Client.cs +++ b/SushiBarDatabaseImplement/Models/Client.cs @@ -24,6 +24,9 @@ namespace SushiBarDatabaseImplement.Models [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); + [ForeignKey("ClientId")] + public virtual List Messages { get; set; } = new(); + public static Client? Create(ClientBindingModel? model) { if (model == null) diff --git a/SushiBarDatabaseImplement/Models/MessageInfo.cs b/SushiBarDatabaseImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..989ec72 --- /dev/null +++ b/SushiBarDatabaseImplement/Models/MessageInfo.cs @@ -0,0 +1,53 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.ViewModels; +using SushiBarDataModels; +using System.ComponentModel.DataAnnotations; + +namespace SushiBarDatabaseImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + [Key] + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + [Required] + public string SenderName { get; set; } = string.Empty; + + [Required] + public DateTime DateDelivery { get; set; } = DateTime.Now; + + [Required] + public string Subject { get; set; } = string.Empty; + + [Required] + public string Body { get; set; } = string.Empty; + + public virtual Client? Client { get; set; } + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if(model == null) return null; + return new MessageInfo + { + 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/SushiBarDatabaseImplement/SushiBarDatabase.cs b/SushiBarDatabaseImplement/SushiBarDatabase.cs index c85497c..f72ec3d 100644 --- a/SushiBarDatabaseImplement/SushiBarDatabase.cs +++ b/SushiBarDatabaseImplement/SushiBarDatabase.cs @@ -26,5 +26,6 @@ namespace SushiBarDatabaseImplement public virtual DbSet Orders { set; get; } public virtual DbSet Clients { set; get; } public virtual DbSet Implementers { set; get; } + public virtual DbSet Messages { set; get; } } } diff --git a/SushiBarFileImplement/DataFileSingleton.cs b/SushiBarFileImplement/DataFileSingleton.cs index 0d33024..8c43ef6 100644 --- a/SushiBarFileImplement/DataFileSingleton.cs +++ b/SushiBarFileImplement/DataFileSingleton.cs @@ -17,11 +17,14 @@ namespace SushiBarFileImplement private readonly string ImplementerFileName = "Implementer.xml"; + private readonly string MessageInfoFileName = "MessageInfo.xml"; + public List Components { get; private set; } public List Orders { get; private set; } public List Sushis { get; private set; } public List Clients { get; private set; } public List Implementers { get; private set; } + public List Messages { get; private set; } public static DataFileSingleton GetInstance() { @@ -37,6 +40,7 @@ namespace SushiBarFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); + public void SaveMessageInfo() => SaveData(Messages, MessageInfoFileName, "Messages", x => x.GetXElement); private DataFileSingleton() { @@ -45,6 +49,7 @@ namespace SushiBarFileImplement Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; + Messages = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/SushiBarFileImplement/Implements/MessageInfoStorage.cs b/SushiBarFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..58e3288 --- /dev/null +++ b/SushiBarFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,49 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarFileImplement.Models; + +namespace SushiBarFileImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataFileSingleton source; + public MessageInfoStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (string.IsNullOrEmpty(model.MessageId)) return null; + return source.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId))?.GetViewModel; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + if (!model.ClientId.HasValue) + { + return new(); + } + return source.Messages.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Messages.Select(x => x.GetViewModel).ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if(newMessage == null) + { + return null; + } + source.Messages.Add(newMessage); + source.SaveMessageInfo(); + return newMessage.GetViewModel; + } + } +} diff --git a/SushiBarFileImplement/Models/MessageInfo.cs b/SushiBarFileImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..a6052b9 --- /dev/null +++ b/SushiBarFileImplement/Models/MessageInfo.cs @@ -0,0 +1,73 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.ViewModels; +using SushiBarDataModels; +using System.Xml.Linq; + +namespace SushiBarFileImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + public string SenderName { get; set; } = string.Empty; + + public DateTime DateDelivery { get; set; } = DateTime.Now; + + public string Subject { get; set; } = string.Empty; + + public string Body { get; set; } = string.Empty; + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) return null; + return new MessageInfo + { + MessageId = model.MessageId, + ClientId = model.ClientId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + Subject = model.Subject, + Body = model.Body, + }; + } + + public static MessageInfo? Create(XElement element) + { + if (element == null) + { + return null; + } + return new MessageInfo() + { + MessageId = element.Attribute("MessageId")!.Value, + ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), + SenderName = element.Element("SenderName")!.Value, + DateDelivery = Convert.ToDateTime(element.Element("DateDelivery")!.Value), + Subject = element.Attribute("Subject")!.Value, + Body = element.Attribute("Body")!.Value, + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + DateDelivery = DateDelivery, + Subject = Subject, + Body = Body, + }; + + public XElement GetXElement => + new("MessageInfo", + new XAttribute("MessageId", MessageId), + new XElement("ClientId", ClientId), + new XElement("SenderName", SenderName), + new XElement("DateDelivery", DateDelivery), + new XElement("Subject", Subject), + new XElement("Body", Body) + ); + } +} diff --git a/SushiBarListImplements/DataListSingleton.cs b/SushiBarListImplements/DataListSingleton.cs index a22b5fa..d4ccb6f 100644 --- a/SushiBarListImplements/DataListSingleton.cs +++ b/SushiBarListImplements/DataListSingleton.cs @@ -10,6 +10,7 @@ namespace SushiBarListImplement public List Sushis { get; set; } public List Clients { get; set; } public List Implementers { get; set; } + public List Messages { get; set; } private DataListSingleton() { Components = new List(); @@ -17,6 +18,7 @@ namespace SushiBarListImplement Sushis = new List(); Clients = new List(); Implementers = new List(); + Messages = new List(); } public static DataListSingleton GetInstance() { diff --git a/SushiBarListImplements/Implements/MessageInfoStorage.cs b/SushiBarListImplements/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..f7c629b --- /dev/null +++ b/SushiBarListImplements/Implements/MessageInfoStorage.cs @@ -0,0 +1,71 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarListImplement; +using SushiBarListImplements.Models; + +namespace SushiBarListImplements.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataListSingleton source; + + public MessageInfoStorage(DataListSingleton source) + { + this.source = source; + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if(string.IsNullOrEmpty(model.MessageId) || !model.ClientId.HasValue) + { + return null; + } + + foreach (var message in source.Messages) + { + if (message.MessageId.Equals(model.MessageId)) + { + return message.GetViewModel; + } + } + + return null; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + var list = new List(); + foreach (var msg in source.Messages) + { + if (msg.ClientId.HasValue && model.ClientId == msg.ClientId) + { + list.Add(msg.GetViewModel); + } + } + return list; + } + + public List GetFullList() + { + var list = new List(); + foreach (var msg in source.Messages) + { + list.Add(msg.GetViewModel); + } + return list; + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + source.Messages.Add(newMessage); + return newMessage.GetViewModel; + } + } +} diff --git a/SushiBarListImplements/Models/MessageInfo.cs b/SushiBarListImplements/Models/MessageInfo.cs new file mode 100644 index 0000000..691dc0d --- /dev/null +++ b/SushiBarListImplements/Models/MessageInfo.cs @@ -0,0 +1,45 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.ViewModels; +using SushiBarDataModels; + +namespace SushiBarListImplements.Models +{ + public class MessageInfo : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + public string SenderName { get; set; } = string.Empty; + + public DateTime DateDelivery { get; set; } = DateTime.Now; + + public string Subject { get; set; } = string.Empty; + + public string Body { get; set; } = string.Empty; + + public static MessageInfo? Create(MessageInfoBindingModel? model) + { + if (model == null) return null; + return new MessageInfo + { + 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/SushiBarRestApi/Controllers/ClientController.cs b/SushiBarRestApi/Controllers/ClientController.cs index 70791d7..f1c78fa 100644 --- a/SushiBarRestApi/Controllers/ClientController.cs +++ b/SushiBarRestApi/Controllers/ClientController.cs @@ -12,11 +12,12 @@ namespace SushiBarRestApi.Controllers { private readonly ILogger _logger; private readonly IClientLogic _logic; - public ClientController(IClientLogic logic, ILogger - logger) + private readonly IMessageInfoLogic messageLogic; + public ClientController(IClientLogic logic, ILogger logger, IMessageInfoLogic messageLogic) { _logger = logger; _logic = logic; + this.messageLogic = messageLogic; } [HttpGet] public ClientViewModel? Login(string login, string password) @@ -61,5 +62,23 @@ namespace SushiBarRestApi.Controllers throw; } } + + [HttpGet] + public List? GetMessages(int clientId) + { + try + { + return messageLogic.ReadList(new MessageInfoSearchModel + { + ClientId = clientId + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения писем клиента"); + throw; + } + } + } } diff --git a/SushiBarRestApi/Program.cs b/SushiBarRestApi/Program.cs index b7ad3c9..b791835 100644 --- a/SushiBarRestApi/Program.cs +++ b/SushiBarRestApi/Program.cs @@ -4,6 +4,8 @@ using SushiBarDatabaseImplement.Implements; using Microsoft.OpenApi.Models; using SushiBarBusinessLogic.BusinessLogic; using SushiBarBusinessLogic; +using SushiBarBusinessLogic.MailWorker; +using SushiBarContracts.BindingModel; var builder = WebApplication.CreateBuilder(args); builder.Logging.SetMinimumLevel(LogLevel.Trace); @@ -12,9 +14,14 @@ builder.Logging.AddLog4Net("log4net.config"); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.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 builder.Services.AddEndpointsApiExplorer(); @@ -27,6 +34,16 @@ 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()) { @@ -36,4 +53,4 @@ if (app.Environment.IsDevelopment()) app.UseHttpsRedirection(); app.UseAuthorization(); app.MapControllers(); -app.Run(); \ No newline at end of file +app.Run(); diff --git a/SushiBarRestApi/appsettings.json b/SushiBarRestApi/appsettings.json index 10f68b8..f9c2d68 100644 --- a/SushiBarRestApi/appsettings.json +++ b/SushiBarRestApi/appsettings.json @@ -5,5 +5,13 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + + "AllowedHosts": "*", + + "SmtpClientHost": "smtp.beget.com", + "SmtpClientPort": "2525", + "PopHost": "pop.beget.com", + "PopPort": "995", + "MailLogin": "sushishop@ekallin.ru", + "MailPassword": "8j#HWiCBiI*I" }