Merge branch 'MA/Exceptions' into 'main'

improvements

See merge request ma03081/COM3014!25

Database/InitTables.sql

@@ -15,14 +15,15 @@ CREATE TABLE RefreshTokens (
 
 CREATE TABLE Flights (
     Id INT AUTO_INCREMENT PRIMARY KEY,
+    AirlineId INT NOT NULL,
     Origin LONGTEXT NOT NULL,
     Destination LONGTEXT NOT NULL,
     DepartureTime DATETIME(6) NOT NULL,
     ArrivalTime DATETIME(6) NOT NULL,
     EconomyCapacity INT NOT NULL,
     BusinessCapacity INT NOT NULL,
-    EconomyPrice DECIMAL(65, 30) NOT NULL,
-    BusinessPrice DECIMAL(65, 30) NOT NULL
+    EconomyPrice DECIMAL(19, 2) NOT NULL,
+    BusinessPrice DECIMAL(19, 2) NOT NULL
 );
 
 CREATE TABLE Seats (

FlightMicroservice/Controllers/FlightController.cs

@@ -2,6 +2,7 @@
 using FlightMicroservice.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System.Security.Claims;
 
 namespace FlightMicroservice.Controllers
 {
@@ -40,8 +41,12 @@ namespace FlightMicroservice.Controllers
         [HttpPost()]
         public ActionResult AddFlight([FromBody] FlightCreationModel model)
         {
+            string? airlineIdValue = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+            if (!int.TryParse(airlineIdValue, out int airlineId))
+                return BadRequest("Unable to get Airline Id from Token");
+
             Flight flight = flightService.CreateFlight(
-                model.Origin, model.Destination, model.DepartureTime, model.ArrivalTime,
+                airlineId, model.Origin, model.Destination, model.DepartureTime, model.ArrivalTime,
                 model.EconomyCapacity, model.BusinessCapacity, model.EconomyPrice, model.BusinessPrice);
 
             if (flight == null)
@@ -50,7 +55,6 @@ namespace FlightMicroservice.Controllers
             return Ok(flight);
         }
 
-        [Authorize]
         [HttpGet("{flightId}/capacity")]
         public ActionResult GetFlightCapacity([FromRoute] int flightId, [FromQuery] ClassType classType)
         {
@@ -64,5 +68,16 @@ namespace FlightMicroservice.Controllers
         }
 
 
+        [HttpGet("{flightId}/seats")]
+        public IActionResult GetFlightSeats([FromRoute] int flightId)
+        {
+            List<Seat>? seats = flightService.GetSeatsByFlightId(flightId);
+            if (seats == null)
+                return NotFound($"Flight with Id {flightId} does not exist or could not be found.");
+
+            return Ok(seats);
+        }
+
+
     }
 }

FlightMicroservice/FlightMicroservice.csproj

-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>

FlightMicroservice/Handler/ExceptionHandler.cs

+using System.Net;
+using System.Text.Json;
+
+namespace FlightMicroservice.Handler
+{
+    public class ExceptionHandler
+    {
+        private readonly RequestDelegate next;
+
+        public ExceptionHandler(RequestDelegate next)
+        {
+            this.next = next;
+        }
+
+        public async Task Invoke(HttpContext context)
+        {
+            try
+            {
+                await next(context);
+            }
+            catch (Exception ex)
+            {
+                if (!context.Response.HasStarted)
+                {
+                    var response = context.Response;
+                    response.ContentType = "application/json";
+                    response.StatusCode = (int)HttpStatusCode.InternalServerError;
+
+                    var result = JsonSerializer.Serialize(new
+                    {
+                        response.StatusCode,
+                        ex.Message
+                    });
+
+                    await response.WriteAsync(result);
+                }
+            }
+        }
+    }
+}

FlightMicroservice/Models/Flight.cs

@@ -6,6 +6,7 @@
         internal static readonly int ECONOMY_SEATS_PER_ROW = 6;
 
         public int Id { get; private set; }
+        public int AirlineId { get; internal set; }
         public string Origin { get; internal set; }
         public string Destination { get; internal set; }
         public DateTime DepartureTime { get; internal set; }
@@ -18,7 +19,8 @@
 
         public Flight() => Seats = new List<Seat>();
 
-        public Flight(string origin, 
+        public Flight(int airlineId,
+                      string origin, 
                       string destination,  
                       DateTime departureTime, 
                       DateTime arrivalTime,
@@ -34,6 +36,7 @@
             if (!IsCapacityValid(businessCapacity, BUSINESS_SEATS_PER_ROW))
                 throw new ArgumentException($"Capacity of Business seats must be a multiple of {BUSINESS_SEATS_PER_ROW}");
 
+            AirlineId = airlineId;
             Origin = origin;
             Destination = destination;
             DepartureTime = departureTime;

FlightMicroservice/Program.cs

+using FlightMicroservice.Handler;
 using FlightMicroservice.Models;
 using FlightMicroservice.Services;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
@@ -47,6 +48,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
+app.UseMiddleware<ExceptionHandler>();
 app.UseHttpsRedirection();
 
 // Middleware for handling the access token in cookies

FlightMicroservice/Services/FlightService.cs

 using FlightMicroservice.Models;
+using Microsoft.EntityFrameworkCore;
 
 namespace FlightMicroservice.Services
 {
@@ -37,6 +38,7 @@ namespace FlightMicroservice.Services
         }
 
         public Flight CreateFlight(
+            int airlineId,
             string origin, 
             string destination, 
             DateTime departureTime, 
@@ -46,7 +48,7 @@ namespace FlightMicroservice.Services
             decimal economyPrice, 
             decimal businessPrice)
         {
-            Flight flight = new Flight(origin, destination, departureTime, arrivalTime, economyCapacity, businessCapacity, economyPrice, businessPrice);
+            Flight flight = new Flight(airlineId, origin, destination, departureTime, arrivalTime, economyCapacity, businessCapacity, economyPrice, businessPrice);
 
             InitializeSeatsForFlight(flight);
 
@@ -68,6 +70,13 @@ namespace FlightMicroservice.Services
             return true;
         }
 
+        public List<Seat> GetSeatsByFlightId(int flightId)
+        {
+            return dbContext.Seats
+                .Where(seat => seat.FlightId == flightId) 
+                .ToList();
+        }
+
         private void InitializeSeatsForFlight(Flight flight)
         {
             int businessRows = flight.BusinessCapacity / Flight.BUSINESS_SEATS_PER_ROW;

FlightMicroservice/Services/IFlightService.cs

@@ -6,7 +6,8 @@ namespace FlightMicroservice.Services
     {
         Flight? GetFlight(int flightId);
         List<Flight> GetFlights(string? origin, string? destination, DateTime? departureTime, DateTime? arrivalTime);
-        Flight CreateFlight(string origin, string destination, DateTime departureTime, DateTime arrivalTime, int economyCapacity, int businessCapacity, decimal economyPrice, decimal businessPrice);
+        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

@@ -49,6 +49,12 @@ namespace GatewayAPI.Clients.FlightService
             return await httpClient.GetAsync($"{FLIGHT_API_PATH}/{flightId}/capacity?ClassType={classType}");
         }
 
+        public async Task<HttpResponseMessage> GetFlightSeatsAsync(int flightId)
+        {
+            return await httpClient.GetAsync($"{FLIGHT_API_PATH}/{flightId}/seats");
+        }
+
+
 
 
 

GatewayAPI/Clients/FlightService/IFlightServiceClient.cs

@@ -8,6 +8,7 @@ namespace GatewayAPI.Clients.FlightService
         Task<HttpResponseMessage> GetFlightsAsync(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);
 
 
         Task<HttpResponseMessage> GetSeatsAsync();

GatewayAPI/Controllers/FlightController.cs

@@ -43,5 +43,13 @@ namespace GatewayAPI.Controllers
             HttpResponseMessage response = await flightServiceClient.GetFlightCapacityAsync(id, classType);
             return new HttpResponseMessageResult(response);
         }
+
+        [HttpGet("{id}/seats")]
+        public async Task<IActionResult> GetFlightSeats([FromRoute] int id)
+        {
+            HttpResponseMessage response = await flightServiceClient.GetFlightSeatsAsync(id);
+            return new HttpResponseMessageResult(response);
+        }
+
     }
 }

UserMicroservice/Handlers/ExceptionHandler.cs

+using System.Net;
+using System.Text.Json;
+
+namespace UserMicroservice.Handlers
+{
+    public class ExceptionHandler
+    {
+        private readonly RequestDelegate next;
+
+        public ExceptionHandler(RequestDelegate next)
+        {
+            this.next = next;
+        }
+
+        public async Task Invoke(HttpContext context)
+        {
+            try
+            {
+                await next(context);
+            }
+            catch (Exception ex)
+            {
+                if (!context.Response.HasStarted)
+                {
+                    var response = context.Response;
+                    response.ContentType = "application/json";
+                    response.StatusCode = (int)HttpStatusCode.InternalServerError;
+
+                    var result = JsonSerializer.Serialize(new
+                    {
+                        response.StatusCode,
+                        ex.Message
+                    });
+
+                    await response.WriteAsync(result);
+                }
+            }
+        }
+
+    }
+}

UserMicroservice/Program.cs

@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 using System.Text;
 using Microsoft.AspNetCore.Identity;
+using UserMicroservice.Handlers;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -46,6 +47,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
+app.UseMiddleware<ExceptionHandler>();
 app.UseHttpsRedirection();
 
 // Middleware to check for the access token in cookies