Added Notifications

app/Services/Achievements/Checkers/AircraftChecker.php

@@ -2,37 +2,13 @@
 
 namespace App\Services\Achievements\Checkers;
 
+use App\Models\Aircraft;
 use App\Models\User;
 use App\Models\UserFlight;
 use Illuminate\Support\Collection;
 
 class AircraftChecker extends BaseChecker
 {
-    private const array BOEING_FAMILIES = [
-        '707' => ['B701', 'B703', 'B720'],
-        '717' => ['B712', 'B717'],
-        '727' => ['B721', 'B722', 'B727'],
-        '737' => ['B731', 'B732', 'B733', 'B734', 'B735', 'B736', 'B737', 'B738', 'B739', 'B37M', 'B38M', 'B39M'],
-        '747' => ['B741', 'B742', 'B743', 'B744', 'B748', 'B74D', 'B74R', 'B74S'],
-        '757' => ['B752', 'B753', 'B757'],
-        '767' => ['B762', 'B763', 'B764', 'B767'],
-        '777' => ['B772', 'B773', 'B77L', 'B77W', 'B778', 'B779'],
-        '787' => ['B788', 'B789', 'B78X'],
-    ];
-
-    private const array AIRBUS_FAMILIES = [
-        'A300' => ['A30B', 'A300', 'A306'],
-        'A310' => ['A310', 'A312', 'A313'],
-        'A318' => ['A318'],
-        'A319' => ['A319', 'A31X'],
-        'A320' => ['A320', 'A20N'],
-        'A321' => ['A321', 'A21N'],
-        'A330' => ['A330', 'A332', 'A333', 'A338', 'A339'],
-        'A340' => ['A340', 'A342', 'A343', 'A345', 'A346'],
-        'A350' => ['A350', 'A358', 'A359', 'A35K'],
-        'A380' => ['A380', 'A388'],
-    ];
-
     private const array DOUBLE_DECKER_DESIGNATORS = [
         // A380
         'A380', 'A388',
@@ -121,7 +97,7 @@ class AircraftChecker extends BaseChecker
 
         // --- Boeing 7x7 families ---
 
-        $flownBoeingFamilies = collect(self::BOEING_FAMILIES)
+        $flownBoeingFamilies = collect(Aircraft::BOEING_FAMILIES)
             ->filter(fn($designators) =>
             $flightsWithAircraft->contains(
                 fn(UserFlight $f) => in_array($f->aircraft->designator, $designators)
@@ -133,7 +109,7 @@ class AircraftChecker extends BaseChecker
 
         // --- Airbus A3xx families ---
 
-        $flownAirbusFamilie = collect(self::AIRBUS_FAMILIES)
+        $flownAirbusFamilie = collect(Aircraft::AIRBUS_FAMILIES)
             ->filter(fn($designators) =>
             $flightsWithAircraft->contains(
                 fn(UserFlight $f) => in_array($f->aircraft->designator, $designators)

app/Services/Achievements/Checkers/CountriesAndContinentsChecker.php

@@ -76,6 +76,13 @@ class CountriesAndContinentsChecker extends BaseChecker
             $dep = $flight->departureAirport->region->continent->internal_name;
             $arr = $flight->arrivalAirport->region->continent->internal_name;
 
+            if (!in_array($dep, self::INHABITED_CONTINENTS) || !in_array($arr, self::INHABITED_CONTINENTS)) continue;
+            if ($dep === $arr) {
+                $depCountry = $flight->departureAirport->region->country_id;
+                $arrCountry = $flight->arrivalAirport->region->country_id;
+                if ($depCountry === $arrCountry) continue;
+            }
+
             // Directed route key e.g. "europe→asia"
             $directedRoutes->push("{$dep}→{$arr}");
 

app/Services/Achievements/Checkers/GeneralFlyingChecker.php

@@ -70,6 +70,11 @@ class GeneralFlyingChecker extends BaseChecker
 
         // --- Progressive achievements ---
 
+        $totalDistance = $flights->sum('distance');
+
+        $this->awardProgress((int) $totalDistance, 'general_flying.circumference_of_the_earth');
+        $this->awardProgress((int) $totalDistance, 'general_flying.to_the_moon');
+
         $this->awardProgress($count,'general_flying.10_flights');
         $this->awardProgress($count,'general_flying.50_flights');
         $this->awardProgress($count,'general_flying.100_flights');