Transfer fixes

TIAMSharedUI/Pages/Formula1.razor

@@ -462,6 +462,7 @@ new HeroSliderItem
             {
                 orderModel.UserId = user.Id;
 
+                if (user.Products != null) 
                     orderModel.ProductId = user.Products.FirstOrDefault()?.Id;
             }
             else
@@ -517,7 +518,7 @@ new HeroSliderItem
         List<TransferWizardModel> transferList = new List<TransferWizardModel>();
         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;

TIAMWebApp/Client/Services/UserDataServiceWeb.cs

@@ -193,16 +193,16 @@ namespace TIAMWebApp.Client.Services
 
         public async Task<UserModelDto?> 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 response = (UserModelDto)(await http.GetFromJsonAsync(url,typeof (UserModelDto)));
-            var result = await response.Content.ReadAsStringAsync();
+            
-            var user = JsonConvert.DeserializeObject<UserModelDto>(result);
+            //var user = JsonConvert.DeserializeObject<UserModelDto>(result);
-            return user;
+            return response;
         }
 
         public async Task<UserModelDto?> GetUserByIdAsync(Guid id)

TIAMWebApp/Server/Controllers/PaymentAPIController.cs

@@ -51,13 +51,18 @@ namespace TIAMWebApp.Server.Controllers
         [Route(APIUrls.CreatePaymentRouteName)]
         public async Task<string> CreatePayment([FromBody] JsonElement paymentItem)
         {
+           
             _logger.Detail($"CreatePayment called! {paymentItem.ToString()}");
             var transferToPay = JObject.Parse(paymentItem.GetRawText()).ToObject<Transfer>();
+            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();
+            var checkoutId = result.Id.ToString();
-            return checkoutUrl;
+            return checkoutId;
         }
 
         [AllowAnonymous]

TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs

@@ -83,7 +83,9 @@ namespace TIAMWebApp.Server.Controllers
                 }
             }
         }
-
+        [AllowAnonymous]
+        [HttpPost]
+        [Route("AddCompany")]
         [SignalR(SignalRTags.AddCompany)]
         public async Task<string> AddCompanyAsync(Company company)
         {

TIAMWebApp/Server/Controllers/TransferDataAPIController.cs

@@ -249,6 +249,7 @@ namespace TIAMWebApp.Server.Controllers
 
                         _logger.Info($"Created transfer, send emailMessage!!!");
                         var message = new MessageSenderModel<EmailMessage>();
+                        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<EmailMessage>();
                         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<Transfer> UpdateTransfer(Transfer transferToModify)
         {
-            _logger.Info($"UpdateTransfer called! + {Request?.ReadFormAsync()}");
+            _logger.Info($"UpdateTransfer called! + {transferToModify.Id}");
             await _adminDal.UpdateTransferAsync(transferToModify);
 
             return transferToModify;

TIAMWebApp/Server/Controllers/UserAPIController.cs

@@ -358,13 +358,11 @@ namespace TIAMWebApp.Server.Controllers
         }
 
         [AllowAnonymous]
-        [HttpPost]
+        [HttpGet]
-        [Route("GetUserByEmail")]
+        [Route(APIUrls.GetUserByEmailRouteName + "/{email}")]
         public Task<UserModelDto?> GetUserByEmail(string email)
         {
             _logger.Info($"GetUserByEmail called with email: {email}");            
-            _logger.Info($@"GetUserByEmail called with email: {email}");
-
             return _userDal.GetUserModelDtoByEmailAsync<UserModelDto>(email, false);
         }