diff --git a/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/ClientLogic.cs b/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/ClientLogic.cs index a9d7c03..b10b4a5 100644 --- a/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/ClientLogic.cs +++ b/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/ClientLogic.cs @@ -4,6 +4,7 @@ using SewingDressesContracts.BusinessLogicsContracts; using SewingDressesContracts.SearchModels; using SewingDressesContracts.StoragesContracts; using SewingDressesContracts.ViewModels; +using System.Text.RegularExpressions; namespace SewingDressesBusinessLogic.BusinessLogic { @@ -94,11 +95,11 @@ namespace SewingDressesBusinessLogic.BusinessLogic { 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/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/MessageInfoLogic.cs b/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/MessageInfoLogic.cs new file mode 100644 index 0000000..dceb269 --- /dev/null +++ b/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/MessageInfoLogic.cs @@ -0,0 +1,46 @@ +using Microsoft.Extensions.Logging; +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.BusinessLogicsContracts; +using SewingDressesContracts.SearchModels; +using SewingDressesContracts.StoragesContracts; +using SewingDressesContracts.ViewModels; + +namespace SewingDressesBusinessLogic.BusinessLogic +{ + public class MessageInfoLogic : IMessageInfoLogic + { + private readonly ILogger _logger; + + private readonly IMessageInfoStorage _messageStorage; + + public MessageInfoLogic(IMessageInfoStorage messageStorage, ILogger logger) + { + _messageStorage = messageStorage; + _logger = logger; + } + public bool Create(MessageInfoBindingModel model) + { + if (_messageStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public List? ReadList(MessageInfoSearchModel? model) + { + _logger.LogInformation("ReadList. ClientID:{ClientID}. ID:{ ID}", model?.ClientId, model?.MessageId); + + var list = model == null ? _messageStorage.GetFullList() : _messageStorage.GetFilteredList(model); + + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + } +} diff --git a/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/OrderLogic.cs b/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/OrderLogic.cs index 561595a..54c462f 100644 --- a/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/OrderLogic.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.Logging; +using SewingDressesBusinessLogic.MailWorker; using SewingDressesContracts.BindingModels; using SewingDressesContracts.BusinessLogicsContracts; using SewingDressesContracts.SearchModels; @@ -12,12 +13,16 @@ namespace SewingDressesBusinessLogic.BusinessLogic { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; + private readonly IClientStorage _clientStorage; + private readonly AbstractMailWorker _mailLogic; static readonly object locker = new object(); - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IClientStorage clientStorage, AbstractMailWorker worker) { _logger = logger; _orderStorage = orderStorage; + _clientStorage = clientStorage; + _mailLogic = worker; } public OrderViewModel? ReadElement(OrderSearchModel model) @@ -78,11 +83,16 @@ namespace SewingDressesBusinessLogic.BusinessLogic 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 orderView = _orderStorage.GetElement(new () { Id = order.Id }); + var clientView = _clientStorage.GetElement(new() { Id = orderView!.ClientId}); + + SendEmail(clientView, orderView); return true; } @@ -106,7 +116,11 @@ namespace SewingDressesBusinessLogic.BusinessLogic model.Status = status; if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now; _orderStorage.Update(model); - return true; + var orderView = _orderStorage.GetElement(new() { Id = model.Id }); + var clientView = _clientStorage.GetElement(new() { Id = orderView!.ClientId }); + + SendEmail(clientView, orderView); + return true; } public bool TakeOrderInWork(OrderBindingModel model) @@ -126,5 +140,36 @@ namespace SewingDressesBusinessLogic.BusinessLogic { return ChangeStatus(model, OrderStatus.Выдан); } - } + public void SendEmail(ClientViewModel clientModel, OrderViewModel orderModel) + { + if (clientModel == null && orderModel == null) + { + return; + } + + MailSendInfoBindingModel mailModel; + + if (orderModel.Status == OrderStatus.Принят) + { + mailModel = new MailSendInfoBindingModel + { + MailAddress = clientModel.Email, + Subject = $"Order №{orderModel.Id}", + Text = $"Your order №{orderModel.Id} by {orderModel.DateCreate} on {orderModel.Sum} was accepted!" + }; + } + else + { + mailModel = new MailSendInfoBindingModel + { + MailAddress = clientModel.Email, + Subject = $"Order №{orderModel.Id}", + Text = $"Order №{orderModel.Id} status was changed to {orderModel.Status}" + }; + } + + + _mailLogic.MailSendAsync(mailModel); + } + } } diff --git a/SewingDresses/SewingDressesBusinessLogic/MailWorker/AbstractMailWorker.cs b/SewingDresses/SewingDressesBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..f22c140 --- /dev/null +++ b/SewingDresses/SewingDressesBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,74 @@ +using Microsoft.Extensions.Logging; +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.BusinessLogicsContracts; + +namespace SewingDressesBusinessLogic.MailWorker +{ + public abstract class AbstractMailWorker + { + protected static string _mailLogin = string.Empty; + protected static string _mailPassword = string.Empty; + protected static string _smtpClientHost = string.Empty; + protected static int _smtpClientPort; + protected static string _popHost = string.Empty; + protected static int _popPort; + private readonly IMessageInfoLogic _messageInfoLogic; + private readonly ILogger _logger; + public AbstractMailWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) + { + _logger = logger; + _messageInfoLogic = messageInfoLogic; + } + public void MailConfig(MailConfigBindingModel config) + { + _mailLogin = config.MailLogin; + _mailPassword = config.MailPassword; + _smtpClientHost = config.SmtpClientHost; + _smtpClientPort = config.SmtpClientPort; + _popHost = config.PopHost; + _popPort = config.PopPort; + _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPort}, {popHost}, {popPort} ", _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort); + } + public async void MailSendAsync(MailSendInfoBindingModel info) + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } + if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text)) + { + return; + } + _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject); + await SendMailAsync(info); + } + public async void MailCheck() + { + if (string.IsNullOrEmpty(_mailLogin) || + string.IsNullOrEmpty(_mailPassword)) + { + return; + } + if (string.IsNullOrEmpty(_popHost) || _popPort == 0) + { + return; + } + if (_messageInfoLogic == null) + { + return; + } + var list = await ReceiveMailAsync(); + _logger.LogDebug("Check Mail: {Count} new mails", list.Count); + foreach (var mail in list) + { + _messageInfoLogic. Create(mail); + } + } + protected abstract Task SendMailAsync(MailSendInfoBindingModel info); + protected abstract Task> ReceiveMailAsync(); + } +} diff --git a/SewingDresses/SewingDressesBusinessLogic/MailWorker/MailKitWorker.cs b/SewingDresses/SewingDressesBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..04554a9 --- /dev/null +++ b/SewingDresses/SewingDressesBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,75 @@ +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.BusinessLogicsContracts; +using MailKit.Net.Pop3; +using MailKit.Security; +using Microsoft.Extensions.Logging; +using System.Net.Mail; +using System.Text; +using System.Net; + +namespace SewingDressesBusinessLogic.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 ex) + { + 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/SewingDresses/SewingDressesBusinessLogic/SewingDressesBusinessLogic.csproj b/SewingDresses/SewingDressesBusinessLogic/SewingDressesBusinessLogic.csproj index f5f43db..a63a621 100644 --- a/SewingDresses/SewingDressesBusinessLogic/SewingDressesBusinessLogic.csproj +++ b/SewingDresses/SewingDressesBusinessLogic/SewingDressesBusinessLogic.csproj @@ -9,6 +9,7 @@ + diff --git a/SewingDresses/SewingDressesClientApp/Controllers/HomeController.cs b/SewingDresses/SewingDressesClientApp/Controllers/HomeController.cs index 9997cb8..503b88f 100644 --- a/SewingDresses/SewingDressesClientApp/Controllers/HomeController.cs +++ b/SewingDresses/SewingDressesClientApp/Controllers/HomeController.cs @@ -140,5 +140,15 @@ namespace SewingDressesClientApp.Controllers var _dress = APIClient.GetRequest($"api/main/getdress?dressid={dress}"); return Math.Round(count * (_dress?.Price ?? 1), 2); } + [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/SewingDresses/SewingDressesClientApp/Views/Home/Mails.cshtml b/SewingDresses/SewingDressesClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..0068467 --- /dev/null +++ b/SewingDresses/SewingDressesClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,52 @@ +@using SewingDressesContracts.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/SewingDresses/SewingDressesClientApp/Views/Shared/_Layout.cshtml b/SewingDresses/SewingDressesClientApp/Views/Shared/_Layout.cshtml index 213634e..2bd158e 100644 --- a/SewingDresses/SewingDressesClientApp/Views/Shared/_Layout.cshtml +++ b/SewingDresses/SewingDressesClientApp/Views/Shared/_Layout.cshtml @@ -20,16 +20,19 @@
diff --git a/SewingDresses/SewingDressesContracts/BindingModels/MailConfigBindingModel.cs b/SewingDresses/SewingDressesContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..a1d9d60 --- /dev/null +++ b/SewingDresses/SewingDressesContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,12 @@ +namespace SewingDressesContracts.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/SewingDresses/SewingDressesContracts/BindingModels/MailSendInfoBindingModel.cs b/SewingDresses/SewingDressesContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..2a260c1 --- /dev/null +++ b/SewingDresses/SewingDressesContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,9 @@ +namespace SewingDressesContracts.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/SewingDresses/SewingDressesContracts/BindingModels/MessageInfoBindingModel.cs b/SewingDresses/SewingDressesContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..fd2907f --- /dev/null +++ b/SewingDresses/SewingDressesContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,19 @@ +using SewingDressesDataModels.Models; + +namespace SewingDressesContracts.BindingModels +{ + public class MessageInfoBindingModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + + public string SenderName { get; set; } = string.Empty; + + public DateTime DateDelivery { get; set; } + + public string Subject { get; set; } = string.Empty; + + public string Body { get; set; } = string.Empty; + } +} diff --git a/SewingDresses/SewingDressesContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/SewingDresses/SewingDressesContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..3292362 --- /dev/null +++ b/SewingDresses/SewingDressesContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,11 @@ +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.SearchModels; +using SewingDressesContracts.ViewModels; +namespace SewingDressesContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + bool Create(MessageInfoBindingModel viewModel); + } +} diff --git a/SewingDresses/SewingDressesContracts/SearchModels/MessageInfoSearchModel.cs b/SewingDresses/SewingDressesContracts/SearchModels/MessageInfoSearchModel.cs new file mode 100644 index 0000000..e45902b --- /dev/null +++ b/SewingDresses/SewingDressesContracts/SearchModels/MessageInfoSearchModel.cs @@ -0,0 +1,8 @@ +namespace SewingDressesContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public string? MessageId { get; set; } + public int? ClientId { get; set; } + } +} diff --git a/SewingDresses/SewingDressesContracts/StoragesContracts/IMessageInfoStorage.cs b/SewingDresses/SewingDressesContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..53cb2df --- /dev/null +++ b/SewingDresses/SewingDressesContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,13 @@ +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.SearchModels; +using SewingDressesContracts.ViewModels; +namespace SewingDressesContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel mode); + } +} diff --git a/SewingDresses/SewingDressesContracts/ViewModels/MessageInfoViewModel.cs b/SewingDresses/SewingDressesContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..820cfed --- /dev/null +++ b/SewingDresses/SewingDressesContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,20 @@ +using SewingDressesDataModels.Models; +using System.ComponentModel; + +namespace SewingDressesContracts.ViewModels +{ + public class MessageInfoViewModel : IMessageInfoModel + { + public string MessageId { get; set; } = string.Empty; + + public int? ClientId { get; set; } + [DisplayName("Имя отправителя")] + public string SenderName { get; set; } = string.Empty; + [DisplayName("Дата доставки")] + public DateTime DateDelivery { get; set; } + [DisplayName("Тема письма")] + public string Subject { get; set; } = string.Empty; + [DisplayName("Внутренности письма")] + public string Body { get; set; } = string.Empty; + } +} diff --git a/SewingDresses/SewingDressesDataModels/Models/IMessageInfoModel.cs b/SewingDresses/SewingDressesDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..9d0eb86 --- /dev/null +++ b/SewingDresses/SewingDressesDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SewingDressesDataModels.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/SewingDresses/SewingDressesDatabaseImplement/Implements/ClientStorage.cs b/SewingDresses/SewingDressesDatabaseImplement/Implements/ClientStorage.cs index 19bec91..06d644a 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/Implements/ClientStorage.cs +++ b/SewingDresses/SewingDressesDatabaseImplement/Implements/ClientStorage.cs @@ -43,7 +43,7 @@ namespace SewingDressesDatabaseImplement.Implements { if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue) { return null; } using var context = new SewingDressesDatabase(); - return context.Clients.FirstOrDefault(x => (!(string.IsNullOrEmpty(model.Email)) && model.Email == x.Email) || (model.Id.HasValue && model.Id == x.Id))?.GetViewModel; + return context.Clients.FirstOrDefault(x => (!(string.IsNullOrEmpty(model.Email)) && model.Email.Equals( x.Email)) || (model.Id.HasValue && model.Id == x.Id))?.GetViewModel; } public List GetFilteredList(ClientSearchModel model) diff --git a/SewingDresses/SewingDressesDatabaseImplement/Implements/MessageInfoStorage.cs b/SewingDresses/SewingDressesDatabaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..9e7b001 --- /dev/null +++ b/SewingDresses/SewingDressesDatabaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,57 @@ +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.ViewModels; +using SewingDressesContracts.SearchModels; +using SewingDressesContracts.StoragesContracts; +using SewingDressesDatabaseImplement.Models; +using Microsoft.EntityFrameworkCore; + +namespace SewingDressesDatabaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (string.IsNullOrEmpty(model.MessageId)) + { + return null; + } + using var context = new SewingDressesDatabase(); + return context.Messages.Include(x => x.Client).FirstOrDefault(x => x.MessageId.Equals(model.MessageId))?.GetViewModel; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + if (!model.ClientId.HasValue) + { + return new(); + } + using var context = new SewingDressesDatabase(); + return context.Messages.Include(x => x.Client).Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + using var context = new SewingDressesDatabase(); + return context.Messages.Include(x => x.Client).Select(x => x.GetViewModel).ToList(); + } + + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + using var context = new SewingDressesDatabase(); + model.ClientId = context.Clients.FirstOrDefault(x => x.Email.Equals(model.SenderName))?.Id; + var message = MessageInfo.Create(model); + if (message == null) + return null; + context.Messages.Add(message); + try { + context.SaveChanges(); + return message.GetViewModel; + } + catch (Exception ex) + { + return null; + } + } + } +} diff --git a/SewingDresses/SewingDressesDatabaseImplement/Migrations/20240502151918_message.Designer.cs b/SewingDresses/SewingDressesDatabaseImplement/Migrations/20240502151918_message.Designer.cs new file mode 100644 index 0000000..9650353 --- /dev/null +++ b/SewingDresses/SewingDressesDatabaseImplement/Migrations/20240502151918_message.Designer.cs @@ -0,0 +1,298 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using SewingDressesDatabaseImplement; + +#nullable disable + +namespace SewingDressesDatabaseImplement.Migrations +{ + [DbContext(typeof(SewingDressesDatabase))] + [Migration("20240502151918_message")] + partial class message + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.16") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Component", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Cost") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Components"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Dress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("DressName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Dresses"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.DressComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DressId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ComponentId"); + + b.HasIndex("DressId"); + + b.ToTable("DressComponents"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Implement", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ImplementFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Qualification") + .HasColumnType("int"); + + b.Property("WorkExperience") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("Implements"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.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("SewingDressesDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DateCreate") + .HasColumnType("datetime2"); + + b.Property("DateImplement") + .HasColumnType("datetime2"); + + b.Property("DressId") + .HasColumnType("int"); + + b.Property("ImplementId") + .HasColumnType("int"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("DressId"); + + b.HasIndex("ImplementId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.DressComponent", b => + { + b.HasOne("SewingDressesDatabaseImplement.Models.Component", "Component") + .WithMany("DressComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("SewingDressesDatabaseImplement.Models.Dress", "Dress") + .WithMany("Components") + .HasForeignKey("DressId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Component"); + + b.Navigation("Dress"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("SewingDressesDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Order", b => + { + b.HasOne("SewingDressesDatabaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("SewingDressesDatabaseImplement.Models.Dress", "Dress") + .WithMany("Orders") + .HasForeignKey("DressId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("SewingDressesDatabaseImplement.Models.Implement", "Implement") + .WithMany("Orders") + .HasForeignKey("ImplementId"); + + b.Navigation("Client"); + + b.Navigation("Dress"); + + b.Navigation("Implement"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Client", b => + { + b.Navigation("Messages"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Component", b => + { + b.Navigation("DressComponents"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Dress", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Implement", b => + { + b.Navigation("Orders"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/SewingDresses/SewingDressesDatabaseImplement/Migrations/20240502151918_message.cs b/SewingDresses/SewingDressesDatabaseImplement/Migrations/20240502151918_message.cs new file mode 100644 index 0000000..83a88de --- /dev/null +++ b/SewingDresses/SewingDressesDatabaseImplement/Migrations/20240502151918_message.cs @@ -0,0 +1,49 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace SewingDressesDatabaseImplement.Migrations +{ + /// + public partial class message : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Messages", + columns: table => new + { + MessageId = table.Column(type: "nvarchar(450)", nullable: false), + ClientId = table.Column(type: "int", nullable: true), + SenderName = table.Column(type: "nvarchar(max)", nullable: false), + DateDelivery = table.Column(type: "datetime2", nullable: false), + Subject = table.Column(type: "nvarchar(max)", nullable: false), + Body = table.Column(type: "nvarchar(max)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Messages", x => x.MessageId); + table.ForeignKey( + name: "FK_Messages_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id", + onDelete: ReferentialAction.SetNull); + }); + + migrationBuilder.CreateIndex( + name: "IX_Messages_ClientId", + table: "Messages", + column: "ClientId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Messages"); + } + } +} diff --git a/SewingDresses/SewingDressesDatabaseImplement/Migrations/SewingDressesDatabaseModelSnapshot.cs b/SewingDresses/SewingDressesDatabaseImplement/Migrations/SewingDressesDatabaseModelSnapshot.cs index b8d2e94..bc0009e 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/Migrations/SewingDressesDatabaseModelSnapshot.cs +++ b/SewingDresses/SewingDressesDatabaseImplement/Migrations/SewingDressesDatabaseModelSnapshot.cs @@ -140,6 +140,36 @@ namespace SewingDressesDatabaseImplement.Migrations b.ToTable("Implements"); }); + modelBuilder.Entity("SewingDressesDatabaseImplement.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("SewingDressesDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -202,6 +232,15 @@ namespace SewingDressesDatabaseImplement.Migrations b.Navigation("Dress"); }); + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("SewingDressesDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Order", b => { b.HasOne("SewingDressesDatabaseImplement.Models.Client", "Client") @@ -229,6 +268,8 @@ namespace SewingDressesDatabaseImplement.Migrations modelBuilder.Entity("SewingDressesDatabaseImplement.Models.Client", b => { + b.Navigation("Messages"); + b.Navigation("Orders"); }); diff --git a/SewingDresses/SewingDressesDatabaseImplement/Models/Client.cs b/SewingDresses/SewingDressesDatabaseImplement/Models/Client.cs index 1619e2d..ed0eece 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/Models/Client.cs +++ b/SewingDresses/SewingDressesDatabaseImplement/Models/Client.cs @@ -19,6 +19,8 @@ namespace SewingDressesDatabaseImplement.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) { diff --git a/SewingDresses/SewingDressesDatabaseImplement/Models/MessageInfo.cs b/SewingDresses/SewingDressesDatabaseImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..631b110 --- /dev/null +++ b/SewingDresses/SewingDressesDatabaseImplement/Models/MessageInfo.cs @@ -0,0 +1,49 @@ +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.ViewModels; +using SewingDressesDataModels.Models; +using System.ComponentModel.DataAnnotations; + +namespace SewingDressesDatabaseImplement.Models +{ + public class MessageInfo : IMessageInfoModel + { + [Key] + public string MessageId { get; private set; } = string.Empty; + public int? ClientId { get; private set; } + [Required] + public string SenderName { get; private set; } = string.Empty; + [Required] + public DateTime DateDelivery { get; private set; } + [Required] + public string Subject { get; private set; } = string.Empty; + [Required] + public string Body { get; private set; } = string.Empty; + public virtual Client? Client { get; private set; } + public static MessageInfo? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new 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/SewingDresses/SewingDressesDatabaseImplement/SewingDressesDatabase.cs b/SewingDresses/SewingDressesDatabaseImplement/SewingDressesDatabase.cs index fdde74f..8279f5c 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/SewingDressesDatabase.cs +++ b/SewingDresses/SewingDressesDatabaseImplement/SewingDressesDatabase.cs @@ -18,5 +18,6 @@ namespace SewingDressesDatabaseImplement public virtual DbSet Orders { get; set; } public virtual DbSet Clients { get; set; } public virtual DbSet Implements { get; set; } + public virtual DbSet Messages { get; set; } } } diff --git a/SewingDresses/SewingDressesDatabaseImplement/SewingDressesDatabaseImplement.csproj b/SewingDresses/SewingDressesDatabaseImplement/SewingDressesDatabaseImplement.csproj index 2574adc..460e096 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/SewingDressesDatabaseImplement.csproj +++ b/SewingDresses/SewingDressesDatabaseImplement/SewingDressesDatabaseImplement.csproj @@ -7,6 +7,8 @@ + + diff --git a/SewingDresses/SewingDressesFileImplement/DataFileSingleton.cs b/SewingDresses/SewingDressesFileImplement/DataFileSingleton.cs index 6923819..8a676a0 100644 --- a/SewingDresses/SewingDressesFileImplement/DataFileSingleton.cs +++ b/SewingDresses/SewingDressesFileImplement/DataFileSingleton.cs @@ -11,11 +11,13 @@ namespace SewingDressesFileImplement private readonly string DressFileName = "Dress.xml"; private readonly string ClientFileName = "Client.xml"; private readonly string ImplementFileName = "Implement.xml"; + private readonly string MessageInfoFileName = "MessageInfo.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Dresses { get; private set;} public List Clients { get; private set; } public List Implements { get; private set; } + public List Messages { get; private set; } public static DataFileSingleton GetInstance() { if (instance == null) @@ -45,13 +47,15 @@ namespace SewingDressesFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveImplements() => SaveData(Implements, ImplementFileName, "Implements", x => x.GetXElement); - private DataFileSingleton() + public void SaveMessages() => SaveData(Messages, MessageInfoFileName, "Messages", x => x.GetXElement); + private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Dresses = LoadData(DressFileName, "Dress", x => Dress.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Implements = LoadData(ImplementFileName, "Implement", x => Implement.Create(x)!)!; + Messages = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!; } } } diff --git a/SewingDresses/SewingDressesFileImplement/Implements/MessageInfoStorage.cs b/SewingDresses/SewingDressesFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..037fd11 --- /dev/null +++ b/SewingDresses/SewingDressesFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,54 @@ +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.SearchModels; +using SewingDressesContracts.StoragesContracts; +using SewingDressesContracts.ViewModels; +using SewingDressesFileImplement.Models; + + +namespace SewingDressesFileImplement.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.SaveMessages(); + return newMessage.GetViewModel; + } + } +} \ No newline at end of file diff --git a/SewingDresses/SewingDressesFileImplement/Models/MessageInfo.cs b/SewingDresses/SewingDressesFileImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..44d6836 --- /dev/null +++ b/SewingDresses/SewingDressesFileImplement/Models/MessageInfo.cs @@ -0,0 +1,75 @@ +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.ViewModels; +using SewingDressesDataModels.Models; +using System.Xml.Linq; + +namespace SewingDressesFileImplement.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; } + + 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.ToString()), + new XElement("SenderName", SenderName), + new XElement("DateDelivery", DateDelivery), + new XElement("Subject", Subject), + new XElement("Body", Body), + new XElement("SenderName", SenderName)); + } +} diff --git a/SewingDresses/SewingDressesListImplement/DataListSingleton.cs b/SewingDresses/SewingDressesListImplement/DataListSingleton.cs index 0cec0a4..f832428 100644 --- a/SewingDresses/SewingDressesListImplement/DataListSingleton.cs +++ b/SewingDresses/SewingDressesListImplement/DataListSingleton.cs @@ -10,13 +10,15 @@ namespace SewingDressesListImplement public List Dresses { get; set; } public List Clients { get; set; } public List Implements { get; set; } - private DataListSingleton() + public List Messages { get; set; } + private DataListSingleton() { Components = new List(); Orders = new List(); Dresses = new List(); Clients = new List(); Implements = new List(); + Messages = new List(); } public static DataListSingleton GetInstance() { diff --git a/SewingDresses/SewingDressesListImplement/Implements/MessageInfoStorage.cs b/SewingDresses/SewingDressesListImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..a8cbad2 --- /dev/null +++ b/SewingDresses/SewingDressesListImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,68 @@ +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.SearchModels; +using SewingDressesContracts.StoragesContracts; +using SewingDressesContracts.ViewModels; +using SewingDressesListImplement.Models; + +namespace SewingDressesListImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataListSingleton _source; + public MessageInfoStorage(DataListSingleton source) + { + _source = DataListSingleton.GetInstance(); + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (string.IsNullOrEmpty(model.MessageId)) + { + return null; + } + + foreach (var msg in _source.Messages) + { + if (msg.MessageId.Equals(model.MessageId)) + { + return msg.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; + } + } +} \ No newline at end of file diff --git a/SewingDresses/SewingDressesListImplement/Models/MessageInfo.cs b/SewingDresses/SewingDressesListImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..f2dbc4e --- /dev/null +++ b/SewingDresses/SewingDressesListImplement/Models/MessageInfo.cs @@ -0,0 +1,46 @@ +using SewingDressesContracts.BindingModels; +using SewingDressesContracts.ViewModels; +using SewingDressesDataModels.Models; + +namespace SewingDressesListImplement.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; } + + 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() + { + MessageId = model.MessageId, + SenderName = model.SenderName, + DateDelivery = model.DateDelivery, + Subject = model.Subject, + Body = model.Body, + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + Subject = Subject, + Body = Body + }; + } +} \ No newline at end of file diff --git a/SewingDresses/SewingDressesRestApi/Controllers/ClientController.cs b/SewingDresses/SewingDressesRestApi/Controllers/ClientController.cs index cfe22a9..e838fc3 100644 --- a/SewingDresses/SewingDressesRestApi/Controllers/ClientController.cs +++ b/SewingDresses/SewingDressesRestApi/Controllers/ClientController.cs @@ -12,10 +12,12 @@ namespace SewingDressesRestApi.Controllers { private readonly ILogger _logger; private readonly IClientLogic _logic; - public ClientController(IClientLogic logic, ILogger logger) + private readonly IMessageInfoLogic _mailLogic; + public ClientController(IClientLogic logic, ILogger logger, IMessageInfoLogic message) { _logger = logger; _logic = logic; + _mailLogic = message; } [HttpGet] public ClientViewModel? Login(string login, string password) @@ -60,5 +62,22 @@ namespace SewingDressesRestApi.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/SewingDresses/SewingDressesRestApi/Program.cs b/SewingDresses/SewingDressesRestApi/Program.cs index f079db5..3e80db1 100644 --- a/SewingDresses/SewingDressesRestApi/Program.cs +++ b/SewingDresses/SewingDressesRestApi/Program.cs @@ -3,6 +3,7 @@ using SewingDressesContracts.BusinessLogicsContracts; using SewingDressesContracts.StoragesContracts; using SewingDressesDatabaseImplement.Implements; using Microsoft.OpenApi.Models; +using SewingDressesBusinessLogic.MailWorker; var builder = WebApplication.CreateBuilder(args); @@ -18,13 +19,30 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddTransient(); + +builder.Services.AddTransient(); builder.Services.AddControllers(); +builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new OpenApiInfo { Title = "SewingDressesRestApi", Version = "v1" }); }); + var app = builder.Build(); +var mailSender = app.Services.GetService(); +mailSender?.MailConfig(new() +{ + 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()) + +}); if (app.Environment.IsDevelopment()) { app.UseSwagger(); diff --git a/SewingDresses/SewingDressesRestApi/appsettings.json b/SewingDresses/SewingDressesRestApi/appsettings.json index 10f68b8..ae4c3f2 100644 --- a/SewingDresses/SewingDressesRestApi/appsettings.json +++ b/SewingDresses/SewingDressesRestApi/appsettings.json @@ -5,5 +5,12 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + + "SmtpClientHost": "smtp.mail.ru", + "SmtpClientPort": "587", + "PopHost": "pop.mail.ru", + "PopPort": "995", + "MailLogin": "pibd21_kozyrev@mail.ru", + "MailPassword": "fyigmU7yKciypukjv0bX" } diff --git a/SewingDresses/SewingDressesView/App.config b/SewingDresses/SewingDressesView/App.config new file mode 100644 index 0000000..289fb43 --- /dev/null +++ b/SewingDresses/SewingDressesView/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/SewingDresses/SewingDressesView/MailForm.Designer.cs b/SewingDresses/SewingDressesView/MailForm.Designer.cs new file mode 100644 index 0000000..cef20b1 --- /dev/null +++ b/SewingDresses/SewingDressesView/MailForm.Designer.cs @@ -0,0 +1,62 @@ +namespace SewingDressesView +{ + partial class MailForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(12, 12); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(776, 426); + dataGridView.TabIndex = 0; + // + // MailForm + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(dataGridView); + Name = "MailForm"; + Text = "Формочка с письмами"; + Load += FormEmails_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/SewingDresses/SewingDressesView/MailForm.cs b/SewingDresses/SewingDressesView/MailForm.cs new file mode 100644 index 0000000..a3593e5 --- /dev/null +++ b/SewingDresses/SewingDressesView/MailForm.cs @@ -0,0 +1,53 @@ +using Microsoft.Extensions.Logging; +using SewingDressesContracts.BusinessLogicsContracts; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SewingDressesView +{ + public partial class MailForm : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + + public MailForm(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormEmails_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Loading materials"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Error loading materials"); + MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/SewingDresses/SewingDressesView/MailForm.resx b/SewingDresses/SewingDressesView/MailForm.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SewingDresses/SewingDressesView/MailForm.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/SewingDresses/SewingDressesView/MainForm.Designer.cs b/SewingDresses/SewingDressesView/MainForm.Designer.cs index 692c56a..25b74a5 100644 --- a/SewingDresses/SewingDressesView/MainForm.Designer.cs +++ b/SewingDresses/SewingDressesView/MainForm.Designer.cs @@ -38,6 +38,7 @@ платьяToolStripMenuItem = new ToolStripMenuItem(); clientsToolStripMenuItem = new ToolStripMenuItem(); исполнителиToolStripMenuItem = new ToolStripMenuItem(); + почтовыеПисьмаToolStripMenuItem = new ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem(); DressesReportToolStripMenuItem = new ToolStripMenuItem(); компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); @@ -99,7 +100,7 @@ // // справочникиToolStripMenuItem // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, платьяToolStripMenuItem, clientsToolStripMenuItem, исполнителиToolStripMenuItem }); + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, платьяToolStripMenuItem, clientsToolStripMenuItem, исполнителиToolStripMenuItem, почтовыеПисьмаToolStripMenuItem }); справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Text = "Справочники"; @@ -107,31 +108,38 @@ // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(185, 26); + компонентыToolStripMenuItem.Size = new Size(224, 26); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; // // платьяToolStripMenuItem // платьяToolStripMenuItem.Name = "платьяToolStripMenuItem"; - платьяToolStripMenuItem.Size = new Size(185, 26); + платьяToolStripMenuItem.Size = new Size(224, 26); платьяToolStripMenuItem.Text = "Платья"; платьяToolStripMenuItem.Click += DressesToolStripMenuItem_Click; // // clientsToolStripMenuItem // clientsToolStripMenuItem.Name = "clientsToolStripMenuItem"; - clientsToolStripMenuItem.Size = new Size(185, 26); + clientsToolStripMenuItem.Size = new Size(224, 26); clientsToolStripMenuItem.Text = "Клиенты"; clientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(185, 26); + исполнителиToolStripMenuItem.Size = new Size(224, 26); исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += ImplementToolStripMenuItem_Click; // + // почтовыеПисьмаToolStripMenuItem + // + почтовыеПисьмаToolStripMenuItem.Name = "почтовыеПисьмаToolStripMenuItem"; + почтовыеПисьмаToolStripMenuItem.Size = new Size(224, 26); + почтовыеПисьмаToolStripMenuItem.Text = "ПочтовыеПисьма"; + почтовыеПисьмаToolStripMenuItem.Click += emailsToolStripMenuItem_Click; + // // отчетыToolStripMenuItem // отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DressesReportToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem }); @@ -205,5 +213,6 @@ private ToolStripMenuItem clientsToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; + private ToolStripMenuItem почтовыеПисьмаToolStripMenuItem; } } \ No newline at end of file diff --git a/SewingDresses/SewingDressesView/MainForm.cs b/SewingDresses/SewingDressesView/MainForm.cs index ad966dd..dcb952e 100644 --- a/SewingDresses/SewingDressesView/MainForm.cs +++ b/SewingDresses/SewingDressesView/MainForm.cs @@ -156,5 +156,13 @@ namespace SewingDressesView MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } + private void emailsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(MailForm)); + if (service is MailForm form) + { + form.ShowDialog(); + } + } } } diff --git a/SewingDresses/SewingDressesView/Program.cs b/SewingDresses/SewingDressesView/Program.cs index 4352870..e74da8d 100644 --- a/SewingDresses/SewingDressesView/Program.cs +++ b/SewingDresses/SewingDressesView/Program.cs @@ -8,6 +8,7 @@ using NLog.Extensions.Logging; using System.Drawing; using SewingDressesBusinessLogic.OfficePackage; using SewingDressesBusinessLogic.OfficePackage.Implements; +using SewingDressesBusinessLogic.MailWorker; namespace SewingDressesView { @@ -22,6 +23,25 @@ namespace SewingDressesView var services = new ServiceCollection(); ConfigureServices(services); _serviceProvider = services.BuildServiceProvider(); + try + { + var mailSender = _serviceProvider.GetService(); + mailSender?.MailConfig(new() + { + 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()); } private static void ConfigureServices(ServiceCollection services) @@ -43,6 +63,9 @@ namespace SewingDressesView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -58,6 +81,8 @@ namespace SewingDressesView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } - } + private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + } } \ No newline at end of file