Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

apiurls fix + emailmessage, formula1 fixes

This commit is contained in:
Adam 2024-06-02 15:44:06 +02:00
parent b917b3d09f
commit 126e907520
6 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TIAM.Services.Server/MessageSenderService.cs
View File

@ -59,7 +59,7 @@ namespace TIAM.Services.Server
if (message.SenderId == Guid.Empty) if (message.SenderId == Guid.Empty)
{ {
message.EmailAddress = "noreply@anataworld.com";
from = new EmailAddress("noreply@anataworld.com", "TourIAm mailservice"); from = new EmailAddress("noreply@anataworld.com", "TourIAm mailservice");
} }
else else
@ -91,8 +91,8 @@ namespace TIAM.Services.Server
{ {
Console.WriteLine($"{response.StatusCode}, {response.Body.ReadAsStringAsync()}"); Console.WriteLine($"{response.StatusCode}, {response.Body.ReadAsStringAsync()}");
} }
//message.Id = Guid.NewGuid();
adminDal.AddEmailMessageAsync(message).Forget(); //adminDal.AddEmailMessageAsync(message).Forget();
} }
catch(Exception ex) catch(Exception ex)
{ {

6
TIAMSharedUI/Pages/Components/InputWizard.razor.cs
View File

@ -116,7 +116,7 @@ namespace TIAMSharedUI.Pages.Components
_logger.Info("Hellooooo " + type.AssemblyQualifiedName); _logger.Info("Hellooooo " + type.AssemblyQualifiedName);
var propertyList = type.GetProperties(); var propertyList = type.GetProperties();
var length = propertyList.Length - IgnoreReflection.Count; //var length = propertyList.Length - IgnoreReflection.Count;
//var propertyList = typeof(TestUserData).GetProperties(); //var propertyList = typeof(TestUserData).GetProperties();
formLayoutBuilder.OpenComponent<DxFormLayout>(0); formLayoutBuilder.OpenComponent<DxFormLayout>(0);
@ -484,7 +484,7 @@ namespace TIAMSharedUI.Pages.Components
layoutItemBuilder.AddAttribute(i++, "Click", EventCallback.Factory.Create<MouseEventArgs>(this, OnNext)); layoutItemBuilder.AddAttribute(i++, "Click", EventCallback.Factory.Create<MouseEventArgs>(this, OnNext));
layoutItemBuilder.AddAttribute(i++, "SubmitFormOnClick", false); layoutItemBuilder.AddAttribute(i++, "SubmitFormOnClick", false);
layoutItemBuilder.AddAttribute(i++, "CssClass", "btn btn-primary mt-3"); layoutItemBuilder.AddAttribute(i++, "CssClass", "btn btn-primary mt-3");
if (!(k < length - 1)) if (!(k < FormSteps.Count - 1))
{ {
layoutItemBuilder.AddAttribute(i++, "disabled", "true"); layoutItemBuilder.AddAttribute(i++, "disabled", "true");
@ -520,7 +520,7 @@ namespace TIAMSharedUI.Pages.Components
editor.AddAttribute(i++, "type", "submit"); editor.AddAttribute(i++, "type", "submit");
editor.AddAttribute(i++, "class", "btn btn-primary mt-3 w-100"); editor.AddAttribute(i++, "class", "btn btn-primary mt-3 w-100");
editor.AddAttribute(i++, "style", "margin: 0 auto"); editor.AddAttribute(i++, "style", "margin: 0 auto");
if (CurrentStep < length - 1) if (CurrentStep < FormSteps.Count - 1)
{ {
editor.AddAttribute(i++, "disabled", "true"); editor.AddAttribute(i++, "disabled", "true");

41
TIAMSharedUI/Pages/Formula1.razor
View File

@ -417,7 +417,7 @@ new HeroSliderItem
public List<string> TransferIgnorList = new List<string> public List<string> TransferIgnorList = new List<string>
{ {
"Id", "Id",
"UserId", "UserId",
"Destination", "Destination",
"PickupAddress", "PickupAddress",
@ -442,9 +442,9 @@ new HeroSliderItem
public async Task SubmitForm(object result) public async Task SubmitForm(object result)
{ {
var orderModel = result as TransferWizardModel; var orderModel = result as TransferWizardModel;
//check if user exists //check if user exists
if (sessionService.IsAuthenticated && sessionService.User != null ) if (sessionService.IsAuthenticated && sessionService.User != null)
{ {
//Basic settings //Basic settings
orderModel.UserId = sessionService.User.UserModelDto.Id; orderModel.UserId = sessionService.User.UserModelDto.Id;
@ -461,7 +461,7 @@ new HeroSliderItem
if (user != null) if (user != null)
{ {
orderModel.UserId = user.Id; orderModel.UserId = user.Id;
orderModel.ProductId = user.Products.FirstOrDefault()?.Id; orderModel.ProductId = user.Products.FirstOrDefault()?.Id;
} }
else else
@ -515,6 +515,35 @@ new HeroSliderItem
public async Task<List<Transfer>> ProcessTransfers(TransferWizardModel orderModel) public async Task<List<Transfer>> ProcessTransfers(TransferWizardModel orderModel)
{ {
List<TransferWizardModel> transferList = new List<TransferWizardModel>(); List<TransferWizardModel> transferList = new List<TransferWizardModel>();
double _transferPrice = 0.0f;
if(orderModel.NumberOfPassengers < 5) {
switch (transferList.Count)
{
case (1):
_transferPrice = 119/2;
break;
case (2):
_transferPrice = 199 / 4;
break;
case (3):
_transferPrice = 269 / 6;
break;
}
}else if (orderModel.NumberOfPassengers > 5 && orderModel.NumberOfPassengers < 8) {
switch (transferList.Count)
{
case (1):
_transferPrice = 219f /2;
break;
case (2):
_transferPrice = 359 / 4;
break;
case (3):
_transferPrice = 489 / 6;
break;
}
}
foreach (var date in OrderDates) foreach (var date in OrderDates)
{ {
@ -525,6 +554,9 @@ new HeroSliderItem
// Outbound trip // Outbound trip
transfer.PickupAddress = OrderLocation; transfer.PickupAddress = OrderLocation;
transfer.Destination = "Hungaroring"; transfer.Destination = "Hungaroring";
transfer.PhoneNumber = orderModel.PhoneNumber;
transfer.EmailAddress = orderModel.EmailAddress;
transfer.Price = _transferPrice;
transferList.Add(transfer); transferList.Add(transfer);
// Return trip // Return trip
@ -534,6 +566,7 @@ new HeroSliderItem
transfer.Destination = OrderLocation; transfer.Destination = OrderLocation;
transfer.PhoneNumber = orderModel.PhoneNumber; transfer.PhoneNumber = orderModel.PhoneNumber;
transfer.EmailAddress = orderModel.EmailAddress; transfer.EmailAddress = orderModel.EmailAddress;
transfer.Price = _transferPrice;
transferList.Add(transfer); transferList.Add(transfer);
} }

6
TIAMWebApp/Server/Controllers/MessageAPIController.cs
View File

@ -71,8 +71,10 @@ namespace TIAMWebApp.Server.Controllers
var messageElement = message.Message; var messageElement = message.Message;
Console.WriteLine(message.Message); Console.WriteLine(message.Message);
var result = await _messageSenderService.SendMessageAsync(messageElement, (int)message.MessageType); var result = await _messageSenderService.SendMessageAsync(messageElement, (int)message.MessageType);
//_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message); //_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message);
Console.WriteLine("SendEmail result: " + result); messageElement.EmailAddress = "noreply@anataworld.com";
_adminDal.AddEmailMessageAsync(messageElement).Forget();
Console.WriteLine("SendEmail result: " + result);
return Ok(result); return Ok(result);
} }

8
TIAMWebApp/Server/Controllers/TransferDataAPIController.cs
View File

@ -299,23 +299,23 @@ namespace TIAMWebApp.Server.Controllers
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
[Route(APIUrls.CreateTransfersRouteName)] [Route(APIUrls.CreateTransfersRouteName)]
public async Task<IActionResult> CreateTransfers([FromBody] JsonElement serializedTransferModel) public async Task<IActionResult> CreateTransfers([FromBody] JsonElement serializedTransferList)
{ {
_logger.Info(@"CreateTransfers called!"); _logger.Info(@"CreateTransfers called!");
if (string.IsNullOrEmpty(serializedTransferModel.GetRawText())) if (string.IsNullOrEmpty(serializedTransferList.GetRawText()))
{ {
return BadRequest("SerializedTramsferDestinationWizardModel is required"); return BadRequest("SerializedTramsferDestinationWizardModel is required");
} }
else else
{ {
_logger.Info($@"Serialized model: {serializedTransferModel.GetRawText()}"); _logger.Info($@"Serialized model: {serializedTransferList.GetRawText()}");
var settings = new JsonSerializerSettings var settings = new JsonSerializerSettings
{ {
ContractResolver = new CamelCasePropertyNamesContractResolver() ContractResolver = new CamelCasePropertyNamesContractResolver()
}; };
List<Transfer>? transfers = JsonConvert.DeserializeObject<List<Transfer>>(serializedTransferModel.GetRawText(), settings); List<Transfer>? transfers = JsonConvert.DeserializeObject<List<Transfer>>(serializedTransferList.GetRawText(), settings);
//List<Transfer>? transfers = JObject.Parse(serializedTransferModel.GetRawText()).ToObject<List<Transfer>>(); //List<Transfer>? transfers = JObject.Parse(serializedTransferModel.GetRawText()).ToObject<List<Transfer>>();
List<Transfer> createdTransfers = new List<Transfer>(); List<Transfer> createdTransfers = new List<Transfer>();

6
TIAMWebApp/Shared/Models/APIUrls.cs
View File

@ -146,13 +146,13 @@ namespace TIAMWebApp.Shared.Application.Models
public const string GetCarsForUserProductMappingRouteName = "GetCarsForUserProductMapping"; public const string GetCarsForUserProductMappingRouteName = "GetCarsForUserProductMapping";
public const string GetCarsForUserProductMapping = ServiceProviderAPI + GetCarsForUserProductMappingRouteName; public const string GetCarsForUserProductMapping = ServiceProviderAPI + GetCarsForUserProductMappingRouteName;
public const string CreateCarRouteName = "GetCarsForUserProductMapping"; public const string CreateCarRouteName = "CreateCar";
public const string CreateCar = ServiceProviderAPI + CreateCarRouteName; public const string CreateCar = ServiceProviderAPI + CreateCarRouteName;
public const string UpdateCarRouteName = "GetCarsForUserProductMapping"; public const string UpdateCarRouteName = "UpdateCar";
public const string UpdateCar = ServiceProviderAPI + UpdateCarRouteName; public const string UpdateCar = ServiceProviderAPI + UpdateCarRouteName;
public const string DeleteCarRouteName = "GetCarsForUserProductMapping"; public const string DeleteCarRouteName = "DeleteCar";
public const string DeleteCar = ServiceProviderAPI + DeleteCarRouteName; public const string DeleteCar = ServiceProviderAPI + DeleteCarRouteName;
//AssingedUsers //AssingedUsers