Development

car-search/backend/CarSearchAPI/CarSearchAPI/.env.example

@@ -23,6 +23,7 @@ ALLOWED_ORIGINS=https://example.com,http://localhost:5173
 DATABASE_CONNECTION_STRING=Data Source={your_data_source};Initial Catalog=CarSearchLocalDB;Integrated Security=True;Pooling=False;Encrypt=False;Trust Server Certificate=False
 JWT_TOKEN_SECRET_KEY=iUHtYkYcb7th6cfFs5l1mFxS2tEVQnsGvIpQx8C1Z3c=
 CAR_RENTAL_API_URL=https://localhost:7077
+DRIVE_EASY_API_URL=
 SENDGRID_API_KEY=
 COMPANY_EMAIL=
 JWT_CONFIRMATION_TOKEN_SECRET_KEY=

car-search/backend/CarSearchAPI/CarSearchAPI/Abstractions/IExternalDataProvider.cs

@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Security.Claims;
 using CarSearchAPI.DTOs.CarRental;
+using CarSearchAPI.DTOs.Rents;
 using CarSearchAPI.DTOs.Users;
 using CarSearchAPI.Models;
 

car-search/backend/CarSearchAPI/CarSearchAPI/Abstractions/IOfferPageService.cs

@@ -6,7 +6,7 @@ namespace CarSearchAPI.Abstractions
     public interface IOfferPageService
     {
         public GetOfferAmountParametersDto GetGetOfferAmountParameters
-            (string? brand, string? model, DateTime startDate, DateTime endDate, string? location);
+            (string? brand, string? model, DateTime startDate, DateTime endDate, string? location, string? email);
         public (int page, int pageSize) GetPageAndPageSize(int? providedPage, int? providedPageSize);
         public GetOfferListParametersDto GetGetOfferListParameters
             (string? brand, string? model, DateTime startDate, DateTime endDate, string? location, string email, int pageSize);

car-search/backend/CarSearchAPI/CarSearchAPI/Abstractions/IProviderCustomerService.cs

@@ -0,0 +1,9 @@
+namespace CarSearchAPI.Abstractions
+{
+    public interface IProviderCustomerService : IProviderService
+    {
+        public Task<bool> CheckIfCustomerExistsAsync(HttpClient client, string url, string? customerId);
+        public Task CreateCustomerAsync(HttpClient client, string url, string? customerId, string? email);
+        public Task<string> GetCustomerIdAsync(HttpClient client, string url, string? email);
+    }
+}

car-search/backend/CarSearchAPI/CarSearchAPI/Abstractions/IProviderOfferService.cs

@@ -5,7 +5,9 @@ namespace CarSearchAPI.Abstractions
 {
     public interface IProviderOfferService : IProviderService
     {
-        public Task<int> GetOfferAmountAsync(HttpClient client, string url);
-        public Task<List<OfferDto>> GetOfferListAsync(HttpClient client, string url);
+        public Task<int> GetOfferAmountAsync(HttpClient client, string url, GetOfferAmountParametersDto parameters,
+            string? customerId);
+        public Task<List<OfferDto>> GetOfferListAsync(HttpClient client, string url,
+            GetOfferListParametersDto parameters, string? customerId);
     }
 }

car-search/backend/CarSearchAPI/CarSearchAPI/Abstractions/IProviderRentService.cs

@@ -1,11 +1,12 @@
 using System.Security.Claims;
 using CarSearchAPI.DTOs.CarSearch;
+using CarSearchAPI.DTOs.Rents;
 
 namespace CarSearchAPI.Abstractions
 {
     public interface IProviderRentService : IProviderService
     {
-        public Task<NewSearchRentDto> CreateNewRentAsync(HttpClient client, string url, StringContent? jsonContent);
-        public Task<bool> SetRentStatusReadyToReturnAsync(HttpClient client, string url, StringContent? jsonContent);
+        public Task<NewSearchRentDto> CreateNewRentAsync(HttpClient client, string url, ClaimsPrincipal claimsPrincipal);
+        public Task<bool> SetRentStatusReadyToReturnAsync(HttpClient client, string url, int rentId);
     }
 }

car-search/backend/CarSearchAPI/CarSearchAPI/Abstractions/IProviderServiceFactory.cs

@@ -5,5 +5,6 @@ public interface IProviderServiceFactory
         public IProviderCarService GetProviderCarService(string providerName);
         public IProviderOfferService GetProviderOfferService(string providerName);
         public IProviderRentService GetProviderRentService(string providerName);
+        public IProviderCustomerService GetProviderCustomerService(string providerName);
     }
 }

