From 9f46c371747f89658d6c4f8d676d253591cec70a Mon Sep 17 00:00:00 2001 From: Noah Stolk <31079637+NoahStolk@users.noreply.github.com> Date: Fri, 29 Mar 2024 19:33:32 +0100 Subject: [PATCH] Use GameTime elsewhere --- .../Services/CustomEntryService.cs | 18 ++++++------ .../Services/CustomLeaderboardService.cs | 7 +++-- .../Services/SpawnsetService.cs | 8 +++--- .../LeaderboardHistoryStatisticsRepository.cs | 1 - .../Repositories/WorldRecordRepository.cs | 1 - .../Repositories/PlayerHistoryRepository.cs | 1 - .../Caching/LeaderboardStatisticsCache.cs | 1 - .../DdLive/CustomLeaderboardConverters.cs | 22 +++++++-------- .../DomainToApi/Ddse/SpawnsetConverters.cs | 8 +++--- .../Main/CustomLeaderboardConverters.cs | 28 +++++++++---------- .../DomainToApi/Main/LeaderboardConverters.cs | 8 +++--- .../Main/LeaderboardHistoryConverters.cs | 8 +++--- .../Tools/CustomLeaderboardConverters.cs | 20 ++++++------- .../CustomLeaderboardHighscoreLogger.cs | 5 ++-- 14 files changed, 67 insertions(+), 69 deletions(-) diff --git a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomEntryService.cs b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomEntryService.cs index 113f2b27d..42a74e7e5 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomEntryService.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomEntryService.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Web.ApiSpec.Admin.CustomEntries; using DevilDaggersInfo.Web.Server.Domain.Admin.Exceptions; using DevilDaggersInfo.Web.Server.Domain.Entities; @@ -45,12 +45,12 @@ public async Task AddCustomEntryAsync(AddCustomEntry addCustomEntry) GemsTotal = addCustomEntry.GemsTotal, HomingStored = addCustomEntry.HomingStored, HomingEaten = addCustomEntry.HomingEaten, - LevelUpTime2 = addCustomEntry.LevelUpTime2.To10thMilliTime(), - LevelUpTime3 = addCustomEntry.LevelUpTime3.To10thMilliTime(), - LevelUpTime4 = addCustomEntry.LevelUpTime4.To10thMilliTime(), + LevelUpTime2 = (int)GameTime.FromSeconds(addCustomEntry.LevelUpTime2).GameUnits, + LevelUpTime3 = (int)GameTime.FromSeconds(addCustomEntry.LevelUpTime3).GameUnits, + LevelUpTime4 = (int)GameTime.FromSeconds(addCustomEntry.LevelUpTime4).GameUnits, PlayerId = addCustomEntry.PlayerId, SubmitDate = addCustomEntry.SubmitDate, - Time = addCustomEntry.Time.To10thMilliTime(), + Time = (int)GameTime.FromSeconds(addCustomEntry.Time).GameUnits, }; _dbContext.CustomEntries.Add(customEntry); await _dbContext.SaveChangesAsync(); @@ -81,12 +81,12 @@ public async Task EditCustomEntryAsync(int id, EditCustomEntry editCustomEntry) customEntry.GemsTotal = editCustomEntry.GemsTotal; customEntry.HomingStored = editCustomEntry.HomingStored; customEntry.HomingEaten = editCustomEntry.HomingEaten; - customEntry.LevelUpTime2 = editCustomEntry.LevelUpTime2.To10thMilliTime(); - customEntry.LevelUpTime3 = editCustomEntry.LevelUpTime3.To10thMilliTime(); - customEntry.LevelUpTime4 = editCustomEntry.LevelUpTime4.To10thMilliTime(); + customEntry.LevelUpTime2 = (int)GameTime.FromSeconds(editCustomEntry.LevelUpTime2).GameUnits; + customEntry.LevelUpTime3 = (int)GameTime.FromSeconds(editCustomEntry.LevelUpTime3).GameUnits; + customEntry.LevelUpTime4 = (int)GameTime.FromSeconds(editCustomEntry.LevelUpTime4).GameUnits; customEntry.PlayerId = editCustomEntry.PlayerId; customEntry.SubmitDate = editCustomEntry.SubmitDate; - customEntry.Time = editCustomEntry.Time.To10thMilliTime(); + customEntry.Time = (int)GameTime.FromSeconds(editCustomEntry.Time).GameUnits; await _dbContext.SaveChangesAsync(); } diff --git a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomLeaderboardService.cs b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomLeaderboardService.cs index 3e70befa2..4987ef9f9 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomLeaderboardService.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomLeaderboardService.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Core.CriteriaExpression; using DevilDaggersInfo.Core.CriteriaExpression.Parts; using DevilDaggersInfo.Core.Spawnset; @@ -514,10 +514,13 @@ levelUpTime3Operator is CustomLeaderboardCriteriaOperator.Equal or CustomLeaderb return expressionBytes; } + /// + /// Gets the dagger value in game units if the rank sorting is time, otherwise the value as is. + /// private static int GetDaggerValue(ApiSpec.Admin.CustomLeaderboards.CustomLeaderboardRankSorting apiRankSorting, double apiValue) { if (apiRankSorting.ToDomain().IsTime()) - return apiValue.To10thMilliTime(); + return (int)GameTime.FromSeconds(apiValue).GameUnits; return (int)apiValue; } diff --git a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/SpawnsetService.cs b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/SpawnsetService.cs index 15df7c157..2624cfb3a 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/SpawnsetService.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/SpawnsetService.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Core.Spawnset; using DevilDaggersInfo.Web.ApiSpec.Admin.Spawnsets; using DevilDaggersInfo.Web.Server.Domain.Admin.Exceptions; @@ -53,13 +53,13 @@ public async Task AddSpawnsetAsync(AddSpawnset addSpawnset) GameMode = spawnsetBinary.GameMode.ToDomain(), SpawnVersion = spawnsetBinary.SpawnVersion, WorldVersion = spawnsetBinary.WorldVersion, - PreLoopLength = sections.PreLoopSection.Length?.To10thMilliTime(), + PreLoopLength = sections.PreLoopSection.Length.HasValue ? (int)GameTime.FromSeconds(sections.PreLoopSection.Length.Value).GameUnits : null, PreLoopSpawnCount = sections.PreLoopSection.SpawnCount, - LoopLength = sections.LoopSection.Length?.To10thMilliTime(), + LoopLength = sections.LoopSection.Length.HasValue ? (int)GameTime.FromSeconds(sections.LoopSection.Length.Value).GameUnits : null, LoopSpawnCount = sections.LoopSection.SpawnCount, HandLevel = spawnsetBinary.HandLevel.ToDomain(), AdditionalGems = spawnsetBinary.AdditionalGems, - TimerStart = spawnsetBinary.TimerStart.To10thMilliTime(), + TimerStart = (int)GameTime.FromSeconds(spawnsetBinary.TimerStart).GameUnits, EffectiveHandLevel = effectivePlayerSettings.HandLevel.ToDomain(), EffectiveGemsOrHoming = effectivePlayerSettings.GemsOrHoming, EffectiveHandMesh = effectivePlayerSettings.HandMesh.ToDomain(), diff --git a/src/DevilDaggersInfo.Web.Server.Domain.Main/Repositories/LeaderboardHistoryStatisticsRepository.cs b/src/DevilDaggersInfo.Web.Server.Domain.Main/Repositories/LeaderboardHistoryStatisticsRepository.cs index b4ebf6f79..a82238a90 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain.Main/Repositories/LeaderboardHistoryStatisticsRepository.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain.Main/Repositories/LeaderboardHistoryStatisticsRepository.cs @@ -1,5 +1,4 @@ using DevilDaggersInfo.Core.Common; -using DevilDaggersInfo.Core.Common.Extensions; using DevilDaggersInfo.Web.ApiSpec.Main.LeaderboardHistoryStatistics; using DevilDaggersInfo.Web.Server.Domain.Models.FileSystem; using DevilDaggersInfo.Web.Server.Domain.Models.LeaderboardHistory; diff --git a/src/DevilDaggersInfo.Web.Server.Domain.Main/Repositories/WorldRecordRepository.cs b/src/DevilDaggersInfo.Web.Server.Domain.Main/Repositories/WorldRecordRepository.cs index b7d3ca32b..e0b9503ca 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain.Main/Repositories/WorldRecordRepository.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain.Main/Repositories/WorldRecordRepository.cs @@ -1,5 +1,4 @@ using DevilDaggersInfo.Core.Common; -using DevilDaggersInfo.Core.Common.Extensions; using DevilDaggersInfo.Core.Wiki; using DevilDaggersInfo.Web.Server.Domain.Entities; using DevilDaggersInfo.Web.Server.Domain.Entities.Enums; diff --git a/src/DevilDaggersInfo.Web.Server.Domain/Repositories/PlayerHistoryRepository.cs b/src/DevilDaggersInfo.Web.Server.Domain/Repositories/PlayerHistoryRepository.cs index 7ffe85044..9cc409e64 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain/Repositories/PlayerHistoryRepository.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain/Repositories/PlayerHistoryRepository.cs @@ -1,5 +1,4 @@ using DevilDaggersInfo.Core.Common; -using DevilDaggersInfo.Core.Common.Extensions; using DevilDaggersInfo.Web.Server.Domain.Entities; using DevilDaggersInfo.Web.Server.Domain.Entities.Enums; using DevilDaggersInfo.Web.Server.Domain.Models.FileSystem; diff --git a/src/DevilDaggersInfo.Web.Server.Domain/Services/Caching/LeaderboardStatisticsCache.cs b/src/DevilDaggersInfo.Web.Server.Domain/Services/Caching/LeaderboardStatisticsCache.cs index 58c1d1f47..2fc6ae842 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain/Services/Caching/LeaderboardStatisticsCache.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain/Services/Caching/LeaderboardStatisticsCache.cs @@ -1,5 +1,4 @@ using DevilDaggersInfo.Core.Common; -using DevilDaggersInfo.Core.Common.Extensions; using DevilDaggersInfo.Core.Wiki; using DevilDaggersInfo.Core.Wiki.Objects; using DevilDaggersInfo.Web.Server.Domain.Models.FileSystem; diff --git a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/DdLive/CustomLeaderboardConverters.cs b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/DdLive/CustomLeaderboardConverters.cs index 956eaa2a0..2bd7be5ed 100644 --- a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/DdLive/CustomLeaderboardConverters.cs +++ b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/DdLive/CustomLeaderboardConverters.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Web.Server.Domain.Entities.Enums; using DevilDaggersInfo.Web.Server.Domain.Models.CustomLeaderboards; using System.Diagnostics; @@ -24,7 +24,7 @@ public static DdLiveApi.GetCustomLeaderboardOverviewDdLive ToDdLiveApi(this Cust Category = GetCategory(customLeaderboard.RankSorting, customLeaderboard.GameMode), TopPlayerId = customLeaderboard.WorldRecord?.PlayerId, TopPlayerName = customLeaderboard.WorldRecord?.PlayerName, - WorldRecord = customLeaderboard.WorldRecord?.Time.ToSecondsTime(), + WorldRecord = customLeaderboard.WorldRecord == null ? null : GameTime.FromGameUnits(customLeaderboard.WorldRecord.Time).Seconds, WorldRecordDagger = customLeaderboard.WorldRecord?.Dagger?.ToDdLiveApi(), RankSorting = customLeaderboard.RankSorting.ToDdLiveApi(), SpawnsetGameMode = customLeaderboard.GameMode.ToDdLiveApi(), @@ -53,11 +53,11 @@ private static DdLiveApi.GetCustomLeaderboardDaggersDdLive ToDdLiveApi(this Cust { return new() { - Bronze = customLeaderboard.Bronze.ToSecondsTime(), - Silver = customLeaderboard.Silver.ToSecondsTime(), - Golden = customLeaderboard.Golden.ToSecondsTime(), - Devil = customLeaderboard.Devil.ToSecondsTime(), - Leviathan = customLeaderboard.Leviathan.ToSecondsTime(), + Bronze = GameTime.FromGameUnits(customLeaderboard.Bronze).Seconds, + Silver = GameTime.FromGameUnits(customLeaderboard.Silver).Seconds, + Golden = GameTime.FromGameUnits(customLeaderboard.Golden).Seconds, + Devil = GameTime.FromGameUnits(customLeaderboard.Devil).Seconds, + Leviathan = GameTime.FromGameUnits(customLeaderboard.Leviathan).Seconds, }; } @@ -80,13 +80,13 @@ private static DdLiveApi.GetCustomEntryDdLive ToDdLiveApi(this CustomEntry custo HomingStored = customEntry.HomingStored, HomingEaten = customEntry.HomingEaten, EnemiesKilled = customEntry.EnemiesKilled, - LevelUpTime2 = customEntry.LevelUpTime2.ToSecondsTime(), - LevelUpTime3 = customEntry.LevelUpTime3.ToSecondsTime(), - LevelUpTime4 = customEntry.LevelUpTime4.ToSecondsTime(), + LevelUpTime2 = GameTime.FromGameUnits(customEntry.LevelUpTime2).Seconds, + LevelUpTime3 = GameTime.FromGameUnits(customEntry.LevelUpTime3).Seconds, + LevelUpTime4 = GameTime.FromGameUnits(customEntry.LevelUpTime4).Seconds, DaggersFired = customEntry.DaggersFired, DaggersHit = customEntry.DaggersHit, SubmitDate = customEntry.SubmitDate, - Time = customEntry.Time.ToSecondsTime(), + Time = GameTime.FromGameUnits(customEntry.Time).Seconds, CustomLeaderboardDagger = customEntry.CustomLeaderboardDagger?.ToDdLiveApi(), HasGraphs = customEntry.HasGraphs, HasReplay = hasReplay, diff --git a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Ddse/SpawnsetConverters.cs b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Ddse/SpawnsetConverters.cs index b6162d920..b40740f70 100644 --- a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Ddse/SpawnsetConverters.cs +++ b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Ddse/SpawnsetConverters.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Web.Server.Domain.Entities; using DevilDaggersInfo.Web.Server.Domain.Entities.Enums; using System.Diagnostics; @@ -23,12 +23,12 @@ public static DdseApi.GetSpawnsetDdse ToDdseApi(this SpawnsetEntity spawnset, bo AdditionalGems = spawnset.EffectiveGemsOrHoming, GameMode = spawnset.GameMode.ToDdseApi(), Hand = (byte)spawnset.EffectiveHandLevel, - LoopLength = (float?)spawnset.LoopLength?.ToSecondsTime(), + LoopLength = spawnset.LoopLength.HasValue ? (float)GameTime.FromGameUnits(spawnset.LoopLength.Value).Seconds : null, LoopSpawnCount = spawnset.LoopSpawnCount, - NonLoopLength = (float?)spawnset.PreLoopLength?.ToSecondsTime(), + NonLoopLength = spawnset.PreLoopLength.HasValue ? (float)GameTime.FromGameUnits(spawnset.PreLoopLength.Value).Seconds : null, NonLoopSpawnCount = spawnset.PreLoopSpawnCount, SpawnVersion = spawnset.SpawnVersion, - TimerStart = (float)spawnset.TimerStart.ToSecondsTime(), + TimerStart = (float)GameTime.FromGameUnits(spawnset.TimerStart).Seconds, WorldVersion = spawnset.WorldVersion, }, Name = spawnset.Name, diff --git a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/CustomLeaderboardConverters.cs b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/CustomLeaderboardConverters.cs index e6a9220f1..b318d8dac 100644 --- a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/CustomLeaderboardConverters.cs +++ b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/CustomLeaderboardConverters.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Core.CriteriaExpression; using DevilDaggersInfo.Web.Server.Domain.Entities; using DevilDaggersInfo.Web.Server.Domain.Entities.Enums; @@ -76,13 +76,13 @@ private static MainApi.GetCustomEntry ToMainApi(this CustomEntry customEntry, Sp HomingStored = customEntry.HomingStored, HomingEaten = customEntry.HomingEaten, EnemiesKilled = customEntry.EnemiesKilled, - LevelUpTime2 = customEntry.LevelUpTime2.ToSecondsTime(), - LevelUpTime3 = customEntry.LevelUpTime3.ToSecondsTime(), - LevelUpTime4 = customEntry.LevelUpTime4.ToSecondsTime(), + LevelUpTime2 = GameTime.FromGameUnits(customEntry.LevelUpTime2).Seconds, + LevelUpTime3 = GameTime.FromGameUnits(customEntry.LevelUpTime3).Seconds, + LevelUpTime4 = GameTime.FromGameUnits(customEntry.LevelUpTime4).Seconds, DaggersFired = customEntry.DaggersFired, DaggersHit = customEntry.DaggersHit, SubmitDate = customEntry.SubmitDate, - Time = customEntry.Time.ToSecondsTime(), + Time = GameTime.FromGameUnits(customEntry.Time).Seconds, CustomLeaderboardDagger = customEntry.CustomLeaderboardDagger?.ToMainApi(), HasGraphs = customEntry.HasGraphs, }; @@ -92,11 +92,11 @@ private static MainApi.GetCustomLeaderboardDaggers ToMainApi(this CustomLeaderbo { return new() { - Bronze = isTime ? customLeaderboardDaggers.Bronze.ToSecondsTime() : customLeaderboardDaggers.Bronze, - Silver = isTime ? customLeaderboardDaggers.Silver.ToSecondsTime() : customLeaderboardDaggers.Silver, - Golden = isTime ? customLeaderboardDaggers.Golden.ToSecondsTime() : customLeaderboardDaggers.Golden, - Devil = isTime ? customLeaderboardDaggers.Devil.ToSecondsTime() : customLeaderboardDaggers.Devil, - Leviathan = isTime ? customLeaderboardDaggers.Leviathan.ToSecondsTime() : customLeaderboardDaggers.Leviathan, + Bronze = isTime ? GameTime.FromGameUnits(customLeaderboardDaggers.Bronze).Seconds : customLeaderboardDaggers.Bronze, + Silver = isTime ? GameTime.FromGameUnits(customLeaderboardDaggers.Silver).Seconds : customLeaderboardDaggers.Silver, + Golden = isTime ? GameTime.FromGameUnits(customLeaderboardDaggers.Golden).Seconds : customLeaderboardDaggers.Golden, + Devil = isTime ? GameTime.FromGameUnits(customLeaderboardDaggers.Devil).Seconds : customLeaderboardDaggers.Devil, + Leviathan = isTime ? GameTime.FromGameUnits(customLeaderboardDaggers.Leviathan).Seconds : customLeaderboardDaggers.Leviathan, }; } @@ -261,13 +261,13 @@ public static MainApi.GetCustomEntryData ToMainApi(this CustomEntryEntity custom HomingStored = customEntry.HomingStored, HomingEaten = customEntry.HomingEaten, EnemiesKilled = customEntry.EnemiesKilled, - LevelUpTime2 = customEntry.LevelUpTime2.ToSecondsTime(), - LevelUpTime3 = customEntry.LevelUpTime3.ToSecondsTime(), - LevelUpTime4 = customEntry.LevelUpTime4.ToSecondsTime(), + LevelUpTime2 = GameTime.FromGameUnits(customEntry.LevelUpTime2).Seconds, + LevelUpTime3 = GameTime.FromGameUnits(customEntry.LevelUpTime3).Seconds, + LevelUpTime4 = GameTime.FromGameUnits(customEntry.LevelUpTime4).Seconds, DaggersFired = customEntry.DaggersFired, DaggersHit = customEntry.DaggersHit, SubmitDate = customEntry.SubmitDate, - Time = customEntry.Time.ToSecondsTime(), + Time = GameTime.FromGameUnits(customEntry.Time).Seconds, CustomLeaderboardDagger = customEntry.CustomLeaderboard.DaggerFromStat(customEntry)?.ToMainApi(), GemsCollectedData = GetInt32Arr(customEntryData?.GemsCollectedData), diff --git a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/LeaderboardConverters.cs b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/LeaderboardConverters.cs index 3dc84848e..f0245bc05 100644 --- a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/LeaderboardConverters.cs +++ b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/LeaderboardConverters.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Web.ApiSpec.Main.Leaderboards; using DevilDaggersInfo.Web.Server.Domain.Services.Inversion; @@ -19,7 +19,7 @@ public static GetLeaderboard ToMainApi(this IDdLeaderboardService.LeaderboardRes GemsGlobal = leaderboardResponse.GemsGlobal, KillsGlobal = leaderboardResponse.KillsGlobal, TotalPlayers = leaderboardResponse.TotalPlayers, - TimeGlobal = leaderboardResponse.TimeGlobal == 0 ? 0 : leaderboardResponse.TimeGlobal.ToSecondsTime(), + TimeGlobal = leaderboardResponse.TimeGlobal == 0 ? 0 : GameTime.FromGameUnits(leaderboardResponse.TimeGlobal).Seconds, }; } @@ -39,8 +39,8 @@ public static GetEntry ToMainApi(this IDdLeaderboardService.EntryResponse entryR Kills = entryResponse.Kills, KillsTotal = entryResponse.KillsTotal, Rank = entryResponse.Rank, - Time = entryResponse.Time.ToSecondsTime(), - TimeTotal = entryResponse.TimeTotal.ToSecondsTime(), + Time = GameTime.FromGameUnits(entryResponse.Time).Seconds, + TimeTotal = GameTime.FromGameUnits(entryResponse.TimeTotal).Seconds, Username = entryResponse.Username, }; } diff --git a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/LeaderboardHistoryConverters.cs b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/LeaderboardHistoryConverters.cs index e5878f4e4..1b3a81a33 100644 --- a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/LeaderboardHistoryConverters.cs +++ b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Main/LeaderboardHistoryConverters.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Web.ApiSpec.Main.LeaderboardHistory; using DevilDaggersInfo.Web.Server.Domain.Models.LeaderboardHistory; @@ -17,7 +17,7 @@ public static GetLeaderboardHistory ToMainApi(this LeaderboardHistory leaderboar Entries = leaderboard.Entries.ConvertAll(eh => eh.ToMainApi(leaderboard.DateTime)), GemsGlobal = leaderboard.GemsGlobal, KillsGlobal = leaderboard.KillsGlobal, - TimeGlobal = leaderboard.TimeGlobal.ToSecondsTime(), + TimeGlobal = GameTime.FromGameUnits(leaderboard.TimeGlobal).Seconds, TotalPlayers = leaderboard.Players, }; } @@ -39,8 +39,8 @@ private static GetEntryHistory ToMainApi(this EntryHistory entry, DateTime dateT Kills = entry.Kills, KillsTotal = entry.KillsTotal, Rank = entry.Rank, - Time = entry.Time.ToSecondsTime(), - TimeTotal = entry.TimeTotal.ToSecondsTime(), + Time = GameTime.FromGameUnits(entry.Time).Seconds, + TimeTotal = GameTime.FromGameUnits(entry.TimeTotal).Seconds, Username = entry.Username, }; } diff --git a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Tools/CustomLeaderboardConverters.cs b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Tools/CustomLeaderboardConverters.cs index 57030f23c..6bef2bb92 100644 --- a/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Tools/CustomLeaderboardConverters.cs +++ b/src/DevilDaggersInfo.Web.Server/Converters/DomainToApi/Tools/CustomLeaderboardConverters.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Core.CriteriaExpression; using DevilDaggersInfo.Web.Server.Domain.Entities.Enums; using DevilDaggersInfo.Web.Server.Domain.Extensions; @@ -173,11 +173,11 @@ private static ToolsApi.GetCustomLeaderboardDaggers ToAppApi(this CustomLeaderbo { return new() { - Bronze = customLeaderboardDaggers.Bronze.ToSecondsTime(), - Silver = customLeaderboardDaggers.Silver.ToSecondsTime(), - Golden = customLeaderboardDaggers.Golden.ToSecondsTime(), - Devil = customLeaderboardDaggers.Devil.ToSecondsTime(), - Leviathan = customLeaderboardDaggers.Leviathan.ToSecondsTime(), + Bronze = GameTime.FromGameUnits(customLeaderboardDaggers.Bronze).Seconds, + Silver = GameTime.FromGameUnits(customLeaderboardDaggers.Silver).Seconds, + Golden = GameTime.FromGameUnits(customLeaderboardDaggers.Golden).Seconds, + Devil = GameTime.FromGameUnits(customLeaderboardDaggers.Devil).Seconds, + Leviathan = GameTime.FromGameUnits(customLeaderboardDaggers.Leviathan).Seconds, }; } @@ -228,14 +228,14 @@ private static ToolsApi.GetCustomEntry ToAppApi(this CustomEntry customEntry) HomingEaten = customEntry.HomingEaten, HomingStored = customEntry.HomingStored, Id = customEntry.Id, - LevelUpTime2InSeconds = customEntry.LevelUpTime2.ToSecondsTime(), - LevelUpTime3InSeconds = customEntry.LevelUpTime3.ToSecondsTime(), - LevelUpTime4InSeconds = customEntry.LevelUpTime4.ToSecondsTime(), + LevelUpTime2InSeconds = GameTime.FromGameUnits(customEntry.LevelUpTime2).Seconds, + LevelUpTime3InSeconds = GameTime.FromGameUnits(customEntry.LevelUpTime3).Seconds, + LevelUpTime4InSeconds = GameTime.FromGameUnits(customEntry.LevelUpTime4).Seconds, PlayerId = customEntry.PlayerId, PlayerName = customEntry.PlayerName, Rank = customEntry.Rank, SubmitDate = customEntry.SubmitDate, - TimeInSeconds = customEntry.Time.ToSecondsTime(), + TimeInSeconds = GameTime.FromGameUnits(customEntry.Time).Seconds, CustomLeaderboardDagger = customEntry.CustomLeaderboardDagger?.ToAppApi(), }; } diff --git a/src/DevilDaggersInfo.Web.Server/Services/CustomLeaderboardHighscoreLogger.cs b/src/DevilDaggersInfo.Web.Server/Services/CustomLeaderboardHighscoreLogger.cs index 3ca0527ab..7a0768547 100644 --- a/src/DevilDaggersInfo.Web.Server/Services/CustomLeaderboardHighscoreLogger.cs +++ b/src/DevilDaggersInfo.Web.Server/Services/CustomLeaderboardHighscoreLogger.cs @@ -1,5 +1,4 @@ using DevilDaggersInfo.Core.Common; -using DevilDaggersInfo.Core.Common.Extensions; using DevilDaggersInfo.Web.Server.Domain.Entities; using DevilDaggersInfo.Web.Server.Domain.Entities.Enums; using DevilDaggersInfo.Web.Server.Domain.Models.CustomLeaderboards; @@ -111,7 +110,7 @@ private static string GetFormattedScoreValue(CustomLeaderboardRankSorting rankSo { return rankSorting switch { - CustomLeaderboardRankSorting.TimeAsc or CustomLeaderboardRankSorting.TimeDesc => customEntry.Time.ToSecondsTime().ToString(StringFormats.TimeFormat), + CustomLeaderboardRankSorting.TimeAsc or CustomLeaderboardRankSorting.TimeDesc => GameTime.FromGameUnits(customEntry.Time).Seconds.ToString(StringFormats.TimeFormat), CustomLeaderboardRankSorting.GemsCollectedAsc or CustomLeaderboardRankSorting.GemsCollectedDesc => customEntry.GemsCollected.ToString(), CustomLeaderboardRankSorting.GemsDespawnedAsc or CustomLeaderboardRankSorting.GemsDespawnedDesc => customEntry.GemsDespawned.ToString(), CustomLeaderboardRankSorting.GemsEatenAsc or CustomLeaderboardRankSorting.GemsEatenDesc => customEntry.GemsEaten.ToString(), @@ -127,7 +126,7 @@ private static string GetFormattedScoreValueDifference(CustomLeaderboardRankSort { return rankSorting switch { - CustomLeaderboardRankSorting.TimeAsc or CustomLeaderboardRankSorting.TimeDesc => valueDifference.ToSecondsTime().ToString("+0.0000;-0.0000;+0.0000"), + CustomLeaderboardRankSorting.TimeAsc or CustomLeaderboardRankSorting.TimeDesc => GameTime.FromGameUnits(valueDifference).Seconds.ToString("+0.0000;-0.0000;+0.0000"), _ => valueDifference.ToString("+0;-0;+0"), }; }