Merge branch 'MA/AddFilterByAirlineId' into 'main'

add filter by airline id

See merge request ma03081/COM3014!27

FlightMicroservice/Controllers/FlightController.cs

@@ -18,9 +18,9 @@ namespace FlightMicroservice.Controllers
         }
 
         [HttpGet()]
-        public ActionResult GetFlights(string? origin = null, string? destination = null, DateTime? departureTime = null, DateTime? arrivalTime = null)
+        public ActionResult GetFlights(int? airlineId = null, string? origin = null, string? destination = null, DateTime? departureTime = null, DateTime? arrivalTime = null)
         {
-            List<Flight> flights = flightService.GetFlights(origin, destination, departureTime, arrivalTime);
+            List<Flight> flights = flightService.GetFlights(airlineId, origin, destination, departureTime, arrivalTime);
             if (flights == null)
                 return BadRequest();
 

FlightMicroservice/Services/FlightService.cs

@@ -18,10 +18,13 @@ namespace FlightMicroservice.Services
             return flight;
         }
 
-        public List<Flight> GetFlights(string? origin, string? destination, DateTime? departureTime, DateTime? arrivalTime)
+        public List<Flight> GetFlights(int? airlineId, string? origin, string? destination, DateTime? departureTime, DateTime? arrivalTime)
         {
             IQueryable<Flight> query = dbContext.Flights.AsQueryable();
 
+            if(airlineId != null)
+                query = query.Where(flight => flight.AirlineId == airlineId);
+
             if (!string.IsNullOrWhiteSpace(origin))
                 query = query.Where(flight => flight.Origin == origin);
 

FlightMicroservice/Services/IFlightService.cs

@@ -5,7 +5,7 @@ namespace FlightMicroservice.Services
     public interface IFlightService
     {
         Flight? GetFlight(int flightId);
-        List<Flight> GetFlights(string? origin, string? destination, DateTime? departureTime, DateTime? arrivalTime);
+        List<Flight> GetFlights(int? airlineId, string? origin, string? destination, DateTime? departureTime, DateTime? arrivalTime);
         Flight CreateFlight(int airlineId, string origin, string destination, DateTime departureTime, DateTime arrivalTime, int economyCapacity, int businessCapacity, decimal economyPrice, decimal businessPrice);
         bool RemoveFlight(int flightId);
         List<Seat> GetSeatsByFlightId(int flightId);

GatewayAPI/Clients/FlightService/FlightServiceClient.cs

@@ -18,14 +18,17 @@ namespace GatewayAPI.Clients.FlightService
             return await httpClient.GetAsync($"{FLIGHT_API_PATH}/{flightId}");
         }
 
-        public async Task<HttpResponseMessage> GetFlightsAsync(string? origin = null, string? destination = null, DateTime? departureTime = null, DateTime? arrivalTime = null)
+        public async Task<HttpResponseMessage> GetFlightsAsync(int? airlineId = null, string? origin = null, string? destination = null, DateTime? departureTime = null, DateTime? arrivalTime = null)
         {
             var queryParams = new List<string>();
 
-            if (origin != null)
+            if(airlineId != null)
+                queryParams.Add($"airlineId={airlineId}");
+
+            if (!string.IsNullOrEmpty(origin))
                 queryParams.Add($"origin={Uri.EscapeDataString(origin)}");
 
-            if (destination != null)
+            if (!string.IsNullOrEmpty(destination))
                 queryParams.Add($"destination={Uri.EscapeDataString(destination)}");
 
             if (departureTime.HasValue)

GatewayAPI/Clients/FlightService/IFlightServiceClient.cs

@@ -5,7 +5,7 @@ namespace GatewayAPI.Clients.FlightService
     public interface IFlightServiceClient
     {
         Task<HttpResponseMessage> GetFlightAsync(int flightId);
-        Task<HttpResponseMessage> GetFlightsAsync(string? origin = null, string? destination = null, DateTime? departureTime = null, DateTime? arrivalTime = null);
+        Task<HttpResponseMessage> GetFlightsAsync(int? airlineId = null, string? origin = null, string? destination = null, DateTime? departureTime = null, DateTime? arrivalTime = null);
         Task<HttpResponseMessage> AddFlightAsync(FlightCreation flight);
         Task<HttpResponseMessage> GetFlightCapacityAsync(int flightId, int classType);
         Task<HttpResponseMessage> GetFlightSeatsAsync(int flightId);

GatewayAPI/Controllers/FlightController.cs

@@ -16,9 +16,9 @@ namespace GatewayAPI.Controllers
         }
 
         [HttpGet()]
-        public async Task<IActionResult> GetFlights(string? origin = null, string? destination = null, DateTime? departureTime = null, DateTime? arrivalTime = null)
+        public async Task<IActionResult> GetFlights(int? airlineId = null, string? origin = null, string? destination = null, DateTime? departureTime = null, DateTime? arrivalTime = null)
         {
-            HttpResponseMessage response = await flightServiceClient.GetFlightsAsync(origin, destination, departureTime, arrivalTime);
+            HttpResponseMessage response = await flightServiceClient.GetFlightsAsync(airlineId, origin, destination, departureTime, arrivalTime);
             return new HttpResponseMessageResult(response);
         }