Fix offset in monthly XP leaderboard

danthe1st · danthe1st · commit c87c5364282b · 2024-01-20T19:57:37.000+01:00
diff --git a/src/main/java/net/discordjug/javabot/systems/help/dao/HelpTransactionRepository.java b/src/main/java/net/discordjug/javabot/systems/help/dao/HelpTransactionRepository.java
@@ -134,7 +134,7 @@ public int getNumberOfUsersWithHelpXPInLastMonth() {
 	public List<Pair<Long, Integer>> getTotalTransactionWeightsInLastMonth(int page, int pageSize) {
 		return jdbcTemplate.query("SELECT recipient, SUM(weight) experience FROM help_transaction WHERE created_at >= ? GROUP BY recipient ORDER BY experience DESC LIMIT ? OFFSET ?",
 				(rs, row) -> new Pair<>(rs.getLong(1), rs.getInt(2)),
-				LocalDateTime.now().minusDays(30), pageSize, page);
+				LocalDateTime.now().minusDays(30), pageSize, Math.max(0, (page * pageSize) - pageSize));
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public int getNumberOfUsersWithHelpXPInLastMonth() {`
`134`	`134`	`public List<Pair<Long, Integer>> getTotalTransactionWeightsInLastMonth(int page, int pageSize) {`
`135`	`135`	`return jdbcTemplate.query("SELECT recipient, SUM(weight) experience FROM help_transaction WHERE created_at >= ? GROUP BY recipient ORDER BY experience DESC LIMIT ? OFFSET ?",`
`136`	`136`	`(rs, row) -> new Pair<>(rs.getLong(1), rs.getInt(2)),`
`137`		`- LocalDateTime.now().minusDays(30), pageSize, page);`
	`137`	`+ LocalDateTime.now().minusDays(30), pageSize, Math.max(0, (page * pageSize) - pageSize));`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`/**`