Fix level friend leaderboards, other level score query optimizations (#862)

Author: jvyden

Refresh.Database/GameDatabaseContext.Leaderboard.cs

@@ -40,7 +40,7 @@ public GameScore SubmitScore(ISerializedScore score, GameUser user, GameLevel le
 
         #region Notifications
 
-        IEnumerable<ScoreWithRank> rankedScores = GetRankedScoresAroundScore(newScore, 3).ToList();
+        IEnumerable<ScoreWithRank> rankedScores = GetRankedScoresAroundScore(newScore, 3).Items;
         ScoreWithRank? rankOne = rankedScores.FirstOrDefault(s => s.rank == 1);
         ScoreWithRank? rankTwo = rankedScores.FirstOrDefault(s => s.rank == 2);
         if (rankOne != null && rankTwo != null &&
@@ -65,53 +65,51 @@ public GameScore SubmitScore(ISerializedScore score, GameUser user, GameLevel le
     public DatabaseList<GameScore> GetTopScoresForLevel(GameLevel level, int count, int skip, byte type, bool showDuplicates = false)
     {
         IEnumerable<GameScore> scores = this.GameScoresIncluded
-            .Where(s => s.ScoreType == type && s.Level == level)
-            .OrderByDescending(s => s.Score)
-            .AsEnumerableIfRealm();
+            .Where(s => s.ScoreType == type && s.LevelId == level.LevelId)
+            .OrderByDescending(s => s.Score);
 
         if (!showDuplicates)
             scores = scores.DistinctBy(s => s.PlayerIds[0]);
 
         return new DatabaseList<GameScore>(scores, skip, count);
     }
 
-    public IEnumerable<ScoreWithRank> GetRankedScoresAroundScore(GameScore score, int count)
+    public DatabaseList<ScoreWithRank> GetRankedScoresAroundScore(GameScore score, int count)
     {
         if (count % 2 != 1) throw new ArgumentException("The number of scores must be odd.", nameof(count));
 
         // this is probably REALLY fucking slow, and i probably shouldn't be trusted with LINQ anymore
 
         List<GameScore> scores = this.GameScoresIncluded
-            .Where(s => s.ScoreType == score.ScoreType && s.Level == score.Level)
+            .Where(s => s.ScoreType == score.ScoreType && s.LevelId == score.LevelId)
             .OrderByDescending(s => s.Score)
-            .AsEnumerable()
-            .ToList();
-
-        scores = scores.DistinctBy(s => s.PlayerIds[0])
+            .ToArray()
+            .DistinctBy(s => s.PlayerIds[0])
             .ToList();
 
-        return scores.Select((s, i) => new ScoreWithRank(s, i + 1))
-            .Skip(Math.Min(scores.Count, scores.IndexOf(score) - count / 2)) // center user's score around other scores
-            .Take(count);
+        return new
+        (
+            scores.Select((s, i) => new ScoreWithRank(s, i + 1)),
+            Math.Min(scores.Count, scores.IndexOf(score) - count / 2), // center user's score around other scores
+            count
+        );
     }
 
-    public IEnumerable<ScoreWithRank> GetLevelTopScoresByFriends(GameUser user, GameLevel level, int count, byte type)
+    public DatabaseList<ScoreWithRank> GetLevelTopScoresByFriends(GameUser user, GameLevel level, int count, byte scoreType)
     {
         IEnumerable<ObjectId> mutuals = this.GetUsersMutuals(user)
-            .AsEnumerableIfRealm()
-            .Select(u => u.UserId);
-        
-        IEnumerable<GameScore> scores = this.GameScores
-            .Where(s => s.ScoreType == type && s.Level == level)
+            .Select(u => u.UserId)
+            .Append(user.UserId);
+
+        IEnumerable<GameScore> scores = this.GameScoresIncluded
+            .Where(s => s.ScoreType == scoreType && s.LevelId == level.LevelId)
             .OrderByDescending(s => s.Score)
-            .AsEnumerableIfRealm()
+            .ToArray()
             .DistinctBy(s => s.PlayerIds[0])
             //TODO: THIS CALL IS EXTREMELY INEFFECIENT!!! once we are in postgres land, figure out a way to do this effeciently
-            .Where(s => s.PlayerIds.Any(p => p == user.UserId || mutuals.Contains(p)))
-            .Take(10)
-            .ToList();
+            .Where(s => s.PlayerIds.Any(p => mutuals.Contains(p)));
 
-        return scores.Select((s, i) => new ScoreWithRank(s, i + 1));
+        return new(scores.Select((s, i) => new ScoreWithRank(s, i + 1)), 0, count);
     }
 
     [Pure]
@@ -173,7 +171,6 @@ public IEnumerable<GameUser> GetPlayersFromScore(GameScore score)
     {
         IEnumerable<ObjectId> playerIds = score.PlayerIds.Select(p => p);
         return this.GameUsersIncluded
-            .AsEnumerableIfRealm()
             .Where(u => playerIds.Contains(u.UserId));
     }
 

Refresh.Database/Models/Levels/Scores/GameScore.cs

@@ -11,9 +11,10 @@ public partial class GameScore
 {
     [Key] public ObjectId ScoreId { get; set; } = ObjectId.GenerateNewId();
 
-     public TokenGame Game { get; set; }
+    public TokenGame Game { get; set; }
     public TokenPlatform Platform { get; set; }
 
+    [Required] public int LevelId { get; set; }
     [Required] public GameLevel Level { get; set; }
     public DateTimeOffset ScoreSubmitted { get; set; }
 

Refresh.Interfaces.Game/Endpoints/Levels/LeaderboardEndpoints.cs

@@ -87,8 +87,9 @@ public Response GetUserScores(RequestContext context, GameUser user, GameDatabas
     {
         GameLevel? level = database.GetLevelByIdAndType(slotType, id);
         if (level == null) return null;
-        
-        return SerializedScoreLeaderboardList.FromSubmittedEnumerable(database.GetLevelTopScoresByFriends(user, level, 10, body.Type), dataContext);
+
+        DatabaseList<ScoreWithRank>? scores = database.GetLevelTopScoresByFriends(user, level, 10, body.Type);
+        return SerializedScoreLeaderboardList.FromSubmittedEnumerable(scores.Items, dataContext);
     }
 
     [GameEndpoint("scoreboard/{slotType}/{id}", ContentType.Xml, HttpMethods.Post)]
@@ -125,10 +126,10 @@ public Response SubmitScore(RequestContext context, GameUser user, GameServerCon
 
         GameScore score = database.SubmitScore(body, token, level);
 
-        IEnumerable<ScoreWithRank>? scores = database.GetRankedScoresAroundScore(score, 5);
+        DatabaseList<ScoreWithRank>? scores = database.GetRankedScoresAroundScore(score, 5);
         Debug.Assert(scores != null);
 
-        return new Response(SerializedScoreLeaderboardList.FromSubmittedEnumerable(scores, dataContext), ContentType.Xml);
+        return new Response(SerializedScoreLeaderboardList.FromSubmittedEnumerable(scores.Items.ToArray(), dataContext), ContentType.Xml);
     }
 
     [GameEndpoint("topscores/{slotType}/{id}/{type}", ContentType.Xml)]
@@ -141,6 +142,8 @@ public Response GetTopScoresForLevel(RequestContext context, GameDatabaseContext
         if (level == null) return NotFound;
 
         (int skip, int count) = context.GetPageData();
-        return new Response(SerializedScoreList.FromSubmittedEnumerable(database.GetTopScoresForLevel(level, count, skip, (byte)type).Items.ToArrayIfPostgres(), dataContext, skip), ContentType.Xml);
+        DatabaseList<GameScore>? scores = database.GetTopScoresForLevel(level, count, skip, (byte)type);
+
+        return new Response(SerializedScoreList.FromSubmittedEnumerable(scores.Items.ToArray(), dataContext, skip), ContentType.Xml);
     }
 }

RefreshTests.GameServer/Tests/Levels/ScoreLeaderboardTests.cs

@@ -317,6 +317,7 @@ private void ScoreSegmentTest(int count, int expectedIndex, int leaderboardCount
         GameScore score = context.SubmitScore(submittedScore, 1, level, user, TokenGame.LittleBigPlanet2, TokenPlatform.PS3);
 
         List<ObjectId> scores = context.Database.GetRankedScoresAroundScore(score, count)!
+            .Items
             .Select(s => s.score.ScoreId)
             .ToList();