Update: Filtering added, relationships revised

ademclk · Mar 20, 2023 · 06fca54 · 06fca54
1 parent 1af654f
commit 06fca54
Show file tree

Hide file tree

Showing 16 changed files with 1,065 additions and 51 deletions.
diff --git a/Ceyehat.Application/Flights/Commands/CreateFlight/CreateFlightCommand.cs b/Ceyehat.Application/Flights/Commands/CreateFlight/CreateFlightCommand.cs
@@ -19,5 +19,7 @@ public record CreateFlightCommand(
     string? AircraftId,
     string? DepartureAirportId,
     string? ArrivalAirportId,
-    string? PriceId
+    string? EconomyPriceId,
+    string? ComfortPriceId,
+    string? BusinessPriceId
 ) : IRequest<ErrorOr<Flight>>;
diff --git a/Ceyehat.Application/Flights/Commands/CreateFlight/CreateFlightCommandHandler.cs b/Ceyehat.Application/Flights/Commands/CreateFlight/CreateFlightCommandHandler.cs
@@ -23,7 +23,9 @@ public async Task<ErrorOr<Flight>> Handle(CreateFlightCommand request, Cancellat
         var aircraftId = AircraftId.Create(Guid.Parse(request.AircraftId!));
         var departureAirportId = AirportId.Create(Guid.Parse(request.DepartureAirportId!));
         var arrivalAirportId = AirportId.Create(Guid.Parse(request.ArrivalAirportId!));
-        var priceId = PriceId.Create(Guid.Parse(request.PriceId!));
+        var ePriceId = PriceId.Create(Guid.Parse(request.EconomyPriceId!));
+        var cPriceId = PriceId.Create(Guid.Parse(request.ComfortPriceId!));
+        var bPriceId = PriceId.Create(Guid.Parse(request.BusinessPriceId!));
 
         var flight = Flight.Create(
             request.FlightNumber,
@@ -36,7 +38,9 @@ public async Task<ErrorOr<Flight>> Handle(CreateFlightCommand request, Cancellat
             aircraftId,
             departureAirportId,
             arrivalAirportId,
-            priceId);
+            ePriceId,
+            cPriceId,
+            bPriceId);
 
         await _flightRepository.AddFlightAsync(flight);
 

diff --git a/Ceyehat.Application/Flights/Queries/SearchFlights/SearchFlightQueryHandler.cs b/Ceyehat.Application/Flights/Queries/SearchFlights/SearchFlightQueryHandler.cs
@@ -24,8 +24,8 @@ public async Task<ErrorOr<List<FlightDto>>> Handle(SearchFlightQuery request, Ca
         var flights = await _flightRepository.SearchFlightsAsync(
             request.DepartureAirportIataCode!,
             request.ArrivalAirportIataCode!,
-            departureDate.ToUniversalTime(),
-            returnDate.ToUniversalTime(),
+            departureDate,
+            returnDate,
             request.PassengerCount);
 
         return flights;

diff --git a/Ceyehat.Contracts/Flights/CreateFlightRequest.cs b/Ceyehat.Contracts/Flights/CreateFlightRequest.cs
@@ -13,5 +13,7 @@ public record CreateFlightRequest(
     string? AircraftId,
     string? DepartureAirportId,
     string? ArrivalAirportId,
-    string? PriceId
+    string? EconomyPriceId,
+    string? ComfortPriceId,
+    string? BusinessPriceId
 );
diff --git a/Ceyehat.Contracts/Flights/FlightResponse.cs b/Ceyehat.Contracts/Flights/FlightResponse.cs
@@ -16,7 +16,9 @@ public record FlightResponse(
     string? AircraftId,
     string? DepartureAirportId,
     string ArrivalAirportId,
-    string? PriceId,
+    string? EconomyPriceId,
+    string? ComfortPriceId,
+    string? BusinessPriceId,
     DateTime CreatedAt,
     DateTime UpdatedAt
 );

diff --git a/Ceyehat.Domain/FlightAggregate/Flight.cs b/Ceyehat.Domain/FlightAggregate/Flight.cs
@@ -20,7 +20,9 @@ public sealed class Flight : AggregateRoot<FlightId>
     public AircraftId AircraftId { get; private set; }
     public AirportId DepartureAirportId { get; private set; }
     public AirportId ArrivalAirportId { get; private set; }
-    public PriceId PriceId { get; private set; }
+    public PriceId EconomyPriceId { get; private set; }
+    public PriceId ComfortPriceId { get; private set; }
+    public PriceId BusinessPriceId { get; private set; }
 
     public DateTime CreatedAt { get; private set; }
     public DateTime UpdatedAt { get; private set; }
@@ -37,7 +39,9 @@ private Flight(
         AircraftId aircraftId,
         AirportId departureAirportId,
         AirportId arrivalAirportId,
-        PriceId priceId,
+        PriceId economyPriceId,
+        PriceId comfortPriceId,
+        PriceId businessPriceId,
         DateTime createdAt,
         DateTime updatedAt) : base(flightId)
     {
@@ -51,7 +55,9 @@ private Flight(
         AircraftId = aircraftId;
         DepartureAirportId = departureAirportId;
         ArrivalAirportId = arrivalAirportId;
-        PriceId = priceId;
+        EconomyPriceId = economyPriceId;
+        ComfortPriceId = comfortPriceId;
+        BusinessPriceId = businessPriceId;
         CreatedAt = createdAt;
         UpdatedAt = updatedAt;
     }
@@ -67,7 +73,9 @@ public static Flight Create(
         AircraftId aircraftId,
         AirportId departureAirport,
         AirportId arrivalAirport,
-        PriceId priceId)
+        PriceId economyPriceId,
+        PriceId comfortPriceId,
+        PriceId businessPriceId)
     {
         return new Flight(
             FlightId.CreateUnique(),
@@ -81,7 +89,9 @@ public static Flight Create(
             aircraftId,
             departureAirport,
             arrivalAirport,
-            priceId,
+            economyPriceId,
+            comfortPriceId,
+            businessPriceId,
             DateTime.UtcNow,
             DateTime.UtcNow);
     }