Skip to content

Made Daily Scoreboard show only Daily scores #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hipposgrumm wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Made Daily Scoreboard show only Daily scores #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66bb9f0
Daily Scoreboard now works correctly.
Hipposgrumm Jun 11, 2025
1770942
Heavily optimized the entire PR.
Hipposgrumm Jun 16, 2025
a74eea6
Merge branch 'SoDOff-Project:master' into master
Hipposgrumm Jun 22, 2025
464c3fd
Fix Merge Conflict
Hipposgrumm Sep 12, 2025
900bdbb
Merge branch 'master' into master
Hipposgrumm Sep 12, 2025
b112bc6
Update comment in GameDataService.cs
Hipposgrumm Sep 16, 2025
695cc76
Merged Daily Value retrieval with GameDataResponseToList.
Hipposgrumm Oct 19, 2025
13427e1
Merge remote-tracking branch 'origin/master' into master
Hipposgrumm Oct 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Controllers/Common/ContentController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2148,7 +2148,7 @@ public IActionResult GetGameDataByGameForDateRange(Viking viking, [FromForm] int
[Route("ContentWebService.asmx/GetPeriodicGameDataByGame")] // used by Math Blaster and WoJS (probably from 24 hours ago to now)
[VikingSession(UseLock = true)]
public IActionResult GetPeriodicGameDataByGame(Viking viking, [FromForm] int gameId, bool isMultiplayer, int difficulty, int gameLevel, string key, int count, bool AscendingOrder, int score, bool buddyFilter, string apiKey) {
return Ok(gameDataService.GetGameData(viking, gameId, isMultiplayer, difficulty, gameLevel, key, count, AscendingOrder, buddyFilter, apiKey, DateTime.Now.AddHours(-24), DateTime.Now));
return Ok(gameDataService.GetDailyGameData(viking, gameId, isMultiplayer, difficulty, gameLevel, key, count, AscendingOrder, buddyFilter, apiKey));
}

[HttpPost]
Expand Down
1 change: 1 addition & 0 deletions src/Model/GameDataPair.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class GameDataPair {
public int GameDataId { get; set; }
public string Name { get; set; } = null!;
public int Value { get; set; }
public int DailyValue { get; set; }
[JsonIgnore]
public virtual GameData GameData { get; set; } = null!;
}
46 changes: 35 additions & 11 deletions src/Services/GameDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,32 @@ public bool SaveGameData(Viking viking, int gameId, bool isMultiplayer, int diff
viking.GameData.Add(gameData);

}
gameData.DatePlayed = DateTime.UtcNow;

SavePairs(gameData, xmlDocumentData);
gameData.DatePlayed = DateTime.UtcNow;
ctx.SaveChanges();

return true;
}

List<GameDataResponse> GameDataResponseToList(IQueryable<Model.GameData> originalQuery, string key, int count, bool AscendingOrder, string apiKey) {
List<GameDataResponse> GameDataResponseToList(IQueryable<Model.GameData> originalQuery, string key, int count, bool AscendingOrder, string apiKey, bool daily=false) {
var query = originalQuery.SelectMany(e => e.GameDataPairs)
.Where(x => x.Name == key);

if (AscendingOrder)
query = query.OrderBy(e => e.Value);
query = query.OrderBy(e => daily ? e.DailyValue : e.Value);
else
query = query.OrderByDescending(e => e.Value);
query = query.OrderByDescending(e => daily ? e.DailyValue : e.Value);

uint gameVersion = ClientVersion.GetVersion(apiKey);
if (gameVersion <= ClientVersion.Max_OldJS)
// use DisplayName instead of Name
return query.Select(e => new GameDataResponse(
XmlUtil.DeserializeXml<AvatarData>(e.GameData.Viking.AvatarSerialized).DisplayName, e.GameData.Viking.Uid, e.GameData.DatePlayed, e.GameData.Win, e.GameData.Loss, e.Value)
XmlUtil.DeserializeXml<AvatarData>(e.GameData.Viking.AvatarSerialized).DisplayName, e.GameData.Viking.Uid, e.GameData.DatePlayed, e.GameData.Win, e.GameData.Loss, daily ? e.DailyValue : e.Value)
).Take(count).ToList();
else
return query.Select(e => new GameDataResponse(
e.GameData.Viking.Name, e.GameData.Viking.Uid, e.GameData.DatePlayed, e.GameData.Win, e.GameData.Loss, e.Value)
e.GameData.Viking.Name, e.GameData.Viking.Uid, e.GameData.DatePlayed, e.GameData.Win, e.GameData.Loss, daily ? e.DailyValue : e.Value)
).Take(count).ToList();
}

Expand All @@ -70,6 +72,20 @@ public GameDataSummary GetGameData(Viking viking, int gameId, bool isMultiplayer

return GetSummaryFromResponse(viking, isMultiplayer, difficulty, gameLevel, key, selectedData);
}

public GameDataSummary GetDailyGameData(Viking viking, int gameId, bool isMultiplayer, int difficulty, int gameLevel, string key, int count, bool AscendingOrder, bool buddyFilter, string apiKey) {
IQueryable<Model.GameData> query = ctx.GameData
.Where(x =>
x.GameId == gameId && x.IsMultiplayer == false &&
x.Difficulty == difficulty && x.GameLevel == gameLevel &&
x.DatePlayed.Date == DateTime.UtcNow.Date);

// TODO: Buddy filter

List<GameDataResponse> selectedData = GameDataResponseToList(query, key, count, AscendingOrder, apiKey, true);

return GetSummaryFromResponse(viking, isMultiplayer, difficulty, gameLevel, key, selectedData);
}

// ByUser for JumpStart's My Scores
public GameDataSummary GetGameDataByUser(Viking viking, int gameId, bool isMultiplayer, int difficulty, int gameLevel, string key, int count, bool AscendingOrder, string apiKey) {
Expand Down Expand Up @@ -141,12 +157,20 @@ private GameDataSummary GetSummaryFromResponse(Viking viking, bool isMultiplayer
private void SavePairs(Model.GameData gameData, string xmlDocumentData) {
foreach (var pair in GetGameDataPairs(xmlDocumentData)) {
GameDataPair? dbPair = gameData.GameDataPairs.FirstOrDefault(x => x.Name == pair.Name);
if (dbPair == null)

// If the score type is "time", use newBest <= existing (newest time is smaller than (or the same as) existing time).
// For anything else, use newBest > existing (newest score is larger than existing score).
bool newBest = (dbPair == null) || ((pair.Name == "time") != (dbPair.Value <= pair.Value));

if (dbPair == null) {
gameData.GameDataPairs.Add(pair);
else if (pair.Name == "time" && dbPair.Value > pair.Value)
dbPair.Value = pair.Value;
else if (pair.Name != "time" && dbPair.Value <= pair.Value)
dbPair.Value = pair.Value;
dbPair = pair;
} else if (newBest) dbPair.Value = pair.Value;

if (
newBest || // Surpassed Score (or Unset)
gameData.DatePlayed.Date != DateTime.UtcNow.Date // Another Day
) dbPair.DailyValue = pair.Value;
}
}

Expand Down