API: move around

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.
      */

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()
             ));
         }