From 021cb7f8f2c8b319b6e19868ba14cc4c0f798c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Sat, 4 May 2024 16:20:45 +0400 Subject: [PATCH 1/7] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9=20=D1=81?= =?UTF-8?q?=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=B8=D0=BD=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D1=8C=D0=BC=D0=B0,=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84?= =?UTF-8?q?=D0=B5=D0=B9=D1=81=D0=BE=D0=B2=20=D1=85=D1=80=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D0=B1=D0=B8=D0=B7=D0=BD=D0=B5?= =?UTF-8?q?=D1=81=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/MessageLogicInfo.cs | 51 +++++++++++++ .../BindingModels/MessageInfoBindingModel.cs | 24 ++++++ .../IMessageInfoLogic.cs | 17 +++++ .../SearchModels/MessageInfoSearchModel.cs | 14 ++++ .../StoragesContracts/IMessageInfoStorage.cs | 20 +++++ .../ViewModels/MessageInfoViewModel.cs | 29 ++++++++ .../Models/IMessageInfoModel.cs | 18 +++++ .../CarRepairShopDatabase.cs | 1 + .../Implements/MessageInfoStorage.cs | 47 ++++++++++++ .../Models/MessageInfo.cs | 55 ++++++++++++++ .../DataFileSingleton.cs | 4 + .../Implements/MessageInfoStorage.cs | 47 ++++++++++++ .../Models/MessageInfo.cs | 74 +++++++++++++++++++ .../DataListSingleton.cs | 2 + .../Implements/MessageInfoStorage.cs | 67 +++++++++++++++++ .../Models/MessageInfo.cs | 50 +++++++++++++ .../CarRepairShopRestApi/appsettings.json | 10 ++- CarRepairShop/CarRepairShopView/App.config | 11 +++ 18 files changed, 540 insertions(+), 1 deletion(-) create mode 100644 CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageLogicInfo.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BindingModels/MessageInfoBindingModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs create mode 100644 CarRepairShop/CarRepairShopContracts/SearchModels/MessageInfoSearchModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/StoragesContracts/IMessageInfoStorage.cs create mode 100644 CarRepairShop/CarRepairShopContracts/ViewModels/MessageInfoViewModel.cs create mode 100644 CarRepairShop/CarRepairShopDataModels/Models/IMessageInfoModel.cs create mode 100644 CarRepairShop/CarRepairShopDatabaseImplement/Implements/MessageInfoStorage.cs create mode 100644 CarRepairShop/CarRepairShopDatabaseImplement/Models/MessageInfo.cs create mode 100644 CarRepairShop/CarRepairShopFileImplement/Implements/MessageInfoStorage.cs create mode 100644 CarRepairShop/CarRepairShopFileImplement/Models/MessageInfo.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Implements/MessageInfoStorage.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Models/MessageInfo.cs create mode 100644 CarRepairShop/CarRepairShopView/App.config diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageLogicInfo.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageLogicInfo.cs new file mode 100644 index 0000000..626ec49 --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageLogicInfo.cs @@ -0,0 +1,51 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Enums; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopBusinessLogic.BusinessLogics +{ + public class MessageLogicInfo : IMessageInfoLogic + { + private readonly ILogger _logger; + private readonly IMessageInfoStorage _storage; + + public MessageLogicInfo(ILogger logger, IMessageInfoStorage storage) + { + _logger = logger; + _storage = storage; + } + + public List? ReadList(MessageInfoSearchModel? model) + { + _logger.LogInformation("ReadList. Id:{Id}", model?.MessageId); + var list = model == null ? _storage.GetFullList() : _storage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public bool Create(MessageInfoBindingModel model) + { + if (_storage.Insert(model) == null) + { + _logger.LogInformation("Create operation failed"); + return false; + } + + return true; + } + } +} diff --git a/CarRepairShop/CarRepairShopContracts/BindingModels/MessageInfoBindingModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/MessageInfoBindingModel.cs new file mode 100644 index 0000000..c78da34 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/MessageInfoBindingModel.cs @@ -0,0 +1,24 @@ +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs new file mode 100644 index 0000000..eef46f7 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -0,0 +1,17 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.BusinessLogicsContracts +{ + public interface IMessageInfoLogic + { + List? ReadList(MessageInfoSearchModel? model); + bool Create(MessageInfoBindingModel model); + } +} diff --git a/CarRepairShop/CarRepairShopContracts/SearchModels/MessageInfoSearchModel.cs b/CarRepairShop/CarRepairShopContracts/SearchModels/MessageInfoSearchModel.cs new file mode 100644 index 0000000..3733a65 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/SearchModels/MessageInfoSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.SearchModels +{ + public class MessageInfoSearchModel + { + public string? MessageId { get; set; } + public int? ClientId { get; set; } + } +} diff --git a/CarRepairShop/CarRepairShopContracts/StoragesContracts/IMessageInfoStorage.cs b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IMessageInfoStorage.cs new file mode 100644 index 0000000..0b6774d --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IMessageInfoStorage.cs @@ -0,0 +1,20 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.StoragesContracts +{ + public interface IMessageInfoStorage + { + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + + } +} diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/MessageInfoViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/MessageInfoViewModel.cs new file mode 100644 index 0000000..6c4745a --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/MessageInfoViewModel.cs @@ -0,0 +1,29 @@ +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopDataModels/Models/IMessageInfoModel.cs b/CarRepairShop/CarRepairShopDataModels/Models/IMessageInfoModel.cs new file mode 100644 index 0000000..8d85ee6 --- /dev/null +++ b/CarRepairShop/CarRepairShopDataModels/Models/IMessageInfoModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopDataModels.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/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabase.cs b/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabase.cs index ab5d3e2..26d529d 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabase.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabase.cs @@ -28,5 +28,6 @@ namespace CarRepairShopDatabaseImplement public virtual DbSet Orders { get; set; } public virtual DbSet Clients { get; set; } public virtual DbSet Implementers { get; set; } + public virtual DbSet Messages { get; set; } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Implements/MessageInfoStorage.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..bed8a70 --- /dev/null +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,47 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDatabaseImplement.Models; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopDatabaseImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + public List GetFullList() + { + using var context = new CarRepairShopDatabase(); + return context.Messages.Include(x => x.Client).Select(x => x.GetViewModel).ToList(); + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + if (!model.ClientId.HasValue) return new(); + using var context = new CarRepairShopDatabase(); + return context.Messages.Include(x => x.Client).Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); + } + + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if(string.IsNullOrEmpty(model.MessageId)) return null; + using var context = new CarRepairShopDatabase(); + return context.Messages.Include(x => x.Client).FirstOrDefault(x => x.MessageId.Equals(model.MessageId))?.GetViewModel; + } + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + using var context = new CarRepairShopDatabase(); + 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); + context.SaveChanges(); + return message.GetViewModel; + } + } +} diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Models/MessageInfo.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..c5a83c4 --- /dev/null +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/MessageInfo.cs @@ -0,0 +1,55 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopDatabaseImplement.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; } + [Required] + public string Subject { get; set; } = string.Empty; + [Required] + public string Body { get; 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, + Subject = model.Subject, + DateDelivery = model.DateDelivery, + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + Body = Body, + Subject = Subject, + DateDelivery = DateDelivery, + }; + } +} diff --git a/CarRepairShop/CarRepairShopFileImplement/DataFileSingleton.cs b/CarRepairShop/CarRepairShopFileImplement/DataFileSingleton.cs index a93d5c3..992bbf9 100644 --- a/CarRepairShop/CarRepairShopFileImplement/DataFileSingleton.cs +++ b/CarRepairShop/CarRepairShopFileImplement/DataFileSingleton.cs @@ -16,11 +16,13 @@ namespace CarRepairShopFileImplement private readonly string RepairFileName = "Repair.xml"; private readonly string ClientFileName = "Client.xml"; private readonly string ImplementerFileName = "Implementer.xml"; + private readonly string MessagesFileName = "MessageInfo.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Repairs { get; private set; } public List Clients { get; private set; } public List Implementers { get; private set; } + public List Messages { get; private set; } public static DataFileSingleton GetInstance() { if(instance == null) @@ -34,6 +36,7 @@ namespace CarRepairShopFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); + public void SaveMessages() => SaveData(Messages, MessagesFileName, "Messages", x => x.GetXElement); private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; @@ -41,6 +44,7 @@ namespace CarRepairShopFileImplement 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(MessagesFileName, "MessageInfo", x => MessageInfo.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { diff --git a/CarRepairShop/CarRepairShopFileImplement/Implements/MessageInfoStorage.cs b/CarRepairShop/CarRepairShopFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..dda4033 --- /dev/null +++ b/CarRepairShop/CarRepairShopFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,47 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopFileImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataFileSingleton _source; + + public MessageInfoStorage() + { + _source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return _source.Messages.Select(x => x.GetViewModel).ToList(); + } + public List GetFilteredList(MessageInfoSearchModel model) + { + if (model == null) return new(); + return _source.Messages.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); + } + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if(model == null) return null; + return _source.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId))?.GetViewModel; + } + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + if (model == null) return null; + var newMessage = MessageInfo.Create(model); + if(newMessage == null) return null; + _source.Messages.Add(newMessage); + _source.SaveMessages(); + return newMessage.GetViewModel; + } + } +} diff --git a/CarRepairShop/CarRepairShopFileImplement/Models/MessageInfo.cs b/CarRepairShop/CarRepairShopFileImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..bd25770 --- /dev/null +++ b/CarRepairShop/CarRepairShopFileImplement/Models/MessageInfo.cs @@ -0,0 +1,74 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace CarRepairShopFileImplement.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.ToString()), + 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/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs b/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs index 6f61107..f55f44b 100644 --- a/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs +++ b/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs @@ -10,6 +10,7 @@ namespace CarRepairShopListImplement public List Orders { get; set; } public List Clients { get; set; } public List Implementers { get; set; } + public List Messages { get; set; } private DataListSingleton() { @@ -18,6 +19,7 @@ namespace CarRepairShopListImplement Orders = new List(); Clients = new List(); Implementers = new List(); + Messages = new List(); } public static DataListSingleton GetInstance() diff --git a/CarRepairShop/CarRepairShopListImplement/Implements/MessageInfoStorage.cs b/CarRepairShop/CarRepairShopListImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..2f8be11 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,67 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopListImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + + private readonly DataListSingleton _source; + + public MessageInfoStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var list = new List(); + foreach(var message in _source.Messages) + { + list.Add(message.GetViewModel); + } + return list; + } + public List GetFilteredList(MessageInfoSearchModel model) + { + var list = new List(); + if(!model.ClientId.HasValue) return list; + foreach(var message in _source.Messages) + { + if(model.ClientId == message.ClientId) + { + list.Add(message.GetViewModel); + } + } + return list; + } + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if(string.IsNullOrEmpty(model.MessageId)) return null; + + foreach(var message in _source.Messages) + { + if (model.MessageId.Equals(model.MessageId)) + { + return message.GetViewModel; + } + } + return null; + } + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if(newMessage == null) return null; + _source.Messages.Add(newMessage); + return newMessage.GetViewModel; + } + } +} diff --git a/CarRepairShop/CarRepairShopListImplement/Models/MessageInfo.cs b/CarRepairShop/CarRepairShopListImplement/Models/MessageInfo.cs new file mode 100644 index 0000000..8e0d346 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Models/MessageInfo.cs @@ -0,0 +1,50 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopListImplement.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 MessageInfoViewModel GetViewModel => new() + { + MessageId = MessageId, + ClientId = ClientId, + SenderName = SenderName, + DateDelivery = DateDelivery, + Subject = Subject, + Body = Body, + }; + } +} diff --git a/CarRepairShop/CarRepairShopRestApi/appsettings.json b/CarRepairShop/CarRepairShopRestApi/appsettings.json index 10f68b8..0578777 100644 --- a/CarRepairShop/CarRepairShopRestApi/appsettings.json +++ b/CarRepairShop/CarRepairShopRestApi/appsettings.json @@ -5,5 +5,13 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + + "SmtpClientHost": "smtp.gmail.com", + "SmtpClientPort": "587", + "PopHost": "pop.gmail.com", + "PopPort": "995", + "MailLogin": "labwork7@mail.com", + "MailPassword": "#eoxSyN1aJS1" + } diff --git a/CarRepairShop/CarRepairShopView/App.config b/CarRepairShop/CarRepairShopView/App.config new file mode 100644 index 0000000..e2d0651 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/App.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file -- 2.25.1 From 32b27fe590cd15669b613df9906aec2be0f30c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Sat, 4 May 2024 17:57:25 +0400 Subject: [PATCH 2/7] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D0=BE=D0=B2,=20=D1=80=D0=B5=D0=B0?= =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B0=D0=B1=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BA=D1=82=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BB?= =?UTF-8?q?=D0=B0=D1=81=D1=81=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=B8=D1=81=D0=B5=D0=BC=20=D0=B8=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20orderLogic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...essageLogicInfo.cs => MessageInfoLogic.cs} | 4 +- .../BusinessLogics/OrderLogic.cs | 50 ++++++++++- .../CarRepairShopBusinessLogic.csproj | 1 + .../MailWorker/AbstractMailWorker.cs | 87 +++++++++++++++++++ .../MailWorker/MailKitWorker.cs | 82 +++++++++++++++++ .../BindingModels/MailConfigBindingModel.cs | 18 ++++ .../BindingModels/MailSendInfoBindingModel.cs | 16 ++++ .../Implements/ClientStorage.cs | 2 +- .../Implements/ClientStorage.cs | 2 +- .../Implements/ClientStorage.cs | 2 +- CarRepairShop/CarRepairShopRestApi/Program.cs | 7 ++ .../CarRepairShopRestApi/appsettings.json | 4 +- CarRepairShop/CarRepairShopView/App.config | 4 +- .../CarRepairShopView.csproj | 6 ++ CarRepairShop/CarRepairShopView/Program.cs | 5 ++ 15 files changed, 278 insertions(+), 12 deletions(-) rename CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/{MessageLogicInfo.cs => MessageInfoLogic.cs} (92%) create mode 100644 CarRepairShop/CarRepairShopBusinessLogic/MailWorker/AbstractMailWorker.cs create mode 100644 CarRepairShop/CarRepairShopBusinessLogic/MailWorker/MailKitWorker.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BindingModels/MailConfigBindingModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BindingModels/MailSendInfoBindingModel.cs diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageLogicInfo.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs similarity index 92% rename from CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageLogicInfo.cs rename to CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs index 626ec49..0effa07 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageLogicInfo.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -13,12 +13,12 @@ using System.Threading.Tasks; namespace CarRepairShopBusinessLogic.BusinessLogics { - public class MessageLogicInfo : IMessageInfoLogic + public class MessageInfoLogic : IMessageInfoLogic { private readonly ILogger _logger; private readonly IMessageInfoStorage _storage; - public MessageLogicInfo(ILogger logger, IMessageInfoStorage storage) + public MessageInfoLogic(ILogger logger, IMessageInfoStorage storage) { _logger = logger; _storage = storage; diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs index ec5f850..7281221 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -1,4 +1,5 @@ -using CarRepairShopContracts.BindingModels; +using CarRepairShopBusinessLogic.MailWorker; +using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.BusinessLogicsContracts; using CarRepairShopContracts.SearchModels; using CarRepairShopContracts.StoragesContracts; @@ -10,6 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Xml.Linq; namespace CarRepairShopBusinessLogic.BusinessLogics { @@ -17,12 +19,16 @@ namespace CarRepairShopBusinessLogic.BusinessLogics { 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 List? ReadList(OrderSearchModel? model) @@ -58,12 +64,16 @@ namespace CarRepairShopBusinessLogic.BusinessLogics { CheckModel(model); model.Status = OrderStatus.Принят; - if (_orderStorage.Insert(model) == null) + var order = _orderStorage.Insert(model); + if (order == null) { _logger.LogInformation("Create operation failed"); return false; } + var clientView = _clientStorage.GetElement(new() { Id = order.ClientId }); + SendMail(clientView, order); + return true; } @@ -109,6 +119,10 @@ namespace CarRepairShopBusinessLogic.BusinessLogics _logger.LogWarning("Update operation failed"); return false; } + + var clientView = _clientStorage.GetElement(new() { Id = element.ClientId }); + SendMail(clientView, element); + return true; } @@ -132,5 +146,35 @@ namespace CarRepairShopBusinessLogic.BusinessLogics } _logger.LogInformation("Order. Id:{Id}. Sum:{Sum}. Count:{Count}", model.Id, model.Sum, model.Count); } + + private void SendMail(ClientViewModel clientModel, OrderViewModel orderModel) + { + if(clientModel == null || orderModel == null) + { + return; + } + + MailSendInfoBindingModel mailModel; + + if(orderModel.Status == OrderStatus.Принят) + { + mailModel = new MailSendInfoBindingModel + { + MailAddress = clientModel.Email, + Subject = $"Заказ №{orderModel.Id}", + Text = $"Ваш заказ №{orderModel.Id} на сумму {orderModel.Sum} был принят" + }; + } + else + { + mailModel = new MailSendInfoBindingModel + { + MailAddress = clientModel.Email, + Subject = $"Заказ №{orderModel.Id}", + Text = $"Статус заказа №{orderModel.Id} был изменен на {orderModel.Status}" + }; + } + _mailLogic.MailSendAsync(mailModel); + } } } diff --git a/CarRepairShop/CarRepairShopBusinessLogic/CarRepairShopBusinessLogic.csproj b/CarRepairShop/CarRepairShopBusinessLogic/CarRepairShopBusinessLogic.csproj index d097b76..ec82c12 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/CarRepairShopBusinessLogic.csproj +++ b/CarRepairShop/CarRepairShopBusinessLogic/CarRepairShopBusinessLogic.csproj @@ -8,6 +8,7 @@ + diff --git a/CarRepairShop/CarRepairShopBusinessLogic/MailWorker/AbstractMailWorker.cs b/CarRepairShop/CarRepairShopBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..abdd111 --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,87 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using SixLabors.ImageSharp.Advanced; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopBusinessLogic.MailWorker +{ + public abstract class AbstractMailWorker + { + protected string _mailLogin = string.Empty; + protected string _mailPassword = string.Empty; + protected string _smtpClientHost = string.Empty; + protected int _smtpClientPort; + protected string _popHost = string.Empty; + protected int _popPort; + private readonly IMessageInfoLogic _messageInfoLogic; + private readonly ILogger _logger; + public AbstractMailWorker(IMessageInfoLogic messageInfoLogic, ILogger logger) + { + _messageInfoLogic = messageInfoLogic; + _logger = logger; + } + + 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/CarRepairShop/CarRepairShopBusinessLogic/MailWorker/MailKitWorker.cs b/CarRepairShop/CarRepairShopBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..0d3b5a3 --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,82 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using MailKit.Net.Pop3; +using MailKit.Security; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Mail; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopBusinessLogic.MailWorker +{ + public class MailKitWorker : AbstractMailWorker + { + public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) : base(messageInfoLogic, logger) { } + + 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/CarRepairShop/CarRepairShopContracts/BindingModels/MailConfigBindingModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/MailConfigBindingModel.cs new file mode 100644 index 0000000..8a1ad4b --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/MailConfigBindingModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/BindingModels/MailSendInfoBindingModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/MailSendInfoBindingModel.cs new file mode 100644 index 0000000..f631001 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/MailSendInfoBindingModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ClientStorage.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ClientStorage.cs index 614e428..7f56f1f 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ClientStorage.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ClientStorage.cs @@ -36,7 +36,7 @@ namespace CarRepairShopDatabaseImplement.Implements return null; } using var context = new CarRepairShopDatabase(); - return context.Clients.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email)) && x.Email == model.Email || model.Id.HasValue && x.Id == model.Id)?.GetViewModel; + return context.Clients.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email)) && x.Email.Contains(model.Email) || model.Id.HasValue && x.Id == model.Id)?.GetViewModel; } public ClientViewModel? Insert(ClientBindingModel model) { diff --git a/CarRepairShop/CarRepairShopFileImplement/Implements/ClientStorage.cs b/CarRepairShop/CarRepairShopFileImplement/Implements/ClientStorage.cs index 134f7ac..e311822 100644 --- a/CarRepairShop/CarRepairShopFileImplement/Implements/ClientStorage.cs +++ b/CarRepairShop/CarRepairShopFileImplement/Implements/ClientStorage.cs @@ -35,7 +35,7 @@ namespace CarRepairShopFileImplement.Implements public ClientViewModel? GetElement(ClientSearchModel model) { if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue) return null; - return source.Clients.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + return source.Clients.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email) && x.Email.Contains(model.Email)) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; } public ClientViewModel? Insert(ClientBindingModel model) diff --git a/CarRepairShop/CarRepairShopListImplement/Implements/ClientStorage.cs b/CarRepairShop/CarRepairShopListImplement/Implements/ClientStorage.cs index abdc349..ceaa59a 100644 --- a/CarRepairShop/CarRepairShopListImplement/Implements/ClientStorage.cs +++ b/CarRepairShop/CarRepairShopListImplement/Implements/ClientStorage.cs @@ -45,7 +45,7 @@ namespace CarRepairShopListImplement.Implements if(string.IsNullOrEmpty(model.Email) && !model.Id.HasValue) return null; foreach (var client in _source.Clients) { - if((!string.IsNullOrEmpty(model.Email) && client.Email == model.Email) || (model.Id.HasValue && client.Id == model.Id)) + if((!string.IsNullOrEmpty(model.Email) && client.Email.Contains(model.Email)) || (model.Id.HasValue && client.Id == model.Id)) { return client.GetViewModel; } diff --git a/CarRepairShop/CarRepairShopRestApi/Program.cs b/CarRepairShop/CarRepairShopRestApi/Program.cs index ce3d820..1d1cd72 100644 --- a/CarRepairShop/CarRepairShopRestApi/Program.cs +++ b/CarRepairShop/CarRepairShopRestApi/Program.cs @@ -1,4 +1,5 @@ using CarRepairShopBusinessLogic.BusinessLogics; +using CarRepairShopBusinessLogic.MailWorker; using CarRepairShopContracts.BusinessLogicsContracts; using CarRepairShopContracts.StoragesContracts; using CarRepairShopDatabaseImplement.Implements; @@ -14,9 +15,15 @@ builder.Logging.AddLog4Net("log4net.config"); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); + builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); + +builder.Services.AddSingleton(); + builder.Services.AddControllers(); diff --git a/CarRepairShop/CarRepairShopRestApi/appsettings.json b/CarRepairShop/CarRepairShopRestApi/appsettings.json index 0578777..097d094 100644 --- a/CarRepairShop/CarRepairShopRestApi/appsettings.json +++ b/CarRepairShop/CarRepairShopRestApi/appsettings.json @@ -11,7 +11,7 @@ "SmtpClientPort": "587", "PopHost": "pop.gmail.com", "PopPort": "995", - "MailLogin": "labwork7@mail.com", - "MailPassword": "#eoxSyN1aJS1" + "MailLogin": "shotboll16@gmail.com", + "MailPassword": "iexy xqps iwrj ihle" } diff --git a/CarRepairShop/CarRepairShopView/App.config b/CarRepairShop/CarRepairShopView/App.config index e2d0651..87968ee 100644 --- a/CarRepairShop/CarRepairShopView/App.config +++ b/CarRepairShop/CarRepairShopView/App.config @@ -5,7 +5,7 @@ - - + + \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj b/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj index 456bc44..677fe26 100644 --- a/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj +++ b/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj @@ -42,4 +42,10 @@ + + + Always + + + \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/Program.cs b/CarRepairShop/CarRepairShopView/Program.cs index f8daeb9..df547fe 100644 --- a/CarRepairShop/CarRepairShopView/Program.cs +++ b/CarRepairShop/CarRepairShopView/Program.cs @@ -1,4 +1,5 @@ using CarRepairShopBusinessLogic.BusinessLogics; +using CarRepairShopBusinessLogic.MailWorker; using CarRepairShopBusinessLogic.OfficePackage; using CarRepairShopBusinessLogic.OfficePackage.Implements; using CarRepairShopContracts.BusinessLogicsContracts; @@ -44,6 +45,7 @@ namespace CarRepairShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -51,7 +53,10 @@ namespace CarRepairShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddSingleton(); services.AddTransient(); services.AddTransient(); -- 2.25.1 From 1f5558c190d0335700155b7899f5653708c7396e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Sun, 5 May 2024 14:24:40 +0400 Subject: [PATCH 3/7] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D1=82=D0=B8=20=D0=B2?= =?UTF-8?q?=D1=81=D0=B5=20=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB,=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=87=D1=82=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=B5=D1=82=20=D0=BA=D1=80=D0=B8=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ClientLogic.cs | 5 + .../BusinessLogics/MessageInfoLogic.cs | 2 +- .../Controllers/HomeController.cs | 13 +- .../Views/Home/Mails.cshtml | 52 ++++++++ .../Views/Home/_Layout.cshtml | 3 + .../Implements/ClientStorage.cs | 2 +- ... 20240505094524_InitMigration.Designer.cs} | 43 ++++++- ...ate.cs => 20240505094524_InitMigration.cs} | 31 ++++- .../CarRepairShopDatabaseModelSnapshot.cs | 39 ++++++ .../Controllers/ClientController.cs | 21 ++- CarRepairShop/CarRepairShopRestApi/Program.cs | 17 ++- .../CarRepairShopView/FormLetters.Designer.cs | 67 ++++++++++ .../CarRepairShopView/FormLetters.cs | 39 ++++++ .../CarRepairShopView/FormLetters.resx | 120 ++++++++++++++++++ .../CarRepairShopView/FormMain.Designer.cs | 23 +++- CarRepairShop/CarRepairShopView/FormMain.cs | 11 +- CarRepairShop/CarRepairShopView/Program.cs | 23 ++++ 17 files changed, 494 insertions(+), 17 deletions(-) create mode 100644 CarRepairShop/CarRepairShopClientApp/Views/Home/Mails.cshtml rename CarRepairShop/CarRepairShopDatabaseImplement/Migrations/{20240420181926_InitialCreate.Designer.cs => 20240505094524_InitMigration.Designer.cs} (85%) rename CarRepairShop/CarRepairShopDatabaseImplement/Migrations/{20240420181926_InitialCreate.cs => 20240505094524_InitMigration.cs} (84%) create mode 100644 CarRepairShop/CarRepairShopView/FormLetters.Designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormLetters.cs create mode 100644 CarRepairShop/CarRepairShopView/FormLetters.resx diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ClientLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ClientLogic.cs index 36f8ded..08db84d 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/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 CarRepairShopBusinessLogic.BusinessLogics @@ -97,6 +98,10 @@ namespace CarRepairShopBusinessLogic.BusinessLogics { throw new ArgumentNullException("Нет ФИО клиента", nameof(model.ClientFIO)); } + if (string.IsNullOrEmpty(model.Email) || !Regex.IsMatch(model.Email, @"^([\w\.\-]+)@([\w\-]+)((\.(\w){2,3})+)$", RegexOptions.IgnoreCase)) + { + throw new ArgumentNullException("Нет почты клиента", nameof(model.Email)); + } if (string.IsNullOrEmpty(model.Password)) { throw new ArgumentNullException("Нет пароля клиента", nameof(model.ClientFIO)); diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs index 0effa07..41914a3 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -18,7 +18,7 @@ namespace CarRepairShopBusinessLogic.BusinessLogics private readonly ILogger _logger; private readonly IMessageInfoStorage _storage; - public MessageInfoLogic(ILogger logger, IMessageInfoStorage storage) + public MessageInfoLogic(ILogger logger, IMessageInfoStorage storage) { _logger = logger; _storage = storage; diff --git a/CarRepairShop/CarRepairShopClientApp/Controllers/HomeController.cs b/CarRepairShop/CarRepairShopClientApp/Controllers/HomeController.cs index 0a67018..d08bad9 100644 --- a/CarRepairShop/CarRepairShopClientApp/Controllers/HomeController.cs +++ b/CarRepairShop/CarRepairShopClientApp/Controllers/HomeController.cs @@ -3,6 +3,7 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.ViewModels; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Formatters; +using Microsoft.Extensions.Logging; using System.Diagnostics; namespace CarRepairShopClientApp.Controllers @@ -125,5 +126,15 @@ namespace CarRepairShopClientApp.Controllers var rep = APIClient.GetRequest($"api/main/getrepair?repairId={repair}"); return count * (rep?.Price ?? 1); } - } + + [HttpGet] + public IActionResult Mails() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + return View(APIClient.GetRequest>($"api/client/getmessages?clientId = {APIClient.Client.Id}")); + } + } } diff --git a/CarRepairShop/CarRepairShopClientApp/Views/Home/Mails.cshtml b/CarRepairShop/CarRepairShopClientApp/Views/Home/Mails.cshtml new file mode 100644 index 0000000..0464add --- /dev/null +++ b/CarRepairShop/CarRepairShopClientApp/Views/Home/Mails.cshtml @@ -0,0 +1,52 @@ +@using CarRepairShopContracts.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/CarRepairShop/CarRepairShopClientApp/Views/Home/_Layout.cshtml b/CarRepairShop/CarRepairShopClientApp/Views/Home/_Layout.cshtml index 3af6d2a..f307b48 100644 --- a/CarRepairShop/CarRepairShopClientApp/Views/Home/_Layout.cshtml +++ b/CarRepairShop/CarRepairShopClientApp/Views/Home/_Layout.cshtml @@ -31,6 +31,9 @@
  • Личные данные
    • +
  • + Письма +
  • Вход
    • diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ClientStorage.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ClientStorage.cs index 7f56f1f..d189ad5 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ClientStorage.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ClientStorage.cs @@ -31,7 +31,7 @@ namespace CarRepairShopDatabaseImplement.Implements } public ClientViewModel? GetElement(ClientSearchModel model) { - if (string.IsNullOrEmpty(model.Email)) + if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue) { return null; } diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240420181926_InitialCreate.Designer.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240505094524_InitMigration.Designer.cs similarity index 85% rename from CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240420181926_InitialCreate.Designer.cs rename to CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240505094524_InitMigration.Designer.cs index 8b690cd..a4c99f7 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240420181926_InitialCreate.Designer.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240505094524_InitMigration.Designer.cs @@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace CarRepairShopDatabaseImplement.Migrations { [DbContext(typeof(CarRepairShopDatabase))] - [Migration("20240420181926_InitialCreate")] - partial class InitialCreate + [Migration("20240505094524_InitMigration")] + partial class InitMigration { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -97,6 +97,36 @@ namespace CarRepairShopDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.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("CarRepairShopDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -186,6 +216,15 @@ namespace CarRepairShopDatabaseImplement.Migrations b.ToTable("RepairComponents"); }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("CarRepairShopDatabaseImplement.Models.Client", "Client") + .WithMany() + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Order", b => { b.HasOne("CarRepairShopDatabaseImplement.Models.Client", "Client") diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240420181926_InitialCreate.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240505094524_InitMigration.cs similarity index 84% rename from CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240420181926_InitialCreate.cs rename to CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240505094524_InitMigration.cs index bd036cb..f244d2a 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240420181926_InitialCreate.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240505094524_InitMigration.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace CarRepairShopDatabaseImplement.Migrations { /// - public partial class InitialCreate : Migration + public partial class InitMigration : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -70,6 +70,27 @@ namespace CarRepairShopDatabaseImplement.Migrations table.PrimaryKey("PK_Repairs", x => x.Id); }); + migrationBuilder.CreateTable( + name: "Messages", + columns: table => new + { + MessageId = table.Column(type: "nvarchar(450)", nullable: false), + ClientId = table.Column(type: "int", nullable: true), + SenderName = table.Column(type: "nvarchar(max)", nullable: false), + DateDelivery = table.Column(type: "datetime2", nullable: false), + Subject = table.Column(type: "nvarchar(max)", nullable: false), + Body = table.Column(type: "nvarchar(max)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Messages", x => x.MessageId); + table.ForeignKey( + name: "FK_Messages_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id"); + }); + migrationBuilder.CreateTable( name: "Orders", columns: table => new @@ -134,6 +155,11 @@ namespace CarRepairShopDatabaseImplement.Migrations onDelete: ReferentialAction.Cascade); }); + migrationBuilder.CreateIndex( + name: "IX_Messages_ClientId", + table: "Messages", + column: "ClientId"); + migrationBuilder.CreateIndex( name: "IX_Orders_ClientId", table: "Orders", @@ -163,6 +189,9 @@ namespace CarRepairShopDatabaseImplement.Migrations /// protected override void Down(MigrationBuilder migrationBuilder) { + migrationBuilder.DropTable( + name: "Messages"); + migrationBuilder.DropTable( name: "Orders"); diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs index 7f581b0..8347d81 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs @@ -94,6 +94,36 @@ namespace CarRepairShopDatabaseImplement.Migrations b.ToTable("Implementers"); }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.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("CarRepairShopDatabaseImplement.Models.Order", b => { b.Property("Id") @@ -183,6 +213,15 @@ namespace CarRepairShopDatabaseImplement.Migrations b.ToTable("RepairComponents"); }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("CarRepairShopDatabaseImplement.Models.Client", "Client") + .WithMany() + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Order", b => { b.HasOne("CarRepairShopDatabaseImplement.Models.Client", "Client") diff --git a/CarRepairShop/CarRepairShopRestApi/Controllers/ClientController.cs b/CarRepairShop/CarRepairShopRestApi/Controllers/ClientController.cs index f9f2030..3cf4679 100644 --- a/CarRepairShop/CarRepairShopRestApi/Controllers/ClientController.cs +++ b/CarRepairShop/CarRepairShopRestApi/Controllers/ClientController.cs @@ -13,11 +13,13 @@ namespace CarRepairShopRestApi.Controllers { private readonly ILogger _logger; private readonly IClientLogic _logic; + private readonly IMessageInfoLogic _mailLogic; - public ClientController(IClientLogic logic, ILogger logger) + public ClientController(IClientLogic logic, ILogger logger, IMessageInfoLogic mailLogic) { _logic = logic; _logger = logger; + _mailLogic = mailLogic; } [HttpGet] @@ -65,5 +67,22 @@ namespace CarRepairShopRestApi.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/CarRepairShop/CarRepairShopRestApi/Program.cs b/CarRepairShop/CarRepairShopRestApi/Program.cs index 1d1cd72..8b0627e 100644 --- a/CarRepairShop/CarRepairShopRestApi/Program.cs +++ b/CarRepairShop/CarRepairShopRestApi/Program.cs @@ -1,5 +1,6 @@ using CarRepairShopBusinessLogic.BusinessLogics; using CarRepairShopBusinessLogic.MailWorker; +using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.BusinessLogicsContracts; using CarRepairShopContracts.StoragesContracts; using CarRepairShopDatabaseImplement.Implements; @@ -16,16 +17,16 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddSingleton(); - - builder.Services.AddControllers(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddEndpointsApiExplorer(); @@ -40,6 +41,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/CarRepairShop/CarRepairShopView/FormLetters.Designer.cs b/CarRepairShop/CarRepairShopView/FormLetters.Designer.cs new file mode 100644 index 0000000..d73b464 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormLetters.Designer.cs @@ -0,0 +1,67 @@ +namespace CarRepairShopView +{ + partial class FormLetters + { + /// + /// 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.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView.BackgroundColor = Color.White; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Fill; + dataGridView.Location = new Point(0, 0); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.RowTemplate.Height = 25; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(800, 450); + dataGridView.TabIndex = 2; + // + // FormLetters + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(dataGridView); + Name = "FormLetters"; + Text = "Письма"; + Load += FormLetters_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormLetters.cs b/CarRepairShop/CarRepairShopView/FormLetters.cs new file mode 100644 index 0000000..76929e9 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormLetters.cs @@ -0,0 +1,39 @@ +using CarRepairShopContracts.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 CarRepairShopView +{ + public partial class FormLetters : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + + public FormLetters(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormLetters_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка писем"); + var list = _logic.ReadList(null); + if(list != null ) + { + dataGridView.DataSource = list; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["ClientId"].Visible = false; + } + } + } +} diff --git a/CarRepairShop/CarRepairShopView/FormLetters.resx b/CarRepairShop/CarRepairShopView/FormLetters.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormLetters.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/CarRepairShop/CarRepairShopView/FormMain.Designer.cs b/CarRepairShop/CarRepairShopView/FormMain.Designer.cs index bf7a664..5c0b4bb 100644 --- a/CarRepairShop/CarRepairShopView/FormMain.Designer.cs +++ b/CarRepairShop/CarRepairShopView/FormMain.Designer.cs @@ -38,18 +38,19 @@ OrdersToolStripMenuItem = new ToolStripMenuItem(); ClientsToolStripMenuItem = new ToolStripMenuItem(); workStartToolStripMenuItem = new ToolStripMenuItem(); + implementersToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonIssuedOrder = new Button(); buttonRef = new Button(); - implementersToolStripMenuItem = new ToolStripMenuItem(); + почтаToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // // menuStrip1 // - menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, ClientsToolStripMenuItem, workStartToolStripMenuItem, implementersToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, ClientsToolStripMenuItem, workStartToolStripMenuItem, implementersToolStripMenuItem, почтаToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new Size(1059, 24); @@ -119,6 +120,13 @@ workStartToolStripMenuItem.Text = "Запуск работ"; workStartToolStripMenuItem.Click += workStartToolStripMenuItem_Click; // + // implementersToolStripMenuItem + // + implementersToolStripMenuItem.Name = "implementersToolStripMenuItem"; + implementersToolStripMenuItem.Size = new Size(94, 20); + implementersToolStripMenuItem.Text = "Исполнители"; + implementersToolStripMenuItem.Click += implementersToolStripMenuItem_Click; + // // dataGridView // dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; @@ -167,12 +175,12 @@ buttonRef.UseVisualStyleBackColor = true; buttonRef.Click += buttonRef_Click; // - // implementersToolStripMenuItem + // почтаToolStripMenuItem // - implementersToolStripMenuItem.Name = "implementersToolStripMenuItem"; - implementersToolStripMenuItem.Size = new Size(94, 20); - implementersToolStripMenuItem.Text = "Исполнители"; - implementersToolStripMenuItem.Click += implementersToolStripMenuItem_Click; + почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; + почтаToolStripMenuItem.Size = new Size(53, 20); + почтаToolStripMenuItem.Text = "Почта"; + почтаToolStripMenuItem.Click += почтаToolStripMenuItem_Click; // // FormMain // @@ -212,5 +220,6 @@ private ToolStripMenuItem ClientsToolStripMenuItem; private ToolStripMenuItem workStartToolStripMenuItem; private ToolStripMenuItem implementersToolStripMenuItem; + private ToolStripMenuItem почтаToolStripMenuItem; } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormMain.cs b/CarRepairShop/CarRepairShopView/FormMain.cs index 1ba6fda..541b841 100644 --- a/CarRepairShop/CarRepairShopView/FormMain.cs +++ b/CarRepairShop/CarRepairShopView/FormMain.cs @@ -208,7 +208,16 @@ namespace CarRepairShopView private void implementersToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); - if(service is FormImplementers form) + if (service is FormImplementers form) + { + form.ShowDialog(); + } + } + + private void почтаToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormLetters)); + if (service is FormLetters form) { form.ShowDialog(); } diff --git a/CarRepairShop/CarRepairShopView/Program.cs b/CarRepairShop/CarRepairShopView/Program.cs index df547fe..0dc5a85 100644 --- a/CarRepairShop/CarRepairShopView/Program.cs +++ b/CarRepairShop/CarRepairShopView/Program.cs @@ -2,6 +2,7 @@ using CarRepairShopBusinessLogic.BusinessLogics; using CarRepairShopBusinessLogic.MailWorker; using CarRepairShopBusinessLogic.OfficePackage; using CarRepairShopBusinessLogic.OfficePackage.Implements; +using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.BusinessLogicsContracts; using CarRepairShopContracts.StoragesContracts; using CarRepairShopDatabaseImplement.Implements; @@ -29,6 +30,26 @@ namespace CarRepairShopView 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()); } @@ -74,6 +95,8 @@ namespace CarRepairShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } + private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); } } \ No newline at end of file -- 2.25.1 From dd020b8935e049acd423e04b2ef91f382a44946b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Sun, 5 May 2024 20:26:18 +0400 Subject: [PATCH 4/7] =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=BD=D0=B0=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D0=B5=D1=86=20=D1=82=D0=BE=20=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ClientLogic.cs | 2 +- .../BusinessLogics/OrderLogic.cs | 2 ++ .../CarRepairShopClientApp/Controllers/HomeController.cs | 2 +- CarRepairShop/CarRepairShopRestApi/appsettings.json | 8 ++++---- CarRepairShop/CarRepairShopView/App.config | 8 ++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ClientLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ClientLogic.cs index 08db84d..5f5bdfe 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ClientLogic.cs @@ -102,7 +102,7 @@ namespace CarRepairShopBusinessLogic.BusinessLogics { throw new ArgumentNullException("Нет почты клиента", nameof(model.Email)); } - if (string.IsNullOrEmpty(model.Password)) + if (string.IsNullOrEmpty(model.Password) || !Regex.IsMatch(model.Password, @"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$", RegexOptions.IgnoreCase)) { throw new ArgumentNullException("Нет пароля клиента", nameof(model.ClientFIO)); } diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs index 7281221..bf43a49 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -120,6 +120,8 @@ namespace CarRepairShopBusinessLogic.BusinessLogics return false; } + element.Status = newStatus; + var clientView = _clientStorage.GetElement(new() { Id = element.ClientId }); SendMail(clientView, element); diff --git a/CarRepairShop/CarRepairShopClientApp/Controllers/HomeController.cs b/CarRepairShop/CarRepairShopClientApp/Controllers/HomeController.cs index d08bad9..6614c2e 100644 --- a/CarRepairShop/CarRepairShopClientApp/Controllers/HomeController.cs +++ b/CarRepairShop/CarRepairShopClientApp/Controllers/HomeController.cs @@ -134,7 +134,7 @@ namespace CarRepairShopClientApp.Controllers { return Redirect("~/Home/Enter"); } - return View(APIClient.GetRequest>($"api/client/getmessages?clientId = {APIClient.Client.Id}")); + return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); } } } diff --git a/CarRepairShop/CarRepairShopRestApi/appsettings.json b/CarRepairShop/CarRepairShopRestApi/appsettings.json index 097d094..7ae6190 100644 --- a/CarRepairShop/CarRepairShopRestApi/appsettings.json +++ b/CarRepairShop/CarRepairShopRestApi/appsettings.json @@ -7,11 +7,11 @@ }, "AllowedHosts": "*", - "SmtpClientHost": "smtp.gmail.com", + "SmtpClientHost": "smtp.mail.ru", "SmtpClientPort": "587", - "PopHost": "pop.gmail.com", + "PopHost": "pop.mail.ru", "PopPort": "995", - "MailLogin": "shotboll16@gmail.com", - "MailPassword": "iexy xqps iwrj ihle" + "MailLogin": "labwork7@mail.ru", + "MailPassword": "i135ssgqi7jEzphpyVH9" } diff --git a/CarRepairShop/CarRepairShopView/App.config b/CarRepairShop/CarRepairShopView/App.config index 87968ee..9585971 100644 --- a/CarRepairShop/CarRepairShopView/App.config +++ b/CarRepairShop/CarRepairShopView/App.config @@ -1,11 +1,11 @@  - + - + - - + + \ No newline at end of file -- 2.25.1 From 0fc71da489c7cfbefbb27266022085b00a42b917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Sun, 5 May 2024 20:30:25 +0400 Subject: [PATCH 5/7] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs index 83b8b14..444d42d 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs @@ -113,7 +113,6 @@ namespace CarRepairShopBusinessLogic.BusinessLogics _logger.LogDebug("DoWork. Исполнитель {Id} вернулся к заказу {Order}", implementer.Id, runOrder.Id); Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count); - ; _logger.LogDebug("DoWork. Исполнитель {Id} закончил заказ {Order}", implementer.Id, runOrder.Id); _orderLogic.FinishOrder(new OrderBindingModel { -- 2.25.1 From 3a9732fc221a39d3610a55c850ec2730b67a2ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Sun, 5 May 2024 20:57:17 +0400 Subject: [PATCH 6/7] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/MessageInfoStorage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Implements/MessageInfoStorage.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/MessageInfoStorage.cs index bed8a70..39091ac 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Implements/MessageInfoStorage.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/MessageInfoStorage.cs @@ -38,7 +38,7 @@ namespace CarRepairShopDatabaseImplement.Implements using var context = new CarRepairShopDatabase(); model.ClientId = context.Clients.FirstOrDefault(x => x.Email.Equals(model.SenderName))?.Id; var message = MessageInfo.Create(model); - if(message == null) return null; + if(message == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId))) return null; context.Messages.Add(message); context.SaveChanges(); return message.GetViewModel; -- 2.25.1 From b7500158cf673574960ac64e9a4b37946d4c814f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Sat, 18 May 2024 15:09:54 +0400 Subject: [PATCH 7/7] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=B7=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=84=D0=BB?= =?UTF-8?q?=D0=B8=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs index 444d42d..83b8b14 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/WorkModeling.cs @@ -113,6 +113,7 @@ namespace CarRepairShopBusinessLogic.BusinessLogics _logger.LogDebug("DoWork. Исполнитель {Id} вернулся к заказу {Order}", implementer.Id, runOrder.Id); Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count); + ; _logger.LogDebug("DoWork. Исполнитель {Id} закончил заказ {Order}", implementer.Id, runOrder.Id); _orderLogic.FinishOrder(new OrderBindingModel { -- 2.25.1