Check ranked state when retrieving user best scores

osu.Server.Queues.ScoreStatisticsProcessor.Tests/ManiaKeyModeUserStatsProcessorTests.cs

@@ -151,6 +151,40 @@ public void RankCountsCorrect()
             WaitForDatabaseState<(int?, int?)>("SELECT `a_rank_count`, `s_rank_count` FROM `osu_user_stats_mania_4k` WHERE `user_id` = @userId", (0, 1), CancellationToken, new { userId = 2 });
         }
 
+        [Fact]
+        public void RankCountsNotUpdatedForUnrankedScores()
+        {
+            var beatmap4K = AddBeatmap(b =>
+            {
+                b.beatmap_id = 12;
+                b.playmode = 3;
+                b.diff_size = 4;
+            }, s => s.beatmapset_id = 1);
+
+            WaitForDatabaseState<(int?, int?)>("SELECT `a_rank_count`, `s_rank_count` FROM `osu_user_stats_mania_4k` WHERE `user_id` = @userId", (null, null), CancellationToken, new { userId = 2 });
+
+            SetScoreForBeatmap(beatmap4K.beatmap_id, s =>
+            {
+                s.Score.ranked = false;
+                s.Score.preserve = true;
+                s.Score.total_score = 500_000;
+                s.Score.rank = ScoreRank.A;
+                s.Score.ruleset_id = 3;
+            });
+
+            WaitForDatabaseState<(int?, int?)>("SELECT `a_rank_count`, `s_rank_count` FROM `osu_user_stats_mania_4k` WHERE `user_id` = @userId", (0, 0), CancellationToken, new { userId = 2 });
+
+            SetScoreForBeatmap(beatmap4K.beatmap_id, s =>
+            {
+                s.Score.ranked = s.Score.preserve = true;
+                s.Score.total_score = 300_000; // same map and keymode as above, lower score, but score is ranked => should count
+                s.Score.rank = ScoreRank.S;
+                s.Score.ruleset_id = 3;
+            });
+
+            WaitForDatabaseState<(int?, int?)>("SELECT `a_rank_count`, `s_rank_count` FROM `osu_user_stats_mania_4k` WHERE `user_id` = @userId", (0, 1), CancellationToken, new { userId = 2 });
+        }
+
         [Fact]
         public void PerformancePointTotalAndRankUpdated()
         {

osu.Server.Queues.ScoreStatisticsProcessor.Tests/RankedScoreProcessorTests.cs

@@ -46,6 +46,19 @@ public void TestScoreOnRankedMapIncreasesRankedScore(BeatmapOnlineStatus status)
             waitForRankedScore("osu_user_stats", 10081);
         }
 
+        [Fact]
+        public void TestUnrankedScoreOnRankedMapDoesNotIncreaseRankedScore()
+        {
+            AddBeatmap(b => b.approved = BeatmapOnlineStatus.Ranked);
+            waitForRankedScore("osu_user_stats", 0);
+
+            SetScoreForBeatmap(TEST_BEATMAP_ID, s => s.Score.ranked = false);
+            waitForRankedScore("osu_user_stats", 0);
+
+            SetScoreForBeatmap(TEST_BEATMAP_ID, s => s.Score.total_score = 50000);
+            waitForRankedScore("osu_user_stats", 5041);
+        }
+
         [Fact]
         public void TestScoresFromDifferentBeatmapsAreCountedSeparately()
         {

osu.Server.Queues.ScoreStatisticsProcessor.Tests/UserRankCountProcessorTests.cs

@@ -116,6 +116,32 @@ public void TestScoreWithRankAOrAboveOnRankedMapChangesRankCounts(BeatmapOnlineS
             });
         }
 
+        [Fact]
+        public void TestUnrankedScoreWithRankAOrAboveOnRankedMapDoesNotChangeRankCounts()
+        {
+            AddBeatmap(b => b.approved = BeatmapOnlineStatus.Ranked);
+            waitForRankCounts("osu_user_stats", new Dictionary<ScoreRank, int>());
+
+            SetScoreForBeatmap(TEST_BEATMAP_ID, item =>
+            {
+                item.Score.total_score = 100_000;
+                item.Score.rank = ScoreRank.A;
+                item.Score.ranked = false;
+            });
+            waitForRankCounts("osu_user_stats", new Dictionary<ScoreRank, int>());
+
+            SetScoreForBeatmap(TEST_BEATMAP_ID, item =>
+            {
+                item.Score.total_score = 50_000;
+                item.Score.rank = ScoreRank.S;
+                item.Score.ranked = true;
+            });
+            waitForRankCounts("osu_user_stats", new Dictionary<ScoreRank, int>
+            {
+                [ScoreRank.S] = 1
+            });
+        }
+
         [Fact]
         public void TestScoreFromSameBeatmapAndHigherTotalChangesCountedRank()
         {

osu.Server.Queues.ScoreStatisticsProcessor/Helpers/DatabaseHelper.cs

@@ -205,6 +205,7 @@ public static bool IsBeatmapValidForRankedCounts(int beatmapId, MySqlConnection
                 // usages in processors will generally pass in an unprocessed score, but still expect it to be included in the results of this query as if it was processed.
                 // therefore we need to make an exception here to ensure it's included.
                 + "AND (`preserve` = 1 OR `id` = @new_score_id) "
+                + "AND `ranked` = 1 "
                 + "ORDER BY total_score DESC, `id` DESC "
                 + "LIMIT @offset, 1", new
                 {