webapi: fix leaderboard (#369)

crpg2 · Jul 17, 2024 · 8bef2a7 · 8bef2a7
1 parent ad5f606
commit 8bef2a7
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/Application/Characters/Queries/GetLeaderboardQuery.cs b/src/Application/Characters/Queries/GetLeaderboardQuery.cs
@@ -37,14 +37,15 @@ public async Task<Result<IList<CharacterPublicViewModel>>> Handle(GetLeaderboard
             {
                 // Todo: use DistinctBy here when EfCore implements it (does not work for now: https://github.com/dotnet/efcore/issues/27470 )
                 var topRatedCharactersByRegion = await _db.Characters
-                .OrderByDescending(c => c.Rating.CompetitiveValue)
-                .Where(c => (req.Region == null || req.Region == c.User!.Region)
-                            && (req.CharacterClass == null || req.CharacterClass == c.Class))
-                .Take(500)
-                .ProjectTo<CharacterPublicViewModel>(_mapper.ConfigurationProvider)
-                .ToArrayAsync(cancellationToken);
+                    .Include(c => c.User)
+                    .OrderByDescending(c => c.Rating.CompetitiveValue)
+                    .Where(c => (req.Region == null || req.Region == c.User!.Region)
+                                && (req.CharacterClass == null || req.CharacterClass == c.Class))
+                    .Take(500)
+                    .ProjectTo<CharacterPublicViewModel>(_mapper.ConfigurationProvider)
+                    .ToArrayAsync(cancellationToken);
 
-                IList<CharacterPublicViewModel> data = topRatedCharactersByRegion.DistinctBy(c => c.User).Take(50).ToList();
+                IList<CharacterPublicViewModel> data = topRatedCharactersByRegion.DistinctBy(c => c.User.Id).Take(50).ToList();
 
                 var cacheOptions = new MemoryCacheEntryOptions()
                     .SetAbsoluteExpiration(TimeSpan.FromMinutes(1));