From 13eae0ccd8c8a5bf5d4de1d19c0aa153fa33c647 Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 25 Sep 2024 20:26:40 +0900 Subject: [PATCH 1/4] Use preloaded country data --- app/Transformers/UserCompactTransformer.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Transformers/UserCompactTransformer.php b/app/Transformers/UserCompactTransformer.php index 15e71dea888..7c83a1f3d83 100644 --- a/app/Transformers/UserCompactTransformer.php +++ b/app/Transformers/UserCompactTransformer.php @@ -22,7 +22,6 @@ class UserCompactTransformer extends TransformerAbstract ]; const CARD_INCLUDES_PRELOAD = [ - 'country', 'userGroups', ]; @@ -193,9 +192,7 @@ public function includeCommentsCount(User $user) public function includeCountry(User $user) { - return $user->country === null - ? $this->primitive(null) - : $this->item($user->country, new CountryTransformer()); + return $this->item(app('countries')->byCode($user->country_acronym), new CountryTransformer()); } public function includeCover(User $user) From 3043cb5257c54ea3eb090428b8c3d724e4c8305c Mon Sep 17 00:00:00 2001 From: bakaneko Date: Wed, 25 Sep 2024 23:02:59 +0900 Subject: [PATCH 2/4] remove useless route --- routes/web.php | 1 - 1 file changed, 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 3e1220f7e96..941fcde9b32 100644 --- a/routes/web.php +++ b/routes/web.php @@ -361,7 +361,6 @@ Route::get('approved', 'PaypalController@approved')->name('approved'); Route::get('declined', 'PaypalController@declined')->name('declined'); Route::post('create', 'PaypalController@create')->name('create'); - Route::get('completed', 'PaypalController@completed')->name('completed'); Route::post('ipn', 'PaypalController@ipn')->name('ipn'); }); From 1f9bbfda37a5af6a613b07385c6b0de49f66e4b1 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 26 Sep 2024 15:03:06 +0900 Subject: [PATCH 3/4] Don't explode on nonexisting country acronym --- app/Transformers/UserCompactTransformer.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Transformers/UserCompactTransformer.php b/app/Transformers/UserCompactTransformer.php index 7c83a1f3d83..8cc97bf3276 100644 --- a/app/Transformers/UserCompactTransformer.php +++ b/app/Transformers/UserCompactTransformer.php @@ -192,7 +192,11 @@ public function includeCommentsCount(User $user) public function includeCountry(User $user) { - return $this->item(app('countries')->byCode($user->country_acronym), new CountryTransformer()); + $country = app('countries')->byCode($user->country_acronym); + + return $country === null + ? $this->primitive(null) + : $this->item($country, new CountryTransformer()); } public function includeCover(User $user) From ef5d91e20f90fc1a6f6bfa6b55ec7710089032a3 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 26 Sep 2024 15:04:33 +0900 Subject: [PATCH 4/4] More null check --- app/Transformers/UserCompactTransformer.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Transformers/UserCompactTransformer.php b/app/Transformers/UserCompactTransformer.php index 8cc97bf3276..1179d9a9e2c 100644 --- a/app/Transformers/UserCompactTransformer.php +++ b/app/Transformers/UserCompactTransformer.php @@ -192,7 +192,10 @@ public function includeCommentsCount(User $user) public function includeCountry(User $user) { - $country = app('countries')->byCode($user->country_acronym); + $countryAcronym = $user->country_acronym; + $country = $countryAcronym === null + ? null + : app('countries')->byCode($countryAcronym); return $country === null ? $this->primitive(null)