Don't show Users' without XP on Leaderboard

cjmellor · Jul 13, 2024 · 05fed85 · 05fed85
1 parent db03ab9
commit 05fed85
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/Services/LeaderboardService.php b/src/Services/LeaderboardService.php
@@ -20,6 +20,7 @@ public function generate(bool $paginate = false, ?int $limit = null): array|Coll
     {
         return $this->userModel::query()
             ->with(relations: ['experience'])
+            ->whereHas('experience', fn (Builder $query) => $query->whereNotNull(columns: 'experience_points'))
             ->orderByDesc(
                 column: Experience::select('experience_points')
                     ->whereColumn(config('level-up.user.foreign_key'), config('level-up.user.users_table').'.id')

diff --git a/tests/Services/LeaderboardServiceTest.php b/tests/Services/LeaderboardServiceTest.php
@@ -11,7 +11,6 @@
 });
 
 it(description: 'returns the correct data in the correct order', closure: function () {
-    // A User is also created in Pest.php, so we have 5 Users in total.
     tap(User::newFactory()->create())->addPoints(44);
     tap(User::newFactory()->create())->addPoints(123);
     tap(User::newFactory()->create())->addPoints(198);
@@ -22,6 +21,14 @@
             ->pluck(value: 'experience.experience_points')
             ->toArray()
     )
-        ->toBe([245, 198, 123, 44, null])
-        ->toHaveCount(count: 5);
+        ->toBe([245, 198, 123, 44])
+        ->toHaveCount(count: 4);
+});
+
+it(description: 'only shows users with experience points', closure: function () {
+    tap(User::newFactory()->create());
+    $userWithPoints = tap(User::newFactory()->create())->addPoints(44);
+
+    expect(Leaderboard::generate())->toHaveCount(count: 1)
+        ->and(Leaderboard::generate()->first()->id)->toEqual($userWithPoints->id);
 });