Add scores to ActivityPage response

LittleBigRefresh · Jul 11, 2023 · c7dac96 · c7dac96
1 parent 8c9e082
commit c7dac96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Refresh.GameServer/Endpoints/ApiV3/DataTypes/Response/ApiActivityPageResponse.cs b/Refresh.GameServer/Endpoints/ApiV3/DataTypes/Response/ApiActivityPageResponse.cs
@@ -8,6 +8,7 @@ public class ApiActivityPageResponse : IApiResponse, IDataConvertableFrom<ApiAct
     public required IEnumerable<ApiEventResponse> Events { get; set; }
     public required IEnumerable<ApiGameUserResponse> Users { get; set; }
     public required IEnumerable<ApiGameLevelResponse> Levels { get; set; }
+    public required IEnumerable<ApiGameScoreResponse> Scores { get; set; }
 
     public static ApiActivityPageResponse? FromOld(ActivityPage? old)
     {
@@ -18,6 +19,7 @@ public class ApiActivityPageResponse : IApiResponse, IDataConvertableFrom<ApiAct
             Events = ApiEventResponse.FromOldList(old.Events),
             Users = ApiGameUserResponse.FromOldList(old.Users.Users),
             Levels = ApiGameLevelResponse.FromOldList(old.Levels.Items),
+            Scores = ApiGameScoreResponse.FromOldList(old.Scores),
         };
     }
 

diff --git a/Refresh.GameServer/Types/Activity/ActivityPage.cs b/Refresh.GameServer/Types/Activity/ActivityPage.cs
@@ -33,13 +33,17 @@ public class ActivityPage
 
     [XmlElement("slots")]
     public SerializedLevelList Levels { get; set; }
+
+    [XmlIgnore, JsonIgnore]
+    public List<GameSubmittedScore> Scores { get; set; }
 
     public ActivityPage()
     {
         this.Events = new List<Event>();
         this.Groups = new ActivityGroups();
         this.Levels = new SerializedLevelList();
         this.Users = new SerializedUserList();
+        this.Scores = new List<GameSubmittedScore>();
     }
 
     public ActivityPage(GameDatabaseContext database, int count = 20, int skip = 0, long timestamp = 0, long endTimestamp = 0, bool generateGroups = true, GameLevel? level = null)
@@ -87,6 +91,8 @@ public ActivityPage(GameDatabaseContext database, int count = 20, int skip = 0,
             .Select(e => database.GetScoreByObjectId(e.StoredObjectId))
             .ToList()!;
 
+        this.Scores = scores;
+
         this.Groups = generateGroups ? this.GenerateGroups(users, scores) : new ActivityGroups();
 
         this.Groups.Groups = this.Groups.Groups