diff --git a/TIAM.Services.Server/MessageSenderService.cs b/TIAM.Services.Server/MessageSenderService.cs index 84d496d5..921438fd 100644 --- a/TIAM.Services.Server/MessageSenderService.cs +++ b/TIAM.Services.Server/MessageSenderService.cs @@ -60,19 +60,20 @@ namespace TIAM.Services.Server if (message.SenderId == Guid.Empty) { - from = new EmailAddress("noreply@touriam.com", "TourIAm mailservice"); + + from = new EmailAddress("noreply@anataworld.com", "TourIAm mailservice"); } else { from = new EmailAddress(message.EmailAddress, senderUser.Profile.Name); } - - List> sendTasks = new List>(); foreach (var messageRecipient in message.Recipients) { var to = new EmailAddress(messageRecipient.EmailAddress, messageRecipient.EmailAddress); + + Console.WriteLine($"Message recipient: {messageRecipient.EmailAddress}"); var plainTextContent = message.Text; var msg = MailHelper.CreateSingleEmail(from, to, message.Subject, plainTextContent, plainTextContent); @@ -81,6 +82,11 @@ namespace TIAM.Services.Server var responses = await Task.WhenAll(sendTasks).ConfigureAwait(false); + foreach (var response in responses) + { + Console.WriteLine($"{response.StatusCode}, {response.Body.ReadAsStringAsync()}"); + } + if (responses.Any(response => !response.IsSuccessStatusCode)) { Console.WriteLine("Some emails failed to send"); diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index bee85219..5aad6c90 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -236,7 +236,8 @@ Guid nonNullableGuid = nullableGuid.Value; messageWizardModel.ContextId = nonNullableGuid; } - messageWizardModel.SenderFullName = Item.FullName; + messageWizardModel.ReceiverEmailAddress = Item.ContactEmail; + messageWizardModel.ReceiverFullName = Item.FullName; PopupVisible = true; } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor index a7b9ab20..2ac3bbe4 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor @@ -12,6 +12,7 @@ @using AyCode.Services.Loggers @layout AdminLayout @inject IEnumerable LogWriters + @inject IStringLocalizer localizer Transfers diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs index 58bf4c64..111e3f2d 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs @@ -34,18 +34,7 @@ namespace TIAMSharedUI.Pages.User.SysAdmins public ITransferDataService transferDataService { get; set; } - /*object? TransferData = new TransferDestinationWizardModel[] - { - new TransferDestinationWizardModel(Guid.NewGuid(), "Liszt Ferenc Airport", "International airport of Budapest", "1185, Budapest, Liszt Ferenc Repülőtér" ), - new TransferDestinationWizardModel(Guid.NewGuid(), "Buda Castle", "Historical site in the heart of Budapest", "1014 Budapest, Szent György tér 2" ), - new TransferDestinationWizardModel(Guid.NewGuid(), "Hungarian National Museum", "Historical site in the heart of Budapest", "1088 Budapest, Múzeum krt. 14-16" ), - new TransferDestinationWizardModel(Guid.NewGuid(), "Parliament of Hungary", "Historical site in the heart of Budapest", "1055 Budapest, Kossuth Lajos tér 1-3" ), - new TransferDestinationWizardModel(Guid.NewGuid(), "Heroes square", "Historical site in the heart of Budapest", "1146 Budapest, Hősök tere" ), - new TransferDestinationWizardModel(Guid.NewGuid(), "Gellert Hill", "Historical site in the heart of Budapest", "1118 Budapest, Gellérthegy" ), - new TransferDestinationWizardModel(Guid.NewGuid(), "Margaret Island", "Historical site in the heart of Budapest", "1138 Budapest, Margitsziget" ), - };*/ - - private ILogger _logger; + private LoggerClient _logger; object? TransferDataFromDb = new TransferDestinationWizardModel[] { }; @@ -186,7 +175,7 @@ namespace TIAMSharedUI.Pages.User.SysAdmins TransferDataFromDb = ((TransferDestinationWizardModel[])TransferDataFromDb).Append( new TransferDestinationWizardModel(item.Id, item.Name, item.Description, item.AddressString, item.Price, item.Price2, item.Price3, item.Address)).ToArray(); - _logger.Detail($"TransferDataFromDb: {item.Name}"); + _logger.DetailConditional($"TransferDataFromDb: {item.Name}"); } _logger.Info($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}"); diff --git a/TIAMWebApp/Server/Controllers/FileAPIController.cs b/TIAMWebApp/Server/Controllers/FileAPIController.cs index 6213dc5f..c95094cc 100644 --- a/TIAMWebApp/Server/Controllers/FileAPIController.cs +++ b/TIAMWebApp/Server/Controllers/FileAPIController.cs @@ -22,11 +22,11 @@ namespace TIAMWebApp.Server.Controllers private readonly IWebHostEnvironment _webHostEnvironment; - private readonly ILogger _logger; + private readonly TIAM.Core.Loggers.ILogger _logger; - public FileAPIController(ILogger logger, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, AdminDal adminDal) + public FileAPIController(IEnumerable logWriters, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, AdminDal adminDal) { - _logger = logger; + _logger = new TIAM.Core.Loggers.Logger(logWriters.ToArray()); _configuration = configuration; _webHostEnvironment = webHostEnvironment; _adminDal = adminDal; @@ -41,7 +41,8 @@ namespace TIAMWebApp.Server.Controllers [AllowAnonymous] [HttpPost] [Route(APIUrls.UploadImageRouteName)] - public ActionResult UploadImage([FromForm] IFormFile file) + //public ActionResult UploadImage([FromForm] IFormFile file) + public ActionResult UploadImage(IFormFile file) { GlobalLogger.Info($@"Upload file called: {file.FileName}"); if (file == null || file.Length == 0) diff --git a/TIAMWebApp/Server/Controllers/PaymentAPIController.cs b/TIAMWebApp/Server/Controllers/PaymentAPIController.cs index 751b420c..5ce26a07 100644 --- a/TIAMWebApp/Server/Controllers/PaymentAPIController.cs +++ b/TIAMWebApp/Server/Controllers/PaymentAPIController.cs @@ -44,7 +44,7 @@ namespace TIAMWebApp.Server.Controllers [Route(APIUrls.CreatePaymentRouteName)] public async Task CreatePayment(Transfer? paymentItem) { - + throw new NotImplementedException(); } } diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs index 1e30513a..b1e9bd9e 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs @@ -15,6 +15,7 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels { public string ReceiverEmailAddress { get; set; } + public string ReceiverFullName { get; set; } public Guid ReceiverId { get; set; } public string SenderEmailAddress { get; set; } public string SenderFullName { get; set; } @@ -30,9 +31,11 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels public string Content { get; set; } public MessageWizardModel() { } - public MessageWizardModel(string receiverEmailAddress, Guid receiverId, string senderEmailAddress, Guid senderId, string subject, string content) + public MessageWizardModel(string receiverEmailAddress, string receiverFullName, Guid contextId, Guid receiverId, string senderEmailAddress, Guid senderId, string subject, string content) { ReceiverEmailAddress = receiverEmailAddress; + ReceiverFullName = receiverFullName; + ContextId = contextId; ReceiverId = receiverId; SenderEmailAddress = senderEmailAddress; SenderId = senderId;