From 7b1d4a73a5da342f12f067abe308a673e1c8ad0a Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 1 Aug 2024 16:35:10 +0100 Subject: [PATCH] API: move around --- .../fascinated/model/score/ScoreResponse.java | 20 +++++++++---------- .../services/TrackedScoreService.java | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/API/src/main/java/cc/fascinated/model/score/ScoreResponse.java b/API/src/main/java/cc/fascinated/model/score/ScoreResponse.java index 3ad31ba..083c895 100644 --- a/API/src/main/java/cc/fascinated/model/score/ScoreResponse.java +++ b/API/src/main/java/cc/fascinated/model/score/ScoreResponse.java @@ -18,16 +18,6 @@ public class ScoreResponse { */ private String scoreId; - /** - * The ID of the player who set the score. - */ - private ScoreSaberAccount player; - - /** - * The ID of the leaderboard. - */ - private Leaderboard leaderboard; - /** * The PP of the score. */ @@ -83,6 +73,16 @@ public class ScoreResponse { */ private Double accuracy; + /** + * The ID of the player who set the score. + */ + private ScoreSaberAccount player; + + /** + * The ID of the leaderboard. + */ + private Leaderboard leaderboard; + /** * The timestamp of the score. */ diff --git a/API/src/main/java/cc/fascinated/services/TrackedScoreService.java b/API/src/main/java/cc/fascinated/services/TrackedScoreService.java index d21ef8a..099db0a 100644 --- a/API/src/main/java/cc/fascinated/services/TrackedScoreService.java +++ b/API/src/main/java/cc/fascinated/services/TrackedScoreService.java @@ -78,8 +78,6 @@ public class TrackedScoreService { scores.add(new ScoreResponse( trackedScore.getScoreId(), - user.getScoresaberAccount(), - leaderboard, trackedScore.getPp(), trackedScore.getRank(), trackedScore.getScore(), @@ -91,6 +89,8 @@ public class TrackedScoreService { trackedScore.getBadCuts(), trackedScore.getMaxCombo(), trackedScore.getAccuracy(), + user.getScoresaberAccount(), + leaderboard, trackedScore.getTimestamp() )); }