Merge pull request #107 from lanedirt/106-highscore-page-throws-error

Fix highscore page, added tests
lanedirt · Apr 28, 2024 · 49e8abf · 49e8abf
2 parents 0b67abc + 5cc5de4
commit 49e8abf
Show file tree

Hide file tree

Showing 15 changed files with 1,200 additions and 851 deletions.
diff --git a/app/Http/Controllers/HighscoreController.php b/app/Http/Controllers/HighscoreController.php
@@ -19,6 +19,8 @@ class HighscoreController extends OGameController
      */
     public function index(Request $request, PlayerService $player) : View
     {
+        $this->setBodyId('highscore');
+
         return view('ingame.highscore.index')->with([
             'initialContent' => $this->ajax($request, $player),
         ]);

diff --git a/app/Services/HighscoreService.php b/app/Services/HighscoreService.php
@@ -102,6 +102,7 @@ public function getPlayerScoreMilitary(PlayerService $player): int
      *
      * @param PlayerService $player
      * @return int
+     * @throws Exception
      */
     public function getPlayerScoreEconomy(PlayerService $player): int
     {
@@ -126,7 +127,9 @@ public function getPlayerScoreEconomy(PlayerService $player): int
     public function getHighscorePlayers(int $offset_start = 0, int $return_amount = 100): array
     {
         // Get all players
-        $players = User::all();
+        // TODO: when cached highscore results are available, remove this max 110 players limit.
+        // This limit is added to prevent loading all players in memory at once which causes timeout issues.
+        $players = User::take(110)->get();
         $highscore = [];
         $count = 0;
         foreach ($players as $player) {
@@ -217,6 +220,12 @@ public function getHighscorePlayerRank(PlayerService $player): int
      */
     public function getHighscorePlayerAmount() : int
     {
-        return User::count();
+        // TODO: return actual player count again when caching is implemented.
+        $actualUserCount = User::count();
+        if ($actualUserCount > 110) {
+            return 110;
+        }
+
+        return $actualUserCount;
     }
 }