Merge pull request #11944 from nanaya/team-ranking-page

notbakaneko · web-flow · commit 0eecb0662ffc · 2025-03-05T16:16:08.000+09:00
Add team ranking page
diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/RankingController.php
@@ -10,9 +10,11 @@
 use App\Models\CountryStatistics;
 use App\Models\Model;
 use App\Models\Spotlight;
+use App\Models\TeamStatistics;
 use App\Models\User;
 use App\Models\UserStatistics;
 use App\Transformers\SelectOptionTransformer;
+use App\Transformers\TeamStatisticsTransformer;
 use App\Transformers\UserCompactTransformer;
 use App\Transformers\UserStatisticsTransformer;
 use DB;
@@ -31,13 +33,14 @@ class RankingController extends Controller
 
     const MAX_RESULTS = 10000;
     const PAGE_SIZE = Model::PER_PAGE;
-    const RANKING_TYPES = ['performance', 'charts', 'score', 'country'];
+    const RANKING_TYPES = ['performance', 'charts', 'score', 'country', 'team'];
     const SPOTLIGHT_TYPES = ['charts'];
     // in display order
     const TYPES = [
         'performance',
         'score',
         'country',
+        'team',
         'multiplayer',
         'daily_challenge',
         'seasons',
@@ -170,6 +173,12 @@ public function index($mode, $type)
                 ->with('country')
                 ->where('mode', $modeInt)
                 ->orderBy('performance', 'desc');
+        } elseif ($type === 'team') {
+            $stats = TeamStatistics::where('ranked_score', '>', 0)
+                ->where('ruleset_id', $modeInt)
+                ->withCount('members')
+                ->with('team')
+                ->orderBy('performance', 'desc');
         } else {
             $class = UserStatistics\Model::getClass($mode, $this->params['variant']);
             $table = (new $class())->getTable();
@@ -242,6 +251,10 @@ public function index($mode, $type)
                     $ranking = json_collection($stats, 'CountryStatistics', ['country']);
                     break;
 
+                case 'team':
+                    $ranking = json_collection($stats, new TeamStatisticsTransformer(), ['member_count', 'team']);
+                    break;
+
                 default:
                     $includes = UserStatisticsTransformer::RANKING_INCLUDES;
 
@@ -399,6 +412,10 @@ private function maxResults($modeInt, $stats)
                 ->count();
         }
 
