From aef795c010112d5a7f9a80f93a32e264bb42dd21 Mon Sep 17 00:00:00 2001 From: Stedoss <29103029+Stedoss@users.noreply.github.com> Date: Mon, 10 Mar 2025 21:57:21 +0000 Subject: [PATCH] Add `leaderboard_score` to score response --- nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt | 1 + .../main/kotlin/com/nisemoe/nise/database/ScoreService.kt | 6 ++++-- .../kotlin/com/nisemoe/nise/database/UserScoreService.kt | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt index 6517d84..e6a8121 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt @@ -175,6 +175,7 @@ data class ReplayData( val pp: Double?, val perfect: Boolean, val max_combo: Int, + val leaderboard_rank: Long?, val count_300: Int, val count_100: Int, diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/database/ScoreService.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/database/ScoreService.kt index 33d9bf3..3f6ace8 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/database/ScoreService.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/database/ScoreService.kt @@ -165,7 +165,8 @@ class ScoreService( SCORES.ERROR_KURTOSIS, SCORES.ERROR_SKEWNESS, SCORES.SLIDEREND_RELEASE_TIMES, - SCORES.KEYPRESSES_TIMES + SCORES.KEYPRESSES_TIMES, + SCORES.LEADERBOARD_RANK, ) .from(SCORES) .join(USERS).on(SCORES.USER_ID.eq(USERS.USER_ID)) @@ -228,7 +229,8 @@ class ScoreService( error_kurtosis = result.get(SCORES.ERROR_KURTOSIS, Double::class.java), error_skewness = result.get(SCORES.ERROR_SKEWNESS, Double::class.java), charts = charts, - similar_scores = this.getSimilarScores(replayId) + similar_scores = this.getSimilarScores(replayId), + leaderboard_rank = result.get(SCORES.LEADERBOARD_RANK, Long::class.java) ) this.loadComparableReplayData(replayData) return replayData diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/database/UserScoreService.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/database/UserScoreService.kt index b9a5cca..d891ed5 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/database/UserScoreService.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/database/UserScoreService.kt @@ -65,7 +65,7 @@ class UserScoreService( USER_SCORES.ERROR_SKEWNESS, USER_SCORES.SLIDEREND_RELEASE_TIMES, USER_SCORES.KEYPRESSES_TIMES, - USER_SCORES.JUDGEMENTS + USER_SCORES.JUDGEMENTS, ) .from(USER_SCORES) .join(BEATMAPS).on(USER_SCORES.BEATMAP_ID.eq(BEATMAPS.BEATMAP_ID)) @@ -127,7 +127,8 @@ class UserScoreService( date = null, pp = null, rank = null, - user_id = null + user_id = null, + leaderboard_rank = null, ) this.scoreService.loadComparableReplayData(replayData) return replayData