fix, message
This commit is contained in:
parent
4ecf486095
commit
f317a06edf
|
|
@ -60,19 +60,20 @@ namespace TIAM.Services.Server
|
||||||
|
|
||||||
if (message.SenderId == Guid.Empty)
|
if (message.SenderId == Guid.Empty)
|
||||||
{
|
{
|
||||||
from = new EmailAddress("noreply@touriam.com", "TourIAm mailservice");
|
|
||||||
|
from = new EmailAddress("noreply@anataworld.com", "TourIAm mailservice");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
from = new EmailAddress(message.EmailAddress, senderUser.Profile.Name);
|
from = new EmailAddress(message.EmailAddress, senderUser.Profile.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
List<Task<Response>> sendTasks = new List<Task<Response>>();
|
List<Task<Response>> sendTasks = new List<Task<Response>>();
|
||||||
foreach (var messageRecipient in message.Recipients)
|
foreach (var messageRecipient in message.Recipients)
|
||||||
{
|
{
|
||||||
var to = new EmailAddress(messageRecipient.EmailAddress, messageRecipient.EmailAddress);
|
var to = new EmailAddress(messageRecipient.EmailAddress, messageRecipient.EmailAddress);
|
||||||
|
|
||||||
|
Console.WriteLine($"Message recipient: {messageRecipient.EmailAddress}");
|
||||||
var plainTextContent = message.Text;
|
var plainTextContent = message.Text;
|
||||||
|
|
||||||
var msg = MailHelper.CreateSingleEmail(from, to, message.Subject, plainTextContent, plainTextContent);
|
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);
|
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))
|
if (responses.Any(response => !response.IsSuccessStatusCode))
|
||||||
{
|
{
|
||||||
Console.WriteLine("Some emails failed to send");
|
Console.WriteLine("Some emails failed to send");
|
||||||
|
|
|
||||||
|
|
@ -236,7 +236,8 @@
|
||||||
Guid nonNullableGuid = nullableGuid.Value;
|
Guid nonNullableGuid = nullableGuid.Value;
|
||||||
messageWizardModel.ContextId = nonNullableGuid;
|
messageWizardModel.ContextId = nonNullableGuid;
|
||||||
}
|
}
|
||||||
messageWizardModel.SenderFullName = Item.FullName;
|
messageWizardModel.ReceiverEmailAddress = Item.ContactEmail;
|
||||||
|
messageWizardModel.ReceiverFullName = Item.FullName;
|
||||||
PopupVisible = true;
|
PopupVisible = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
@using AyCode.Services.Loggers
|
@using AyCode.Services.Loggers
|
||||||
@layout AdminLayout
|
@layout AdminLayout
|
||||||
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
|
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
|
||||||
|
|
||||||
@inject IStringLocalizer<TIAMResources> localizer
|
@inject IStringLocalizer<TIAMResources> localizer
|
||||||
<PageTitle>Transfers</PageTitle>
|
<PageTitle>Transfers</PageTitle>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,18 +34,7 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
|
||||||
public ITransferDataService transferDataService { get; set; }
|
public ITransferDataService transferDataService { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/*object? TransferData = new TransferDestinationWizardModel[]
|
private LoggerClient<TransferDestinations> _logger;
|
||||||
{
|
|
||||||
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;
|
|
||||||
|
|
||||||
object? TransferDataFromDb = new TransferDestinationWizardModel[] { };
|
object? TransferDataFromDb = new TransferDestinationWizardModel[] { };
|
||||||
|
|
||||||
|
|
@ -186,7 +175,7 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
|
||||||
TransferDataFromDb = ((TransferDestinationWizardModel[])TransferDataFromDb).Append(
|
TransferDataFromDb = ((TransferDestinationWizardModel[])TransferDataFromDb).Append(
|
||||||
new TransferDestinationWizardModel(item.Id, item.Name, item.Description, item.AddressString, item.Price, item.Price2, item.Price3, item.Address)).ToArray();
|
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}");
|
_logger.Info($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}");
|
||||||
|
|
|
||||||
|
|
@ -22,11 +22,11 @@ namespace TIAMWebApp.Server.Controllers
|
||||||
private readonly IWebHostEnvironment _webHostEnvironment;
|
private readonly IWebHostEnvironment _webHostEnvironment;
|
||||||
|
|
||||||
|
|
||||||
private readonly ILogger<FileAPIController> _logger;
|
private readonly TIAM.Core.Loggers.ILogger _logger;
|
||||||
|
|
||||||
public FileAPIController(ILogger<FileAPIController> logger, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, AdminDal adminDal)
|
public FileAPIController(IEnumerable<IAcLogWriterBase> logWriters, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, AdminDal adminDal)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = new TIAM.Core.Loggers.Logger<UserAPIController>(logWriters.ToArray());
|
||||||
_configuration = configuration;
|
_configuration = configuration;
|
||||||
_webHostEnvironment = webHostEnvironment;
|
_webHostEnvironment = webHostEnvironment;
|
||||||
_adminDal = adminDal;
|
_adminDal = adminDal;
|
||||||
|
|
@ -41,7 +41,8 @@ namespace TIAMWebApp.Server.Controllers
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
[Route(APIUrls.UploadImageRouteName)]
|
[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}");
|
GlobalLogger.Info($@"Upload file called: {file.FileName}");
|
||||||
if (file == null || file.Length == 0)
|
if (file == null || file.Length == 0)
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ namespace TIAMWebApp.Server.Controllers
|
||||||
[Route(APIUrls.CreatePaymentRouteName)]
|
[Route(APIUrls.CreatePaymentRouteName)]
|
||||||
public async Task CreatePayment(Transfer? paymentItem)
|
public async Task CreatePayment(Transfer? paymentItem)
|
||||||
{
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
|
||||||
{
|
{
|
||||||
|
|
||||||
public string ReceiverEmailAddress { get; set; }
|
public string ReceiverEmailAddress { get; set; }
|
||||||
|
public string ReceiverFullName { get; set; }
|
||||||
public Guid ReceiverId { get; set; }
|
public Guid ReceiverId { get; set; }
|
||||||
public string SenderEmailAddress { get; set; }
|
public string SenderEmailAddress { get; set; }
|
||||||
public string SenderFullName { 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 string Content { get; set; }
|
||||||
|
|
||||||
public MessageWizardModel() { }
|
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;
|
ReceiverEmailAddress = receiverEmailAddress;
|
||||||
|
ReceiverFullName = receiverFullName;
|
||||||
|
ContextId = contextId;
|
||||||
ReceiverId = receiverId;
|
ReceiverId = receiverId;
|
||||||
SenderEmailAddress = senderEmailAddress;
|
SenderEmailAddress = senderEmailAddress;
|
||||||
SenderId = senderId;
|
SenderId = senderId;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue