Merge pull request #11654 from nanaya/country-access

Use singleton for country lookup
ppy · Nov 21, 2024 · caae318 · caae318
2 parents 3d826c2 + 604eff0
commit caae318
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
@@ -17,7 +17,6 @@
 use App\Libraries\UserRegistration;
 use App\Models\Beatmap;
 use App\Models\BeatmapDiscussion;
-use App\Models\Country;
 use App\Models\IpBan;
 use App\Models\Log;
 use App\Models\User;
@@ -983,9 +982,8 @@ private function storeUser(array $rawParams)
             'username',
         ], ['null_missing' => true]);
         $countryCode = request_country();
-        $country = Country::find($countryCode);
         $params['user_ip'] = $ip;
-        $params['country_acronym'] = $country === null ? '' : $country->getKey();
+        $params['country_acronym'] = $countryCode;
         $params['user_lang'] = \App::getLocale();
 
         $registration = new UserRegistration($params);
@@ -1009,7 +1007,11 @@ private function storeUser(array $rawParams)
             $user = $registration->user();
 
             // report unknown country code but ignore non-country from cloudflare
-            if ($countryCode !== null && $country === null && $countryCode !== 'T1') {
+            if (
+                $countryCode !== null
+                && $countryCode !== 'T1'
+                && app('countries')->byCode($countryCode) === null
+            ) {
                 app('sentry')->getClient()->captureMessage(
                     'User registered from unknown country',
                     null,

diff --git a/app/Libraries/User/CountryChange.php b/app/Libraries/User/CountryChange.php
@@ -9,7 +9,6 @@
 
 use App\Exceptions\InvariantException;
 use App\Models\Beatmap;
-use App\Models\Country;
 use App\Models\User;
 use App\Models\UserAccountHistory;
 
@@ -18,7 +17,7 @@ class CountryChange
     public static function handle(User $user, string $newCountry, string $reason): void
     {
         // Assert valid country acronym
-        $country = Country::find($newCountry);
+        $country = app('countries')->byCode($newCountry);
         if ($country === null) {
             throw new InvariantException('invalid country specified');
         }

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -2320,11 +2320,12 @@ public function isValid()
 
         if ($this->isDirty('country_acronym')) {
             if (present($this->country_acronym)) {
-                if (($country = Country::find($this->country_acronym)) !== null) {
+                $country = app('countries')->byCode($this->country_acronym);
+                if ($country === null) {
+                    $this->validationErrors()->add('country', '.invalid_country');
+                } else {
                     // ensure matching case
                     $this->country_acronym = $country->getKey();
-                } else {
-                    $this->validationErrors()->add('country', '.invalid_country');
                 }
             } else {
                 $this->country_acronym = Country::UNKNOWN;

diff --git a/database/factories/CountryFactory.php b/database/factories/CountryFactory.php
@@ -13,6 +13,11 @@ class CountryFactory extends Factory
 {
     protected $model = Country::class;
 
+    public function configure(): static
+    {
+        return $this->afterCreating(fn () => app('countries')->resetMemoized());
+    }
+
     public function definition(): array
     {
         return [