Skip to content

fix: stabilize activity leaderboard pagination #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vycdev2 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: stabilize activity leaderboard pagination #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions Morpheus.Tests/ActivityLeaderboardServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,58 @@ public async Task GetGlobalMessageLeaderboardAsync_ExcludesUsersWithoutMessages(
Assert.Equal(["[1] | active: Messages 5"], result.Page.Lines);
Assert.Equal(1, result.Page.TotalPages);
}

[Fact]
public async Task GetGuildXpLeaderboardAsync_OrdersTiesByUserIdAcrossPages()
{
await using SqliteConnection connection = new("Data Source=:memory:");
await connection.OpenAsync();

DbContextOptions<DB> options = new DbContextOptionsBuilder<DB>()
.UseSqlite(connection)
.Options;
await using DB db = new(options);
await db.Database.EnsureCreatedAsync();

Guild guild = new() { DiscordId = 1, Name = "Test guild" };
List<User> users = [.. Enumerable.Range(1, 12)
.Select(index => new User { DiscordId = (ulong)index, Username = $"user{index:00}" })];
db.Add(guild);
db.AddRange(users);
await db.SaveChangesAsync();

db.UserLevels.AddRange(users.AsEnumerable().Reverse().Select(user => new UserLevels
{
UserId = user.Id,
GuildId = guild.Id,
TotalXp = 100
}));
await db.SaveChangesAsync();

ActivityLeaderboardService service = new(db);
ActivityLeaderboardQueryResult firstPage = await service.GetGuildXpLeaderboardAsync(
guild.Id,
guild.Name,
viewerUserId: null,
page: 1);
ActivityLeaderboardQueryResult secondPage = await service.GetGuildXpLeaderboardAsync(
guild.Id,
guild.Name,
viewerUserId: null,
page: 2);

Assert.True(firstPage.Success);
Assert.NotNull(firstPage.Page);
Assert.Equal(
users.Take(ActivityLeaderboardService.PageSize).Select((user, index) =>
$"[{index + 1}] | {user.Username}: Level 0 with 100 XP"),
firstPage.Page.Lines);

Assert.True(secondPage.Success);
Assert.NotNull(secondPage.Page);
Assert.Equal(
users.Skip(ActivityLeaderboardService.PageSize).Select((user, index) =>
$"[{ActivityLeaderboardService.PageSize + index + 1}] | {user.Username}: Level 0 with 100 XP"),
secondPage.Page.Lines);
}
}
30 changes: 20 additions & 10 deletions Services/ActivityLeaderboardService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGuildXpLeaderboardAsync(
IQueryable<UserLevels> query = dbContext.UserLevels
.AsNoTracking()
.Where(ul => ul.GuildId == guildId)
.OrderByDescending(ul => ul.TotalXp);
.OrderByDescending(ul => ul.TotalXp)
.ThenBy(ul => ul.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, "No level data found for this guild.");
Expand Down Expand Up @@ -53,7 +54,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGuildPastXpLeaderboardAsync
var query = baseQuery
.GroupBy(ua => ua.UserId)
.Select(g => new { UserId = g.Key, Value = (long)g.Sum(x => x.XpGained) })
.OrderByDescending(x => x.Value);
.OrderByDescending(x => x.Value)
.ThenBy(x => x.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, $"No activity data found for the past {days} days.");
Expand All @@ -78,7 +80,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGlobalXpLeaderboardAsync(in
.AsNoTracking()
.GroupBy(ul => ul.UserId)
.Select(g => new { UserId = g.Key, Value = (long)g.Sum(ul => ul.TotalXp) })
.OrderByDescending(x => x.Value);
.OrderByDescending(x => x.Value)
.ThenBy(x => x.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, "No level data found globally.");
Expand Down Expand Up @@ -110,7 +113,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGlobalPastXpLeaderboardAsyn
var query = baseQuery
.GroupBy(ua => ua.UserId)
.Select(g => new { UserId = g.Key, Value = (long)g.Sum(x => x.XpGained) })
.OrderByDescending(x => x.Value);
.OrderByDescending(x => x.Value)
.ThenBy(x => x.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, $"No activity data found globally for the past {days} days.");
Expand Down Expand Up @@ -138,7 +142,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGuildMessageLeaderboardAsyn
IQueryable<UserLevels> query = dbContext.UserLevels
.AsNoTracking()
.Where(ul => ul.GuildId == guildId && ul.UserMessageCount > 0)
.OrderByDescending(ul => ul.UserMessageCount);
.OrderByDescending(ul => ul.UserMessageCount)
.ThenBy(ul => ul.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, "No message data found for this guild.");
Expand Down Expand Up @@ -173,7 +178,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGuildPastMessageLeaderboard
var query = baseQuery
.GroupBy(ua => ua.UserId)
.Select(g => new { UserId = g.Key, Value = g.Count() })
.OrderByDescending(x => x.Value);
.OrderByDescending(x => x.Value)
.ThenBy(x => x.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, $"No message data found for the past {days} days.");
Expand All @@ -199,7 +205,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGlobalMessageLeaderboardAsy
.GroupBy(ul => ul.UserId)
.Select(g => new { UserId = g.Key, Value = g.Sum(ul => ul.UserMessageCount) })
.Where(x => x.Value > 0)
.OrderByDescending(x => x.Value);
.OrderByDescending(x => x.Value)
.ThenBy(x => x.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, "No message data found globally.");
Expand Down Expand Up @@ -231,7 +238,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGlobalPastMessageLeaderboar
var query = baseQuery
.GroupBy(ua => ua.UserId)
.Select(g => new { UserId = g.Key, Value = g.Count() })
.OrderByDescending(x => x.Value);
.OrderByDescending(x => x.Value)
.ThenBy(x => x.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, $"No message data found globally for the past {days} days.");
Expand Down Expand Up @@ -259,7 +267,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGuildAverageLengthLeaderboa
IQueryable<UserLevels> query = dbContext.UserLevels
.AsNoTracking()
.Where(ul => ul.GuildId == guildId && ul.UserMessageCount > 0)
.OrderByDescending(ul => ul.UserAverageMessageLength);
.OrderByDescending(ul => ul.UserAverageMessageLength)
.ThenBy(ul => ul.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, "No message data found for this guild.");
Expand Down Expand Up @@ -301,7 +310,8 @@ public async Task<ActivityLeaderboardQueryResult> GetGlobalAverageLengthLeaderbo
})
.Where(x => x.SumCount > 0)
.Select(x => new { x.UserId, AverageLength = x.SumLen / x.SumCount })
.OrderByDescending(x => x.AverageLength);
.OrderByDescending(x => x.AverageLength)
.ThenBy(x => x.UserId);

int totalUsers = await query.CountAsync();
ActivityLeaderboardQueryResult? invalidPage = ValidatePage(page, totalUsers, "No message data found globally.");
Expand Down