Merge branch 'dev' into squashMigrations

arthurpar06 · Jul 2, 2024 · c70740c · c70740c
2 parents ee022bc + 7e037ec
commit c70740c
Show file tree

Hide file tree

Showing 41 changed files with 717 additions and 138 deletions.
diff --git a/Makefile b/Makefile
@@ -106,7 +106,7 @@ docker-test:
 	    -u $(shell id -u):$(shell id -g) \
 	    -v $(shell pwd):/var/www/html \
 	    -w /var/www/html \
-	    laravelsail/php82-composer:latest \
+	    laravelsail/php83-composer:latest \
 	    composer install --ignore-platform-reqs
 	@vendor/bin/sail up
 

diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ docker run --rm \
     -u "$(id -u):$(id -g)" \
     -v "$(pwd):/var/www/html" \
     -w /var/www/html \
-    laravelsail/php82-composer:latest \
+    laravelsail/php83-composer:latest \
     composer install --ignore-platform-reqs
 
 # Then you can start sail
@@ -75,6 +75,8 @@ sail composer install
 sail npm run dev
 ```
 
+To interact with databases (MariaDB, Redis...), please refer to the Laravel Sail documentation
+
 ### Building JS/CSS assets
 
 Yarn is required, run:

diff --git a/app/Database/migrations/2024_01_26_142501_add_vatsim_id_to_users.php b/app/Database/migrations/2024_01_26_142501_add_vatsim_id_to_users.php
@@ -0,0 +1,21 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('vatsim_id')->default('')->after('discord_private_channel_id');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('vatsim_id');
+        });
+    }
+};
diff --git a/app/Database/migrations/2024_06_03_124335_add_ivao_id_to_users.php b/app/Database/migrations/2024_06_03_124335_add_ivao_id_to_users.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('ivao_id')->default('')->after('discord_private_channel_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('ivao_id');
+        });
+    }
+};
diff --git a/app/Database/migrations_data/2023_12_19_174436_correct_expenses.php b/app/Database/migrations_data/2023_12_19_174436_correct_expenses.php
@@ -0,0 +1,49 @@
+<?php
+
+use App\Contracts\Migration;
+use App\Models\Expense;
+
+/**
+ * Update the expenses to add the airline ID
+ */
+return new class() extends Migration {
+    public function up(): void
+    {
+        /** @var Expense[] $all_expenses */
+        $all_expenses = Expense::all();
+        foreach ($all_expenses as $expense) {
+            $this->getAirlineId($expense);
+        }
+    }
+
+    /**
+     * Figure out the airline ID
+     *
+     * @param Expense $expense
+     *
+     * @return void
+     */
+    public function getAirlineId(Expense $expense): void
+    {
+        $klass = 'Expense';
+        if ($expense->ref_model) {
+            $ref = explode('\\', $expense->ref_model);
+            $klass = end($ref);
+            $obj = $expense->getReferencedObject();
+        }
+
+        if (empty($obj)) {
+            return;
+        }
+
+        if ($klass === 'Airport') {
+            // TODO: Get an airline ID?
+        } elseif ($klass === 'Subfleet') {
+            $expense->airline_id = $obj->airline_id;
+        } elseif ($klass === 'Aircraft') {
+            $expense->airline_id = $obj->airline->id;
+        }
+
+        $expense->save();
+    }
+};
diff --git a/app/Events/NewsUpdated.php b/app/Events/NewsUpdated.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Events;
+
+use App\Contracts\Event;
+use App\Models\News;
+
+class NewsUpdated extends Event
+{
+    public function __construct(
+        public News $news
+    ) {
+    }
+}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -69,7 +69,7 @@ public function render($request, Throwable $exception)
      */
     private function handleApiError($request, Throwable $exception)
     {
-        Log::error('API Error', $exception->getTrace());
+        Log::error('API Error: '.$exception->getMessage(), $exception->getTrace());
 
         if ($exception instanceof AbstractHttpException) {
             return $exception->getResponse();

diff --git a/app/Http/Controllers/Admin/AircraftController.php b/app/Http/Controllers/Admin/AircraftController.php
@@ -15,6 +15,7 @@
 use App\Repositories\AirportRepository;
 use App\Services\ExportService;
 use App\Services\FileService;
+use App\Services\FinanceService;
 use App\Services\ImportService;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -26,19 +27,12 @@ class AircraftController extends Controller
 {
     use Importable;
 
-    /**
-     * AircraftController constructor.
-     *
-     * @param AirportRepository  $airportRepo
-     * @param AircraftRepository $aircraftRepo
-     * @param FileService        $fileSvc
-     * @param ImportService      $importSvc
-     */
     public function __construct(
         private readonly AirportRepository $airportRepo,
         private readonly AircraftRepository $aircraftRepo,
         private readonly FileService $fileSvc,
         private readonly ImportService $importSvc,
+        private readonly FinanceService $financeSvc,
     ) {
     }
 
@@ -317,7 +311,8 @@ protected function return_expenses_view(Aircraft $aircraft): View
      */
     public function expenses(int $id, Request $request): View
     {
-        $aircraft = $this->aircraftRepo->findWithoutFail($id);
+        /** @var Aircraft $aircraft */
+        $aircraft = $this->aircraftRepo->with('airline')->findWithoutFail($id);
         if (empty($aircraft)) {
             return $this->return_expenses_view($aircraft);
         }
@@ -327,10 +322,11 @@ public function expenses(int $id, Request $request): View
         }
 
         if ($request->isMethod('post')) {
-            $expense = new Expense($request->post());
-            $expense->ref_model = Aircraft::class;
-            $expense->ref_model_id = $aircraft->id;
-            $expense->save();
+            $this->financeSvc->addExpense(
+                $request->post(),
+                $aircraft,
+                $aircraft->airline->id
+            );
         } elseif ($request->isMethod('put')) {
             $expense = Expense::findOrFail($request->input('expense_id'));
             $expense->{$request->name} = $request->value;

diff --git a/app/Http/Controllers/Admin/AirportController.php b/app/Http/Controllers/Admin/AirportController.php
@@ -13,6 +13,7 @@
 use App\Repositories\Criteria\WhereCriteria;
 use App\Services\ExportService;
 use App\Services\FileService;
+use App\Services\FinanceService;
 use App\Services\ImportService;
 use App\Support\Timezonelist;
 use Illuminate\Http\RedirectResponse;
@@ -25,15 +26,11 @@ class AirportController extends Controller
 {
     use Importable;
 
-    /**
-     * @param AirportRepository $airportRepo
-     * @param FileService       $fileSvc
-     * @param ImportService     $importSvc
-     */
     public function __construct(
         private readonly AirportRepository $airportRepo,
         private readonly FileService $fileSvc,
         private readonly ImportService $importSvc,
+        private readonly FinanceService $financeSvc,
     ) {
     }
 
@@ -270,10 +267,10 @@ public function expenses(string $id, Request $request): View
         }
 
         if ($request->isMethod('post')) {
-            $expense = new Expense($request->post());
-            $expense->ref_model = Airport::class;
-            $expense->ref_model_id = $airport->id;
-            $expense->save();
+            $this->financeSvc->addExpense(
+                $request->post(),
+                $airport,
+            );
         } elseif ($request->isMethod('put')) {
             $expense = Expense::findOrFail($request->input('expense_id'));
             $expense->{$request->name} = $request->value;

diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php
@@ -93,6 +93,11 @@ public function news(Request $request): View
             $attrs['user_id'] = Auth::user()->id;
 
             $this->newsSvc->addNews($attrs);
+        } elseif ($request->isMethod('patch')) {
+            $attrs = $request->post();
+            $attrs['user_id'] = Auth::user()->id;
+
+            $this->newsSvc->updateNews($attrs);
         } elseif ($request->isMethod('delete')) {
             $id = $request->input('news_id');
             $this->newsSvc->deleteNews($id);

diff --git a/app/Http/Controllers/Admin/ExpenseController.php b/app/Http/Controllers/Admin/ExpenseController.php
@@ -11,6 +11,7 @@
 use App\Repositories\AirlineRepository;
 use App\Repositories\ExpenseRepository;
 use App\Services\ExportService;
+use App\Services\FinanceService;
 use App\Services\ImportService;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -23,17 +24,11 @@ class ExpenseController extends Controller
 {
     use Importable;
 
-    /**
-     * expensesController constructor.
-     *
-     * @param AirlineRepository $airlineRepo
-     * @param ExpenseRepository $expenseRepo
-     * @param ImportService     $importSvc
-     */
     public function __construct(
         private readonly AirlineRepository $airlineRepo,
         private readonly ExpenseRepository $expenseRepo,
-        private readonly ImportService $importSvc
+        private readonly ImportService $importSvc,
+        private readonly FinanceService $financeSvc,
     ) {
     }
 
@@ -81,9 +76,7 @@ public function create(): View
      */
     public function store(Request $request): RedirectResponse
     {
-        $input = $request->all();
-        $input['ref_model'] = Expense::class;
-        $this->expenseRepo->create($input);
+        $this->financeSvc->addExpense($request->all(), null, null);
 
         Flash::success('Expense saved successfully.');
 

diff --git a/app/Http/Controllers/Admin/SubfleetController.php b/app/Http/Controllers/Admin/SubfleetController.php
@@ -21,6 +21,7 @@
 use App\Services\ExportService;
 use App\Services\FareService;
 use App\Services\FileService;
+use App\Services\FinanceService;
 use App\Services\FleetService;
 use App\Services\ImportService;
 use Illuminate\Http\RedirectResponse;
@@ -34,19 +35,6 @@ class SubfleetController extends Controller
 {
     use Importable;
 
-    /**
-     * SubfleetController constructor.
-     *
-     * @param AircraftRepository   $aircraftRepo
-     * @param FareRepository       $fareRepo
-     * @param FareService          $fareSvc
-     * @param FileService          $fileSvc
-     * @param FleetService         $fleetSvc
-     * @param ImportService        $importSvc
-     * @param RankRepository       $rankRepo
-     * @param SubfleetRepository   $subfleetRepo
-     * @param TypeRatingRepository $typeratingRepo
-     */
     public function __construct(
         private readonly AircraftRepository $aircraftRepo,
         private readonly FareRepository $fareRepo,
@@ -56,7 +44,8 @@ public function __construct(
         private readonly ImportService $importSvc,
         private readonly RankRepository $rankRepo,
         private readonly SubfleetRepository $subfleetRepo,
-        private readonly TypeRatingRepository $typeratingRepo
+        private readonly TypeRatingRepository $typeratingRepo,
+        private readonly FinanceService $financeSvc,
     ) {
     }
 
@@ -445,6 +434,7 @@ protected function return_typeratings_view(?Subfleet $subfleet): View
      */
     public function expenses(int $id, Request $request): View
     {
+        /** @var Subfleet $subfleet */
         $subfleet = $this->subfleetRepo->findWithoutFail($id);
         if (empty($subfleet)) {
             return $this->return_expenses_view($subfleet);
@@ -458,10 +448,11 @@ public function expenses(int $id, Request $request): View
          * update specific rank data
          */
         if ($request->isMethod('post')) {
-            $expense = new Expense($request->post());
-            $expense->ref_model = Subfleet::class;
-            $expense->ref_model_id = $subfleet->id;
-            $expense->save();
+            $this->financeSvc->addExpense(
+                $request->post(),
+                $subfleet,
+                $subfleet->airline_id
+            );
         } elseif ($request->isMethod('put')) {
             $expense = Expense::findOrFail($request->input('expense_id'));
             $expense->{$request->name} = $request->value;

diff --git a/app/Http/Controllers/Api/MaintenanceController.php b/app/Http/Controllers/Api/MaintenanceController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use App\Console\Cron;
+use App\Console\Kernel;
 use App\Contracts\Controller;
 use App\Exceptions\CronInvalid;
 use Illuminate\Http\JsonResponse;
@@ -25,6 +26,15 @@ public function cron(Request $request, string $id): JsonResponse
             throw new CronInvalid();
         }
 
+        // Create a console kernel instance
+        $consoleKernel = app()->make(Kernel::class);
+
+        // Run a null artisan thing just so Laravel internals can be setup properly
+        $status = $consoleKernel->handle(
+            new \Symfony\Component\Console\Input\ArgvInput(),
+            new \Symfony\Component\Console\Output\NullOutput()
+        );
+
         $cron = app(Cron::class);
         $run = $cron->run();