Added achievement data

2026-04-28 22:16:21 +10:00
parent 14aed7bf6e
commit b94b1d8ec2
43 changed files with 1559 additions and 130 deletions
@@ -55,6 +55,8 @@ class AchievementService
            'airline.alliance',
            'aircraft',
            'flightClass',
+            'departureAirport.region',
+            'arrivalAirport.region',
            'departureAirport.region.continent',
            'arrivalAirport.region.continent',
        ])->get();
@@ -151,8 +153,8 @@ class AchievementService
    {
        Notification::create([
            'user_id'        => $user->id,
-            'title'          => 'Achievement Unlocked!',
-            'body'           => "You've earned the \"{$achievement->name}\" achievement — {$achievement->short_description}",
+            'title'          => $achievement->name,
+            'body'           => $achievement->short_description,
            'is_achievement' => true,
            'achievement_id' => $achievement->id,
            'expires_at'     => null,
@@ -5,9 +5,14 @@ namespace App\Services\Achievements\Checkers;
 use App\Models\Alliance;
 use App\Models\User;
 use App\Models\UserFlight;
+use Illuminate\Support\Collection;

 class AirlinesAndAlliancesChecker extends BaseChecker
 {
+    const array US_3 = ['american-airlines', 'delta', 'united-airlines'];
+    const array ME_3 = ['emirates', 'etihad-airways', 'qatar-airways'];
+    const array CN_3 = ['china-southern-airlines', 'china-eastern', 'air-china'];
+
    public function check(): void
    {
        $flights = $this->flights();
@@ -25,5 +30,16 @@ class AirlinesAndAlliancesChecker extends BaseChecker
        $this->awardProgress($check('oneworld'),         'airlines_alliances.all_oneworld');
        $this->awardProgress($check('star_alliance'),    'airlines_alliances.all_star_alliance');
        $this->awardProgress($check('vanilla_alliance'), 'airlines_alliances.all_vanilla_alliance');
+
+        $flownAirlines = $flights
+            ->pluck('airline.internal_name')
+            ->filter()
+            ->unique();
+
+        $checkGroup = fn(array $group): int => $flownAirlines->intersect($group)->count();
+
+        $this->awardProgress($checkGroup(self::ME_3), 'airlines_alliances.me3');
+        $this->awardProgress($checkGroup(self::US_3), 'airlines_alliances.us3');
+        $this->awardProgress($checkGroup(self::CN_3), 'airlines_alliances.cn3');
    }
 }
@@ -3,27 +3,60 @@
 namespace App\Services\Achievements\Checkers;

 use App\Models\User;
+use App\Models\UserFlight;

 class FunChallengesChecker extends BaseChecker
 {
+    const array US_STATES = [
+        'US-AK', 'US-AL', 'US-AR', 'US-AZ', 'US-CA', 'US-CO', 'US-CT', 'US-DC',
+        'US-DE', 'US-FL', 'US-GA', 'US-HI', 'US-IA', 'US-ID', 'US-IL', 'US-IN',
+        'US-KS', 'US-KY', 'US-LA', 'US-MA', 'US-MD', 'US-ME', 'US-MI', 'US-MN',
+        'US-MO', 'US-MS', 'US-MT', 'US-NC', 'US-ND', 'US-NE', 'US-NH', 'US-NJ',
+        'US-NM', 'US-NV', 'US-NY', 'US-OH', 'US-OK', 'US-OR', 'US-PA', 'US-RI',
+        'US-SC', 'US-SD', 'US-TN', 'US-TX', 'US-UT', 'US-VA', 'US-VT', 'US-WA',
+        'US-WI', 'US-WV', 'US-WY',
+    ];
+
+    const array AUSTRALIAN_STATES = [
+            'AU-ACT', 'AU-NSW', 'AU-NT', 'AU-QLD', 'AU-SA', 'AU-TAS', 'AU-VIC', 'AU-WA',
+    ];
+
+    const array CHINESE_PROVINCES = [
+            'CN-11', 'CN-12', 'CN-13', 'CN-14', 'CN-15', 'CN-21', 'CN-22', 'CN-23',
+            'CN-31', 'CN-32', 'CN-33', 'CN-34', 'CN-35', 'CN-36', 'CN-37', 'CN-41',
+            'CN-42', 'CN-43', 'CN-44', 'CN-45', 'CN-46', 'CN-50', 'CN-51', 'CN-52',
+            'CN-53', 'CN-54', 'CN-61', 'CN-62', 'CN-63', 'CN-64', 'CN-65',
+
+    ];
+
+    const array BRAZILIAN_STATES = [
+        'BR-AC', 'BR-AL', 'BR-AM', 'BR-AP', 'BR-BA', 'BR-CE', 'BR-DF', 'BR-ES',
+        'BR-GO', 'BR-MA', 'BR-MG', 'BR-MS', 'BR-MT', 'BR-PA', 'BR-PB', 'BR-PE',
+        'BR-PI', 'BR-PR', 'BR-RJ', 'BR-RN', 'BR-RO', 'BR-RR', 'BR-RS', 'BR-SC',
+        'BR-SE', 'BR-SP', 'BR-TO',
+    ];
+
+    const array CANADIAN_PROVINCES = [
+        'CA-AB', 'CA-BC', 'CA-MB', 'CA-NB', 'CA-NL', 'CA-NS', 'CA-NT',
+        'CA-NU', 'CA-ON', 'CA-PE', 'CA-QC', 'CA-SK', 'CA-YT',
+    ];
+
    public function check(): void
    {
        $flights = $this->flights();

        $airlineLetters = $flights
-            ->filter(fn($f) => $f->airline?->IATA_code !== null)
-            ->map(fn($f) => strtoupper($f->airline->IATA_code[0]))
+            ->filter(fn(UserFlight $f) => $f->airline?->IATA_code !== null)
+            ->map(fn(UserFlight $f) => strtoupper($f->airline->IATA_code[0]))
            ->filter(fn($letter) => ctype_alpha($letter))
            ->unique()
            ->count();

        $this->awardProgress($airlineLetters, 'fun_challenges.airline_alphabet');

-        // --- Visit the Alphabet ---
-        // Collect first letters from both departure and arrival airport IATA codes

        $airportLetters = $flights
-            ->flatMap(fn($f) => [
+            ->flatMap(fn(UserFlight $f) => [
                $f->departureAirport?->iata_code,
                $f->arrivalAirport?->iata_code,
            ])
@@ -33,5 +66,70 @@ class FunChallengesChecker extends BaseChecker
            ->count();

        $this->awardProgress($airportLetters, 'fun_challenges.airport_alphabet');
+
+        // --- US States ---
+        $visitedUsStates = $flights
+            ->flatMap(fn(UserFlight $f) => [
+                $f->departureAirport?->region?->code,
+                $f->arrivalAirport?->region?->code,
+            ])
+            ->filter()
+            ->filter(fn($code) => in_array($code, self::US_STATES))
+            ->unique()
+            ->count();
+
+        $this->awardProgress($visitedUsStates, 'fun_challenges.us_states');
+
+        // --- Australian States ---
+        $visitedAustralianStates = $flights
+            ->flatMap(fn(UserFlight $f) => [
+                $f->departureAirport?->region?->code,
+                $f->arrivalAirport?->region?->code,
+            ])
+            ->filter()
+            ->filter(fn($code) => in_array($code, self::AUSTRALIAN_STATES))
+            ->unique()
+            ->count();
+
+        $this->awardProgress($visitedAustralianStates, 'fun_challenges.australian_states');
+
+        // --- Chinese Provinces ---
+        $visitedChineseProvinces = $flights
+            ->flatMap(fn(UserFlight $f) => [
+                $f->departureAirport?->region?->code,
+                $f->arrivalAirport?->region?->code,
+            ])
+            ->filter()
+            ->filter(fn($code) => in_array($code, self::CHINESE_PROVINCES))
+            ->unique()
+            ->count();
+
+        $this->awardProgress($visitedChineseProvinces, 'fun_challenges.chinese_provinces');
+
+        // --- Brazilian States ---
+        $visitedBrazilianStates = $flights
+            ->flatMap(fn(UserFlight $f) => [
+                $f->departureAirport?->region?->code,
+                $f->arrivalAirport?->region?->code,
+            ])
+            ->filter()
+            ->filter(fn($code) => in_array($code, self::BRAZILIAN_STATES))
+            ->unique()
+            ->count();
+
+        $this->awardProgress($visitedBrazilianStates, 'fun_challenges.brazilian_states');
+
+        // --- Canadian Provinces ---
+        $visitedCanadianProvinces = $flights
+            ->flatMap(fn(UserFlight $f) => [
+                $f->departureAirport?->region?->code,
+                $f->arrivalAirport?->region?->code,
+            ])
+            ->filter()
+            ->filter(fn($code) => in_array($code, self::CANADIAN_PROVINCES))
+            ->unique()
+            ->count();
+
+        $this->awardProgress($visitedCanadianProvinces, 'fun_challenges.canadian_provinces');
    }
 }
@@ -71,6 +71,7 @@ class GeneralFlyingChecker extends BaseChecker
        // --- Progressive achievements ---

        $this->awardProgress($count,'general_flying.10_flights');
+        $this->awardProgress($count,'general_flying.50_flights');
        $this->awardProgress($count,'general_flying.100_flights');
        $this->awardProgress($count,'general_flying.500_flights');
        $this->awardProgress($count,'general_flying.1000_flights');