SoDOff-Project/sodoff
1
0
Fork 1
mirror of https://github.com/SoDOff-Project/sodoff.git synced 2025-10-11 08:18:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

This is why I don't like having to resolve merge conflicts because I don't know what I'm doing.

Browse Source
This commit is contained in:
Hipposgrumm 2025-06-30 21:02:47 -06:00
parent 4c3db02f5e
commit 7d148ce381
3 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controllers/Common/ContentController.cs
View File

@ -2126,7 +2126,7 @@ public class ContentController : Controller {
[Route("ContentWebService.asmx/GetPeriodicGameDataByGame")] // used by Math Blaster and WoJS (probably from 24 hours ago to now) [Route("ContentWebService.asmx/GetPeriodicGameDataByGame")] // used by Math Blaster and WoJS (probably from 24 hours ago to now)
[VikingSession(UseLock = true)] [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) { 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.GetDailyGameData(viking, gameId, isMultiplayer, difficulty, gameLevel, key, count, AscendingOrder, buddyFilter, apiKey)); return Ok(gameDataService.GetGameData(viking, gameId, isMultiplayer, difficulty, gameLevel, key, count, AscendingOrder, buddyFilter, apiKey, DateTime.Now.AddHours(-24), DateTime.Now));
} }
[HttpPost] [HttpPost]

1
src/Model/GameDataPair.cs
View File

@ -7,6 +7,5 @@ public class GameDataPair {
public int GameDataId { get; set; } public int GameDataId { get; set; }
public string Name { get; set; } = null!; public string Name { get; set; } = null!;
public int Value { get; set; } public int Value { get; set; }
public int DailyValue { get; set; }
public virtual GameData GameData { get; set; } = null!; public virtual GameData GameData { get; set; } = null!;
} }

49
src/Services/GameDataService.cs
View File

@ -31,9 +31,9 @@ public class GameDataService {
viking.GameData.Add(gameData); viking.GameData.Add(gameData);
} }
SavePairs(gameData, xmlDocumentData);
gameData.DatePlayed = DateTime.UtcNow; gameData.DatePlayed = DateTime.UtcNow;
SavePairs(gameData, xmlDocumentData);
ctx.SaveChanges(); ctx.SaveChanges();
return true; return true;
@ -72,33 +72,6 @@ public class GameDataService {
return GetSummaryFromResponse(viking, isMultiplayer, difficulty, gameLevel, key, selectedData); 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<GameDataPair> query = ctx.GameData
.Where(x =>
x.GameId == gameId && x.IsMultiplayer == false &&
x.Difficulty == difficulty && x.GameLevel == gameLevel &&
x.DatePlayed.Date == DateTime.UtcNow.Date
).SelectMany(e => e.GameDataPairs).Where(x => x.Name == key);
// TODO: Buddy filter
if (AscendingOrder) query = query.OrderBy(e => e.Value);
else query = query.OrderByDescending(e => e.Value);
List<GameDataResponse> selectedData;
if (ClientVersion.GetVersion(apiKey) <= ClientVersion.Max_OldJS)
// use DisplayName instead of Name
selectedData = query.Select(e => new GameDataResponse(
XmlUtil.DeserializeXml<AvatarData>(e.GameData.Viking.AvatarSerialized).DisplayName, e.GameData.Viking.Uid, e.GameData.DatePlayed, false, false, e.DailyValue)
).Take(count).ToList();
else
selectedData = query.Select(e => new GameDataResponse(
e.GameData.Viking.Name, e.GameData.Viking.Uid, e.GameData.DatePlayed, false, false, e.DailyValue)
).Take(count).ToList();
return GetSummaryFromResponse(viking, isMultiplayer, difficulty, gameLevel, key, selectedData);
}
// ByUser for JumpStart's My Scores // 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) { public GameDataSummary GetGameDataByUser(Viking viking, int gameId, bool isMultiplayer, int difficulty, int gameLevel, string key, int count, bool AscendingOrder, string apiKey) {
@ -170,20 +143,12 @@ public class GameDataService {
private void SavePairs(Model.GameData gameData, string xmlDocumentData) { private void SavePairs(Model.GameData gameData, string xmlDocumentData) {
foreach (var pair in GetGameDataPairs(xmlDocumentData)) { foreach (var pair in GetGameDataPairs(xmlDocumentData)) {
GameDataPair? dbPair = gameData.GameDataPairs.FirstOrDefault(x => x.Name == pair.Name); GameDataPair? dbPair = gameData.GameDataPairs.FirstOrDefault(x => x.Name == pair.Name);
if (dbPair == null)
// If Name == "time" then (existing <= incoming) needs to be false (effectively (existing > incoming), as time should function).
// if Name is anything else, then second condition as normal.
bool newBest = (dbPair == null) || ((pair.Name == "time") != (dbPair.Value <= pair.Value));
if (dbPair == null) {
gameData.GameDataPairs.Add(pair); gameData.GameDataPairs.Add(pair);
dbPair = pair; else if (pair.Name == "time" && dbPair.Value > pair.Value)
} else if (newBest) dbPair.Value = pair.Value; dbPair.Value = pair.Value;
else if (pair.Name != "time" && dbPair.Value <= pair.Value)
if ( dbPair.Value = pair.Value;
newBest || // Surpassed Score (or Unset)
gameData.DatePlayed.Date != DateTime.UtcNow.Date // Another Day
) dbPair.DailyValue = pair.Value;
} }
} }