From 126e90752043736b1624eb0441d26f2668d4cdde Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 2 Jun 2024 15:44:06 +0200 Subject: [PATCH] apiurls fix + emailmessage, formula1 fixes --- TIAM.Services.Server/MessageSenderService.cs | 6 +-- .../Pages/Components/InputWizard.razor.cs | 6 +-- TIAMSharedUI/Pages/Formula1.razor | 41 +++++++++++++++++-- .../Controllers/MessageAPIController.cs | 6 ++- .../Controllers/TransferDataAPIController.cs | 8 ++-- TIAMWebApp/Shared/Models/APIUrls.cs | 6 +-- 6 files changed, 54 insertions(+), 19 deletions(-) diff --git a/TIAM.Services.Server/MessageSenderService.cs b/TIAM.Services.Server/MessageSenderService.cs index b67541d7..08e197ff 100644 --- a/TIAM.Services.Server/MessageSenderService.cs +++ b/TIAM.Services.Server/MessageSenderService.cs @@ -59,7 +59,7 @@ namespace TIAM.Services.Server if (message.SenderId == Guid.Empty) { - + message.EmailAddress = "noreply@anataworld.com"; from = new EmailAddress("noreply@anataworld.com", "TourIAm mailservice"); } else @@ -91,8 +91,8 @@ namespace TIAM.Services.Server { Console.WriteLine($"{response.StatusCode}, {response.Body.ReadAsStringAsync()}"); } - - adminDal.AddEmailMessageAsync(message).Forget(); + //message.Id = Guid.NewGuid(); + //adminDal.AddEmailMessageAsync(message).Forget(); } catch(Exception ex) { diff --git a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs index 0d55b5a7..b263bb03 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs @@ -116,7 +116,7 @@ namespace TIAMSharedUI.Pages.Components _logger.Info("Hellooooo " + type.AssemblyQualifiedName); var propertyList = type.GetProperties(); - var length = propertyList.Length - IgnoreReflection.Count; + //var length = propertyList.Length - IgnoreReflection.Count; //var propertyList = typeof(TestUserData).GetProperties(); formLayoutBuilder.OpenComponent(0); @@ -484,7 +484,7 @@ namespace TIAMSharedUI.Pages.Components layoutItemBuilder.AddAttribute(i++, "Click", EventCallback.Factory.Create(this, OnNext)); layoutItemBuilder.AddAttribute(i++, "SubmitFormOnClick", false); layoutItemBuilder.AddAttribute(i++, "CssClass", "btn btn-primary mt-3"); - if (!(k < length - 1)) + if (!(k < FormSteps.Count - 1)) { layoutItemBuilder.AddAttribute(i++, "disabled", "true"); @@ -520,7 +520,7 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(i++, "type", "submit"); editor.AddAttribute(i++, "class", "btn btn-primary mt-3 w-100"); editor.AddAttribute(i++, "style", "margin: 0 auto"); - if (CurrentStep < length - 1) + if (CurrentStep < FormSteps.Count - 1) { editor.AddAttribute(i++, "disabled", "true"); diff --git a/TIAMSharedUI/Pages/Formula1.razor b/TIAMSharedUI/Pages/Formula1.razor index 797b77fe..d612027f 100644 --- a/TIAMSharedUI/Pages/Formula1.razor +++ b/TIAMSharedUI/Pages/Formula1.razor @@ -417,7 +417,7 @@ new HeroSliderItem public List TransferIgnorList = new List { - "Id", + "Id", "UserId", "Destination", "PickupAddress", @@ -442,9 +442,9 @@ new HeroSliderItem public async Task SubmitForm(object result) { var orderModel = result as TransferWizardModel; - + //check if user exists - if (sessionService.IsAuthenticated && sessionService.User != null ) + if (sessionService.IsAuthenticated && sessionService.User != null) { //Basic settings orderModel.UserId = sessionService.User.UserModelDto.Id; @@ -461,7 +461,7 @@ new HeroSliderItem if (user != null) { orderModel.UserId = user.Id; - + orderModel.ProductId = user.Products.FirstOrDefault()?.Id; } else @@ -515,6 +515,35 @@ new HeroSliderItem public async Task> ProcessTransfers(TransferWizardModel orderModel) { List transferList = new List(); + 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) { @@ -525,6 +554,9 @@ new HeroSliderItem // Outbound trip transfer.PickupAddress = OrderLocation; transfer.Destination = "Hungaroring"; + transfer.PhoneNumber = orderModel.PhoneNumber; + transfer.EmailAddress = orderModel.EmailAddress; + transfer.Price = _transferPrice; transferList.Add(transfer); // Return trip @@ -534,6 +566,7 @@ new HeroSliderItem transfer.Destination = OrderLocation; transfer.PhoneNumber = orderModel.PhoneNumber; transfer.EmailAddress = orderModel.EmailAddress; + transfer.Price = _transferPrice; transferList.Add(transfer); } diff --git a/TIAMWebApp/Server/Controllers/MessageAPIController.cs b/TIAMWebApp/Server/Controllers/MessageAPIController.cs index 906a537c..3eebef98 100644 --- a/TIAMWebApp/Server/Controllers/MessageAPIController.cs +++ b/TIAMWebApp/Server/Controllers/MessageAPIController.cs @@ -71,8 +71,10 @@ namespace TIAMWebApp.Server.Controllers var messageElement = message.Message; Console.WriteLine(message.Message); var result = await _messageSenderService.SendMessageAsync(messageElement, (int)message.MessageType); - //_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message); - Console.WriteLine("SendEmail result: " + result); + //_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message); + messageElement.EmailAddress = "noreply@anataworld.com"; + _adminDal.AddEmailMessageAsync(messageElement).Forget(); + Console.WriteLine("SendEmail result: " + result); return Ok(result); } diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index 3e228f28..2ed97d0c 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -299,23 +299,23 @@ namespace TIAMWebApp.Server.Controllers [AllowAnonymous] [HttpPost] [Route(APIUrls.CreateTransfersRouteName)] - public async Task CreateTransfers([FromBody] JsonElement serializedTransferModel) + public async Task CreateTransfers([FromBody] JsonElement serializedTransferList) { _logger.Info(@"CreateTransfers called!"); - if (string.IsNullOrEmpty(serializedTransferModel.GetRawText())) + if (string.IsNullOrEmpty(serializedTransferList.GetRawText())) { return BadRequest("SerializedTramsferDestinationWizardModel is required"); } else { - _logger.Info($@"Serialized model: {serializedTransferModel.GetRawText()}"); + _logger.Info($@"Serialized model: {serializedTransferList.GetRawText()}"); var settings = new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() }; - List? transfers = JsonConvert.DeserializeObject>(serializedTransferModel.GetRawText(), settings); + List? transfers = JsonConvert.DeserializeObject>(serializedTransferList.GetRawText(), settings); //List? transfers = JObject.Parse(serializedTransferModel.GetRawText()).ToObject>(); List createdTransfers = new List(); diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index 96a3b2b0..0700ced5 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -146,13 +146,13 @@ namespace TIAMWebApp.Shared.Application.Models public const string GetCarsForUserProductMappingRouteName = "GetCarsForUserProductMapping"; 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 UpdateCarRouteName = "GetCarsForUserProductMapping"; + public const string UpdateCarRouteName = "UpdateCar"; public const string UpdateCar = ServiceProviderAPI + UpdateCarRouteName; - public const string DeleteCarRouteName = "GetCarsForUserProductMapping"; + public const string DeleteCarRouteName = "DeleteCar"; public const string DeleteCar = ServiceProviderAPI + DeleteCarRouteName; //AssingedUsers