From 5dc83b43bb181c28b29876e016d010b2711925bd Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 3 Jun 2024 12:56:17 +0200 Subject: [PATCH] Transfer fixes --- TIAMSharedUI/Pages/Formula1.razor | 10 ++++++---- TIAMWebApp/Client/Services/UserDataServiceWeb.cs | 10 +++++----- TIAMWebApp/Server/Controllers/PaymentAPIController.cs | 11 ++++++++--- .../Controllers/ServiceProviderAPIController.cs | 6 ++++-- .../Server/Controllers/TransferDataAPIController.cs | 8 +++++--- TIAMWebApp/Server/Controllers/UserAPIController.cs | 8 +++----- 6 files changed, 31 insertions(+), 22 deletions(-) diff --git a/TIAMSharedUI/Pages/Formula1.razor b/TIAMSharedUI/Pages/Formula1.razor index d612027f..84676515 100644 --- a/TIAMSharedUI/Pages/Formula1.razor +++ b/TIAMSharedUI/Pages/Formula1.razor @@ -462,7 +462,8 @@ new HeroSliderItem { orderModel.UserId = user.Id; - orderModel.ProductId = user.Products.FirstOrDefault()?.Id; + if (user.Products != null) + orderModel.ProductId = user.Products.FirstOrDefault()?.Id; } else { @@ -517,7 +518,7 @@ new HeroSliderItem List transferList = new List(); double _transferPrice = 0.0f; if(orderModel.NumberOfPassengers < 5) { - switch (transferList.Count) + switch (OrderDates.Length) { case (1): _transferPrice = 119/2; @@ -529,8 +530,9 @@ new HeroSliderItem _transferPrice = 269 / 6; break; } - }else if (orderModel.NumberOfPassengers > 5 && orderModel.NumberOfPassengers < 8) { - switch (transferList.Count) + } + else if (orderModel.NumberOfPassengers > 5 && orderModel.NumberOfPassengers <= 8) { + switch (OrderDates.Length) { case (1): _transferPrice = 219f /2; diff --git a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs index 77b58f88..0e6b10c0 100644 --- a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs +++ b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs @@ -193,16 +193,16 @@ namespace TIAMWebApp.Client.Services public async Task GetUserByEmailAsync(string email) { - var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}/{email}"; _logger.Info("GetUserByEmailAsync url: " + url + ", " + email); //GlobalLogger.Info("GetUserByEmailAsync url: " + url + ", " + email, "GLOBAL_LOGGER"); - var response = await http.PostAsJsonAsync(url, email); - var result = await response.Content.ReadAsStringAsync(); - var user = JsonConvert.DeserializeObject(result); - return user; + var response = (UserModelDto)(await http.GetFromJsonAsync(url,typeof (UserModelDto))); + + //var user = JsonConvert.DeserializeObject(result); + return response; } public async Task GetUserByIdAsync(Guid id) diff --git a/TIAMWebApp/Server/Controllers/PaymentAPIController.cs b/TIAMWebApp/Server/Controllers/PaymentAPIController.cs index bc03bcfe..ab153d89 100644 --- a/TIAMWebApp/Server/Controllers/PaymentAPIController.cs +++ b/TIAMWebApp/Server/Controllers/PaymentAPIController.cs @@ -51,13 +51,18 @@ namespace TIAMWebApp.Server.Controllers [Route(APIUrls.CreatePaymentRouteName)] public async Task CreatePayment([FromBody] JsonElement paymentItem) { + _logger.Detail($"CreatePayment called! {paymentItem.ToString()}"); var transferToPay = JObject.Parse(paymentItem.GetRawText()).ToObject(); + if (transferToPay == null) + { + return("error"); + } if (transferToPay.Price == null) { transferToPay.Price = 1000; } - else return "false"; + var paymentRequest = new SumupPaymentRequest { CheckoutReference = transferToPay.OrderId.ToString(), @@ -69,8 +74,8 @@ namespace TIAMWebApp.Server.Controllers }; var result = await _sumupService.CreateCheckout(paymentRequest); _logger.Detail($"CreatePayment result: {result}"); - var checkoutUrl = result.Id.ToString(); - return checkoutUrl; + var checkoutId = result.Id.ToString(); + return checkoutId; } [AllowAnonymous] diff --git a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs index edc5a013..7a7b4750 100644 --- a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs +++ b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs @@ -83,7 +83,9 @@ namespace TIAMWebApp.Server.Controllers } } } - + [AllowAnonymous] + [HttpPost] + [Route("AddCompany")] [SignalR(SignalRTags.AddCompany)] public async Task AddCompanyAsync(Company company) { @@ -106,7 +108,7 @@ namespace TIAMWebApp.Server.Controllers } //16. - [AllowAnonymous] + [AllowAnonymous] [HttpGet] [Route(APIUrls.GetServiceProvidersRouteName)] [SignalR(SignalRTags.GetCompanies)] diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index 2ed97d0c..01687352 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -249,6 +249,7 @@ namespace TIAMWebApp.Server.Controllers _logger.Info($"Created transfer, send emailMessage!!!"); var message = new MessageSenderModel(); + message.Message.Id = Guid.NewGuid(); message.Message.Subject = "[Tour I Am] New transfer in Budapest"; message.Message.ContextId = transfer.Id; message.Message.SenderId = Guid.Empty; @@ -277,7 +278,7 @@ namespace TIAMWebApp.Server.Controllers //message.Message.Text = $"Dear {transfer.FullName}! /n We have received an order from you, please confirm the details here: https://www.touriam.com/mytransfer?{transfer.Id}"; var messageElement = message.Message; var result = await _messageSenderService.SendMessageAsync(messageElement, (int)message.MessageType); - //_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message); + await _adminDal.AddEmailMessageAsync(messageElement); _logger.Info("SendEmail result: " + result); @@ -336,6 +337,7 @@ namespace TIAMWebApp.Server.Controllers _logger.Info($"Created transfer, send emailMessage!!!"); var message = new MessageSenderModel(); message.Message = new EmailMessage(); + message.Message.Id = Guid.NewGuid(); message.MessageType = AyCode.Models.Enums.MessageTypesEnum.email; message.Message.Subject = "[Tour I Am] New transfer in Budapest"; message.Message.ContextId = createdTransfer.Id; @@ -365,7 +367,7 @@ 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); + await _adminDal.AddEmailMessageAsync(messageElement); _logger.Info("SendEmail result: " + result); } @@ -410,7 +412,7 @@ namespace TIAMWebApp.Server.Controllers [SignalR(SignalRTags.UpdateTransfer)] public async Task UpdateTransfer(Transfer transferToModify) { - _logger.Info($"UpdateTransfer called! + {Request?.ReadFormAsync()}"); + _logger.Info($"UpdateTransfer called! + {transferToModify.Id}"); await _adminDal.UpdateTransferAsync(transferToModify); return transferToModify; diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index 1e7cb9ac..08fcf84e 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -358,13 +358,11 @@ namespace TIAMWebApp.Server.Controllers } [AllowAnonymous] - [HttpPost] - [Route("GetUserByEmail")] + [HttpGet] + [Route(APIUrls.GetUserByEmailRouteName + "/{email}")] public Task GetUserByEmail(string email) { - _logger.Info($"GetUserByEmail called with email: {email}"); - _logger.Info($@"GetUserByEmail called with email: {email}"); - + _logger.Info($"GetUserByEmail called with email: {email}"); return _userDal.GetUserModelDtoByEmailAsync(email, false); }