diff --git a/SecuritySystem/SecuritySystem/App.config b/SecuritySystem/SecuritySystem/App.config new file mode 100644 index 0000000..e93988a --- /dev/null +++ b/SecuritySystem/SecuritySystem/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/SecuritySystem/SecuritySystem/FormMails.Designer.cs b/SecuritySystem/SecuritySystem/FormMails.Designer.cs new file mode 100644 index 0000000..4d7023a --- /dev/null +++ b/SecuritySystem/SecuritySystem/FormMails.Designer.cs @@ -0,0 +1,64 @@ +namespace SecuritySystem +{ + partial class FormMails + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Fill; + dataGridView.Location = new Point(0, 0); + dataGridView.Margin = new Padding(3, 2, 3, 2); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(700, 338); + dataGridView.TabIndex = 1; + // + // FormMails + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(700, 338); + 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/SecuritySystem/SecuritySystem/FormMails.cs b/SecuritySystem/SecuritySystem/FormMails.cs new file mode 100644 index 0000000..cee925e --- /dev/null +++ b/SecuritySystem/SecuritySystem/FormMails.cs @@ -0,0 +1,60 @@ +using SecuritySystemBusinessLogic.BusinessLogic; +using SecuritySystemContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +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 SecuritySystem +{ + public partial class FormMails : Form + { + private readonly ILogger _logger; + + private readonly IMessageInfoLogic _messageLogic; + + public FormMails(ILogger logger, IMessageInfoLogic messageLogic) + { + InitializeComponent(); + + _logger = logger; + _messageLogic = messageLogic; + } + + private void FormMails_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + _logger.LogInformation("Загрузка писем"); + + try + { + var list = _messageLogic.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); + } + } + } +} diff --git a/SecuritySystem/SecuritySystem/FormMails.resx b/SecuritySystem/SecuritySystem/FormMails.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SecuritySystem/SecuritySystem/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/SecuritySystem/SecuritySystem/FormMain.cs b/SecuritySystem/SecuritySystem/FormMain.cs index 18cfdb7..78a346d 100644 --- a/SecuritySystem/SecuritySystem/FormMain.cs +++ b/SecuritySystem/SecuritySystem/FormMain.cs @@ -185,7 +185,7 @@ namespace SecuritySystem { _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); - MessageBox.Show(" ", "", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show(" ", "", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void ImplementerToolStripMenuItem_Click(object sender, EventArgs e) @@ -197,5 +197,15 @@ namespace SecuritySystem form.ShowDialog(); } } + + private void MailsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + + if (service is FormMails form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/SecuritySystem/SecuritySystem/Program.cs b/SecuritySystem/SecuritySystem/Program.cs index fe0cea5..908f2a3 100644 --- a/SecuritySystem/SecuritySystem/Program.cs +++ b/SecuritySystem/SecuritySystem/Program.cs @@ -1,6 +1,8 @@ using SecuritySystemBusinessLogic.BusinessLogic; +using SecuritySystemBusinessLogic.MailWorker; using SecuritySystemBusinessLogic.OfficePackage; using SecuritySystemBusinessLogic.OfficePackage.Implements; +using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; using SecuritySystemContracts.StoragesContracts; using SecuritySystemDatabaseImplement.Implements; @@ -28,6 +30,31 @@ namespace SecuritySystem var services = new ServiceCollection(); ConfigureServices(services); _serviceProvider = services.BuildServiceProvider(); + + try + { + var mailSender = _serviceProvider.GetService(); + mailSender?.MailConfig(new MailConfigBindingModel + { + MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, + MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty, + SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty, + SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]), + PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty, + PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"]) + }); + + // + var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000); + } + catch (Exception ex) + { + var logger = _serviceProvider.GetService(); + + logger?.LogError(ex, " "); + } + + Application.Run(_serviceProvider.GetRequiredService()); } @@ -44,6 +71,7 @@ namespace SecuritySystem services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -51,12 +79,15 @@ namespace SecuritySystem services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddSingleton(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -69,6 +100,9 @@ namespace SecuritySystem 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/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/ClientLogic.cs b/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/ClientLogic.cs index e230697..b8c4c6a 100644 --- a/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/ClientLogic.cs +++ b/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/ClientLogic.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; namespace SecuritySystemBusinessLogic.BusinessLogic @@ -141,6 +142,16 @@ namespace SecuritySystemBusinessLogic.BusinessLogic throw new ArgumentNullException("Отсутствие пароля в учётной записи", nameof(model.Password)); } + if (!Regex.IsMatch(model.Email, @"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$", RegexOptions.IgnoreCase)) + { + throw new ArgumentException("Некорректная почта", nameof(model.Email)); + } + + if (!Regex.IsMatch(model.Password, @"^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase) && model.Password.Length < 10 && model.Password.Length > 50) + { + throw new ArgumentException("Необходимо придумать другой пароль", nameof(model.Password)); + } + _logger.LogInformation("Client. ClientFIO:{ClientFIO}. Email:{Email}. Password:{Password}. Id:{Id}", model.ClientFIO, model.Email, model.Password, model.Id); diff --git a/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/MessageInfoLogic.cs b/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/MessageInfoLogic.cs new file mode 100644 index 0000000..7a19b5e --- /dev/null +++ b/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/MessageInfoLogic.cs @@ -0,0 +1,57 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.SearchModels; +using SecuritySystemContracts.StoragesContracts; +using SecuritySystemContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemBusinessLogic.BusinessLogic +{ + public class MessageInfoLogic : IMessageInfoLogic + { + private readonly ILogger _logger; + + private readonly IMessageInfoStorage _messageInfoStorage; + + public MessageInfoLogic(ILogger logger, IMessageInfoStorage messageInfoStorage) + { + _logger = logger; + _messageInfoStorage = messageInfoStorage; + } + + public List? ReadList(MessageInfoSearchModel? model) + { + _logger.LogInformation("ReadList. MessageId:{MessageId}", model?.MessageId); + + //list хранит весь список в случае, если model пришло со значением null на вход метода + 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.OrderByDescending(x => x.DateDelivery).ToList(); + } + + public bool Create(MessageInfoBindingModel model) + { + if (_messageInfoStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + + return false; + } + + return true; + } + } +} diff --git a/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/OrderLogic.cs b/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/OrderLogic.cs index dd9b6e0..0ee314f 100644 --- a/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/OrderLogic.cs +++ b/SecuritySystem/SecuritySystemBusinessLogiс/BusinessLogic/OrderLogic.cs @@ -1,4 +1,5 @@ -using SecuritySystemContracts.BindingModels; +using SecuritySystemBusinessLogic.MailWorker; +using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; using SecuritySystemContracts.SearchModels; using SecuritySystemContracts.StoragesContracts; @@ -20,10 +21,15 @@ namespace SecuritySystemBusinessLogic.BusinessLogic private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + private readonly AbstractMailWorker _mailWorker; + + private readonly IClientLogic _clientLogic; + public OrderLogic(ILogger logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic) { _logger = logger; _orderStorage = orderStorage; + _mailWorker = mailWorker; + _clientLogic = clientLogic; } //вывод отфильтрованного списка компонентов @@ -82,13 +88,17 @@ namespace SecuritySystemBusinessLogic.BusinessLogic model.Status = OrderStatus.Принят; - if (_orderStorage.Insert(model) == null) + var result = _orderStorage.Insert(model); + + if (result == null) { model.Status = OrderStatus.Неизвестен; _logger.LogWarning("Insert operation failed"); return false; } + SendOrderMessage(result.ClientId, $"Кузнечная мастерская, Заказ №{result.Id}", $"Заказ №{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят"); + return true; } @@ -191,8 +201,10 @@ namespace SecuritySystemBusinessLogic.BusinessLogic CheckModel(model, false); + var result = _orderStorage.Update(model); + //финальная проверка на возможность обновления - if (_orderStorage.Update(model) == null) + if (result == null) { model.Status--; @@ -201,6 +213,27 @@ namespace SecuritySystemBusinessLogic.BusinessLogic return false; } + SendOrderMessage(result.ClientId, $"Кузнечаня мастерская, Заказ №{result.Id}", $"Заказ №{model.Id} изменен статус на {result.Status}"); + + return true; + } + + private bool SendOrderMessage(int clientId, string subject, string text) + { + var client = _clientLogic.ReadElement(new() { Id = clientId }); + + if (client == null) + { + return false; + } + + _mailWorker.MailSendAsync(new() + { + MailAddress = client.Email, + Subject = subject, + Text = text + }); + return true; } } diff --git a/SecuritySystem/SecuritySystemBusinessLogiс/MailWorker/AbstractMailWorker.cs b/SecuritySystem/SecuritySystemBusinessLogiс/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..9005762 --- /dev/null +++ b/SecuritySystem/SecuritySystemBusinessLogiс/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,107 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemBusinessLogic.MailWorker +{ + public abstract class AbstractMailWorker + { + protected string _mailLogin = string.Empty; + + protected string _mailPassword = string.Empty; + + protected string _smtpClientHost = string.Empty; + + protected int _smtpClientPort; + + protected string _popHost = string.Empty; + + protected int _popPort; + + private readonly IMessageInfoLogic _messageInfoLogic; + + private readonly IClientLogic _clientLogic; + + private readonly ILogger _logger; + + public AbstractMailWorker(ILogger logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) + { + _logger = logger; + _messageInfoLogic = messageInfoLogic; + _clientLogic = clientLogic; + } + + public void MailConfig(MailConfigBindingModel config) + { + _mailLogin = config.MailLogin; + _mailPassword = config.MailPassword; + _smtpClientHost = config.SmtpClientHost; + _smtpClientPort = config.SmtpClientPort; + _popHost = config.PopHost; + _popPort = config.PopPort; + + _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, { popHost}, { popPort}", + _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort); + } + + public async void MailSendAsync(MailSendInfoBindingModel info) + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } + + if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text)) + { + return; + } + + _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject); + + await SendMailAsync(info); + } + + public async void MailCheck() + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + + if (string.IsNullOrEmpty(_popHost) || _popPort == 0) + { + return; + } + + if (_messageInfoLogic == null) + { + return; + } + + var list = await ReceiveMailAsync(); + + _logger.LogDebug("Check Mail: {Count} new mails", list.Count); + + foreach (var mail in list) + { + mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id; + + _messageInfoLogic.Create(mail); + } + } + + protected abstract Task SendMailAsync(MailSendInfoBindingModel info); + + protected abstract Task> ReceiveMailAsync(); + } +} diff --git a/SecuritySystem/SecuritySystemBusinessLogiс/MailWorker/MailKitWorker.cs b/SecuritySystem/SecuritySystemBusinessLogiс/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..3c8b06e --- /dev/null +++ b/SecuritySystem/SecuritySystemBusinessLogiс/MailWorker/MailKitWorker.cs @@ -0,0 +1,91 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Mail; +using System.Net; +using System.Text; +using System.Threading.Tasks; +using MailKit.Net.Pop3; +using MailKit.Security; + +namespace SecuritySystemBusinessLogic.MailWorker +{ + public class MailKitWorker : AbstractMailWorker + { + public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) + : base(logger, messageInfoLogic, clientLogic) { } + + protected override async Task SendMailAsync(MailSendInfoBindingModel info) + { + using var objMailMessage = new MailMessage(); + + using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort); + + try + { + objMailMessage.From = new MailAddress(_mailLogin); + objMailMessage.To.Add(new MailAddress(info.MailAddress)); + objMailMessage.Subject = info.Subject; + objMailMessage.Body = info.Text; + objMailMessage.SubjectEncoding = Encoding.UTF8; + objMailMessage.BodyEncoding = Encoding.UTF8; + + objSmtpClient.UseDefaultCredentials = false; + objSmtpClient.EnableSsl = true; + objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; + objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + + await Task.Run(() => objSmtpClient.Send(objMailMessage)); + } + catch (Exception) + { + throw; + } + } + + protected override async Task> ReceiveMailAsync() + { + var list = new List(); + + using var client = new Pop3Client(); + + await Task.Run(() => + { + try + { + client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect); + + client.Authenticate(_mailLogin, _mailPassword); + + for (int i = 0; i < client.Count; i++) + { + var message = client.GetMessage(i); + + foreach (var mail in message.From.Mailboxes) + { + list.Add(new MessageInfoBindingModel + { + DateDelivery = message.Date.DateTime, + MessageId = message.MessageId, + SenderName = mail.Address, + Subject = message.Subject, + Body = message.TextBody + }); + } + } + } + catch (AuthenticationException) + { } + finally + { + client.Disconnect(true); + } + }); + + return list; + } + } +} diff --git a/SecuritySystem/SecuritySystemBusinessLogiс/SecuritySystemBusinessLogiс.csproj b/SecuritySystem/SecuritySystemBusinessLogiс/SecuritySystemBusinessLogiс.csproj index b2a2c49..cfd574a 100644 --- a/SecuritySystem/SecuritySystemBusinessLogiс/SecuritySystemBusinessLogiс.csproj +++ b/SecuritySystem/SecuritySystemBusinessLogiс/SecuritySystemBusinessLogiс.csproj @@ -8,6 +8,7 @@ + diff --git a/SecuritySystem/SecuritySystemClientApp/Controllers/HomeController.cs b/SecuritySystem/SecuritySystemClientApp/Controllers/HomeController.cs index a2a4107..d98eae7 100644 --- a/SecuritySystem/SecuritySystemClientApp/Controllers/HomeController.cs +++ b/SecuritySystem/SecuritySystemClientApp/Controllers/HomeController.cs @@ -44,7 +44,7 @@ namespace SecuritySystemClientApp.Controllers { if (APIClient.Client == null) { - throw new Exception("Вход только авторизованным"); + throw new Exception("Вы как сюда попали? Суда вход только авторизованным"); } if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio)) @@ -146,7 +146,7 @@ namespace SecuritySystemClientApp.Controllers { if (APIClient.Client == null) { - throw new Exception("Вход только авторизованным"); + throw new Exception("Вы как сюда попали? Суда вход только авторизованным"); } if (count <= 0) @@ -174,5 +174,17 @@ namespace SecuritySystemClientApp.Controllers return count * (manuf?.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/SecuritySystem/SecuritySystemClientApp/Views/Home/Enter.cshtml b/SecuritySystem/SecuritySystemClientApp/Views/Home/Enter.cshtml index affc9d4..5618938 100644 --- a/SecuritySystem/SecuritySystemClientApp/Views/Home/Enter.cshtml +++ b/SecuritySystem/SecuritySystemClientApp/Views/Home/Enter.cshtml @@ -9,7 +9,7 @@
Логин:
-
diff --git a/SecuritySystem/SecuritySystemClientApp/Views/Home/Mails.cshtml b/SecuritySystem/SecuritySystemClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..b0d9457 --- /dev/null +++ b/SecuritySystem/SecuritySystemClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,51 @@ +@using SecuritySystemContracts.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) +
+ } +
diff --git a/SecuritySystem/SecuritySystemClientApp/Views/Shared/_Layout.cshtml b/SecuritySystem/SecuritySystemClientApp/Views/Shared/_Layout.cshtml index 9668af8..5c75b94 100644 --- a/SecuritySystem/SecuritySystemClientApp/Views/Shared/_Layout.cshtml +++ b/SecuritySystem/SecuritySystemClientApp/Views/Shared/_Layout.cshtml @@ -16,8 +16,8 @@ Система безопасности -
@@ -28,6 +28,9 @@
  • Личные данные
    • +
  • + Письма +
  • Вход
    • diff --git a/SecuritySystem/SecuritySystemContracts/BindingModels/MailConfigBindingModel.cs b/SecuritySystem/SecuritySystemContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..d003f66 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemContracts.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/SecuritySystem/SecuritySystemContracts/BindingModels/MailSendInfoBindingModel.cs b/SecuritySystem/SecuritySystemContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..5b2e9f2 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemContracts.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/SecuritySystem/SecuritySystemContracts/BindingModels/MessageInfoBindingModel.cs b/SecuritySystem/SecuritySystemContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..b19ef31 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,24 @@ +using SecuritySystemDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemContracts.BindingModels +{ + public class MessageInfoBindingModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + public string SenderName { get; set; } = string.Empty; + + public DateTime DateDelivery { get; set; } = DateTime.Now; + + public string Subject { get; set; } = string.Empty; + + public string Body { get; set; } = string.Empty; + } +} diff --git a/SecuritySystem/SecuritySystemContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/SecuritySystem/SecuritySystemContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..59837c5 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,18 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.SearchModels; +using SecuritySystemContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + + bool Create(MessageInfoBindingModel model); + } +} diff --git a/SecuritySystem/SecuritySystemContracts/SearchModels/MessageInfoSearchModel.cs b/SecuritySystem/SecuritySystemContracts/SearchModels/MessageInfoSearchModel.cs new file mode 100644 index 0000000..b6692d1 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/SearchModels/MessageInfoSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public string? MessageId { get; set; } + + public int? ClientId { get; set; } + } +} diff --git a/SecuritySystem/SecuritySystemContracts/StoragesContracts/IMessageInfoStorage.cs b/SecuritySystem/SecuritySystemContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..efb7c20 --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,22 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.SearchModels; +using SecuritySystemContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + + List GetFilteredList(MessageInfoSearchModel model); + + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + } +} diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..89a3e6a --- /dev/null +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,29 @@ +using SecuritySystemDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemContracts.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/SecuritySystem/SecuritySystemDataModels/Models/IMessageInfoModel.cs b/SecuritySystem/SecuritySystemDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..5a50c57 --- /dev/null +++ b/SecuritySystem/SecuritySystemDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemDataModels.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/SecuritySystem/SecuritySystemDatabaseImplement/Implements/ClientStorage.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/ClientStorage.cs index 0453e1a..45119ea 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Implements/ClientStorage.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/ClientStorage.cs @@ -12,10 +12,10 @@ using System.Threading.Tasks; namespace SecuritySystemDatabaseImplement.Implements { - public class ClientStorage : IClientStorage - { - public ClientViewModel? Delete(ClientBindingModel model) - { + public class ClientStorage : IClientStorage + { + public ClientViewModel? Delete(ClientBindingModel model) + { using var context = new SecuritySystemDatabase(); var element = context.Clients @@ -38,18 +38,19 @@ namespace SecuritySystemDatabaseImplement.Implements return null; } - public ClientViewModel? GetElement(ClientSearchModel model) - { + public ClientViewModel? GetElement(ClientSearchModel model) + { using var context = new SecuritySystemDatabase(); if (model.Id.HasValue) { return context.Clients .Include(x => x.Orders) - .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id) + .FirstOrDefault(x => x.Id == model.Id) ?.GetViewModel; } - else if (!string.IsNullOrEmpty(model.Email) && !string.IsNullOrEmpty(model.Password)) + + if (!string.IsNullOrEmpty(model.Email) && !string.IsNullOrEmpty(model.Password)) { return context.Clients .Include(x => x.Orders) @@ -57,7 +58,12 @@ namespace SecuritySystemDatabaseImplement.Implements ?.GetViewModel; } - return new(); + if (!string.IsNullOrEmpty(model.Email)) + return context.Clients + .FirstOrDefault(x => x.Email == model.Email) + ?.GetViewModel; + + return null; } public List GetFilteredList(ClientSearchModel model) @@ -76,8 +82,8 @@ namespace SecuritySystemDatabaseImplement.Implements .ToList(); } - public List GetFullList() - { + public List GetFullList() + { using var context = new SecuritySystemDatabase(); return context.Clients @@ -86,8 +92,8 @@ namespace SecuritySystemDatabaseImplement.Implements .ToList(); } - public ClientViewModel? Insert(ClientBindingModel model) - { + public ClientViewModel? Insert(ClientBindingModel model) + { var newClient = Client.Create(model); if (newClient == null) @@ -106,8 +112,8 @@ namespace SecuritySystemDatabaseImplement.Implements ?.GetViewModel; } - public ClientViewModel? Update(ClientBindingModel model) - { + public ClientViewModel? Update(ClientBindingModel model) + { using var context = new SecuritySystemDatabase(); var order = context.Clients .Include(x => x.Orders) @@ -126,5 +132,5 @@ namespace SecuritySystemDatabaseImplement.Implements .FirstOrDefault(x => x.Id == model.Id) ?.GetViewModel; } - } + } } diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Implements/MessageInfoStorage.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..86cb72f --- /dev/null +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,67 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.SearchModels; +using SecuritySystemContracts.StoragesContracts; +using SecuritySystemContracts.ViewModels; +using SecuritySystemDatabaseImplement.Models; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemDatabaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (string.IsNullOrEmpty(model.MessageId)) + { + return null; + } + + using var context = new SecuritySystemDatabase(); + + return context.Messages + .FirstOrDefault(x => (x.MessageId == model.MessageId)) + ?.GetViewModel; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + using var context = new SecuritySystemDatabase(); + + return context.Messages + .Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + using var context = new SecuritySystemDatabase(); + + return context.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + using var context = new SecuritySystemDatabase(); + + var newMessage = MessageInfo.Create(model); + + if (newMessage == null) + { + return null; + } + + context.Messages.Add(newMessage); + context.SaveChanges(); + + return newMessage.GetViewModel; + } + } +} diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Client.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Client.cs index 483962a..5c35dbd 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Client.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Client.cs @@ -28,6 +28,9 @@ namespace SecuritySystemDatabaseImplement.Models [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); + [ForeignKey("ClientId")] + public virtual List MessageInfos { get; set; } = new(); + public static Client? Create(ClientBindingModel model) { if (model == null) @@ -39,7 +42,7 @@ namespace SecuritySystemDatabaseImplement.Models { Id = model.Id, ClientFIO = model.ClientFIO, - Email = model.Email, + Email = model.Email, Password = model.Password }; } diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/MessageInfo.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..05403f5 --- /dev/null +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/MessageInfo.cs @@ -0,0 +1,62 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.ViewModels; +using SecuritySystemDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemDatabaseImplement.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, + Body = model.Body, + DateDelivery = model.DateDelivery, + Subject = model.Subject + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + Body = Body, + DateDelivery = DateDelivery, + Subject = Subject + }; + } +} diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/SecuritySystemDatabase.cs b/SecuritySystem/SecuritySystemDatabaseImplement/SecuritySystemDatabase.cs index 5c34d6a..c5eed06 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/SecuritySystemDatabase.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/SecuritySystemDatabase.cs @@ -32,6 +32,8 @@ namespace SecuritySystemDatabaseImplement public virtual DbSet Clients { get; set; } - public virtual DbSet Implementers { set; get; } - } + public virtual DbSet Implementers { set; get; } + + public virtual DbSet Messages { set; get; } + } } diff --git a/SecuritySystem/SecuritySystemFileImplement/DataFileSingleton.cs b/SecuritySystem/SecuritySystemFileImplement/DataFileSingleton.cs index 546ad2d..abd3812 100644 --- a/SecuritySystem/SecuritySystemFileImplement/DataFileSingleton.cs +++ b/SecuritySystem/SecuritySystemFileImplement/DataFileSingleton.cs @@ -8,75 +8,81 @@ using SecuritySystemFileImplement.Models; namespace SecuritySystemFileImplement { - public class DataFileSingleton - { - private static DataFileSingleton? instance; + public class DataFileSingleton + { + private static DataFileSingleton? instance; - private readonly string SensorFileName = "Sensor.xml"; + private readonly string SensorFileName = "Sensor.xml"; - private readonly string OrderFileName = "Order.xml"; + private readonly string OrderFileName = "Order.xml"; - private readonly string SecureFileName = "Secure.xml"; + private readonly string SecureFileName = "Secure.xml"; - private readonly string ClientFileName = "Client.xml"; + private readonly string ClientFileName = "Client.xml"; - private readonly string ImplementerFileName = "Implementer.xml"; + private readonly string ImplementerFileName = "Implementer.xml"; - public List Sensors { get; private set; } + private readonly string MessageFileName = "Message.xml"; - public List Orders { get; private set; } + public List Sensors { get; private set; } - public List Secures { get; private set; } + public List Orders { get; private set; } - public List Clients { get; private set; } + public List Secures { get; private set; } - public List Implementers { get; private set; } + public List Clients { get; private set; } - public static DataFileSingleton GetInstance() - { - if (instance == null) - { - instance = new DataFileSingleton(); - } + public List Implementers { get; private set; } - return instance; - } + public List Messages { get; private set; } - public void SaveSensors() => SaveData(Sensors, SensorFileName, "Sensors", x => x.GetXElement); + public static DataFileSingleton GetInstance() + { + if (instance == null) + { + instance = new DataFileSingleton(); + } - public void SaveSecures() => SaveData(Secures, SecureFileName, "Secures", x => x.GetXElement); + return instance; + } - public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveSensors() => SaveData(Sensors, SensorFileName, "Sensors", x => x.GetXElement); - public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); + public void SaveSecures() => SaveData(Secures, SecureFileName, "Secures", x => x.GetXElement); - public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); - private DataFileSingleton() - { - Sensors = LoadData(SensorFileName, "Sensor", x => Sensor.Create(x)!)!; - Secures = LoadData(SecureFileName, "Secure", x => Secure.Create(x)!)!; - Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; - Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; - Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; - } + public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); - private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) - { - if (File.Exists(filename)) - { - return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); - } + public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); - return new List(); - } + public void SaveMessages() => SaveData(Messages, MessageFileName, "Messages", x => x.GetXElement); + private DataFileSingleton() + { + Sensors = LoadData(SensorFileName, "Sensor", x => Sensor.Create(x)!)!; + Secures = LoadData(SecureFileName, "Secure", x => Secure.Create(x)!)!; + Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; + Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; + Messages = LoadData(MessageFileName, "Messages", x => MessageInfo.Create(x)!)!; + } - private static void SaveData(List data, string filename, string xmlNodeName, Func selectFunction) - { - if (data != null) - { - new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename); - } - } - } + private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) + { + if (File.Exists(filename)) + { + return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); + } + + return new List(); + } + + private static void SaveData(List data, string filename, string xmlNodeName, Func selectFunction) + { + if (data != null) + { + new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename); + } + } + } } diff --git a/SecuritySystem/SecuritySystemFileImplement/Implements/MessageInfoStorage.cs b/SecuritySystem/SecuritySystemFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..5310944 --- /dev/null +++ b/SecuritySystem/SecuritySystemFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,76 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.SearchModels; +using SecuritySystemContracts.StoragesContracts; +using SecuritySystemContracts.ViewModels; +using SecuritySystemFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemFileImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataFileSingleton source; + + public MessageInfoStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Messages.Select(x => GetViewModel(x)).ToList(); + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + if (!model.ClientId.HasValue) + { + return source.Messages + .Select(x => GetViewModel(x)) + .ToList(); + } + + return source.Messages + .Where(x => x.ClientId == model.ClientId) + .Select(x => GetViewModel(x)) + .ToList(); + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (!model.ClientId.HasValue) + { + return null; + } + + return source.Messages.FirstOrDefault(x => (model.ClientId.HasValue && x.ClientId == model.ClientId))?.GetViewModel; + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + model.MessageId = source.Messages.Count > 0 ? Convert.ToString(source.Messages.Count + 1) : "1"; + + var newMessage = MessageInfo.Create(model); + + if (newMessage == null) + { + return null; + } + + source.Messages.Add(newMessage); + source.SaveOrders(); + + return GetViewModel(newMessage); + } + + //для загрузки названий и имён в заказ + private MessageInfoViewModel GetViewModel(MessageInfo message) + { + return message.GetViewModel; + } + } +} diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs b/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..e87d878 --- /dev/null +++ b/SecuritySystem/SecuritySystemFileImplement/Models/MessageInfo.cs @@ -0,0 +1,98 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.ViewModels; +using SecuritySystemDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace SecuritySystemFileImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + public string MessageId { get; private set; } = string.Empty; + + public int? ClientId { get; private set; } + + public string SenderName { get; private set; } = string.Empty; + + public DateTime DateDelivery { get; private set; } = DateTime.Now; + + public string Subject { get; private set; } = string.Empty; + + public string Body { get; private set; } = string.Empty; + + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + + return new MessageInfo() + { + MessageId = model.MessageId, + ClientId = model.ClientId, + SenderName = model.SenderName, + Body = model.Body, + Subject = model.Subject, + DateDelivery = model.DateDelivery + }; + } + + public static MessageInfo? Create(XElement element) + { + if (element == null) + { + return null; + } + + return new MessageInfo() + { + MessageId = element.Element("MessageId")!.Value, + ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), + SenderName = element.Element("SenderName")!.Value, + Body = element.Element("Body")!.Value, + Subject = element.Element("Subject")!.Value, + DateDelivery = Convert.ToDateTime(element.Element("DateDelivery")!.Value) + }; + } + + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + + MessageId = model.MessageId; + ClientId = model.ClientId; + SenderName = model.SenderName; + Body = model.Body; + Subject = model.Subject; + DateDelivery = model.DateDelivery; + } + + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + Body = Body, + Subject = Subject, + DateDelivery = DateDelivery + }; + + public XElement GetXElement => new("MessageInfo", + new XAttribute("MessageId", MessageId), + new XElement("ClientId", ClientId.ToString()), + new XElement("SenderName", SenderName), + new XElement("Body", Body), + new XElement("Subject", Subject), + new XElement("DateDelivery", DateDelivery.ToString())); + } +} diff --git a/SecuritySystem/SecuritySystemListImplement/DataListSingleton.cs b/SecuritySystem/SecuritySystemListImplement/DataListSingleton.cs index cf9c920..aea428b 100644 --- a/SecuritySystem/SecuritySystemListImplement/DataListSingleton.cs +++ b/SecuritySystem/SecuritySystemListImplement/DataListSingleton.cs @@ -7,43 +7,48 @@ using System.Threading.Tasks; namespace SecuritySystemListImplement { - //класс для списков, в которых будет храниться информация при работе приложения - public class DataListSingleton - { - private static DataListSingleton? _instance; + //класс для списков, в которых будет храниться информация при работе приложения + public class DataListSingleton + { + private static DataListSingleton? _instance; - //список для хранения заготовок - public List Sensors { get; set; } + //список для хранения заготовок + public List Sensors { get; set; } - //список для хранения изделий - public List Secures { get; set; } + //список для хранения изделий + public List Secures { get; set; } - //список для хранения заказов - public List Orders { get; set; } + //список для хранения заказов + public List Orders { get; set; } - //список для хранения клиентов - public List Clients { get; set; } + //список для хранения клиентов + public List Clients { get; set; } - //список для хранения исполнителей - public List Implementers { get; set; } + //список для хранения исполнителей + public List Implementers { get; set; } - public DataListSingleton() - { - Sensors = new List(); - Secures = new List(); - Orders = new List(); - Clients = new List(); - Implementers = new List(); - } + //список для хранения писем + public List MessageInfos { get; set; } - public static DataListSingleton GetInstance() - { - if (_instance == null) - { - _instance = new DataListSingleton(); - } - return _instance; - } - } + public DataListSingleton() + { + Sensors = new List(); + Secures = new List(); + Orders = new List(); + Clients = new List(); + Implementers = new List(); + MessageInfos = new List(); + } + + public static DataListSingleton GetInstance() + { + if (_instance == null) + { + _instance = new DataListSingleton(); + } + + return _instance; + } + } } diff --git a/SecuritySystem/SecuritySystemListImplement/Implements/MessageInfoStorage.cs b/SecuritySystem/SecuritySystemListImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..a833a10 --- /dev/null +++ b/SecuritySystem/SecuritySystemListImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,88 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.SearchModels; +using SecuritySystemContracts.StoragesContracts; +using SecuritySystemContracts.ViewModels; +using SecuritySystemListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemListImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + //поле для работы со списком изделий + private readonly DataListSingleton _source; + + public MessageInfoStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + + foreach (var messageInfo in _source.MessageInfos) + { + result.Add(messageInfo.GetViewModel); + } + + return result; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + var result = new List(); + + if (string.IsNullOrEmpty(model.MessageId)) + { + return result; + } + + foreach (var messageInfo in _source.MessageInfos) + { + if (messageInfo.ClientId == model.ClientId) + { + result.Add(messageInfo.GetViewModel); + } + } + + return result; + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (string.IsNullOrEmpty(model.MessageId)) + { + return null; + } + + foreach (var messageInfo in _source.MessageInfos) + { + if (messageInfo.MessageId == model.MessageId) + { + return messageInfo.GetViewModel; + } + } + + return null; + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + + if (newMessage == null) + { + return null; + } + + _source.MessageInfos.Add(newMessage); + + return newMessage.GetViewModel; + } + } +} diff --git a/SecuritySystem/SecuritySystemListImplement/Models/MessageInfo.cs b/SecuritySystem/SecuritySystemListImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..86695cc --- /dev/null +++ b/SecuritySystem/SecuritySystemListImplement/Models/MessageInfo.cs @@ -0,0 +1,73 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.ViewModels; +using SecuritySystemDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemListImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + public string MessageId { get; private set; } = string.Empty; + + public int? ClientId { get; private set; } + + public string SenderName { get; private set; } = string.Empty; + + public DateTime DateDelivery { get; private set; } = DateTime.Now; + + public string Subject { get; private set; } = string.Empty; + + public string Body { get; private set; } = string.Empty; + + //метод для создания объекта от класса-компонента на основе класса-BindingModel + 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 void Update(MessageInfoBindingModel? model) + { + if (model == null) + { + return; + } + + MessageId = model.MessageId; + ClientId = model.ClientId; + SenderName = model.SenderName; + DateDelivery = model.DateDelivery; + Subject = model.Subject; + Body = model.Body; + } + + //метод для создания объекта класса ViewModel на основе данных объекта класса-компонента + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + DateDelivery = DateDelivery, + Subject = Subject, + Body = Body + }; + } +} diff --git a/SecuritySystem/SecuritySystemRestApi/Controllers/ClientController.cs b/SecuritySystem/SecuritySystemRestApi/Controllers/ClientController.cs index d7d3633..be0cbdb 100644 --- a/SecuritySystem/SecuritySystemRestApi/Controllers/ClientController.cs +++ b/SecuritySystem/SecuritySystemRestApi/Controllers/ClientController.cs @@ -15,12 +15,16 @@ namespace SecuritySystemRestApi.Controllers private readonly IClientLogic _logic; - public ClientController(IClientLogic logic, ILogger logger) + private readonly IMessageInfoLogic _mailLogic; + + public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger logger) { _logger = logger; _logic = logic; + _mailLogic = mailLogic; } + [HttpGet] public ClientViewModel? Login(string login, string password) { @@ -69,5 +73,22 @@ namespace SecuritySystemRestApi.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/SecuritySystem/SecuritySystemRestApi/Program.cs b/SecuritySystem/SecuritySystemRestApi/Program.cs index 75741f9..18e4e38 100644 --- a/SecuritySystem/SecuritySystemRestApi/Program.cs +++ b/SecuritySystem/SecuritySystemRestApi/Program.cs @@ -1,4 +1,6 @@ using SecuritySystemBusinessLogic.BusinessLogic; +using SecuritySystemBusinessLogic.MailWorker; +using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; using SecuritySystemContracts.StoragesContracts; using SecuritySystemDatabaseImplement.Implements; @@ -15,11 +17,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(); @@ -34,6 +40,18 @@ 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/SecuritySystem/SecuritySystemRestApi/appsettings.json b/SecuritySystem/SecuritySystemRestApi/appsettings.json index 10f68b8..471597d 100644 --- a/SecuritySystem/SecuritySystemRestApi/appsettings.json +++ b/SecuritySystem/SecuritySystemRestApi/appsettings.json @@ -5,5 +5,12 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + + "SmtpClientHost": "smtp.gmail.com", + "SmtpClientPort": "587", + "PopHost": "pop.gmail.com", + "PopPort": "995", + "MailLogin": "spaccyy@mail.ru", + "MailPassword": "123" }