Updated logo API

app/Http/Controllers/Api/AirlineApiController.php

@@ -8,7 +8,7 @@ use App\Models\Airline;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
-class LogoController extends ApiController
+class AirlineApiController extends ApiController
 {
     const array CONDOR_LOGOS = ['BEACH', 'ISLAND', 'PASSION', 'SEA', 'SUNSHINE'];
 
@@ -47,4 +47,30 @@ class LogoController extends ApiController
         return $this->getAirlineLogo($airline);
     }
 
+    function parseAirlineData(Airline $airline){
+        $countryCode = $airline->country->code;
+
+        $result = $airline->toArray();
+        unset($result['id']);
+        unset($result['logo']);
+        unset($result['country_id']);
+        unset($result['country']);
+        $result['slug'] = $result['internal_name'];
+        unset($result['internal_name']);
+        $result['country_code'] = $countryCode;
+        return $result;
+    }
+
+    function getByCode(string $code){
+        $lookupColumn = strlen($code) === 3 ? 'ICAO_code' : 'IATA_code';
+        $airlines = Airline::where($lookupColumn, strtoupper($code))->get()->map(fn($airline) => $this->parseAirlineData($airline));
+        return response()->json($airlines);
+
+    }
+
+    function get(string $internalName){
+        $airline = Airline::where('internal_name', $internalName)->first();
+        return response()->json($this->parseAirlineData($airline));
+    }
+
 }

app/Http/Controllers/Api/UserApiController.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\ApiController;
+use App\Models\User;
+use App\Models\UserFlight;
+use Carbon\Carbon;
+use Illuminate\Http\JsonResponse;
+
+class UserApiController extends ApiController
+{
+    public function nextFlight(string $username): JsonResponse
+    {
+        $user = User::where('name', 'ilike', $username)->first();
+
+        if (!$user) {
+            return response()->json(['message' => 'User not found'], 404);
+        }
+
+        $flight = UserFlight::with(['departureAirport', 'arrivalAirport', 'airline', 'aircraft'])
+            ->where('user_id', $user->id)
+            ->where('departure_date', '>', now()->utc())
+            ->orderBy('departure_date', 'asc')
+            ->first();
+
+        if (!$flight) {
+            return response()->json(['message' => 'No upcoming flights found'], 404);
+        }
+
+        $departure = Carbon::parse($flight->departure_date)->setTimezone($flight->departureAirport->timezone);
+        $arrival = Carbon::parse($flight->arrival_date)->setTimezone($flight->arrivalAirport->timezone);
+
+        return response()->json([
+            'departureAirportCode'  => $flight->departureAirport->iata_code,
+            'departureCity'         => $flight->departureAirport->municipality,
+            'departureDateReadable' => $departure->format('F j'),
+            'departureTime'         => $departure->format('H:i'),
+            'arrivalAirportCode'    => $flight->arrivalAirport->iata_code,
+            'arrivalCity'           => $flight->arrivalAirport->municipality,
+            'arrivalDateReadable'   => $arrival->format('F j'),
+            'arrivalTime'           => $arrival->format('H:i'),
+            'flightNumber'          => $flight->flight_number,
+            'airlineName'           => $flight->airline->name,
+            'aircraftType'          => $flight->aircraft->manufacturer_code . ' ' . $flight->aircraft->model_full_name,
+            'logoUrl'               => $flight->airline?->logo_url ?? 'undefined',
+        ]);
+    }
+
+    public function flights(string $username): JsonResponse
+    {
+        $user = User::where('name', 'ilike', $username)->first();
+
+        if (!$user) {
+            return response()->json(['message' => 'User not found'], 404);
+        }
+
+        return response()->json($user->FlightController()->flights());
+    }
+}

app/Http/Controllers/Api/UserController.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Http\Controllers\ApiController;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Models\UserFlight;
-use Carbon\Carbon;
-use DB;
-use Illuminate\Http\Request;
-
-class UserController extends ApiController
-{
-    function nextFlight(string $username): ?array
-    {
-        $user = User::where('name' ,'ilike', $username)->first();
-        if(!$user) return [
-            'message' => 'User not found',
-        ];
-
-        $flight = UserFlight::with(['departureAirport', 'arrivalAirport', 'airline', 'aircraft'])
-            ->where('user_id', $user->id)
-            ->where('departure_date', '>', now()->utc())
-            ->orderBy('departure_date', 'asc')
-            ->first();
-
-        $departure = Carbon::parse($flight->departure_date)->setTimezone($flight->departureAirport->timezone);
-        $arrival = Carbon::parse($flight->arrival_date)->setTimezone($flight->arrivalAirport->timezone);
-
-        return [
-            'departureAirportCode' => $flight->departureAirport->iata_code,
-            'departureCity'        => $flight->departureAirport->municipality,
-            'departureDateReadable' => $departure->format('F j'),
-            'departureTime'        => $departure->format('H:i'),
-            'arrivalAirportCode'   => $flight->arrivalAirport->iata_code,
-            'arrivalCity'          => $flight->arrivalAirport->municipality,
-            'arrivalDateReadable'  => $arrival->format('F j'),
-            'arrivalTime'          => $arrival->format('H:i'),
-            'flightNumber'         => $flight->flight_number,
-            'airlineName'          => $flight->airline->name,
-            'aircraftType'         => $flight->aircraft->manufacturer_code . ' ' . $flight->aircraft->model_full_name,
-            'logoUrl' => $flight->airline->logo_url,
-        ];
-    }
-
-    function flights(string $username){
-
-    }
-}