merge

TIAMSharedUI/Pages/Formula1.razor

@@ -388,7 +388,6 @@ new HeroSliderItem
     "UserProductToCarId",
     "ReferralId",
     "Price",
-    "Driver",
     "Comment"
     };
 
@@ -400,12 +399,13 @@ new HeroSliderItem
     public async Task SubmitForm(object result)
     {
         var orderModel = result as TransferWizardModel;
+     
         //check if user exists
-        if (sessionService.IsAuthenticated)
+        if (sessionService.IsAuthenticated && sessionService.User != null )
         {
             //Basic settings
             orderModel.UserId = sessionService.User.UserModelDto.Id;
-            orderModel.ProductId = sessionService.User.UserModelDto.Products.FirstOrDefault().Id;
+            orderModel.ProductId = sessionService.User.UserModelDto.Products.FirstOrDefault()?.Id;
         }
         else
         {
@@ -435,7 +435,7 @@ new HeroSliderItem
                         PhoneNumber = orderModel.PhoneNumber,
                         Email = orderModel.EmailAddress,
                         Password = password,
-                        ReferralId = Guid.Empty
+                        ReferralId = null
                     };
 
                 var bleh = await UserDataService.CreateGuestUser(regModel);
@@ -471,7 +471,7 @@ new HeroSliderItem
 
     public async Task<List<Transfer>> ProcessTransfers(TransferWizardModel orderModel)
     {
-        List<TransferWizardModel> TransferList = new List<TransferWizardModel>();
+        List<TransferWizardModel> transferList = new List<TransferWizardModel>();
         foreach (var date in OrderDates)
         {
 
@@ -482,17 +482,19 @@ new HeroSliderItem
             // Outbound trip
             transfer.PickupAddress = OrderLocation;
             transfer.Destination = "Hungaroring";
-            TransferList.Add(transfer);
+            transferList.Add(transfer);
 
             // Return trip
             transfer = orderModel.Clone();
             transfer.TripDate = new DateTime(2024, 07, date);
             transfer.PickupAddress = "Hungaroring";
             transfer.Destination = OrderLocation;
-            TransferList.Add(transfer);
+            transfer.PhoneNumber = orderModel.PhoneNumber;
+            transfer.EmailAddress = orderModel.EmailAddress;
+            transferList.Add(transfer);
         }
 
-        var transferResult = await transferDataService.CreateTransfers(TransferList);
+        var transferResult = await transferDataService.CreateTransfers(transferList);
         logToBrowserConsole.LogToBC($"Submitted nested form: {transferResult.GetType().FullName}, {transferResult.Count}");
         return transferResult;
     }

TIAMWebApp/Server/Controllers/TransferDataAPIController.cs

@@ -1,3 +1,4 @@
+using AyCode.Utils.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -245,7 +246,11 @@ namespace TIAMWebApp.Server.Controllers
 
                         var from = await _adminDal.Context.TransferDestinations.FirstOrDefaultAsync(x => x.AddressString == transfer.FromAddress);
                         var to = await _adminDal.Context.TransferDestinations.FirstOrDefaultAsync(x => x.AddressString == transfer.ToAddress);
-                        transfer.Price = _transferBackendService.GetTransferPrice(transfer.ProductId, from, to, transfer.PassengerCount);
+                        
+                        //TODO 
+                        if(!transfer.ProductId.IsNullOrEmpty())
+                            transfer.Price = _transferBackendService.GetTransferPrice(transfer.ProductId.Value, from, to, transfer.PassengerCount);
+                        
                         transfer.TransferStatusType = TransferStatusType.OrderSubmitted;
                         
                         await _adminDal.AddTransferAsync(transfer);

TIAMWebApp/Server/Controllers/UserAPIController.cs

@@ -352,12 +352,18 @@ namespace TIAMWebApp.Server.Controllers
                         Console.WriteLine($"User to be created: {phoneNumber}");
                         Console.WriteLine($"User to be created: {password}");
                         User userToCreate = new(userId, email, phoneNumber, password);
+                        userToCreate.ProfileId = Guid.NewGuid();
+
                         userToCreate.Profile = new Profile();
+                        userToCreate.Profile.Id = userToCreate.ProfileId;
                         userToCreate.Profile.Name = "Guest - " + nameExtension;                       
                         userToCreate.RefferalId = referralId;
+                        userToCreate.Profile.AddressId = Guid.NewGuid();
+
                         Random rnd = new Random();
                         userToCreate.Profile.Address = new Address();
-                        userToCreate.Profile.Address.AddressText = "NAN";
+                        userToCreate.Profile.Address.Id = userToCreate.Profile.AddressId;
+                        userToCreate.Profile.Address.AddressText = null;
                         userToCreate.Profile.Address.Latitude = Math.Round(90 + rnd.NextDouble(), 8);
                         userToCreate.Profile.Address.Longitude = Math.Round(180 + rnd.NextDouble(), 8);
                         result = await _adminDal.AddUser(userToCreate);
@@ -369,22 +375,6 @@ namespace TIAMWebApp.Server.Controllers
             }
         }       
 
-        [HttpPost]
-        [Route("Test1")]
-        public async Task<IActionResult> TestEndpoint([FromBody] int testParam)
-        {
-            return Ok(testParam.ToString());
-
-        }
-
-        [HttpGet]
-        [Route("Test2")]
-        public string TestEndpoint2(int testParam)
-        {
-            return testParam.ToString();
-
-        }
-
         [AllowAnonymous]
         [HttpGet]
         [Route("GetUsers")]

TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs

@@ -68,9 +68,9 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
         [Display(Name = ResourceKeys.Price, ResourceType = typeof(TIAMResources))]
         public double? Price { get; set;}
 
-        [DataType("Driver")]
+        //[DataType("Driver")]
-        [Display(Name = ResourceKeys.Driver, ResourceType = typeof(TIAMResources))]
+        //[Display(Name = ResourceKeys.Driver, ResourceType = typeof(TIAMResources))]
-        public DriverModel Driver { get; set; }
+        //public DriverModel Driver { get; set; }
 
         #endregion wizard fields
 
@@ -111,7 +111,7 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
             FullName = fullName;
             PhoneNumber = phoneNumber;
             EmailAddress = emailAddress;
-            Driver = driver;
+            //Driver = driver;
         }
 
         

TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModelExtensions.cs

@@ -28,7 +28,7 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
                 PhoneNumber = obj.PhoneNumber,
                 EmailAddress = obj.EmailAddress,
                 Price = obj.Price,
-                Driver = obj.Driver,
+                
             };
         }
 
@@ -43,9 +43,9 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
                 FromAddress = obj.PickupAddress,
                 Appointment = obj.TripDate,
                 PassengerCount = Convert.ToByte(obj.NumberOfPassengers),
-                //FullName = model.FullName,
+                //TODO: ContactName = obj.FullName,
-                //PhoneNumber = model.PhoneNumber,
+                ContactPhone = obj.PhoneNumber,
-                //EmailAddress = model.EmailAddress,
+                ContactEmail = obj.EmailAddress,
                 Price = obj.Price,
                 //UserProductMappingId = Guid.NewGuid(),
                 TransferStatusType = TIAM.Core.Enums.TransferStatusType.OrderSubmitted,