+        if ($this->params['type'] === 'team') {
+            return TeamStatistics::where('ruleset_id', $modeInt)->where('ranked_score', '>', 0)->count();
+        }
+
         $maxResults = static::MAX_RESULTS;
 
         if ($this->params['variant'] !== null) {
diff --git a/app/Models/TeamStatistics.php b/app/Models/TeamStatistics.php
@@ -8,6 +8,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class TeamStatistics extends Model
 {
@@ -21,6 +22,11 @@ public function team(): BelongsTo
         return $this->belongsTo(Team::class);
     }
 
+    public function members(): HasMany
+    {
+        return $this->hasMany(TeamMember::class, 'team_id', 'team_id');
+    }
+
     public function recalculate(): void
     {
         $userIdsQuery = TeamMember
diff --git a/app/Transformers/TeamStatisticsTransformer.php b/app/Transformers/TeamStatisticsTransformer.php
@@ -0,0 +1,34 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace App\Transformers;
+
+use App\Models\TeamStatistics;
+
+class TeamStatisticsTransformer extends TransformerAbstract
+{
+    protected array $availableIncludes = ['member_count', 'team'];
+
+    public function transform(TeamStatistics $stat)
+    {
+        return [
+            'team_id' => $stat->team_id,
+            'ruleset_id' => $stat->ruleset_id,
+            'play_count' => $stat->play_count,
+            'ranked_score' => $stat->ranked_score,
+            'performance' => $stat->performance,
+        ];
+    }
+
+    public function includeTeam(TeamStatistics $stat)
+    {
+        return $this->item($stat->team, new TeamTransformer());
+    }
+
+    public function includeMemberCount(TeamStatistics $stat)
+    {
+        return $this->primitive($stat->members_count);
+    }
+}
diff --git a/resources/css/bem/ranking-page-table.less b/resources/css/bem/ranking-page-table.less
@@ -77,6 +77,11 @@
       padding-right: 10px;
     }
 
+    &--value {
+      padding-left: 10px;
+      padding-right: $padding-left;
+    }
+
     &:first-child {
       border-top-left-radius: @border-radius-base;
       border-bottom-left-radius: @border-radius-base;
@@ -122,5 +127,6 @@
 
   &__user-link-text {
     margin-left: 10px;
+    max-width: 350px;
   }
 }
diff --git a/resources/css/variables.less b/resources/css/variables.less
@@ -44,7 +44,7 @@
 @nav2-height: 90px;
 @nav2-height--pinned: 50px;
 @nav2-header-height: 360px;
-@nav2-header-image-height: 310px;
+@nav2-header-image-height: 340px;
 
 // mobile nav
 // TODO: un-bootstrap names
diff --git a/resources/lang/en/rankings.php b/resources/lang/en/rankings.php
@@ -42,6 +42,7 @@
         'performance' => 'performance',
         'score' => 'score',
         'seasons' => 'seasons',
+        'team' => 'team',
     ],
 
     'seasons' => [
@@ -66,6 +67,7 @@
         'active_users' => 'Active Users',
         'country' => 'Country',
         'division' => 'Division',
+        'members' => 'Members',
         'play_count' => 'Play Count',
         'performance' => 'Performance',
         'total_score' => 'Total Score',
diff --git a/resources/views/rankings/team.blade.php b/resources/views/rankings/team.blade.php
@@ -0,0 +1,73 @@
+{{--
+    Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+    See the LICENCE file in the repository root for full licence text.
+--}}
+@extends('rankings.index', ['hasFilter' => false])
+
+@section("scores")
+    <table class="ranking-page-table">
+        <thead>
+            <tr>
+                <th class="ranking-page-table__heading"></th>
+                <th class="ranking-page-table__heading ranking-page-table__heading--main"></th>
+                <th class="ranking-page-table__heading">
+                    {{ osu_trans('rankings.stat.members') }}
+                </th>
+                <th class="ranking-page-table__heading">
+                    {{ osu_trans('rankings.stat.play_count') }}
+                </th>
+                <th class="ranking-page-table__heading">
+                    {{ osu_trans('rankings.stat.ranked_score') }}
+                </th>
+                <th class="ranking-page-table__heading">
+                    {{ osu_trans('rankings.stat.average_score') }}
+                </th>
+                <th class="ranking-page-table__heading ranking-page-table__heading--focused">
+                    {{ osu_trans('rankings.stat.performance') }}
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach ($scores as $index => $score)
+                <tr class="ranking-page-table__row">
+                    <td class="ranking-page-table__column ranking-page-table__column--rank">
+                        #{{ $scores->firstItem() + $index }}
+                    </td>
+                    <td class="ranking-page-table__column">
+                        <div class="ranking-page-table__user-link">
+                            @php
+                                $url = route('teams.leaderboard', [
+                                    'ruleset' => $mode,
+                                    'team' => $score->team->getKey(),
+                                ]);
+                            @endphp
+                            <div class="ranking-page-table__flags">
+                                <a class="u-contents" href="{{ $url }}">
+                                    @include('objects._flag_team', ['team' => $score->team])
+                                </a>
+                            </div>
+                            <a class="ranking-page-table__user-link-text u-ellipsis-overflow" href="{{ $url }}">
+                                {{ $score->team->name }}
+                            </a>
+                        </div>
+                    </td>
+                    <td class="ranking-page-table__column ranking-page-table__column--value ranking-page-table__column--dimmed">
+                        {{ i18n_number_format($score->members_count) }}
+                    </td>
+                    <td class="ranking-page-table__column ranking-page-table__column--value ranking-page-table__column--dimmed">
+                        {{ i18n_number_format($score->play_count) }}
+                    </td>
+                    <td class="ranking-page-table__column ranking-page-table__column--value ranking-page-table__column--dimmed">
+                        {{ i18n_number_format($score->ranked_score) }}
+                    </td>
+                    <td class="ranking-page-table__column ranking-page-table__column--value ranking-page-table__column--dimmed">
+                        {{ i18n_number_format(round($score->ranked_score / max($score->members_count, 1))) }}
+                    </td>
+                    <td class="ranking-page-table__column ranking-page-table__column--value ranking-page-table__column--focused">
+                        {{ i18n_number_format(round($score->performance)) }}
+                    </td>
+                </tr>
+            @endforeach
+        </tbody>
+    </table>
+@endsection

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`namespace App\Models;`
`9`	`9`
`10`	`10`	`use Illuminate\Database\Eloquent\Relations\BelongsTo;`
	`11`	`+use Illuminate\Database\Eloquent\Relations\HasMany;`
`11`	`12`
`12`	`13`	`class TeamStatistics extends Model`
`13`	`14`	`{`
`@@ -21,6 +22,11 @@ public function team(): BelongsTo`
`21`	`22`	`return $this->belongsTo(Team::class);`
`22`	`23`	`}`
`23`	`24`
	`25`	`+ public function members(): HasMany`
	`26`	`+ {`
	`27`	`+ return $this->hasMany(TeamMember::class, 'team_id', 'team_id');`
	`28`	`+ }`
	`29`	`+`
`24`	`30`	`public function recalculate(): void`
`25`	`31`	`{`
`26`	`32`	`$userIdsQuery = TeamMember`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,11 @@`
`77`	`77`	`padding-right: 10px;`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ &--value {`
	`81`	`+ padding-left: 10px;`
	`82`	`+ padding-right: $padding-left;`
	`83`	`+ }`
	`84`	`+`
`80`	`85`	`&:first-child {`
`81`	`86`	`border-top-left-radius: @border-radius-base;`
`82`	`87`	`border-bottom-left-radius: @border-radius-base;`
`@@ -122,5 +127,6 @@`
`122`	`127`
`123`	`128`	`&__user-link-text {`
`124`	`129`	`margin-left: 10px;`
	`130`	`+ max-width: 350px;`
`125`	`131`	`}`
`126`	`132`	`}`