car-search/backend/CarSearchAPI/CarSearchAPI/Controllers/ForwardControllers/OffersForwardController.cs

@@ -41,7 +41,7 @@ public async Task<IActionResult> OfferList(
             (int _page, int _pageSize) = _offerPageService.GetPageAndPageSize(page, pageSize);
 
             var offerAmountParametersDto = _offerPageService.GetGetOfferAmountParameters
-                (brand, model, startDate, endDate, location);
+                (brand, model, startDate, endDate, location, email);
 
             var offerListParametersDto = _offerPageService.GetGetOfferListParameters
                 (brand, model, startDate, endDate, location, email, _pageSize);

car-search/backend/CarSearchAPI/CarSearchAPI/DTOs/DriveEasy/DriveEasyCarDto.cs

@@ -0,0 +1,14 @@
+namespace CarSearchAPI.DTOs.DriveEasy
+{
+    public class DriveEasyCarDto
+    {
+        public int Id { get; set; }
+        public string Brand { get; set; }
+        public string Model { get; set; }
+        public int Year { get; set; }
+        public string Photo  { get; set; }
+        public string Status { get; set; }
+        public decimal Price { get; set; }
+        public DriveEasyLocationDto Location { get; set; }
+    }
+}

car-search/backend/CarSearchAPI/CarSearchAPI/DTOs/DriveEasy/DriveEasyCustomerCreationParametersDto.cs

@@ -0,0 +1,11 @@
+namespace CarSearchAPI.DTOs.DriveEasy
+{
+    public class DriveEasyCustomerCreationParametersDto
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string Surname { get; set; }
+        public string Email { get; set; }
+    }
+}
+

car-search/backend/CarSearchAPI/CarSearchAPI/DTOs/DriveEasy/DriveEasyLocationDto.cs

@@ -0,0 +1,11 @@
+namespace CarSearchAPI.DTOs.DriveEasy
+{
+    public class DriveEasyLocationDto
+    {
+        public int Id { get; set; }
+        public float Latitude { get; set; }
+        public float Longitude { get; set; }
+        public string Name { get; set; }
+        public string Address { get; set; }
+    }
+}

car-search/backend/CarSearchAPI/CarSearchAPI/DTOs/DriveEasy/DriveEasyOfferDto.cs

@@ -0,0 +1,12 @@
+namespace CarSearchAPI.DTOs.DriveEasy
+{
+    public class DriveEasyOfferDto
+    {
+        public string Id { get; set; }
+        public DriveEasyCarDto Car { get; set; }
+        public string ClientId { get; set; }
+        public decimal Price { get; set; }
+        public DateTime StartDate { get; set; }
+        public DateTime EndDate { get; set; }
+    }
+}

car-search/backend/CarSearchAPI/CarSearchAPI/DTOs/DriveEasy/NewDriveEasyRentDto.cs

@@ -0,0 +1,13 @@
+namespace CarSearchAPI.DTOs.DriveEasy
+{
+    public class NewDriveEasyRentDto
+    {
+        public string RentId { get; set; }
+        public DateTime Start { get; set; }
+        public DateTime End { get; set; }
+        public string CarBrand { get; set; }
+        public string CarModel { get; set; }
+        public int CarYear { get; set; }
+        public decimal CarPrice { get; set; }
+    }
+}

car-search/backend/CarSearchAPI/CarSearchAPI/DTOs/ForwardingParameters/GetOfferAmountParametersDto.cs

@@ -7,5 +7,6 @@ public class GetOfferAmountParametersDto
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }
         public string? Location { get; set; }
+        public string? Email { get; set; }
     }
 }

car-search/backend/CarSearchAPI/CarSearchAPI/DTOs/CarSearch/NewSearchRentDto.cs → car-search/backend/CarSearchAPI/CarSearchAPI/DTOs/Rents/NewSearchRentDto.cs

@@ -1,4 +1,4 @@
-namespace CarSearchAPI.DTOs.CarSearch
+namespace CarSearchAPI.DTOs.Rents
 {
     public class NewSearchRentDto
     {
@@ -8,6 +8,5 @@ public class NewSearchRentDto
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }
         public int RentalCompanyRentId { get; set; }
-
     }
 }

car-search/backend/CarSearchAPI/CarSearchAPI/Migrations/20250116125913_ChangedCarRentalRentIdFromIntToString.cs

@@ -0,0 +1,34 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CarSearchAPI.Migrations
+{
+    /// <inheritdoc />
+    public partial class ChangedCarRentalRentIdFromIntToString : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "RentalCompanyRentId",
+                table: "rents",
+                type: "nvarchar(max)",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "RentalCompanyRentId",
+                table: "rents",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)");
+        }
+    }
+}