Merge pull request #11864 from nanaya/ranking-user-team

Include user team in ranking json
ppy · Feb 18, 2025 · 491abf1 · 491abf1
2 parents 21497c6 + 09f3717
commit 491abf1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/RankingController.php
@@ -14,6 +14,7 @@
 use App\Models\UserStatistics;
 use App\Transformers\SelectOptionTransformer;
 use App\Transformers\UserCompactTransformer;
+use App\Transformers\UserStatisticsTransformer;
 use DB;
 use Illuminate\Pagination\LengthAwarePaginator;
 
@@ -242,7 +243,7 @@ public function index($mode, $type)
                     break;
 
                 default:
-                    $includes = ['user', 'user.cover', 'user.country'];
+                    $includes = UserStatisticsTransformer::RANKING_INCLUDES;
 
                     if ($this->country !== null) {
                         $includes[] = 'country_rank';
@@ -256,7 +257,7 @@ public function index($mode, $type)
                         $includes[] = 'rank_change_since_30_days';
                     }
 
-                    $ranking = json_collection($stats, 'UserStatistics', $includes);
+                    $ranking = json_collection($stats, new UserStatisticsTransformer(), $includes);
                     break;
             }
 
@@ -346,7 +347,11 @@ public function spotlight($mode)
                     // transformer can't do nested includes with params properly.
                     // https://github.com/thephpleague/fractal/issues/239
                     'beatmapsets' => json_collection($beatmapsets, 'Beatmapset', ['beatmaps']),
-                    'ranking' => json_collection($scores->get(), 'UserStatistics', ['user', 'user.cover', 'user.country']),
+                    'ranking' => json_collection(
+                        $scores->get(),
+                        new UserStatisticsTransformer(),
+                        UserStatisticsTransformer::RANKING_INCLUDES,
+                    ),
                     'spotlight' => json_item($spotlight, 'Spotlight', ["participant_count:mode({$mode})"]),
                 ];
             } else {

diff --git a/app/Transformers/UserStatisticsTransformer.php b/app/Transformers/UserStatisticsTransformer.php
@@ -11,6 +11,12 @@
 
 class UserStatisticsTransformer extends TransformerAbstract
 {
+    const RANKING_INCLUDES = [
+        'user.country',
+        'user.cover',
+        'user.team',
+    ];
+
     protected array $availableIncludes = [
         'country_rank',
         'rank',
@@ -19,11 +25,9 @@ class UserStatisticsTransformer extends TransformerAbstract
         'variants',
     ];
 
-    public function transform(UserStatistics\Model $stats = null)
+    public function transform(?UserStatistics\Model $stats = null)
     {
-        if ($stats === null) {
-            $stats = new UserStatistics\Osu();
-        }
+        $stats ??= new UserStatistics\Osu();
 
         if (!$GLOBALS['cfg']['osu']['scores']['experimental_rank_as_default'] && $GLOBALS['cfg']['osu']['scores']['experimental_rank_as_extra']) {
             $globalRankExp = $stats->globalRankExp();