From ad6588b7297999b9c2550fbbc2e042c235d6a99a Mon Sep 17 00:00:00 2001 From: Atralupus Date: Thu, 19 Jun 2025 20:57:21 +0900 Subject: [PATCH 1/9] Add round index colume --- ArenaService.Shared/Models/Battle.cs | 3 + ArenaService.Shared/Models/Round.cs | 5 ++ .../Repositories/ClanRankingRepository.cs | 70 +++++++++--------- .../Repositories/RankingRepository.cs | 74 +++++++++---------- .../Repositories/SeasonCacheRepository.cs | 12 +-- .../Services/ParticipateService.cs | 10 ++- .../Services/RankingService.cs | 18 ++--- .../Services/RoundPreparationService.cs | 6 +- .../Services/SeasonPreparationService.cs | 8 +- .../Controllers/ArenaInfoController.cs | 4 +- ArenaService/Processor/BattleProcessor.cs | 5 +- ArenaService/Worker/CacheBlockTipWorker.cs | 1 + ArenaService/Worker/PrepareRankingWorker.cs | 8 +- ArenaService/Worker/RankingCopyWorker.cs | 4 +- 14 files changed, 121 insertions(+), 107 deletions(-) diff --git a/ArenaService.Shared/Models/Battle.cs b/ArenaService.Shared/Models/Battle.cs index c963bac..b04ed6f 100644 --- a/ArenaService.Shared/Models/Battle.cs +++ b/ArenaService.Shared/Models/Battle.cs @@ -30,6 +30,9 @@ public class Battle [Required] public int RoundId { get; set; } + [ForeignKey(nameof(RoundId))] + public Round Round { get; set; } = null!; + [Required] public int AvailableOpponentId { get; set; } diff --git a/ArenaService.Shared/Models/Round.cs b/ArenaService.Shared/Models/Round.cs index 725b9a4..c09ef76 100644 --- a/ArenaService.Shared/Models/Round.cs +++ b/ArenaService.Shared/Models/Round.cs @@ -1,9 +1,11 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace ArenaService.Shared.Models; [Table("rounds")] +[Index(nameof(SeasonId), nameof(RoundIndex), IsUnique = true)] public class Round { [Key] @@ -21,6 +23,9 @@ public class Round [Required] public long EndBlock { get; set; } + [Required] + public int RoundIndex { get; set; } + [Required] [Column(TypeName = "timestamptz")] public DateTime CreatedAt { get; set; } = DateTime.UtcNow; diff --git a/ArenaService.Shared/Repositories/ClanRankingRepository.cs b/ArenaService.Shared/Repositories/ClanRankingRepository.cs index b5e1e00..9e614f0 100644 --- a/ArenaService.Shared/Repositories/ClanRankingRepository.cs +++ b/ArenaService.Shared/Repositories/ClanRankingRepository.cs @@ -11,25 +11,25 @@ Task UpdateScoreAsync( int clanId, Address avatarAddress, int seasonId, - int roundId, + int roundIndex, int scoreChange ); - Task GetRankAsync(int clanId, Address avatarAddress, int seasonId, int roundId); + Task GetRankAsync(int clanId, Address avatarAddress, int seasonId, int roundIndex); - Task> GetClansAsync(int seasonId, int roundId); + Task> GetClansAsync(int seasonId, int roundIndex); Task> GetScoresAsync( int clanId, int seasonId, - int roundId + int roundIndex ); Task CopyRoundDataAsync( int clanId, int seasonId, - int sourceRoundId, - int targetRoundId, + int sourceRoundIndex, + int targetRoundIndex, int roundInterval ); @@ -37,14 +37,14 @@ Task InitRankingAsync( List<(Address AvatarAddress, int Score)> rankingData, int clanId, int seasonId, - int roundId, + int roundIndex, int roundInterval ); Task> GetTopClansAsync( int clanId, int seasonId, - int roundId, + int roundIndex, int topN = 10 ); } @@ -75,13 +75,13 @@ public async Task UpdateScoreAsync( int clanId, Address avatarAddress, int seasonId, - int roundId, + int roundIndex, int scoreChange ) { - await InsureRankingStatus(seasonId, roundId, clanId); + await InsureRankingStatus(seasonId, roundIndex, clanId); - string clanRankingKey = string.Format(ClanRankingFormat, seasonId, roundId, clanId); + string clanRankingKey = string.Format(ClanRankingFormat, seasonId, roundIndex, clanId); string participantKey = string.Format( ParticipantKeyFormat, avatarAddress.ToHex().ToLower() @@ -94,12 +94,12 @@ public async Task GetRankAsync( int clanId, Address avatarAddress, int seasonId, - int roundId + int roundIndex ) { - await InsureRankingStatus(seasonId, roundId, clanId); + await InsureRankingStatus(seasonId, roundIndex, clanId); - string clanRankingKey = string.Format(ClanRankingFormat, seasonId, roundId, clanId); + string clanRankingKey = string.Format(ClanRankingFormat, seasonId, roundIndex, clanId); string participantKey = string.Format( ParticipantKeyFormat, avatarAddress.ToHex().ToLower() @@ -122,12 +122,12 @@ int roundId public async Task> GetScoresAsync( int clanId, int seasonId, - int roundId + int roundIndex ) { - await InsureRankingStatus(seasonId, roundId, clanId); + await InsureRankingStatus(seasonId, roundIndex, clanId); - string clanRankingKey = string.Format(ClanRankingFormat, seasonId, roundId, clanId); + string clanRankingKey = string.Format(ClanRankingFormat, seasonId, roundIndex, clanId); var scores = await _redis.SortedSetRangeByRankWithScoresAsync(clanRankingKey); @@ -148,13 +148,13 @@ public async Task InitRankingAsync( List<(Address AvatarAddress, int Score)> rankingData, int clanId, int seasonId, - int roundId, + int roundIndex, int roundInterval ) { - string statusKey = string.Format(StatusKeyFormat, seasonId, roundId, clanId); + string statusKey = string.Format(StatusKeyFormat, seasonId, roundIndex, clanId); await _redis.StringSetAsync(statusKey, RankingStatus.INITIALIZING.ToString()); - string clanRankingKey = string.Format(ClanRankingFormat, seasonId, roundId, clanId); + string clanRankingKey = string.Format(ClanRankingFormat, seasonId, roundIndex, clanId); foreach (var rankingEntry in rankingData) { @@ -184,7 +184,7 @@ await _redis.StringSetAsync( ) ); - string clansKey = string.Format(ClansKeyFormat, seasonId, roundId); + string clansKey = string.Format(ClansKeyFormat, seasonId, roundIndex); await _redis.SetAddAsync(clansKey, clanId.ToString()); await _redis.KeyExpireAsync( clansKey, @@ -197,15 +197,15 @@ await _redis.KeyExpireAsync( public async Task CopyRoundDataAsync( int clanId, int seasonId, - int sourceRoundId, - int targetRoundId, + int sourceRoundIndex, + int targetRoundIndex, int roundInterval ) { - string statusKey = string.Format(StatusKeyFormat, seasonId, targetRoundId, clanId); + string statusKey = string.Format(StatusKeyFormat, seasonId, targetRoundIndex, clanId); await _redis.StringSetAsync(statusKey, RankingStatus.COPYING_IN_PROGRESS.ToString()); - string sourceKey = string.Format(ClanRankingFormat, seasonId, sourceRoundId, clanId); - string targetKey = string.Format(ClanRankingFormat, seasonId, targetRoundId, clanId); + string sourceKey = string.Format(ClanRankingFormat, seasonId, sourceRoundIndex, clanId); + string targetKey = string.Format(ClanRankingFormat, seasonId, targetRoundIndex, clanId); await _redis.SortedSetCombineAndStoreAsync(SetOperation.Union, targetKey, [sourceKey]); await _redis.KeyExpireAsync( @@ -222,9 +222,9 @@ await _redis.StringSetAsync( ) ); - string clansKey = string.Format(ClansKeyFormat, seasonId, targetRoundId); + string clansKey = string.Format(ClansKeyFormat, seasonId, targetRoundIndex); - var clans = await GetClansAsync(seasonId, sourceRoundId); + var clans = await GetClansAsync(seasonId, sourceRoundIndex); foreach (var existsClanId in clans) { await _redis.SetAddAsync(clansKey, existsClanId.ToString()); @@ -238,9 +238,9 @@ await _redis.KeyExpireAsync( ); } - public async Task> GetClansAsync(int seasonId, int roundId) + public async Task> GetClansAsync(int seasonId, int roundIndex) { - string clansKey = string.Format(ClansKeyFormat, seasonId, roundId); + string clansKey = string.Format(ClansKeyFormat, seasonId, roundIndex); var clanIds = await _redis.SetMembersAsync(clansKey); return clanIds.Select(id => int.Parse(id.ToString())).ToList(); } @@ -248,13 +248,13 @@ public async Task> GetClansAsync(int seasonId, int roundId) public async Task> GetTopClansAsync( int clanId, int seasonId, - int roundId, + int roundIndex, int topN ) { - await InsureRankingStatus(seasonId, roundId, clanId); + await InsureRankingStatus(seasonId, roundIndex, clanId); - string clanRankingPerClanKey = string.Format(ClanRankingFormat, seasonId, roundId, clanId); + string clanRankingPerClanKey = string.Format(ClanRankingFormat, seasonId, roundIndex, clanId); var topParticipants = await _redis.SortedSetRangeByRankWithScoresAsync( clanRankingPerClanKey, @@ -273,9 +273,9 @@ int topN .ToList(); } - private async Task InsureRankingStatus(int seasonId, int roundId, int clanId) + private async Task InsureRankingStatus(int seasonId, int roundIndex, int clanId) { - string statusKey = string.Format(StatusKeyFormat, seasonId, roundId, clanId); + string statusKey = string.Format(StatusKeyFormat, seasonId, roundIndex, clanId); var rankingStatus = await _redis.StringGetAsync(statusKey); if (rankingStatus != RankingStatus.DONE.ToString()) { diff --git a/ArenaService.Shared/Repositories/RankingRepository.cs b/ArenaService.Shared/Repositories/RankingRepository.cs index ee24ea4..1dbd755 100644 --- a/ArenaService.Shared/Repositories/RankingRepository.cs +++ b/ArenaService.Shared/Repositories/RankingRepository.cs @@ -7,33 +7,33 @@ namespace ArenaService.Shared.Repositories; public interface IRankingRepository { - Task GetRankingStatus(int seasonId, int roundId); + Task GetRankingStatus(int seasonId, int roundIndex); - Task UpdateScoreAsync(Address avatarAddress, int seasonId, int roundId, int scoreChange); + Task UpdateScoreAsync(Address avatarAddress, int seasonId, int roundIndex, int scoreChange); - Task GetRankAsync(Address avatarAddress, int seasonId, int roundId); + Task GetRankAsync(Address avatarAddress, int seasonId, int roundIndex); - Task> GetScoresAsync(int seasonId, int roundId); + Task> GetScoresAsync(int seasonId, int roundIndex); - Task GetScoreAsync(Address avatarAddress, int seasonId, int roundId); + Task GetScoreAsync(Address avatarAddress, int seasonId, int roundIndex); Task InitRankingAsync( List<(Address AvatarAddress, int Score)> rankingData, int seasonId, - int roundId, + int roundIndex, int roundInterval ); Task> SelectBattleOpponentsAsync( Address avatarAddress, int seasonId, - int roundId, + int roundIndex, bool isFirstRound ); - Task CopyRoundDataAsync(int seasonId, int sourceRoundId, int targetRoundId, int roundInterval); + Task CopyRoundDataAsync(int seasonId, int sourceRoundIndex, int targetRoundIndex, int roundInterval); - Task GetRankingCountAsync(int seasonId, int roundId); + Task GetRankingCountAsync(int seasonId, int roundIndex); } public class RankingRepository : IRankingRepository @@ -58,9 +58,9 @@ public RankingRepository(IConnectionMultiplexer redis, int? databaseNumber = nul } } - public async Task GetRankingStatus(int seasonId, int roundId) + public async Task GetRankingStatus(int seasonId, int roundIndex) { - string statusKey = string.Format(StatusKeyFormat, seasonId, roundId); + string statusKey = string.Format(StatusKeyFormat, seasonId, roundIndex); var rankingStatus = await _redis.StringGetAsync(statusKey); return rankingStatus; } @@ -68,13 +68,13 @@ public RankingRepository(IConnectionMultiplexer redis, int? databaseNumber = nul public async Task UpdateScoreAsync( Address avatarAddress, int seasonId, - int roundId, + int roundIndex, int scoreChange ) { - await InsureRankingStatus(seasonId, roundId); + await InsureRankingStatus(seasonId, roundIndex); - string rankingKey = string.Format(RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); string participantKey = string.Format( ParticipantKeyFormat, avatarAddress.ToHex().ToLower() @@ -83,11 +83,11 @@ int scoreChange await _redis.SortedSetIncrementAsync(rankingKey, participantKey, scoreChange); } - public async Task GetRankAsync(Address avatarAddress, int seasonId, int roundId) + public async Task GetRankAsync(Address avatarAddress, int seasonId, int roundIndex) { - await InsureRankingStatus(seasonId, roundId); + await InsureRankingStatus(seasonId, roundIndex); - string rankingKey = string.Format(RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); string participantKey = string.Format( ParticipantKeyFormat, avatarAddress.ToHex().ToLower() @@ -113,12 +113,12 @@ await _redis.SortedSetRangeByScoreWithScoresAsync( public async Task> GetScoresAsync( int seasonId, - int roundId + int roundIndex ) { - await InsureRankingStatus(seasonId, roundId); + await InsureRankingStatus(seasonId, roundIndex); - string rankingKey = string.Format(RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); var scores = await _redis.SortedSetRangeByRankWithScoresAsync(rankingKey); @@ -135,20 +135,20 @@ int roundId .ToList(); } - public async Task GetRankingCountAsync(int seasonId, int roundId) + public async Task GetRankingCountAsync(int seasonId, int roundIndex) { - string rankingKey = string.Format(RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); int totalRankingCount = (int)await _redis.SortedSetLengthAsync(rankingKey); return totalRankingCount; } - public async Task GetScoreAsync(Address avatarAddress, int seasonId, int roundId) + public async Task GetScoreAsync(Address avatarAddress, int seasonId, int roundIndex) { - await InsureRankingStatus(seasonId, roundId); + await InsureRankingStatus(seasonId, roundIndex); - string rankingKey = string.Format(RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); string participantKey = string.Format( ParticipantKeyFormat, avatarAddress.ToHex().ToLower() @@ -162,9 +162,9 @@ public async Task GetScoreAsync(Address avatarAddress, int seasonId, int ro public async Task< Dictionary - > SelectBattleOpponentsAsync(Address avatarAddress, int seasonId, int roundId, bool isFirstRound) + > SelectBattleOpponentsAsync(Address avatarAddress, int seasonId, int roundIndex, bool isFirstRound) { - string rankingKey = string.Format(RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); string participantKey = string.Format( ParticipantKeyFormat, avatarAddress.ToHex().ToLower() @@ -255,13 +255,13 @@ await _redis.SortedSetRangeByRankWithScoresAsync( public async Task InitRankingAsync( List<(Address AvatarAddress, int Score)> rankingData, int seasonId, - int roundId, + int roundIndex, int roundInterval ) { - string statusKey = string.Format(StatusKeyFormat, seasonId, roundId); + string statusKey = string.Format(StatusKeyFormat, seasonId, roundIndex); await _redis.StringSetAsync(statusKey, RankingStatus.INITIALIZING.ToString()); - string rankingKey = string.Format(RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); foreach (var rankingEntry in rankingData) { @@ -289,16 +289,16 @@ await _redis.StringSetAsync( public async Task CopyRoundDataAsync( int seasonId, - int sourceRoundId, - int targetRoundId, + int sourceRoundIndex, + int targetRoundIndex, int roundInterval ) { - string statusKey = string.Format(StatusKeyFormat, seasonId, targetRoundId); + string statusKey = string.Format(StatusKeyFormat, seasonId, targetRoundIndex); await _redis.StringSetAsync(statusKey, RankingStatus.COPYING_IN_PROGRESS.ToString()); - string sourceKey = string.Format(RankingKeyFormat, seasonId, sourceRoundId); - string targetKey = string.Format(RankingKeyFormat, seasonId, targetRoundId); + string sourceKey = string.Format(RankingKeyFormat, seasonId, sourceRoundIndex); + string targetKey = string.Format(RankingKeyFormat, seasonId, targetRoundIndex); await _redis.SortedSetCombineAndStoreAsync(SetOperation.Union, targetKey, [sourceKey]); await _redis.KeyExpireAsync( @@ -316,9 +316,9 @@ await _redis.StringSetAsync( ); } - private async Task InsureRankingStatus(int seasonId, int roundId) + private async Task InsureRankingStatus(int seasonId, int roundIndex) { - string statusKey = string.Format(StatusKeyFormat, seasonId, roundId); + string statusKey = string.Format(StatusKeyFormat, seasonId, roundIndex); var rankingStatus = await _redis.StringGetAsync(statusKey); if (rankingStatus != RankingStatus.DONE.ToString()) { diff --git a/ArenaService.Shared/Repositories/SeasonCacheRepository.cs b/ArenaService.Shared/Repositories/SeasonCacheRepository.cs index 8db3b79..50f6470 100644 --- a/ArenaService.Shared/Repositories/SeasonCacheRepository.cs +++ b/ArenaService.Shared/Repositories/SeasonCacheRepository.cs @@ -8,10 +8,10 @@ public interface ISeasonCacheRepository { Task GetBlockIndexAsync(); Task<(int Id, long StartBlock, long EndBlock)> GetSeasonAsync(); - Task<(int Id, long StartBlock, long EndBlock)> GetRoundAsync(); + Task<(int Id, int RoundIndex, long StartBlock, long EndBlock)> GetRoundAsync(); Task SetBlockIndexAsync(long blockIndex); Task SetSeasonAsync(int seasonId, long startBlock, long endBlock); - Task SetRoundAsync(int roundId, long startBlock, long endBlock); + Task SetRoundAsync(int roundId, int roundIndex, long startBlock, long endBlock); } public class SeasonCacheRepository : ISeasonCacheRepository @@ -52,7 +52,7 @@ public async Task GetBlockIndexAsync() return (seasonData!.Id, seasonData.StartBlock, seasonData.EndBlock); } - public async Task<(int Id, long StartBlock, long EndBlock)> GetRoundAsync() + public async Task<(int Id, int RoundIndex, long StartBlock, long EndBlock)> GetRoundAsync() { var value = await _redis.StringGetAsync($"{PREFIX}:{RoundKey}"); @@ -62,7 +62,7 @@ public async Task GetBlockIndexAsync() } var roundData = JsonSerializer.Deserialize(value!); - return (roundData!.Id, roundData.StartBlock, roundData.EndBlock); + return (roundData!.Id, roundData.RoundIndex, roundData.StartBlock, roundData.EndBlock); } public async Task SetBlockIndexAsync(long blockIndex) @@ -84,11 +84,12 @@ public async Task SetSeasonAsync(int seasonId, long startBlock, long endBlock) await _redis.StringSetAsync($"{PREFIX}:{SeasonKey}", json); } - public async Task SetRoundAsync(int roundId, long startBlock, long endBlock) + public async Task SetRoundAsync(int roundId, int roundIndex, long startBlock, long endBlock) { var roundData = new CachedRound { Id = roundId, + RoundIndex = roundIndex, StartBlock = startBlock, EndBlock = endBlock }; @@ -108,6 +109,7 @@ private class CachedSeason private class CachedRound { public int Id { get; set; } + public int RoundIndex { get; set; } public long StartBlock { get; set; } public long EndBlock { get; set; } } diff --git a/ArenaService.Shared/Services/ParticipateService.cs b/ArenaService.Shared/Services/ParticipateService.cs index 936cdca..09fba5b 100644 --- a/ArenaService.Shared/Services/ParticipateService.cs +++ b/ArenaService.Shared/Services/ParticipateService.cs @@ -13,6 +13,7 @@ public interface IParticipateService Task ParticipateAsync( int seasonId, int roundId, + int roundIndex, Address avatarAddress, int roundInterval, Func, IQueryable>? includeQuery = null @@ -54,6 +55,7 @@ IClanRankingRepository clanRankingRepo public async Task ParticipateAsync( int seasonId, int roundId, + int roundIndex, Address avatarAddress, int roundInterval, Func, IQueryable>? includeQuery = null @@ -122,13 +124,13 @@ await _rankingSnapshotRepo.AddRankingsSnapshot( await _rankingRepo.UpdateScoreAsync( participant.AvatarAddress, seasonId, - roundId, + roundIndex, participant.Score ); await _rankingRepo.UpdateScoreAsync( participant.AvatarAddress, seasonId, - roundId + 1, + roundIndex + 1, participant.Score ); @@ -138,14 +140,14 @@ await _clanRankingRepo.UpdateScoreAsync( user.ClanId.Value, avatarAddress, seasonId, - roundId, + roundIndex, participant.Score ); await _clanRankingRepo.UpdateScoreAsync( user.ClanId.Value, avatarAddress, seasonId, - roundId + 1, + roundIndex + 1, participant.Score ); } diff --git a/ArenaService.Shared/Services/RankingService.cs b/ArenaService.Shared/Services/RankingService.cs index 4491039..96cfae8 100644 --- a/ArenaService.Shared/Services/RankingService.cs +++ b/ArenaService.Shared/Services/RankingService.cs @@ -7,12 +7,12 @@ public interface IRankingService Task UpdateScoreAsync( Address avatarAddress, int seasonId, - int roundId, + int roundIndex, int scoreChange, int? clanId ); - Task UpdateAllClanRankingAsync(int seasonId, int roundId, int roundInterval); + Task UpdateAllClanRankingAsync(int seasonId, int roundIndex, int roundInterval); } public class RankingService : IRankingService @@ -35,12 +35,12 @@ IAllClanRankingRepository allClanRankingRepo public async Task UpdateScoreAsync( Address avatarAddress, int seasonId, - int roundId, + int roundIndex, int scoreChange, int? clanId = null ) { - await _rankingRepo.UpdateScoreAsync(avatarAddress, seasonId, roundId, scoreChange); + await _rankingRepo.UpdateScoreAsync(avatarAddress, seasonId, roundIndex, scoreChange); if (clanId is not null) { @@ -48,27 +48,27 @@ await _clanRankingRepo.UpdateScoreAsync( clanId.Value, avatarAddress, seasonId, - roundId, + roundIndex, scoreChange ); } } - public async Task UpdateAllClanRankingAsync(int seasonId, int roundId, int roundInterval) + public async Task UpdateAllClanRankingAsync(int seasonId, int roundIndex, int roundInterval) { - var clans = await _clanRankingRepo.GetClansAsync(seasonId, roundId); + var clans = await _clanRankingRepo.GetClansAsync(seasonId, roundIndex); var clanScores = new List<(int ClanId, int Score)>(); foreach (var clanId in clans) { - var topMembers = await _clanRankingRepo.GetTopClansAsync(clanId, seasonId, roundId); + var topMembers = await _clanRankingRepo.GetTopClansAsync(clanId, seasonId, roundIndex); int totalScore = topMembers.Sum(member => member.Score); clanScores.Add((clanId, totalScore)); } - await _allClanRankingRepo.InitRankingAsync(clanScores, seasonId, roundId, roundInterval); + await _allClanRankingRepo.InitRankingAsync(clanScores, seasonId, roundIndex, roundInterval); } } diff --git a/ArenaService.Shared/Services/RoundPreparationService.cs b/ArenaService.Shared/Services/RoundPreparationService.cs index 7816246..9619ce3 100644 --- a/ArenaService.Shared/Services/RoundPreparationService.cs +++ b/ArenaService.Shared/Services/RoundPreparationService.cs @@ -113,14 +113,14 @@ await _rankingSnapshotRepo.AddRankingsSnapshot( await _rankingService.UpdateAllClanRankingAsync( seasonAndRound.Season.Id, - seasonAndRound.Round.Id + 1, + seasonAndRound.Round.RoundIndex + 1, seasonAndRound.Season.RoundInterval ); await _rankingRepo.InitRankingAsync( rankingData, seasonAndRound.Season.Id, - seasonAndRound.Round.Id + 1, + seasonAndRound.Round.RoundIndex + 1, seasonAndRound.Season.RoundInterval ); _logger.LogInformation($"{nameof(RoundPreparationService)} Update Redis Ranking"); @@ -141,7 +141,7 @@ await _clanRankingRepo.CopyRoundDataAsync( clanId, seasonAndRound.Season.Id, seasonAndRound.Round.Id, - seasonAndRound.Round.Id + 1, + seasonAndRound.Round.RoundIndex + 1, seasonAndRound.Season.RoundInterval ); diff --git a/ArenaService.Shared/Services/SeasonPreparationService.cs b/ArenaService.Shared/Services/SeasonPreparationService.cs index 6da07d2..e684b25 100644 --- a/ArenaService.Shared/Services/SeasonPreparationService.cs +++ b/ArenaService.Shared/Services/SeasonPreparationService.cs @@ -171,7 +171,7 @@ Round round await _rankingRepo.InitRankingAsync( rankingData, season.Id, - round.Id + 1, + round.RoundIndex + 1, season.RoundInterval ); @@ -188,14 +188,14 @@ await _clanRankingRepo.InitRankingAsync( clanRankingData, clanId, season.Id, - round.Id + 1, + round.RoundIndex + 1, season.RoundInterval ); } - await _rankingService.UpdateAllClanRankingAsync(season.Id, round.Id, season.RoundInterval); + await _rankingService.UpdateAllClanRankingAsync(season.Id, round.RoundIndex, season.RoundInterval); await _rankingService.UpdateAllClanRankingAsync( season.Id, - round.Id + 1, + round.RoundIndex + 1, season.RoundInterval ); } diff --git a/ArenaService/Controllers/ArenaInfoController.cs b/ArenaService/Controllers/ArenaInfoController.cs index 9986af7..6fcbf07 100644 --- a/ArenaService/Controllers/ArenaInfoController.cs +++ b/ArenaService/Controllers/ArenaInfoController.cs @@ -140,12 +140,12 @@ public async Task GetArenaInfo() var nextScore = await _rankingRepo.GetScoreAsync( avatarAddress, cachedSeason.Id, - cachedRound.Id + 1 + cachedRound.RoundIndex + 1 ); var nextRank = await _rankingRepo.GetRankAsync( avatarAddress, cachedSeason.Id, - cachedRound.Id + 1 + cachedRound.RoundIndex + 1 ); var arenaInfo = new ArenaInfoResponse diff --git a/ArenaService/Processor/BattleProcessor.cs b/ArenaService/Processor/BattleProcessor.cs index 4d2433a..b975768 100644 --- a/ArenaService/Processor/BattleProcessor.cs +++ b/ArenaService/Processor/BattleProcessor.cs @@ -83,6 +83,7 @@ public async Task ProcessAsync(int battleId) .ThenInclude(u => u.Clan) .Include(b => b.Season) .ThenInclude(s => s.BattleTicketPolicy) + .Include(b => b.Round) .Include(b => b.Participant) .ThenInclude(p => p.User) .ThenInclude(u => u.Clan) @@ -395,7 +396,7 @@ await _battleRepo.UpdateBattle( await _rankingService.UpdateScoreAsync( battle.AvatarAddress, battle.SeasonId, - battle.RoundId + 1, + battle.Round.RoundIndex + 1, myScoreChange, battle.Participant.User.Clan is null ? null : battle.Participant.User.Clan.Id ); @@ -404,7 +405,7 @@ await _rankingService.UpdateScoreAsync( await _rankingService.UpdateScoreAsync( battle.AvailableOpponent.OpponentAvatarAddress, battle.SeasonId, - battle.RoundId + 1, + battle.Round.RoundIndex + 1, opponentScoreChange, battle.AvailableOpponent.Opponent.User.Clan is null ? null diff --git a/ArenaService/Worker/CacheBlockTipWorker.cs b/ArenaService/Worker/CacheBlockTipWorker.cs index e52783f..1a62559 100644 --- a/ArenaService/Worker/CacheBlockTipWorker.cs +++ b/ArenaService/Worker/CacheBlockTipWorker.cs @@ -155,6 +155,7 @@ ISeasonCacheRepository seasonCacheRepo await seasonCacheRepo.SetRoundAsync( seasonInfo.Round.Id, + seasonInfo.Round.RoundIndex, seasonInfo.Round.StartBlock, seasonInfo.Round.EndBlock ); diff --git a/ArenaService/Worker/PrepareRankingWorker.cs b/ArenaService/Worker/PrepareRankingWorker.cs index 65f8ea3..da1a670 100644 --- a/ArenaService/Worker/PrepareRankingWorker.cs +++ b/ArenaService/Worker/PrepareRankingWorker.cs @@ -289,7 +289,7 @@ await clanRankingRepo.InitRankingAsync( await rankingRepo.InitRankingAsync( nextRoundRankingData, seasonInfo.Season.Id, - seasonInfo.Round.Id + 1, + seasonInfo.Round.RoundIndex + 1, seasonInfo.Season.RoundInterval ); @@ -299,7 +299,7 @@ await clanRankingRepo.InitRankingAsync( nextRoundClanRankingData, clanId, seasonInfo.Season.Id, - seasonInfo.Round.Id + 1, + seasonInfo.Round.RoundIndex + 1, seasonInfo.Season.RoundInterval ); } @@ -308,12 +308,12 @@ await clanRankingRepo.InitRankingAsync( } await rankingService.UpdateAllClanRankingAsync( seasonInfo.Season.Id, - seasonInfo.Round.Id, + seasonInfo.Round.RoundIndex, seasonInfo.Season.RoundInterval ); await rankingService.UpdateAllClanRankingAsync( seasonInfo.Season.Id, - seasonInfo.Round.Id + 1, + seasonInfo.Round.RoundIndex + 1, seasonInfo.Season.RoundInterval ); diff --git a/ArenaService/Worker/RankingCopyWorker.cs b/ArenaService/Worker/RankingCopyWorker.cs index bb37eee..2f27c8d 100644 --- a/ArenaService/Worker/RankingCopyWorker.cs +++ b/ArenaService/Worker/RankingCopyWorker.cs @@ -123,11 +123,11 @@ IRoundPreparationService roundPreparationService var nextRoundInfo = await seasonService.GetSeasonAndRoundByBlock(blockIndex + 10); var nextRoundRankingCount = await rankingSnapshotRepo.GetRankingSnapshotsCount( nextRoundInfo.Season.Id, - nextRoundInfo.Round.Id + nextRoundInfo.Round.RoundIndex ); var previousRoundRankingCount = await rankingSnapshotRepo.GetRankingSnapshotsCount( nextRoundInfo.Season.Id, - nextRoundInfo.Round.Id - 1 + nextRoundInfo.Round.RoundIndex - 1 ); _logger.LogInformation( From d23827fdd20ef26a9bc68126f571afc416a11f14 Mon Sep 17 00:00:00 2001 From: Atralupus Date: Thu, 19 Jun 2025 21:24:34 +0900 Subject: [PATCH 2/9] Add season delete func --- .../Pages/CacheInitialization.razor | 185 ++++++++ .../Components/Pages/ManageSeasons.razor | 4 +- .../Components/Pages/Seasons.razor | 59 ++- .../Components/Shared/NavMenu.razor | 99 ++-- ArenaService.BackOffice/Program.cs | 423 +++++++++--------- .../Repositories/RankingRepository.cs | 49 ++ .../Repositories/RoundRepository.cs | 20 + .../Repositories/SeasonRepository.cs | 14 +- .../Services/CacheInitializationService.cs | 50 +++ .../Services/SeasonBlockAdjustmentService.cs | 4 +- ArenaService.Shared/Services/SeasonService.cs | 15 + .../AvailableOpponentController.cs | 2 + ArenaService/Controllers/BattleController.cs | 1 + 13 files changed, 662 insertions(+), 263 deletions(-) create mode 100644 ArenaService.BackOffice/Components/Pages/CacheInitialization.razor create mode 100644 ArenaService.Shared/Services/CacheInitializationService.cs diff --git a/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor new file mode 100644 index 0000000..688e08d --- /dev/null +++ b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor @@ -0,0 +1,185 @@ +@page "/cache-initialization" +@using ArenaService.Shared.Services +@using ArenaService.Shared.Repositories +@using ArenaService.Shared.Models +@inject ICacheInitializationService CacheInitializationService +@inject ISeasonCacheRepository SeasonCacheRepo +@inject IRankingRepository RankingRepo + +캐시 초기화 + +
+

🔄 캐시 초기화

+ + +

📅 현재 진행 중인 시즌

+ @if (currentSeason != null) + { + + + + + + + + + + + + + + + +
ID시작 블록종료 블록
@currentSeason?.Id@currentSeason?.StartBlock@currentSeason?.EndBlock
+ +

📅 현재 진행 중인 라운드

+ + + + + + + + + + + + + + + + + +
ID라운드 인덱스시작 블록종료 블록
@currentRound?.Id@currentRound?.RoundIndex@currentRound?.StartBlock@currentRound?.EndBlock
+ +

📊 랭킹 데이터 가용성

+ + + + + + + + + + @foreach (var roundRanking in rankingCounts) + { + + + + + + } + +
라운드랭킹 데이터 수상태
@roundRanking.RoundOffset@roundRanking.RankingCount@(roundRanking.RankingCount > 0 ? "✅ 준비됨" : "❌ 불완전")
+ } + else + { +

⚠️ 현재 진행 중인 시즌이 없습니다.

+ } + +
+ + +
+
+
🗑️ 전체 캐시 초기화
+
+
+

모든 랭킹 캐시를 초기화합니다. 이 작업은 되돌릴 수 없습니다.

+ +
+
+ + @if (!string.IsNullOrEmpty(message)) + { + + } +
+ +@code { + private bool isLoading = false; + private string message = ""; + private string alertClass = ""; + private (int Id, long StartBlock, long EndBlock)? currentSeason; + private (int Id, int RoundIndex, long StartBlock, long EndBlock)? currentRound; + private List<(int RoundOffset, int RankingCount)> rankingCounts = new(); + + protected override async Task OnInitializedAsync() + { + try + { + currentSeason = await SeasonCacheRepo.GetSeasonAsync(); + currentRound = await SeasonCacheRepo.GetRoundAsync(); + + if (currentSeason.HasValue && currentRound.HasValue) + { + await LoadRankingCounts(currentSeason.Value.Id, currentRound.Value.Id); + } + } + catch (Exception ex) + { + message = $"시즌 정보를 불러오는 중 오류가 발생했습니다: {ex.Message}"; + alertClass = "alert-danger"; + } + } + + private async Task LoadRankingCounts(int seasonId, int currentRoundId) + { + rankingCounts.Clear(); + + for (int offset = -1; offset <= 2; offset++) + { + int roundToCheck = currentRoundId + offset; + int rankingCount = await RankingRepo.GetRankingCountAsync(seasonId, roundToCheck); + rankingCounts.Add((currentRoundId + offset, rankingCount)); + } + } + + private async Task InitializeAllCache() + { + isLoading = true; + message = ""; + + try + { + var result = await CacheInitializationService.InitializeAllCacheAsync(); + + if (result) + { + message = "모든 랭킹 캐시가 성공적으로 초기화되었습니다."; + alertClass = "alert-success"; + + // 페이지 새로고침하여 최신 정보 표시 + await Task.Delay(1000); + await LoadRankingCounts(currentSeason!.Value.Id, currentRound!.Value.Id); + } + else + { + message = "캐시 초기화에 실패했습니다."; + alertClass = "alert-danger"; + } + } + catch (Exception ex) + { + message = $"캐시 초기화 중 오류가 발생했습니다: {ex.Message}"; + alertClass = "alert-danger"; + } + finally + { + isLoading = false; + } + } +} \ No newline at end of file diff --git a/ArenaService.BackOffice/Components/Pages/ManageSeasons.razor b/ArenaService.BackOffice/Components/Pages/ManageSeasons.razor index ae6f9df..da3f1a0 100644 --- a/ArenaService.BackOffice/Components/Pages/ManageSeasons.razor +++ b/ArenaService.BackOffice/Components/Pages/ManageSeasons.razor @@ -42,6 +42,7 @@ ID + Round Index Start Block End Block @@ -49,6 +50,7 @@ @currentRound?.Id + @currentRound?.RoundIndex @currentRound?.StartBlock @currentRound?.EndBlock @@ -114,7 +116,7 @@ else @code { private (int Id, long StartBlock, long EndBlock)? currentSeason; - private (int Id, long StartBlock, long EndBlock)? currentRound; + private (int Id, int RoundIndex, long StartBlock, long EndBlock)? currentRound; private List<(int RoundOffset, int RankingCount)> rankingCounts = new(); private int seasonId; private int roundId; diff --git a/ArenaService.BackOffice/Components/Pages/Seasons.razor b/ArenaService.BackOffice/Components/Pages/Seasons.razor index 63e020b..7c9d945 100644 --- a/ArenaService.BackOffice/Components/Pages/Seasons.razor +++ b/ArenaService.BackOffice/Components/Pages/Seasons.razor @@ -10,6 +10,7 @@ @inject ISeasonRepository SeasonRepository @inject ISeasonCacheRepository SeasonCacheRepo @inject ISeasonBlockAdjustmentService SeasonBlockAdjustmentService +@inject ISeasonService SeasonService @inject NavigationManager NavigationManager

🏆 Season List

@@ -42,7 +43,16 @@ else { @season.Id - @season.SeasonGroupId + + @if (editingSeasonId == season.Id) + { + + } + else + { + @season.SeasonGroupId + } + @season.StartBlock @season.EndBlock @@ -120,6 +130,14 @@ else { + @if (deletableSeasonIds.Contains(season.Id)) + { + + } + else + { + + } } @@ -173,6 +191,10 @@ else }

🆕 Add New Season

+
+ + +
@@ -240,6 +262,9 @@ else private Season editingSeason = new(); private long newEndBlock; + private int newSeasonGroupId; + + private HashSet deletableSeasonIds = new(); protected override async Task OnInitializedAsync() { @@ -253,6 +278,19 @@ else loading = true; paginatedSeasons = await SeasonRepository.GetSeasonsPagedAsync(currentPage, pageSize, q => q.Include(s => s.Rounds).Include(s => s.BattleTicketPolicy).Include(s => s.RefreshTicketPolicy)); + + // 현재 캐싱된 block index 가져오기 + var currentBlockIndex = await SeasonCacheRepo.GetBlockIndexAsync(); + deletableSeasonIds.Clear(); + + foreach (var season in paginatedSeasons) + { + if (season.StartBlock >= currentBlockIndex) + { + deletableSeasonIds.Add(season.Id); + } + } + loading = false; } @@ -264,7 +302,7 @@ else newStartBlock, newRoundInterval, newRoundCount, - 0, + newSeasonGroupId, newArenaType, newRequiredMedalCount, newTotalPrize, @@ -317,6 +355,7 @@ else editingSeason = new Season { Id = season.Id, + SeasonGroupId = season.SeasonGroupId, ArenaType = season.ArenaType, RoundInterval = season.RoundInterval, RequiredMedalCount = season.RequiredMedalCount, @@ -332,6 +371,7 @@ else { await SeasonRepository.UpdateSeasonAsync( seasonId, + editingSeason.SeasonGroupId, editingSeason.ArenaType, editingSeason.RoundInterval, editingSeason.RequiredMedalCount, @@ -373,4 +413,19 @@ else message = $"❌ Failed to adjust season end block: {ex.Message}"; } } + + private async Task DeleteSeason(int seasonId) + { + try + { + await SeasonService.DeleteSeasonAsync(seasonId); + message = "✅ Season deleted successfully!"; + totalSeasons = await SeasonRepository.GetTotalSeasonsCountAsync(); + await LoadSeasons(); + } + catch (Exception ex) + { + message = $"❌ Failed to delete season: {ex.Message}"; + } + } } diff --git a/ArenaService.BackOffice/Components/Shared/NavMenu.razor b/ArenaService.BackOffice/Components/Shared/NavMenu.razor index 7731a7c..6f3dd1a 100644 --- a/ArenaService.BackOffice/Components/Shared/NavMenu.razor +++ b/ArenaService.BackOffice/Components/Shared/NavMenu.razor @@ -1,48 +1,53 @@ -
-
- ArenaService.Backoffice -
-
- - - -
- +
+
+ ArenaService.Backoffice +
+
+ + + +
+
\ No newline at end of file diff --git a/ArenaService.BackOffice/Program.cs b/ArenaService.BackOffice/Program.cs index 5612942..7baca35 100644 --- a/ArenaService.BackOffice/Program.cs +++ b/ArenaService.BackOffice/Program.cs @@ -1,211 +1,212 @@ -using System.IdentityModel.Tokens.Jwt; -using System.Net.Http.Headers; -using System.Text; -using ArenaService.BackOffice.Components; -using ArenaService.BackOffice.Options; -using ArenaService.Options; -using ArenaService.Shared.Data; -using ArenaService.Shared.Jwt; -using ArenaService.Shared.Repositories; -using ArenaService.Shared.Services; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Authentication.Google; -using Microsoft.AspNetCore.HttpOverrides; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Options; -using Microsoft.IdentityModel.Tokens; -using StackExchange.Redis; - -var builder = WebApplication.CreateBuilder(args); -var configuration = builder.Configuration; - -builder.Services.Configure(configuration.GetSection(RedisOptions.SectionName)); -builder.Services.Configure( - configuration.GetSection(GoogleAuthOptions.SectionName) -); -builder.Services.Configure(configuration.GetSection(HeadlessOptions.SectionName)); - -// Add services to the container. -builder.Services.AddRazorComponents().AddInteractiveServerComponents(); - -// Add Google Authentication -builder - .Services.AddAuthentication(options => - { - options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; - options.DefaultChallengeScheme = GoogleDefaults.AuthenticationScheme; - }) - .AddCookie() - .AddGoogle(googleOptions => - { - var googleAuthOptions = builder - .Services.BuildServiceProvider() - .GetRequiredService>() - .Value; - googleOptions.ClientId = googleAuthOptions.ClientId; - googleOptions.ClientSecret = googleAuthOptions.ClientSecret; - - googleOptions.CallbackPath = "/signin-google"; - - googleOptions.CorrelationCookie.SecurePolicy = CookieSecurePolicy.Always; - googleOptions.CorrelationCookie.SameSite = SameSiteMode.Lax; - }); - -builder.Services.AddDbContext(options => - options - .UseNpgsql(configuration.GetConnectionString("DefaultConnection")) - .UseSnakeCaseNamingConvention() -); - -builder.Services - .AddHeadlessClient() - .ConfigureHttpClient( - (provider, client) => - { - var headlessOptions = provider.GetRequiredService>(); - client.BaseAddress = headlessOptions.Value.HeadlessEndpoint; - - if ( - headlessOptions.Value.JwtSecretKey is not null - && headlessOptions.Value.JwtIssuer is not null - ) - { - var key = new SymmetricSecurityKey( - Encoding.UTF8.GetBytes(headlessOptions.Value.JwtSecretKey) - ); - var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); - var token = new JwtSecurityToken( - issuer: headlessOptions.Value.JwtIssuer, - expires: DateTime.UtcNow.AddMinutes(5), - signingCredentials: creds - ); - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue( - "Bearer", - new JwtSecurityTokenHandler().WriteToken(token) - ); - } - } - ); - -builder.Services.AddSingleton(provider => -{ - var redisOptions = provider.GetRequiredService>().Value; - var config = new ConfigurationOptions - { - DefaultDatabase = redisOptions.RankingDbNumber - }; - - config.EndPoints.Add(redisOptions.Host, int.Parse(redisOptions.Port)); - - if (!string.IsNullOrEmpty(redisOptions.Username)) - { - config.User = redisOptions.Username; - } - - if (!string.IsNullOrEmpty(redisOptions.Password)) - { - config.Password = redisOptions.Password; - } - - return ConnectionMultiplexer.Connect(config); -}); - -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); - -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); - -// Fake Key -builder.Services.AddSingleton( - new BattleTokenGenerator( - "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF1UkpPT0xhTGcrMHJyd20xNUdwMgpPWnRmMXdLeDB0dlZ1RSt0ZXFZUDZ3Zm1zTE5KZnpRcTVqYjZSVFhKU2FjRS9mN3JDQ013cnBqVUJtM2ZzTUxpCkZ1aE1ZY1IweTdYb1BHRCtHb1lXM0xYYVMwSC9RY1FMUmk5ejZKM1NyOC9UREZ6eVo0MGtlOHE2M0k1STNBWDYKSlBzUUZpNlZoNHl5MWtqZDJVTjdZazNQcjRWY3BCS1pxNnc4VFlnRWNhbWxCeXFxWWdkbjdtZjRySUtFREYvZQo3NHp1T0ZLcnE2Y0hJMGRuMGtpdTZBY3lkcWYxVUx3dDFRVHRNajdYN3h3WmRCZUNVV3AzOU16bTdDMzRjemF4CkMrZ05tQnVYZFQwT3NhMTlqZlJlRjB5cUpvNG1xMVpOMi9GY0xXZVZyYStVNEhZdXJqcTJqYjIyRWxiSDYxak8KOFFJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==" - ) -); - -builder.Services.AddHttpsRedirection(options => -{ - options.RedirectStatusCode = StatusCodes.Status307TemporaryRedirect; -}); - -builder.Services.Configure(options => -{ - options.ForwardedHeaders = - ForwardedHeaders.XForwardedFor - | ForwardedHeaders.XForwardedProto - | ForwardedHeaders.XForwardedHost; - options.KnownNetworks.Clear(); - options.KnownProxies.Clear(); -}); - -var app = builder.Build(); - -// Configure the HTTP request pipeline. -if (!app.Environment.IsDevelopment()) -{ - app.UseExceptionHandler("/Error"); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); -} - -app.UseForwardedHeaders(); - -app.Use( - async (context, next) => - { - context.Response.Headers.Add("X-Frame-Options", "DENY"); - context.Response.Headers.Add("X-Content-Type-Options", "nosniff"); - context.Response.Headers.Add("X-XSS-Protection", "1; mode=block"); - context.Response.Headers.Add("Referrer-Policy", "strict-origin-when-cross-origin"); - await next(); - } -); - -app.UseHttpsRedirection(); -app.UseStaticFiles(); -app.UseRouting(); -app.UseAuthentication(); -app.UseAuthorization(); -app.UseAntiforgery(); - -app.MapGet( - "/login", - async (HttpContext context) => - { - await context.ChallengeAsync( - GoogleDefaults.AuthenticationScheme, - new AuthenticationProperties { RedirectUri = "/" } - ); - } -); - -app.MapGet( - "/logout", - async (HttpContext context) => - { - await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); - - return Results.Redirect("/"); - } -); - -app.MapRazorComponents().AddInteractiveServerRenderMode().RequireAuthorization(); - -app.Run(); +using System.IdentityModel.Tokens.Jwt; +using System.Net.Http.Headers; +using System.Text; +using ArenaService.BackOffice.Components; +using ArenaService.BackOffice.Options; +using ArenaService.Options; +using ArenaService.Shared.Data; +using ArenaService.Shared.Jwt; +using ArenaService.Shared.Repositories; +using ArenaService.Shared.Services; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.Google; +using Microsoft.AspNetCore.HttpOverrides; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Options; +using Microsoft.IdentityModel.Tokens; +using StackExchange.Redis; + +var builder = WebApplication.CreateBuilder(args); +var configuration = builder.Configuration; + +builder.Services.Configure(configuration.GetSection(RedisOptions.SectionName)); +builder.Services.Configure( + configuration.GetSection(GoogleAuthOptions.SectionName) +); +builder.Services.Configure(configuration.GetSection(HeadlessOptions.SectionName)); + +// Add services to the container. +builder.Services.AddRazorComponents().AddInteractiveServerComponents(); + +// Add Google Authentication +builder + .Services.AddAuthentication(options => + { + options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; + options.DefaultChallengeScheme = GoogleDefaults.AuthenticationScheme; + }) + .AddCookie() + .AddGoogle(googleOptions => + { + var googleAuthOptions = builder + .Services.BuildServiceProvider() + .GetRequiredService>() + .Value; + googleOptions.ClientId = googleAuthOptions.ClientId; + googleOptions.ClientSecret = googleAuthOptions.ClientSecret; + + googleOptions.CallbackPath = "/signin-google"; + + googleOptions.CorrelationCookie.SecurePolicy = CookieSecurePolicy.Always; + googleOptions.CorrelationCookie.SameSite = SameSiteMode.Lax; + }); + +builder.Services.AddDbContext(options => + options + .UseNpgsql(configuration.GetConnectionString("DefaultConnection")) + .UseSnakeCaseNamingConvention() +); + +builder.Services + .AddHeadlessClient() + .ConfigureHttpClient( + (provider, client) => + { + var headlessOptions = provider.GetRequiredService>(); + client.BaseAddress = headlessOptions.Value.HeadlessEndpoint; + + if ( + headlessOptions.Value.JwtSecretKey is not null + && headlessOptions.Value.JwtIssuer is not null + ) + { + var key = new SymmetricSecurityKey( + Encoding.UTF8.GetBytes(headlessOptions.Value.JwtSecretKey) + ); + var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); + var token = new JwtSecurityToken( + issuer: headlessOptions.Value.JwtIssuer, + expires: DateTime.UtcNow.AddMinutes(5), + signingCredentials: creds + ); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue( + "Bearer", + new JwtSecurityTokenHandler().WriteToken(token) + ); + } + } + ); + +builder.Services.AddSingleton(provider => +{ + var redisOptions = provider.GetRequiredService>().Value; + var config = new ConfigurationOptions + { + DefaultDatabase = redisOptions.RankingDbNumber + }; + + config.EndPoints.Add(redisOptions.Host, int.Parse(redisOptions.Port)); + + if (!string.IsNullOrEmpty(redisOptions.Username)) + { + config.User = redisOptions.Username; + } + + if (!string.IsNullOrEmpty(redisOptions.Password)) + { + config.Password = redisOptions.Password; + } + + return ConnectionMultiplexer.Connect(config); +}); + +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); + +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); + +// Fake Key +builder.Services.AddSingleton( + new BattleTokenGenerator( + "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF1UkpPT0xhTGcrMHJyd20xNUdwMgpPWnRmMXdLeDB0dlZ1RSt0ZXFZUDZ3Zm1zTE5KZnpRcTVqYjZSVFhKU2FjRS9mN3JDQ013cnBqVUJtM2ZzTUxpCkZ1aE1ZY1IweTdYb1BHRCtHb1lXM0xYYVMwSC9RY1FMUmk5ejZKM1NyOC9UREZ6eVo0MGtlOHE2M0k1STNBWDYKSlBzUUZpNlZoNHl5MWtqZDJVTjdZazNQcjRWY3BCS1pxNnc4VFlnRWNhbWxCeXFxWWdkbjdtZjRySUtFREYvZQo3NHp1T0ZLcnE2Y0hJMGRuMGtpdTZBY3lkcWYxVUx3dDFRVHRNajdYN3h3WmRCZUNVV3AzOU16bTdDMzRjemF4CkMrZ05tQnVYZFQwT3NhMTlqZlJlRjB5cUpvNG1xMVpOMi9GY0xXZVZyYStVNEhZdXJqcTJqYjIyRWxiSDYxak8KOFFJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==" + ) +); + +builder.Services.AddHttpsRedirection(options => +{ + options.RedirectStatusCode = StatusCodes.Status307TemporaryRedirect; +}); + +builder.Services.Configure(options => +{ + options.ForwardedHeaders = + ForwardedHeaders.XForwardedFor + | ForwardedHeaders.XForwardedProto + | ForwardedHeaders.XForwardedHost; + options.KnownNetworks.Clear(); + options.KnownProxies.Clear(); +}); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (!app.Environment.IsDevelopment()) +{ + app.UseExceptionHandler("/Error"); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); +} + +app.UseForwardedHeaders(); + +app.Use( + async (context, next) => + { + context.Response.Headers.Add("X-Frame-Options", "DENY"); + context.Response.Headers.Add("X-Content-Type-Options", "nosniff"); + context.Response.Headers.Add("X-XSS-Protection", "1; mode=block"); + context.Response.Headers.Add("Referrer-Policy", "strict-origin-when-cross-origin"); + await next(); + } +); + +app.UseHttpsRedirection(); +app.UseStaticFiles(); +app.UseRouting(); +app.UseAuthentication(); +app.UseAuthorization(); +app.UseAntiforgery(); + +app.MapGet( + "/login", + async (HttpContext context) => + { + await context.ChallengeAsync( + GoogleDefaults.AuthenticationScheme, + new AuthenticationProperties { RedirectUri = "/" } + ); + } +); + +app.MapGet( + "/logout", + async (HttpContext context) => + { + await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); + + return Results.Redirect("/"); + } +); + +app.MapRazorComponents().AddInteractiveServerRenderMode().RequireAuthorization(); + +app.Run(); diff --git a/ArenaService.Shared/Repositories/RankingRepository.cs b/ArenaService.Shared/Repositories/RankingRepository.cs index 1dbd755..bc1ddad 100644 --- a/ArenaService.Shared/Repositories/RankingRepository.cs +++ b/ArenaService.Shared/Repositories/RankingRepository.cs @@ -34,6 +34,12 @@ bool isFirstRound Task CopyRoundDataAsync(int seasonId, int sourceRoundIndex, int targetRoundIndex, int roundInterval); Task GetRankingCountAsync(int seasonId, int roundIndex); + + Task ClearRankingCacheAsync(int seasonId, int roundIndex); + + Task ClearAllRankingCacheAsync(); + + Task ClearSeasonAndRoundCacheAsync(); } public class RankingRepository : IRankingRepository @@ -325,4 +331,47 @@ private async Task InsureRankingStatus(int seasonId, int roundIndex) throw new CacheUnavailableException($"Ranking is {rankingStatus}"); } } + + public async Task ClearRankingCacheAsync(int seasonId, int roundIndex) + { + string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); + string statusKey = string.Format(StatusKeyFormat, seasonId, roundIndex); + + await _redis.KeyDeleteAsync(rankingKey); + await _redis.KeyDeleteAsync(statusKey); + } + + public async Task ClearAllRankingCacheAsync() + { + var server = _redis.Multiplexer.GetServer(_redis.Multiplexer.GetEndPoints().First()); + var keys = server.Keys(pattern: "season:*:round:*:ranking"); + + foreach (var key in keys) + { + await _redis.KeyDeleteAsync(key); + } + + var statusKeys = server.Keys(pattern: "season:*:round:*:ranking:status"); + foreach (var key in statusKeys) + { + await _redis.KeyDeleteAsync(key); + } + } + + public async Task ClearSeasonAndRoundCacheAsync() + { + var server = _redis.Multiplexer.GetServer(_redis.Multiplexer.GetEndPoints().First()); + var keys = server.Keys(pattern: "season:*:round:*:ranking"); + + foreach (var key in keys) + { + await _redis.KeyDeleteAsync(key); + } + + var statusKeys = server.Keys(pattern: "season:*:round:*:ranking:status"); + foreach (var key in statusKeys) + { + await _redis.KeyDeleteAsync(key); + } + } } diff --git a/ArenaService.Shared/Repositories/RoundRepository.cs b/ArenaService.Shared/Repositories/RoundRepository.cs index 37a44c4..63aa30d 100644 --- a/ArenaService.Shared/Repositories/RoundRepository.cs +++ b/ArenaService.Shared/Repositories/RoundRepository.cs @@ -11,6 +11,11 @@ public interface IRoundRepository int roundId, Func, IQueryable>? includeQuery = null ); + + Task> GetRoundsBySeasonIdAsync( + int seasonId, + Func, IQueryable>? includeQuery = null + ); } public class RoundRepository : IRoundRepository @@ -36,4 +41,19 @@ public RoundRepository(ArenaDbContext context) return await query.SingleOrDefaultAsync(r => r.Id == roundId); } + + public async Task> GetRoundsBySeasonIdAsync( + int seasonId, + Func, IQueryable>? includeQuery = null + ) + { + var query = _context.Rounds.AsQueryable().AsNoTracking(); + + if (includeQuery != null) + { + query = includeQuery(query); + } + + return await query.Where(r => r.SeasonId == seasonId).ToListAsync(); + } } diff --git a/ArenaService.Shared/Repositories/SeasonRepository.cs b/ArenaService.Shared/Repositories/SeasonRepository.cs index a50ffba..c478efc 100644 --- a/ArenaService.Shared/Repositories/SeasonRepository.cs +++ b/ArenaService.Shared/Repositories/SeasonRepository.cs @@ -39,6 +39,7 @@ int refreshTicketPolicyId ); Task UpdateSeasonAsync( int id, + int seasonGroupId, ArenaType arenaType, int roundInterval, int requiredMedalCount, @@ -47,6 +48,7 @@ Task UpdateSeasonAsync( int refreshTicketPolicyId ); Task AdjustSeasonEndBlockAsync(int seasonId, long newEndBlock); + Task DeleteSeasonAsync(int seasonId); } public class SeasonRepository : ISeasonRepository @@ -190,7 +192,8 @@ int refreshTicketPolicyId { SeasonId = season.Id, StartBlock = currentStart, - EndBlock = currentEnd + EndBlock = currentEnd, + RoundIndex = i } ); @@ -203,6 +206,7 @@ int refreshTicketPolicyId public async Task UpdateSeasonAsync( int id, + int seasonGroupId, ArenaType arenaType, int roundInterval, int requiredMedalCount, @@ -218,6 +222,7 @@ int refreshTicketPolicyId season.TotalPrize = totalPrize; season.BattleTicketPolicyId = battleTicketPolicyId; season.RefreshTicketPolicyId = refreshTicketPolicyId; + season.SeasonGroupId = seasonGroupId; await _context.SaveChangesAsync(); return season; @@ -231,4 +236,11 @@ public async Task AdjustSeasonEndBlockAsync(int seasonId, long newEndBlo await _context.SaveChangesAsync(); return season; } + + public async Task DeleteSeasonAsync(int seasonId) + { + var season = await _context.Seasons.SingleAsync(s => s.Id == seasonId); + _context.Seasons.Remove(season); + await _context.SaveChangesAsync(); + } } diff --git a/ArenaService.Shared/Services/CacheInitializationService.cs b/ArenaService.Shared/Services/CacheInitializationService.cs new file mode 100644 index 0000000..0d8baea --- /dev/null +++ b/ArenaService.Shared/Services/CacheInitializationService.cs @@ -0,0 +1,50 @@ +using ArenaService.Shared.Repositories; + +namespace ArenaService.Shared.Services; + +public interface ICacheInitializationService +{ + Task InitializeCacheAsync(int seasonId, int roundIndex); + Task InitializeAllCacheAsync(); + Task InitializeSeasonAndRoundCacheAsync(); +} + +public class CacheInitializationService : ICacheInitializationService +{ + private readonly IRankingRepository _rankingRepository; + private readonly IRankingSnapshotRepository _rankingSnapshotRepository; + + public CacheInitializationService( + IRankingRepository rankingRepository, + IRankingSnapshotRepository rankingSnapshotRepository) + { + _rankingRepository = rankingRepository; + _rankingSnapshotRepository = rankingSnapshotRepository; + } + + public async Task InitializeCacheAsync(int seasonId, int roundIndex) + { + var rankingCount = await _rankingRepository.GetRankingCountAsync(seasonId, roundIndex); + var snapshotCount = await _rankingSnapshotRepository.GetRankingSnapshotsCount(seasonId, roundIndex); + + if (rankingCount == 0 || snapshotCount < rankingCount) + { + return false; + } + + await _rankingRepository.ClearRankingCacheAsync(seasonId, roundIndex); + return true; + } + + public async Task InitializeAllCacheAsync() + { + await _rankingRepository.ClearAllRankingCacheAsync(); + return true; + } + + public async Task InitializeSeasonAndRoundCacheAsync() + { + await _rankingRepository.ClearSeasonAndRoundCacheAsync(); + return true; + } +} \ No newline at end of file diff --git a/ArenaService.Shared/Services/SeasonBlockAdjustmentService.cs b/ArenaService.Shared/Services/SeasonBlockAdjustmentService.cs index 86b9b49..7c014b6 100644 --- a/ArenaService.Shared/Services/SeasonBlockAdjustmentService.cs +++ b/ArenaService.Shared/Services/SeasonBlockAdjustmentService.cs @@ -82,6 +82,7 @@ private async Task HandleEndBlockIncrease(Season season, List rounds, lon var currentStartBlock = lastRound.EndBlock + 1; var newRounds = new List(); + var nextRoundIndex = rounds.Max(r => r.RoundIndex) + 1; while (currentStartBlock <= season.EndBlock) { @@ -93,7 +94,8 @@ private async Task HandleEndBlockIncrease(Season season, List rounds, lon { SeasonId = season.Id, StartBlock = currentStartBlock, - EndBlock = currentEndBlock + EndBlock = currentEndBlock, + RoundIndex = nextRoundIndex++ }; newRounds.Add(newRound); diff --git a/ArenaService.Shared/Services/SeasonService.cs b/ArenaService.Shared/Services/SeasonService.cs index fe8944c..7d8a96c 100644 --- a/ArenaService.Shared/Services/SeasonService.cs +++ b/ArenaService.Shared/Services/SeasonService.cs @@ -16,6 +16,10 @@ Task> ClassifyByChampionship( ); Task<(Season Season, Round Round)> GetSeasonAndRoundByBlock(long blockIndex); + + Task CanDeleteSeasonAsync(int seasonId, long currentBlockIndex); + + Task DeleteSeasonAsync(int seasonId); } public class SeasonService : ISeasonService @@ -110,4 +114,15 @@ public async Task> ClassifyByChampionship( return (season, round); } + + public async Task CanDeleteSeasonAsync(int seasonId, long currentBlockIndex) + { + var season = await _seasonRepo.GetSeasonAsync(seasonId); + return season.StartBlock >= currentBlockIndex; + } + + public async Task DeleteSeasonAsync(int seasonId) + { + await _seasonRepo.DeleteSeasonAsync(seasonId); + } } diff --git a/ArenaService/Controllers/AvailableOpponentController.cs b/ArenaService/Controllers/AvailableOpponentController.cs index b070b50..dd8cfef 100644 --- a/ArenaService/Controllers/AvailableOpponentController.cs +++ b/ArenaService/Controllers/AvailableOpponentController.cs @@ -63,6 +63,7 @@ public async Task GetAvailableOpponents() var participant = await _participateService.ParticipateAsync( cachedSeason.Id, cachedRound.Id, + cachedRound.RoundIndex, avatarAddress, (int)(cachedRound.EndBlock - cachedRound.StartBlock), query => query.Include(p => p.User) @@ -164,6 +165,7 @@ public async Task RequestFreeRefresh() var participant = await _participateService.ParticipateAsync( cachedSeason.Id, cachedRound.Id, + cachedRound.RoundIndex, avatarAddress, (int)(cachedRound.EndBlock - cachedRound.StartBlock), query => diff --git a/ArenaService/Controllers/BattleController.cs b/ArenaService/Controllers/BattleController.cs index 2b7b6a9..bbc01bc 100644 --- a/ArenaService/Controllers/BattleController.cs +++ b/ArenaService/Controllers/BattleController.cs @@ -87,6 +87,7 @@ public async Task CreateBattleToken(Address opponentAvatarAddress var participant = await _participateService.ParticipateAsync( cachedSeason.Id, cachedRound.Id, + cachedRound.RoundIndex, avatarAddress, (int)(cachedRound.EndBlock - cachedRound.StartBlock), query => From 6795212e75da31d4fd4e94ba654423b0bf0b375e Mon Sep 17 00:00:00 2001 From: Atralupus Date: Fri, 20 Jun 2025 15:40:25 +0900 Subject: [PATCH 3/9] Add roundindex migration file --- .../Components/Pages/Seasons.razor | 2 + .../20250620050806_Add RoundIndex.Designer.cs | 1377 +++++++++++++++++ .../20250620050806_Add RoundIndex.cs | 69 + .../Migrations/ArenaDbContextModelSnapshot.cs | 21 +- .../Controllers/BlockStatusControllerTests.cs | 3 +- 5 files changed, 1469 insertions(+), 3 deletions(-) create mode 100644 ArenaService.Shared/Migrations/20250620050806_Add RoundIndex.Designer.cs create mode 100644 ArenaService.Shared/Migrations/20250620050806_Add RoundIndex.cs diff --git a/ArenaService.BackOffice/Components/Pages/Seasons.razor b/ArenaService.BackOffice/Components/Pages/Seasons.razor index 7c9d945..173af90 100644 --- a/ArenaService.BackOffice/Components/Pages/Seasons.razor +++ b/ArenaService.BackOffice/Components/Pages/Seasons.razor @@ -159,6 +159,7 @@ else Round ID + Round Index Start Block End Block @@ -168,6 +169,7 @@ else { @round.Id + @round.RoundIndex @round.StartBlock @round.EndBlock diff --git a/ArenaService.Shared/Migrations/20250620050806_Add RoundIndex.Designer.cs b/ArenaService.Shared/Migrations/20250620050806_Add RoundIndex.Designer.cs new file mode 100644 index 0000000..586d8e7 --- /dev/null +++ b/ArenaService.Shared/Migrations/20250620050806_Add RoundIndex.Designer.cs @@ -0,0 +1,1377 @@ +// +using System; +using System.Collections.Generic; +using ArenaService.Shared.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace ArenaService.Shared.Migrations +{ + [DbContext(typeof(ArenaDbContext))] + [Migration("20250620050806_Add RoundIndex")] + partial class AddRoundIndex + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "8.0.11") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("ArenaService.Shared.Models.AvailableOpponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AvatarAddress") + .IsRequired() + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("timestamptz") + .HasColumnName("deleted_at"); + + b.Property("GroupId") + .HasColumnType("integer") + .HasColumnName("group_id"); + + b.Property("OpponentAvatarAddress") + .IsRequired() + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("opponent_avatar_address"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("SuccessBattleId") + .HasColumnType("integer") + .HasColumnName("success_battle_id"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_available_opponents"); + + b.HasIndex("SeasonId") + .HasDatabaseName("ix_available_opponents_season_id"); + + b.HasIndex("SuccessBattleId") + .HasDatabaseName("ix_available_opponents_success_battle_id"); + + b.HasIndex("AvatarAddress", "SeasonId") + .HasDatabaseName("ix_available_opponents_avatar_address_season_id"); + + b.HasIndex("OpponentAvatarAddress", "SeasonId") + .HasDatabaseName("ix_available_opponents_opponent_avatar_address_season_id"); + + b.HasIndex("AvatarAddress", "RoundId", "DeletedAt") + .HasDatabaseName("ix_available_opponents_avatar_address_round_id_deleted_at"); + + b.HasIndex("RoundId", "AvatarAddress", "OpponentAvatarAddress", "SuccessBattleId", "DeletedAt") + .HasDatabaseName("ix_available_opponents_round_id_avatar_address_opponent_avatar"); + + b.ToTable("available_opponents", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Battle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AvailableOpponentId") + .HasColumnType("integer") + .HasColumnName("available_opponent_id"); + + b.Property("AvatarAddress") + .IsRequired() + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("BattleStatus") + .HasColumnType("integer") + .HasColumnName("battle_status"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("ExceptionNames") + .HasColumnType("text") + .HasColumnName("exception_names"); + + b.Property("IsVictory") + .HasColumnType("boolean") + .HasColumnName("is_victory"); + + b.Property("MyScoreChange") + .HasColumnType("integer") + .HasColumnName("my_score_change"); + + b.Property("OpponentScoreChange") + .HasColumnType("integer") + .HasColumnName("opponent_score_change"); + + b.Property("Reviewed") + .HasColumnType("boolean") + .HasColumnName("reviewed"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("Token") + .IsRequired() + .HasColumnType("text") + .HasColumnName("token"); + + b.Property("TxId") + .HasColumnType("text") + .HasColumnName("tx_id"); + + b.Property("TxStatus") + .HasColumnType("integer") + .HasColumnName("tx_status"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_battles"); + + b.HasIndex("AvailableOpponentId") + .HasDatabaseName("ix_battles_available_opponent_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("ix_battles_round_id"); + + b.HasIndex("SeasonId") + .HasDatabaseName("ix_battles_season_id"); + + b.HasIndex("AvatarAddress", "SeasonId") + .HasDatabaseName("ix_battles_avatar_address_season_id"); + + b.HasIndex("BattleStatus", "Reviewed") + .HasDatabaseName("ix_battles_battle_status_reviewed"); + + b.HasIndex("Id", "TxId") + .HasDatabaseName("ix_battles_id_tx_id"); + + b.ToTable("battles", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.BattleTicket.BattleTicketPolicy", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("DefaultTicketsPerRound") + .HasColumnType("integer") + .HasColumnName("default_tickets_per_round"); + + b.Property("MaxPurchasableTicketsPerRound") + .HasColumnType("integer") + .HasColumnName("max_purchasable_tickets_per_round"); + + b.Property("MaxPurchasableTicketsPerSeason") + .HasColumnType("integer") + .HasColumnName("max_purchasable_tickets_per_season"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.Property>("PurchasePrices") + .IsRequired() + .HasColumnType("decimal[]") + .HasColumnName("purchase_prices"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_battle_ticket_policies"); + + b.ToTable("battle_ticket_policies", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.BattleTicket.BattleTicketPurchaseLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AmountPaid") + .HasColumnType("decimal(18,2)") + .HasColumnName("amount_paid"); + + b.Property("AvatarAddress") + .IsRequired() + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("ExceptionNames") + .HasColumnType("text") + .HasColumnName("exception_names"); + + b.Property("PurchaseCount") + .HasColumnType("integer") + .HasColumnName("purchase_count"); + + b.Property("PurchaseStatus") + .HasColumnType("integer") + .HasColumnName("purchase_status"); + + b.Property("Reviewed") + .HasColumnType("boolean") + .HasColumnName("reviewed"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("TxId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("tx_id"); + + b.Property("TxStatus") + .HasColumnType("integer") + .HasColumnName("tx_status"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_battle_ticket_purchase_logs"); + + b.ToTable("battle_ticket_purchase_logs", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.BattleTicket.BattleTicketStatusPerRound", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AvatarAddress") + .IsRequired() + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("BattleTicketPolicyId") + .HasColumnType("integer") + .HasColumnName("battle_ticket_policy_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("LoseCount") + .HasColumnType("integer") + .HasColumnName("lose_count"); + + b.Property("PurchaseCount") + .HasColumnType("integer") + .HasColumnName("purchase_count"); + + b.Property("RemainingCount") + .HasColumnType("integer") + .HasColumnName("remaining_count"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.Property("UsedCount") + .HasColumnType("integer") + .HasColumnName("used_count"); + + b.Property("WinCount") + .HasColumnType("integer") + .HasColumnName("win_count"); + + b.HasKey("Id") + .HasName("pk_battle_ticket_statuses_per_round"); + + b.HasIndex("BattleTicketPolicyId") + .HasDatabaseName("ix_battle_ticket_statuses_per_round_battle_ticket_policy_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("ix_battle_ticket_statuses_per_round_round_id"); + + b.HasIndex("SeasonId") + .HasDatabaseName("ix_battle_ticket_statuses_per_round_season_id"); + + b.HasIndex("AvatarAddress", "SeasonId", "RoundId") + .IsUnique() + .HasDatabaseName("ix_battle_ticket_statuses_per_round_avatar_address_season_id_r"); + + b.ToTable("battle_ticket_statuses_per_round", null, t => + { + t.HasCheckConstraint("CK_BattleTicketStatusPerRound_RemainingCount", "remaining_count >= 0"); + }); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.BattleTicket.BattleTicketStatusPerSeason", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AvatarAddress") + .IsRequired() + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("BattleTicketPolicyId") + .HasColumnType("integer") + .HasColumnName("battle_ticket_policy_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("PurchaseCount") + .HasColumnType("integer") + .HasColumnName("purchase_count"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.Property("UsedCount") + .HasColumnType("integer") + .HasColumnName("used_count"); + + b.HasKey("Id") + .HasName("pk_battle_ticket_statuses_per_season"); + + b.HasIndex("BattleTicketPolicyId") + .HasDatabaseName("ix_battle_ticket_statuses_per_season_battle_ticket_policy_id"); + + b.HasIndex("SeasonId") + .HasDatabaseName("ix_battle_ticket_statuses_per_season_season_id"); + + b.HasIndex("AvatarAddress", "SeasonId") + .IsUnique() + .HasDatabaseName("ix_battle_ticket_statuses_per_season_avatar_address_season_id"); + + b.ToTable("battle_ticket_statuses_per_season", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.BattleTicket.BattleTicketUsageLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("BattleId") + .HasColumnType("integer") + .HasColumnName("battle_id"); + + b.Property("BattleTicketStatusPerRoundId") + .HasColumnType("integer") + .HasColumnName("battle_ticket_status_per_round_id"); + + b.Property("BattleTicketStatusPerSeasonId") + .HasColumnType("integer") + .HasColumnName("battle_ticket_status_per_season_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.HasKey("Id") + .HasName("pk_battle_ticket_usage_logs"); + + b.HasIndex("BattleTicketStatusPerRoundId") + .HasDatabaseName("ix_battle_ticket_usage_logs_battle_ticket_status_per_round_id"); + + b.HasIndex("BattleTicketStatusPerSeasonId") + .HasDatabaseName("ix_battle_ticket_usage_logs_battle_ticket_status_per_season_id"); + + b.ToTable("battle_ticket_usage_logs", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Clan", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("ImageURL") + .IsRequired() + .HasColumnType("text") + .HasColumnName("image_url"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("character varying(20)") + .HasColumnName("name"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_clans"); + + b.ToTable("clans", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Medal", b => + { + b.Property("AvatarAddress") + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("MedalCount") + .HasColumnType("integer") + .HasColumnName("medal_count"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("AvatarAddress", "SeasonId") + .HasName("pk_medals"); + + b.HasIndex("SeasonId") + .HasDatabaseName("ix_medals_season_id"); + + b.HasIndex("MedalCount", "SeasonId") + .HasDatabaseName("ix_medals_medal_count_season_id"); + + b.ToTable("medals", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Participant", b => + { + b.Property("AvatarAddress") + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("InitializedScore") + .HasColumnType("integer") + .HasColumnName("initialized_score"); + + b.Property("Score") + .HasColumnType("integer") + .HasColumnName("score"); + + b.Property("TotalLose") + .HasColumnType("integer") + .HasColumnName("total_lose"); + + b.Property("TotalWin") + .HasColumnType("integer") + .HasColumnName("total_win"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("AvatarAddress", "SeasonId") + .HasName("pk_participants"); + + b.HasIndex("SeasonId") + .HasDatabaseName("ix_participants_season_id"); + + b.HasIndex("SeasonId", "Score") + .IsDescending(false, true) + .HasDatabaseName("ix_participants_season_id_score"); + + b.ToTable("participants", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.RankingSnapshot", b => + { + b.Property("AvatarAddress") + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("ClanId") + .HasColumnType("integer") + .HasColumnName("clan_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("Score") + .HasColumnType("integer") + .HasColumnName("score"); + + b.HasKey("AvatarAddress", "SeasonId", "RoundId") + .HasName("pk_ranking_snapshots"); + + b.HasIndex("RoundId") + .HasDatabaseName("ix_ranking_snapshots_round_id"); + + b.HasIndex("SeasonId") + .HasDatabaseName("ix_ranking_snapshots_season_id"); + + b.HasIndex("SeasonId", "RoundId") + .HasDatabaseName("ix_ranking_snapshots_season_id_round_id"); + + b.ToTable("ranking_snapshots", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.RefreshTicket.RefreshTicketPolicy", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("DefaultTicketsPerRound") + .HasColumnType("integer") + .HasColumnName("default_tickets_per_round"); + + b.Property("MaxPurchasableTicketsPerRound") + .HasColumnType("integer") + .HasColumnName("max_purchasable_tickets_per_round"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.Property>("PurchasePrices") + .IsRequired() + .HasColumnType("decimal[]") + .HasColumnName("purchase_prices"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_refresh_ticket_policies"); + + b.ToTable("refresh_ticket_policies", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.RefreshTicket.RefreshTicketPurchaseLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AmountPaid") + .HasColumnType("decimal(18,2)") + .HasColumnName("amount_paid"); + + b.Property("AvatarAddress") + .IsRequired() + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("ExceptionNames") + .HasColumnType("text") + .HasColumnName("exception_names"); + + b.Property("PurchaseCount") + .HasColumnType("integer") + .HasColumnName("purchase_count"); + + b.Property("PurchaseStatus") + .HasColumnType("integer") + .HasColumnName("purchase_status"); + + b.Property("Reviewed") + .HasColumnType("boolean") + .HasColumnName("reviewed"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("TxId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("tx_id"); + + b.Property("TxStatus") + .HasColumnType("integer") + .HasColumnName("tx_status"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_refresh_ticket_purchase_logs"); + + b.ToTable("refresh_ticket_purchase_logs", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.RefreshTicket.RefreshTicketStatusPerRound", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AvatarAddress") + .IsRequired() + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("PurchaseCount") + .HasColumnType("integer") + .HasColumnName("purchase_count"); + + b.Property("RefreshTicketPolicyId") + .HasColumnType("integer") + .HasColumnName("refresh_ticket_policy_id"); + + b.Property("RemainingCount") + .HasColumnType("integer") + .HasColumnName("remaining_count"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.Property("UsedCount") + .HasColumnType("integer") + .HasColumnName("used_count"); + + b.HasKey("Id") + .HasName("pk_refresh_ticket_statuses_per_round"); + + b.HasIndex("RefreshTicketPolicyId") + .HasDatabaseName("ix_refresh_ticket_statuses_per_round_refresh_ticket_policy_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("ix_refresh_ticket_statuses_per_round_round_id"); + + b.HasIndex("SeasonId") + .HasDatabaseName("ix_refresh_ticket_statuses_per_round_season_id"); + + b.HasIndex("AvatarAddress", "SeasonId", "RoundId") + .IsUnique() + .HasDatabaseName("ix_refresh_ticket_statuses_per_round_avatar_address_season_id_"); + + b.ToTable("refresh_ticket_statuses_per_round", null, t => + { + t.HasCheckConstraint("CK_RefreshTicketStatusPerRound_RemainingCount", "remaining_count >= 0"); + }); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.RefreshTicket.RefreshTicketUsageLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("RefreshTicketStatusPerRoundId") + .HasColumnType("integer") + .HasColumnName("refresh_ticket_status_per_round_id"); + + b.Property>("SpecifiedOpponentIds") + .IsRequired() + .HasColumnType("integer[]") + .HasColumnName("specified_opponent_ids"); + + b.HasKey("Id") + .HasName("pk_refresh_ticket_usage_logs"); + + b.HasIndex("RefreshTicketStatusPerRoundId") + .HasDatabaseName("ix_refresh_ticket_usage_logs_refresh_ticket_status_per_round_id"); + + b.ToTable("refresh_ticket_usage_logs", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Round", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("EndBlock") + .HasColumnType("bigint") + .HasColumnName("end_block"); + + b.Property("RoundIndex") + .HasColumnType("integer") + .HasColumnName("round_index"); + + b.Property("SeasonId") + .HasColumnType("integer") + .HasColumnName("season_id"); + + b.Property("StartBlock") + .HasColumnType("bigint") + .HasColumnName("start_block"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_rounds"); + + b.HasIndex("SeasonId", "RoundIndex") + .IsUnique() + .HasDatabaseName("ix_rounds_season_id_round_index"); + + b.ToTable("rounds", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Season", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ArenaType") + .HasColumnType("integer") + .HasColumnName("arena_type"); + + b.Property("BattleTicketPolicyId") + .HasColumnType("integer") + .HasColumnName("battle_ticket_policy_id"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("EndBlock") + .HasColumnType("bigint") + .HasColumnName("end_block"); + + b.Property("PrizeDetailUrl") + .IsRequired() + .HasColumnType("text") + .HasColumnName("prize_detail_url"); + + b.Property("RefreshTicketPolicyId") + .HasColumnType("integer") + .HasColumnName("refresh_ticket_policy_id"); + + b.Property("RequiredMedalCount") + .HasColumnType("integer") + .HasColumnName("required_medal_count"); + + b.Property("RoundInterval") + .HasColumnType("integer") + .HasColumnName("round_interval"); + + b.Property("SeasonGroupId") + .HasColumnType("integer") + .HasColumnName("season_group_id"); + + b.Property("StartBlock") + .HasColumnType("bigint") + .HasColumnName("start_block"); + + b.Property("TotalPrize") + .HasColumnType("integer") + .HasColumnName("total_prize"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_seasons"); + + b.HasIndex("BattleTicketPolicyId") + .HasDatabaseName("ix_seasons_battle_ticket_policy_id"); + + b.HasIndex("RefreshTicketPolicyId") + .HasDatabaseName("ix_seasons_refresh_ticket_policy_id"); + + b.HasIndex("StartBlock") + .HasDatabaseName("ix_seasons_start_block"); + + b.HasIndex("StartBlock", "EndBlock") + .HasDatabaseName("ix_seasons_start_block_end_block"); + + b.ToTable("seasons", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.User", b => + { + b.Property("AvatarAddress") + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("avatar_address"); + + b.Property("AgentAddress") + .IsRequired() + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("agent_address"); + + b.Property("ClanId") + .HasColumnType("integer") + .HasColumnName("clan_id"); + + b.Property("Cp") + .HasColumnType("bigint") + .HasColumnName("cp"); + + b.Property("CreatedAt") + .HasColumnType("timestamptz") + .HasColumnName("created_at"); + + b.Property("Level") + .HasColumnType("integer") + .HasColumnName("level"); + + b.Property("NameWithHash") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name_with_hash"); + + b.Property("PortraitId") + .HasColumnType("integer") + .HasColumnName("portrait_id"); + + b.Property("UpdatedAt") + .HasColumnType("timestamptz") + .HasColumnName("updated_at"); + + b.HasKey("AvatarAddress") + .HasName("pk_users"); + + b.HasIndex("ClanId") + .HasDatabaseName("ix_users_clan_id"); + + b.ToTable("users", (string)null); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.AvailableOpponent", b => + { + b.HasOne("ArenaService.Shared.Models.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_available_opponents_rounds_round_id"); + + b.HasOne("ArenaService.Shared.Models.Season", "Season") + .WithMany() + .HasForeignKey("SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_available_opponents_seasons_season_id"); + + b.HasOne("ArenaService.Shared.Models.Battle", "SuccessBattle") + .WithMany() + .HasForeignKey("SuccessBattleId") + .HasConstraintName("fk_available_opponents_battles_success_battle_id"); + + b.HasOne("ArenaService.Shared.Models.Participant", "Me") + .WithMany("AvailableOpponents") + .HasForeignKey("AvatarAddress", "SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_available_opponents_participants_avatar_address_season_id"); + + b.HasOne("ArenaService.Shared.Models.Participant", "Opponent") + .WithMany() + .HasForeignKey("OpponentAvatarAddress", "SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_available_opponents_participants_opponent_avatar_address_se"); + + b.Navigation("Me"); + + b.Navigation("Opponent"); + + b.Navigation("Round"); + + b.Navigation("Season"); + + b.Navigation("SuccessBattle"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Battle", b => + { + b.HasOne("ArenaService.Shared.Models.AvailableOpponent", "AvailableOpponent") + .WithMany("Battles") + .HasForeignKey("AvailableOpponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battles_available_opponents_available_opponent_id"); + + b.HasOne("ArenaService.Shared.Models.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battles_rounds_round_id"); + + b.HasOne("ArenaService.Shared.Models.Season", "Season") + .WithMany() + .HasForeignKey("SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battles_seasons_season_id"); + + b.HasOne("ArenaService.Shared.Models.Participant", "Participant") + .WithMany() + .HasForeignKey("AvatarAddress", "SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battles_participants_avatar_address_season_id"); + + b.Navigation("AvailableOpponent"); + + b.Navigation("Participant"); + + b.Navigation("Round"); + + b.Navigation("Season"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.BattleTicket.BattleTicketStatusPerRound", b => + { + b.HasOne("ArenaService.Shared.Models.BattleTicket.BattleTicketPolicy", "BattleTicketPolicy") + .WithMany() + .HasForeignKey("BattleTicketPolicyId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battle_ticket_statuses_per_round_battle_ticket_policies_bat"); + + b.HasOne("ArenaService.Shared.Models.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battle_ticket_statuses_per_round_rounds_round_id"); + + b.HasOne("ArenaService.Shared.Models.Season", "Season") + .WithMany() + .HasForeignKey("SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battle_ticket_statuses_per_round_seasons_season_id"); + + b.HasOne("ArenaService.Shared.Models.Participant", "Participant") + .WithMany() + .HasForeignKey("AvatarAddress", "SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battle_ticket_statuses_per_round_participants_avatar_addres"); + + b.Navigation("BattleTicketPolicy"); + + b.Navigation("Participant"); + + b.Navigation("Round"); + + b.Navigation("Season"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.BattleTicket.BattleTicketStatusPerSeason", b => + { + b.HasOne("ArenaService.Shared.Models.BattleTicket.BattleTicketPolicy", "BattleTicketPolicy") + .WithMany() + .HasForeignKey("BattleTicketPolicyId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battle_ticket_statuses_per_season_battle_ticket_policies_ba"); + + b.HasOne("ArenaService.Shared.Models.Season", "Season") + .WithMany() + .HasForeignKey("SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battle_ticket_statuses_per_season_seasons_season_id"); + + b.HasOne("ArenaService.Shared.Models.Participant", "Participant") + .WithMany() + .HasForeignKey("AvatarAddress", "SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battle_ticket_statuses_per_season_participants_avatar_addre"); + + b.Navigation("BattleTicketPolicy"); + + b.Navigation("Participant"); + + b.Navigation("Season"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.BattleTicket.BattleTicketUsageLog", b => + { + b.HasOne("ArenaService.Shared.Models.BattleTicket.BattleTicketStatusPerRound", "BattleTicketStatusPerRound") + .WithMany() + .HasForeignKey("BattleTicketStatusPerRoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battle_ticket_usage_logs_battle_ticket_statuses_per_round_b"); + + b.HasOne("ArenaService.Shared.Models.BattleTicket.BattleTicketStatusPerSeason", "BattleTicketStatusPerSeason") + .WithMany() + .HasForeignKey("BattleTicketStatusPerSeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battle_ticket_usage_logs_battle_ticket_statuses_per_season_"); + + b.Navigation("BattleTicketStatusPerRound"); + + b.Navigation("BattleTicketStatusPerSeason"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Medal", b => + { + b.HasOne("ArenaService.Shared.Models.User", "User") + .WithMany() + .HasForeignKey("AvatarAddress") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_medals_users_avatar_address"); + + b.HasOne("ArenaService.Shared.Models.Season", "Season") + .WithMany() + .HasForeignKey("SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_medals_seasons_season_id"); + + b.Navigation("Season"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Participant", b => + { + b.HasOne("ArenaService.Shared.Models.User", "User") + .WithMany() + .HasForeignKey("AvatarAddress") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_participants_users_avatar_address"); + + b.HasOne("ArenaService.Shared.Models.Season", "Season") + .WithMany() + .HasForeignKey("SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_participants_seasons_season_id"); + + b.Navigation("Season"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.RankingSnapshot", b => + { + b.HasOne("ArenaService.Shared.Models.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_ranking_snapshots_rounds_round_id"); + + b.HasOne("ArenaService.Shared.Models.Season", "Season") + .WithMany() + .HasForeignKey("SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_ranking_snapshots_seasons_season_id"); + + b.HasOne("ArenaService.Shared.Models.Participant", "Participant") + .WithMany() + .HasForeignKey("AvatarAddress", "SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_ranking_snapshots_participants_avatar_address_season_id"); + + b.Navigation("Participant"); + + b.Navigation("Round"); + + b.Navigation("Season"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.RefreshTicket.RefreshTicketStatusPerRound", b => + { + b.HasOne("ArenaService.Shared.Models.RefreshTicket.RefreshTicketPolicy", "RefreshTicketPolicy") + .WithMany() + .HasForeignKey("RefreshTicketPolicyId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_refresh_ticket_statuses_per_round_refresh_ticket_policies_r"); + + b.HasOne("ArenaService.Shared.Models.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_refresh_ticket_statuses_per_round_rounds_round_id"); + + b.HasOne("ArenaService.Shared.Models.Season", "Season") + .WithMany() + .HasForeignKey("SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_refresh_ticket_statuses_per_round_seasons_season_id"); + + b.HasOne("ArenaService.Shared.Models.Participant", "Participant") + .WithMany() + .HasForeignKey("AvatarAddress", "SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_refresh_ticket_statuses_per_round_participants_avatar_addre"); + + b.Navigation("Participant"); + + b.Navigation("RefreshTicketPolicy"); + + b.Navigation("Round"); + + b.Navigation("Season"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.RefreshTicket.RefreshTicketUsageLog", b => + { + b.HasOne("ArenaService.Shared.Models.RefreshTicket.RefreshTicketStatusPerRound", "RefreshTicketStatusPerRound") + .WithMany() + .HasForeignKey("RefreshTicketStatusPerRoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_refresh_ticket_usage_logs_refresh_ticket_statuses_per_round"); + + b.Navigation("RefreshTicketStatusPerRound"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Round", b => + { + b.HasOne("ArenaService.Shared.Models.Season", "Season") + .WithMany("Rounds") + .HasForeignKey("SeasonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_rounds_seasons_season_id"); + + b.Navigation("Season"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Season", b => + { + b.HasOne("ArenaService.Shared.Models.BattleTicket.BattleTicketPolicy", "BattleTicketPolicy") + .WithMany() + .HasForeignKey("BattleTicketPolicyId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_seasons_battle_ticket_policies_battle_ticket_policy_id"); + + b.HasOne("ArenaService.Shared.Models.RefreshTicket.RefreshTicketPolicy", "RefreshTicketPolicy") + .WithMany() + .HasForeignKey("RefreshTicketPolicyId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_seasons_refresh_ticket_policies_refresh_ticket_policy_id"); + + b.Navigation("BattleTicketPolicy"); + + b.Navigation("RefreshTicketPolicy"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.User", b => + { + b.HasOne("ArenaService.Shared.Models.Clan", "Clan") + .WithMany("Users") + .HasForeignKey("ClanId") + .HasConstraintName("fk_users_clans_clan_id"); + + b.Navigation("Clan"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.AvailableOpponent", b => + { + b.Navigation("Battles"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Clan", b => + { + b.Navigation("Users"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Participant", b => + { + b.Navigation("AvailableOpponents"); + }); + + modelBuilder.Entity("ArenaService.Shared.Models.Season", b => + { + b.Navigation("Rounds"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/ArenaService.Shared/Migrations/20250620050806_Add RoundIndex.cs b/ArenaService.Shared/Migrations/20250620050806_Add RoundIndex.cs new file mode 100644 index 0000000..dddca42 --- /dev/null +++ b/ArenaService.Shared/Migrations/20250620050806_Add RoundIndex.cs @@ -0,0 +1,69 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace ArenaService.Shared.Migrations +{ + /// + public partial class AddRoundIndex : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropIndex( + name: "ix_rounds_season_id", + table: "rounds"); + + migrationBuilder.AddColumn( + name: "round_index", + table: "rounds", + type: "integer", + nullable: false, + defaultValue: 0); + + migrationBuilder.CreateIndex( + name: "ix_rounds_season_id_round_index", + table: "rounds", + columns: new[] { "season_id", "round_index" }, + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_battles_round_id", + table: "battles", + column: "round_id"); + + migrationBuilder.AddForeignKey( + name: "fk_battles_rounds_round_id", + table: "battles", + column: "round_id", + principalTable: "rounds", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "fk_battles_rounds_round_id", + table: "battles"); + + migrationBuilder.DropIndex( + name: "ix_rounds_season_id_round_index", + table: "rounds"); + + migrationBuilder.DropIndex( + name: "ix_battles_round_id", + table: "battles"); + + migrationBuilder.DropColumn( + name: "round_index", + table: "rounds"); + + migrationBuilder.CreateIndex( + name: "ix_rounds_season_id", + table: "rounds", + column: "season_id"); + } + } +} diff --git a/ArenaService.Shared/Migrations/ArenaDbContextModelSnapshot.cs b/ArenaService.Shared/Migrations/ArenaDbContextModelSnapshot.cs index 5328dab..e7bec62 100644 --- a/ArenaService.Shared/Migrations/ArenaDbContextModelSnapshot.cs +++ b/ArenaService.Shared/Migrations/ArenaDbContextModelSnapshot.cs @@ -174,6 +174,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasIndex("AvailableOpponentId") .HasDatabaseName("ix_battles_available_opponent_id"); + b.HasIndex("RoundId") + .HasDatabaseName("ix_battles_round_id"); + b.HasIndex("SeasonId") .HasDatabaseName("ix_battles_season_id"); @@ -852,6 +855,10 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("bigint") .HasColumnName("end_block"); + b.Property("RoundIndex") + .HasColumnType("integer") + .HasColumnName("round_index"); + b.Property("SeasonId") .HasColumnType("integer") .HasColumnName("season_id"); @@ -867,8 +874,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasKey("Id") .HasName("pk_rounds"); - b.HasIndex("SeasonId") - .HasDatabaseName("ix_rounds_season_id"); + b.HasIndex("SeasonId", "RoundIndex") + .IsUnique() + .HasDatabaseName("ix_rounds_season_id_round_index"); b.ToTable("rounds", (string)null); }); @@ -1055,6 +1063,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) .IsRequired() .HasConstraintName("fk_battles_available_opponents_available_opponent_id"); + b.HasOne("ArenaService.Shared.Models.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_battles_rounds_round_id"); + b.HasOne("ArenaService.Shared.Models.Season", "Season") .WithMany() .HasForeignKey("SeasonId") @@ -1073,6 +1088,8 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Participant"); + b.Navigation("Round"); + b.Navigation("Season"); }); diff --git a/ArenaService.Tests/Controllers/BlockStatusControllerTests.cs b/ArenaService.Tests/Controllers/BlockStatusControllerTests.cs index 20b5fff..18e50c6 100644 --- a/ArenaService.Tests/Controllers/BlockStatusControllerTests.cs +++ b/ArenaService.Tests/Controllers/BlockStatusControllerTests.cs @@ -28,6 +28,7 @@ public async Task GetCachedBlockInfo_ShouldReturnCorrectInfo() const long seasonStartBlock = 900; const long seasonEndBlock = 1100; const int roundId = 1; + const int roundIndex = 1; const long roundStartBlock = 950; const long roundEndBlock = 1050; const long battleTxTrackerBlock = 990; @@ -40,7 +41,7 @@ public async Task GetCachedBlockInfo_ShouldReturnCorrectInfo() .ReturnsAsync((seasonId, seasonStartBlock, seasonEndBlock)); _seasonCacheRepoMock .Setup(x => x.GetRoundAsync()) - .ReturnsAsync((roundId, roundStartBlock, roundEndBlock)); + .ReturnsAsync((roundId, roundIndex, roundStartBlock, roundEndBlock)); _blockTrackerRepoMock .Setup(x => x.GetBattleTxTrackerBlockIndexAsync()) .ReturnsAsync(battleTxTrackerBlock); From 41da159b77be1b669d4298ea5b302d3f40d57b3b Mon Sep 17 00:00:00 2001 From: Atralupus Date: Fri, 20 Jun 2025 17:45:30 +0900 Subject: [PATCH 4/9] Replace all round id to round index --- .../Pages/CacheInitialization.razor | 13 ++-- .../ClanRankingRepo/CopyRoundDataCorrectly.cs | 20 +++--- .../ClanRankingRepo/InitRankingCorrectly.cs | 10 +-- .../ClanRankingRepo/UpdateScoreCorrectly.cs | 8 +-- .../SelectBattleOpponentsTotal100Tests.cs | 12 ++-- .../SelectBattleOpponentsTotal3000Tests.cs | 12 ++-- .../SelectBattleOpponentsTotal40Tests.cs | 12 ++-- .../Repositories/AllClanRankingRepository.cs | 62 +++++++++---------- .../Services/RoundPreparationService.cs | 4 +- .../Services/SeasonPreparationService.cs | 2 +- .../Controllers/ArenaInfoController.cs | 8 +-- .../AvailableOpponentController.cs | 18 +++--- ArenaService/Controllers/ClanController.cs | 4 +- .../Controllers/LeaderboardController.cs | 4 +- ArenaService/Worker/PrepareRankingWorker.cs | 6 +- 15 files changed, 97 insertions(+), 98 deletions(-) diff --git a/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor index 688e08d..a4827da 100644 --- a/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor +++ b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor @@ -65,7 +65,7 @@ @foreach (var roundRanking in rankingCounts) { - @roundRanking.RoundOffset + @roundRanking.RoundIndex @roundRanking.RankingCount @(roundRanking.RankingCount > 0 ? "✅ 준비됨" : "❌ 불완전") @@ -126,7 +126,7 @@ if (currentSeason.HasValue && currentRound.HasValue) { - await LoadRankingCounts(currentSeason.Value.Id, currentRound.Value.Id); + await LoadRankingCounts(currentSeason.Value.Id, currentRound.Value.RoundIndex); } } catch (Exception ex) @@ -136,15 +136,14 @@ } } - private async Task LoadRankingCounts(int seasonId, int currentRoundId) + private async Task LoadRankingCounts(int seasonId, int currentRoundIndex) { rankingCounts.Clear(); for (int offset = -1; offset <= 2; offset++) { - int roundToCheck = currentRoundId + offset; - int rankingCount = await RankingRepo.GetRankingCountAsync(seasonId, roundToCheck); - rankingCounts.Add((currentRoundId + offset, rankingCount)); + int rankingCount = await RankingRepo.GetRankingCountAsync(seasonId, currentRoundIndex + offset); + rankingCounts.Add((currentRoundIndex + offset, rankingCount)); } } @@ -164,7 +163,7 @@ // 페이지 새로고침하여 최신 정보 표시 await Task.Delay(1000); - await LoadRankingCounts(currentSeason!.Value.Id, currentRound!.Value.Id); + await LoadRankingCounts(currentSeason!.Value.Id, currentRound!.Value.RoundIndex); } else { diff --git a/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/CopyRoundDataCorrectly.cs b/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/CopyRoundDataCorrectly.cs index db506a8..abceaf4 100644 --- a/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/CopyRoundDataCorrectly.cs +++ b/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/CopyRoundDataCorrectly.cs @@ -16,44 +16,44 @@ public CopyRoundDataCorrectly(RedisTestFixture fixture) public async Task CopyRoundDataTests() { var seasonId = 1; - var sourceRoundId = 1; - var targetRoundId = 2; + var sourceRoundIndex = 1; + var targetRoundIndex = 2; var clanId = 1; var roundInterval = 10; string sourceRankingKey = string.Format( ClanRankingRepository.ClanRankingFormat, seasonId, - sourceRoundId, + sourceRoundIndex, clanId ); string targetRankingKey = string.Format( ClanRankingRepository.ClanRankingFormat, seasonId, - targetRoundId, + targetRoundIndex, clanId ); string sourceStatusKey = string.Format( ClanRankingRepository.StatusKeyFormat, seasonId, - sourceRoundId, + sourceRoundIndex, clanId ); string targetStatusKey = string.Format( ClanRankingRepository.StatusKeyFormat, seasonId, - targetRoundId, + targetRoundIndex, clanId ); string sourceClansKey = string.Format( ClanRankingRepository.ClansKeyFormat, seasonId, - sourceRoundId + sourceRoundIndex ); string targetClansKey = string.Format( ClanRankingRepository.ClansKeyFormat, seasonId, - sourceRoundId + sourceRoundIndex ); await Database.StringSetAsync(sourceStatusKey, RankingStatus.DONE.ToString()); @@ -81,8 +81,8 @@ public async Task CopyRoundDataTests() await ClanRankingRepository.CopyRoundDataAsync( clanId, seasonId, - sourceRoundId, - targetRoundId, + sourceRoundIndex, + targetRoundIndex, roundInterval ); diff --git a/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/InitRankingCorrectly.cs b/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/InitRankingCorrectly.cs index 7761883..48f06d6 100644 --- a/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/InitRankingCorrectly.cs +++ b/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/InitRankingCorrectly.cs @@ -16,14 +16,14 @@ public InitRankingCorrectly(RedisTestFixture fixture) public async Task InitRankingTests() { var seasonId = 1; - var roundId = 1; + var roundIndex = 1; var clanId = 1; var roundInterval = 10; string statusKey = string.Format( ClanRankingRepository.StatusKeyFormat, seasonId, - roundId, + roundIndex, clanId ); @@ -32,7 +32,7 @@ public async Task InitRankingTests() string rankingKey = string.Format( ClanRankingRepository.ClanRankingFormat, seasonId, - roundId, + roundIndex, clanId ); @@ -46,7 +46,7 @@ await ClanRankingRepository.InitRankingAsync( rankingData, clanId, seasonId, - roundId, + roundIndex, roundInterval ); @@ -60,7 +60,7 @@ await ClanRankingRepository.InitRankingAsync( var resultScore = await Database.SortedSetScoreAsync(rankingKey, participantKey); Assert.Equal(score, resultScore); } - string clansKey = string.Format(ClanRankingRepository.ClansKeyFormat, seasonId, roundId); + string clansKey = string.Format(ClanRankingRepository.ClansKeyFormat, seasonId, roundIndex); Assert.True(await Database.SetContainsAsync(clansKey, clanId)); diff --git a/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/UpdateScoreCorrectly.cs b/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/UpdateScoreCorrectly.cs index fedd595..ff2bed6 100644 --- a/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/UpdateScoreCorrectly.cs +++ b/ArenaService.IntegrationTests/Repositories/ClanRankingRepo/UpdateScoreCorrectly.cs @@ -16,13 +16,13 @@ public UpdateScoreCorrectly(RedisTestFixture fixture) public async Task UpdateScoreTests() { var seasonId = 1; - var roundId = 1; + var roundIndex = 1; var clanId = 1; string statusKey = string.Format( ClanRankingRepository.StatusKeyFormat, seasonId, - roundId, + roundIndex, clanId ); await Database.StringSetAsync(statusKey, RankingStatus.DONE.ToString()); @@ -32,7 +32,7 @@ public async Task UpdateScoreTests() string rankingKey = string.Format( ClanRankingRepository.ClanRankingFormat, seasonId, - roundId, + roundIndex, clanId ); @@ -48,7 +48,7 @@ public async Task UpdateScoreTests() ClanRankingRepository.ParticipantKeyFormat, address.ToHex().ToLower() ); - await ClanRankingRepository.UpdateScoreAsync(clanId, address, seasonId, roundId, score); + await ClanRankingRepository.UpdateScoreAsync(clanId, address, seasonId, roundIndex, score); var resultScore = await Database.SortedSetScoreAsync(rankingKey, participantKey); Assert.Equal(score, resultScore); diff --git a/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal100Tests.cs b/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal100Tests.cs index b3151c3..651fa8a 100644 --- a/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal100Tests.cs +++ b/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal100Tests.cs @@ -16,14 +16,14 @@ public SelectBattleOpponentsTotal100Tests(RedisTestFixture fixture) public async Task SelectBattleOpponentsTotal100Correctly() { var seasonId = 1; - var roundId = 1; + var roundIndex = 1; - string statusKey = string.Format(RankingRepository.StatusKeyFormat, seasonId, roundId); + string statusKey = string.Format(RankingRepository.StatusKeyFormat, seasonId, roundIndex); await Database.StringSetAsync(statusKey, RankingStatus.DONE.ToString()); var totalParticipants = 100; var participants = new Dictionary(); - string rankingKey = string.Format(RankingRepository.RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingRepository.RankingKeyFormat, seasonId, roundIndex); for (int i = 0; i < totalParticipants; i++) { @@ -47,14 +47,14 @@ public async Task SelectBattleOpponentsTotal100Correctly() { foreach (var (score, address) in participants) { - await CheckRankInRange(seasonId, roundId, address, rankingKey); + await CheckRankInRange(seasonId, roundIndex, address, rankingKey); } } } private async Task CheckRankInRange( int seasonId, - int roundId, + int roundIndex, Address avatarAddress, string rankingKey ) @@ -62,7 +62,7 @@ string rankingKey var opponents = await RankingRepository.SelectBattleOpponentsAsync( avatarAddress, seasonId, - roundId, + roundIndex, false ); Assert.Equal(5, opponents.Count); diff --git a/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal3000Tests.cs b/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal3000Tests.cs index 8374b79..5fc8e0a 100644 --- a/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal3000Tests.cs +++ b/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal3000Tests.cs @@ -16,14 +16,14 @@ public SelectBattleOpponentsTotal3000Tests(RedisTestFixture fixture) public async Task SelectBattleOpponentsTotal3000Correctly() { var seasonId = 1; - var roundId = 1; + var roundIndex = 1; - string statusKey = string.Format(RankingRepository.StatusKeyFormat, seasonId, roundId); + string statusKey = string.Format(RankingRepository.StatusKeyFormat, seasonId, roundIndex); await Database.StringSetAsync(statusKey, RankingStatus.DONE.ToString()); var totalParticipants = 3000; var participants = new Dictionary(); - string rankingKey = string.Format(RankingRepository.RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingRepository.RankingKeyFormat, seasonId, roundIndex); for (int i = 0; i < totalParticipants; i++) { @@ -47,14 +47,14 @@ public async Task SelectBattleOpponentsTotal3000Correctly() { foreach (var (score, address) in participants) { - await CheckRankInRange(seasonId, roundId, address, rankingKey); + await CheckRankInRange(seasonId, roundIndex, address, rankingKey); } } } private async Task CheckRankInRange( int seasonId, - int roundId, + int roundIndex, Address avatarAddress, string rankingKey ) @@ -62,7 +62,7 @@ string rankingKey var opponents = await RankingRepository.SelectBattleOpponentsAsync( avatarAddress, seasonId, - roundId, + roundIndex, true ); Assert.Equal(5, opponents.Count); diff --git a/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal40Tests.cs b/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal40Tests.cs index 5b015b3..06573b2 100644 --- a/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal40Tests.cs +++ b/ArenaService.IntegrationTests/Repositories/RankingRepo/SelectBattleOpponentsTotal40Tests.cs @@ -16,14 +16,14 @@ public SelectBattleOpponentsTotal40Tests(RedisTestFixture fixture) public async Task SelectBattleOpponentsTotal40Correctly() { var seasonId = 1; - var roundId = 1; + var roundIndex = 1; - string statusKey = string.Format(RankingRepository.StatusKeyFormat, seasonId, roundId); + string statusKey = string.Format(RankingRepository.StatusKeyFormat, seasonId, roundIndex); await Database.StringSetAsync(statusKey, RankingStatus.DONE.ToString()); var totalParticipants = 41; var participants = new Dictionary(); - string rankingKey = string.Format(RankingRepository.RankingKeyFormat, seasonId, roundId); + string rankingKey = string.Format(RankingRepository.RankingKeyFormat, seasonId, roundIndex); for (int i = 0; i < totalParticipants; i++) { @@ -47,14 +47,14 @@ public async Task SelectBattleOpponentsTotal40Correctly() { foreach (var (score, address) in participants) { - await CheckRankInRange(seasonId, roundId, address, rankingKey); + await CheckRankInRange(seasonId, roundIndex, address, rankingKey); } } } private async Task CheckRankInRange( int seasonId, - int roundId, + int roundIndex, Address avatarAddress, string rankingKey ) @@ -62,7 +62,7 @@ string rankingKey var opponents = await RankingRepository.SelectBattleOpponentsAsync( avatarAddress, seasonId, - roundId, + roundIndex, false ); Assert.Equal(5, opponents.Count); diff --git a/ArenaService.Shared/Repositories/AllClanRankingRepository.cs b/ArenaService.Shared/Repositories/AllClanRankingRepository.cs index d252873..4d164d7 100644 --- a/ArenaService.Shared/Repositories/AllClanRankingRepository.cs +++ b/ArenaService.Shared/Repositories/AllClanRankingRepository.cs @@ -6,24 +6,24 @@ namespace ArenaService.Shared.Repositories; public interface IAllClanRankingRepository { - Task UpdateScoreAsync(int clanId, int seasonId, int roundId, int scoreChange); + Task UpdateScoreAsync(int clanId, int seasonId, int roundIndex, int scoreChange); - Task GetRankAsync(int clanId, int seasonId, int roundId); + Task GetRankAsync(int clanId, int seasonId, int roundIndex); - Task GetScoreAsync(int clanId, int seasonId, int roundId); + Task GetScoreAsync(int clanId, int seasonId, int roundIndex); - Task CopyRoundDataAsync(int seasonId, int sourceRoundId, int targetRoundId, int roundInterval); + Task CopyRoundDataAsync(int seasonId, int sourceRoundIndex, int targetRoundIndex, int roundInterval); Task InitRankingAsync( List<(int ClanId, int Score)> rankingData, int seasonId, - int roundId, + int roundIndex, int roundInterval ); Task> GetTopClansAsync( int seasonId, - int roundId, + int roundIndex, int topN ); } @@ -49,21 +49,21 @@ public AllClanRankingRepository(IConnectionMultiplexer redis, int? databaseNumbe } } - public async Task UpdateScoreAsync(int clanId, int seasonId, int roundId, int scoreChange) + public async Task UpdateScoreAsync(int clanId, int seasonId, int roundIndex, int scoreChange) { - await InsureRankingStatus(seasonId, roundId); + await InsureRankingStatus(seasonId, roundIndex); - string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundId); + string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundIndex); string clanKey = string.Format(ClanKeyFormat, clanId); await _redis.SortedSetIncrementAsync(clanRankingKey, clanKey, scoreChange); } - public async Task GetRankAsync(int clanId, int seasonId, int roundId) + public async Task GetRankAsync(int clanId, int seasonId, int roundIndex) { - await InsureRankingStatus(seasonId, roundId); + await InsureRankingStatus(seasonId, roundIndex); - string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundId); + string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundIndex); string clanKey = string.Format(ClanKeyFormat, clanId); var score = await _redis.SortedSetScoreAsync(clanRankingKey, clanKey); @@ -84,11 +84,11 @@ await _redis.SortedSetRangeByScoreWithScoresAsync( return higherScoresCount; } - public async Task GetScoreAsync(int clanId, int seasonId, int roundId) + public async Task GetScoreAsync(int clanId, int seasonId, int roundIndex) { - await InsureRankingStatus(seasonId, roundId); + await InsureRankingStatus(seasonId, roundIndex); - string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundId); + string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundIndex); string clanKey = string.Format(ClanKeyFormat, clanId); var score = await _redis.SortedSetScoreAsync(clanRankingKey, clanKey); @@ -97,11 +97,11 @@ public async Task GetScoreAsync(int clanId, int seasonId, int roundId) : throw new NotRankedException($"Clan {clanId} not found."); } - public async Task> GetScoresAsync(int seasonId, int roundId) + public async Task> GetScoresAsync(int seasonId, int roundIndex) { - await InsureRankingStatus(seasonId, roundId); + await InsureRankingStatus(seasonId, roundIndex); - string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundId); + string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundIndex); var scores = await _redis.SortedSetRangeByRankWithScoresAsync(clanRankingKey); @@ -121,13 +121,13 @@ public async Task GetScoreAsync(int clanId, int seasonId, int roundId) public async Task InitRankingAsync( List<(int ClanId, int Score)> rankingData, int seasonId, - int roundId, + int roundIndex, int roundInterval ) { - string statusKey = string.Format(StatusKeyFormat, seasonId, roundId); + string statusKey = string.Format(StatusKeyFormat, seasonId, roundIndex); await _redis.StringSetAsync(statusKey, RankingStatus.INITIALIZING.ToString()); - string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundId); + string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundIndex); foreach (var rankingEntry in rankingData) { @@ -153,15 +153,15 @@ await _redis.StringSetAsync( public async Task CopyRoundDataAsync( int seasonId, - int sourceRoundId, - int targetRoundId, + int sourceRoundIndex, + int targetRoundIndex, int roundInterval ) { - string statusKey = string.Format(StatusKeyFormat, seasonId, targetRoundId); + string statusKey = string.Format(StatusKeyFormat, seasonId, targetRoundIndex); await _redis.StringSetAsync(statusKey, RankingStatus.COPYING_IN_PROGRESS.ToString()); - string sourceKey = string.Format(ClanRankingKeyFormat, seasonId, sourceRoundId); - string targetKey = string.Format(ClanRankingKeyFormat, seasonId, targetRoundId); + string sourceKey = string.Format(ClanRankingKeyFormat, seasonId, sourceRoundIndex); + string targetKey = string.Format(ClanRankingKeyFormat, seasonId, targetRoundIndex); await _redis.SortedSetCombineAndStoreAsync(SetOperation.Union, targetKey, [sourceKey]); await _redis.KeyExpireAsync( @@ -181,13 +181,13 @@ await _redis.StringSetAsync( public async Task> GetTopClansAsync( int seasonId, - int roundId, + int roundIndex, int topN ) { - await InsureRankingStatus(seasonId, roundId); + await InsureRankingStatus(seasonId, roundIndex); - string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundId); + string clanRankingKey = string.Format(ClanRankingKeyFormat, seasonId, roundIndex); var topClans = await _redis.SortedSetRangeByRankWithScoresAsync( clanRankingKey, @@ -221,9 +221,9 @@ var group in topClans return result; } - private async Task InsureRankingStatus(int seasonId, int roundId) + private async Task InsureRankingStatus(int seasonId, int roundIndex) { - string statusKey = string.Format(StatusKeyFormat, seasonId, roundId); + string statusKey = string.Format(StatusKeyFormat, seasonId, roundIndex); var rankingStatus = await _redis.StringGetAsync(statusKey); if (rankingStatus != RankingStatus.DONE.ToString()) { diff --git a/ArenaService.Shared/Services/RoundPreparationService.cs b/ArenaService.Shared/Services/RoundPreparationService.cs index 9619ce3..e5e0ac1 100644 --- a/ArenaService.Shared/Services/RoundPreparationService.cs +++ b/ArenaService.Shared/Services/RoundPreparationService.cs @@ -56,7 +56,7 @@ public async Task PrepareNextRoundWithSnapshotAsync((Season Season, Round Round) var clanIds = await _clanRankingRepo.GetClansAsync( seasonAndRound.Season.Id, - seasonAndRound.Round.Id + seasonAndRound.Round.RoundIndex ); _logger.LogInformation($"{nameof(RoundPreparationService)} Load participants"); @@ -140,7 +140,7 @@ private async Task> GetClanMappingsAsync( await _clanRankingRepo.CopyRoundDataAsync( clanId, seasonAndRound.Season.Id, - seasonAndRound.Round.Id, + seasonAndRound.Round.RoundIndex, seasonAndRound.Round.RoundIndex + 1, seasonAndRound.Season.RoundInterval ); diff --git a/ArenaService.Shared/Services/SeasonPreparationService.cs b/ArenaService.Shared/Services/SeasonPreparationService.cs index e684b25..86e8dd6 100644 --- a/ArenaService.Shared/Services/SeasonPreparationService.cs +++ b/ArenaService.Shared/Services/SeasonPreparationService.cs @@ -181,7 +181,7 @@ await _clanRankingRepo.InitRankingAsync( clanRankingData, clanId, season.Id, - round.Id, + round.RoundIndex, season.RoundInterval ); await _clanRankingRepo.InitRankingAsync( diff --git a/ArenaService/Controllers/ArenaInfoController.cs b/ArenaService/Controllers/ArenaInfoController.cs index 6fcbf07..1b461fe 100644 --- a/ArenaService/Controllers/ArenaInfoController.cs +++ b/ArenaService/Controllers/ArenaInfoController.cs @@ -71,12 +71,12 @@ public async Task GetArenaInfo() var myClanRank = await _allClanRankingRepo.GetRankAsync( participant.User.ClanId!.Value, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); var myClanScore = await _allClanRankingRepo.GetScoreAsync( participant.User.ClanId!.Value, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); myClanResponse = participant.User.Clan!.ToResponse(myClanRank, myClanScore); } @@ -134,9 +134,9 @@ public async Task GetArenaInfo() var score = await _rankingRepo.GetScoreAsync( avatarAddress, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); - var rank = await _rankingRepo.GetRankAsync(avatarAddress, cachedSeason.Id, cachedRound.Id); + var rank = await _rankingRepo.GetRankAsync(avatarAddress, cachedSeason.Id, cachedRound.RoundIndex); var nextScore = await _rankingRepo.GetScoreAsync( avatarAddress, cachedSeason.Id, diff --git a/ArenaService/Controllers/AvailableOpponentController.cs b/ArenaService/Controllers/AvailableOpponentController.cs index dd8cfef..04c99ba 100644 --- a/ArenaService/Controllers/AvailableOpponentController.cs +++ b/ArenaService/Controllers/AvailableOpponentController.cs @@ -91,12 +91,12 @@ public async Task GetAvailableOpponents() var opponentRank = await _rankingRepo.GetRankAsync( availableOpponent.Opponent.AvatarAddress, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); var opponentScore = await _rankingRepo.GetScoreAsync( availableOpponent.Opponent.AvatarAddress, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); ClanResponse? clanResponse = null; @@ -105,12 +105,12 @@ public async Task GetAvailableOpponents() var clanRank = await _allClanRankingRepo.GetRankAsync( availableOpponent.Opponent.User.ClanId!.Value, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); var clanScore = await _allClanRankingRepo.GetScoreAsync( availableOpponent.Opponent.User.ClanId!.Value, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); clanResponse = availableOpponent.Opponent.User.Clan!.ToResponse( clanRank, @@ -201,13 +201,13 @@ public async Task RequestFreeRefresh() var myScore = await _rankingRepo.GetScoreAsync( avatarAddress, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); var opponents = await _rankingRepo.SelectBattleOpponentsAsync( avatarAddress, cachedSeason.Id, - cachedRound.Id, + cachedRound.RoundIndex, cachedSeason.StartBlock == cachedRound.StartBlock ); @@ -245,7 +245,7 @@ await _ticketRepo.AddRefreshTicketUsageLog( var opponentRank = await _rankingRepo.GetRankAsync( opponentParticipant!.AvatarAddress, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); ClanResponse? clanResponse = null; @@ -254,12 +254,12 @@ await _ticketRepo.AddRefreshTicketUsageLog( var clanRank = await _allClanRankingRepo.GetRankAsync( opponentParticipant.User.ClanId!.Value, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); var clanScore = await _allClanRankingRepo.GetScoreAsync( opponentParticipant.User.ClanId!.Value, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); clanResponse = opponentParticipant.User.Clan!.ToResponse(clanRank, clanScore); } diff --git a/ArenaService/Controllers/ClanController.cs b/ArenaService/Controllers/ClanController.cs index 40028a5..74c13c1 100644 --- a/ArenaService/Controllers/ClanController.cs +++ b/ArenaService/Controllers/ClanController.cs @@ -52,12 +52,12 @@ public async Task> GetClanLeaderboard() var myClanRank = await _allClanRankingRepo.GetRankAsync( user.ClanId!.Value, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); var myClanScore = await _allClanRankingRepo.GetScoreAsync( user.ClanId!.Value, cachedSeason.Id, - cachedRound.Id + cachedRound.RoundIndex ); myClanResponse = new ClanResponse { diff --git a/ArenaService/Controllers/LeaderboardController.cs b/ArenaService/Controllers/LeaderboardController.cs index 1645033..915c15d 100644 --- a/ArenaService/Controllers/LeaderboardController.cs +++ b/ArenaService/Controllers/LeaderboardController.cs @@ -23,9 +23,9 @@ IRankingRepository rankingRepo [HttpGet("count")] [SwaggerResponse(StatusCodes.Status200OK, "Ranking Count Response", typeof(int))] - public async Task> GetRankingCount(int seasonId, int roundId) + public async Task> GetRankingCount(int seasonId, int roundIndex) { - var rankingCount = await _rankingRepo.GetRankingCountAsync(seasonId, roundId); + var rankingCount = await _rankingRepo.GetRankingCountAsync(seasonId, roundIndex); return Ok(rankingCount); } diff --git a/ArenaService/Worker/PrepareRankingWorker.cs b/ArenaService/Worker/PrepareRankingWorker.cs index da1a670..83352da 100644 --- a/ArenaService/Worker/PrepareRankingWorker.cs +++ b/ArenaService/Worker/PrepareRankingWorker.cs @@ -100,7 +100,7 @@ await Task.Delay( } // 캐시를 복구해야하는지 판단합니다. - if (await rankingRepo.GetRankingStatus(cachedSeason.Id, cachedRound.Id) is null) + if (await rankingRepo.GetRankingStatus(cachedSeason.Id, cachedRound.RoundIndex) is null) { await RestoreRankings( cachedBlockIndex, @@ -230,7 +230,7 @@ IRankingService rankingService await rankingRepo.InitRankingAsync( rankingData.Select(r => (r.AvatarAddress, r.Score)).ToList(), seasonInfo.Season.Id, - seasonInfo.Round.Id, + seasonInfo.Round.RoundIndex, seasonInfo.Season.RoundInterval ); foreach (var (clanId, clanRankingData) in clanRankingsData) @@ -239,7 +239,7 @@ await clanRankingRepo.InitRankingAsync( clanRankingData, clanId, seasonInfo.Season.Id, - seasonInfo.Round.Id, + seasonInfo.Round.RoundIndex, seasonInfo.Season.RoundInterval ); } From cfcc451e18bb9c1f070af4f23a39e7002a9b018d Mon Sep 17 00:00:00 2001 From: Atralupus Date: Fri, 20 Jun 2025 17:56:48 +0900 Subject: [PATCH 5/9] fix typo --- .../Components/Pages/CacheInitialization.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor index a4827da..11c4813 100644 --- a/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor +++ b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor @@ -115,7 +115,7 @@ private string alertClass = ""; private (int Id, long StartBlock, long EndBlock)? currentSeason; private (int Id, int RoundIndex, long StartBlock, long EndBlock)? currentRound; - private List<(int RoundOffset, int RankingCount)> rankingCounts = new(); + private List<(int RoundIndex, int RankingCount)> rankingCounts = new(); protected override async Task OnInitializedAsync() { From b6ead10ed85cca3a0d4ebe5fe5f43b79c7022244 Mon Sep 17 00:00:00 2001 From: Atralupus Date: Fri, 20 Jun 2025 21:49:27 +0900 Subject: [PATCH 6/9] fix typo --- .../Repositories/RoundRepository.cs | 22 +++++++++++++++++++ .../Services/RoundPreparationService.cs | 4 ++-- .../Services/SeasonPreparationService.cs | 7 +++--- ArenaService.Shared/Services/SeasonService.cs | 12 ++++++++++ ArenaService/Worker/RankingCopyWorker.cs | 4 +++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/ArenaService.Shared/Repositories/RoundRepository.cs b/ArenaService.Shared/Repositories/RoundRepository.cs index 63aa30d..43d550d 100644 --- a/ArenaService.Shared/Repositories/RoundRepository.cs +++ b/ArenaService.Shared/Repositories/RoundRepository.cs @@ -12,6 +12,12 @@ public interface IRoundRepository Func, IQueryable>? includeQuery = null ); + Task GetRoundAsync( + int seasonId, + int roundIndex, + Func, IQueryable>? includeQuery = null + ); + Task> GetRoundsBySeasonIdAsync( int seasonId, Func, IQueryable>? includeQuery = null @@ -42,6 +48,22 @@ public RoundRepository(ArenaDbContext context) return await query.SingleOrDefaultAsync(r => r.Id == roundId); } + public async Task GetRoundAsync( + int seasonId, + int roundIndex, + Func, IQueryable>? includeQuery = null + ) + { + var query = _context.Rounds.AsQueryable().AsNoTracking(); + + if (includeQuery != null) + { + query = includeQuery(query); + } + + return await query.SingleOrDefaultAsync(r => r.SeasonId == seasonId && r.RoundIndex == roundIndex); + } + public async Task> GetRoundsBySeasonIdAsync( int seasonId, Func, IQueryable>? includeQuery = null diff --git a/ArenaService.Shared/Services/RoundPreparationService.cs b/ArenaService.Shared/Services/RoundPreparationService.cs index e5e0ac1..a2dce4c 100644 --- a/ArenaService.Shared/Services/RoundPreparationService.cs +++ b/ArenaService.Shared/Services/RoundPreparationService.cs @@ -68,7 +68,7 @@ public async Task PrepareNextRoundWithSnapshotAsync((Season Season, Round Round) var newParticipants = await _participantRepo.GetParticipantsAsync( seasonAndRound.Season.Id, skip, - 1500 + 3000 ); _logger.LogInformation( $"{nameof(RoundPreparationService)} ... {newParticipants.Count}" @@ -84,7 +84,7 @@ public async Task PrepareNextRoundWithSnapshotAsync((Season Season, Round Round) break; participants.AddRange(newParticipants); - skip += 1500; + skip += 3000; } var rankingData = participants.Select(p => (p.AvatarAddress, p.Score)).ToList(); _logger.LogInformation($"{nameof(RoundPreparationService)} Select avatar address, score"); diff --git a/ArenaService.Shared/Services/SeasonPreparationService.cs b/ArenaService.Shared/Services/SeasonPreparationService.cs index 86e8dd6..a8a198c 100644 --- a/ArenaService.Shared/Services/SeasonPreparationService.cs +++ b/ArenaService.Shared/Services/SeasonPreparationService.cs @@ -24,7 +24,7 @@ public class SeasonPreparationService : ISeasonPreparationService private readonly IRankingService _rankingService; private readonly ILogger _logger; - private const int BatchSize = 1500; + private const int BatchSize = 3000; public SeasonPreparationService( IParticipantRepository participantRepo, @@ -49,7 +49,8 @@ ILogger logger public async Task PrepareSeasonAsync((Season Season, Round Round) seasonAndRound) { - var prevSeasonId = seasonAndRound.Season.Id - 1; + var prevSeason = await _seasonService.GetLastSeasonByBlockIndexAsync(seasonAndRound.Season.StartBlock); + var prevSeasonId = prevSeason.Season.Id; Dictionary? medalCounts = null; int skip = 0; @@ -167,7 +168,7 @@ private async Task InitializeRankings( Round round ) { - await _rankingRepo.InitRankingAsync(rankingData, season.Id, round.Id, season.RoundInterval); + await _rankingRepo.InitRankingAsync(rankingData, season.Id, round.RoundIndex, season.RoundInterval); await _rankingRepo.InitRankingAsync( rankingData, season.Id, diff --git a/ArenaService.Shared/Services/SeasonService.cs b/ArenaService.Shared/Services/SeasonService.cs index 7d8a96c..ba7fc4c 100644 --- a/ArenaService.Shared/Services/SeasonService.cs +++ b/ArenaService.Shared/Services/SeasonService.cs @@ -20,6 +20,8 @@ Task> ClassifyByChampionship( Task CanDeleteSeasonAsync(int seasonId, long currentBlockIndex); Task DeleteSeasonAsync(int seasonId); + + Task GetLastSeasonByBlockIndexAsync(long blockIndex); } public class SeasonService : ISeasonService @@ -125,4 +127,14 @@ public async Task DeleteSeasonAsync(int seasonId) { await _seasonRepo.DeleteSeasonAsync(seasonId); } + + public async Task GetLastSeasonByBlockIndexAsync(long blockIndex) + { + var seasons = await _seasonRepo.GetAllSeasonsAsync(); + + return seasons + .Where(s => s.ArenaType == ArenaType.SEASON && s.EndBlock < blockIndex) + .OrderByDescending(s => s.EndBlock) + .FirstOrDefault(); + } } diff --git a/ArenaService/Worker/RankingCopyWorker.cs b/ArenaService/Worker/RankingCopyWorker.cs index 2f27c8d..f2eee40 100644 --- a/ArenaService/Worker/RankingCopyWorker.cs +++ b/ArenaService/Worker/RankingCopyWorker.cs @@ -46,6 +46,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) var cachedRound = await seasonCacheRepo.GetRoundAsync(); var cachedSeason = await seasonCacheRepo.GetSeasonAsync(); + var prevRound = await roundRepo.GetRoundAsync(cachedSeason.Id, cachedRound.RoundIndex - 1); + _logger.LogInformation( $"Check prepare next round {cachedBlockIndex >= cachedRound.EndBlock - 5} prepareInProgress: {prepareInProgress}" ); @@ -71,7 +73,7 @@ await Task.Delay( cachedRound.Id ) < await rankingSnapshotRepo.GetRankingSnapshotsCount( cachedSeason.Id, - cachedRound.Id - 1 + prevRound.Id ) ) { From 427f92ed707ceab6c5bb1abc7d2d99d05fb3cca0 Mon Sep 17 00:00:00 2001 From: Atralupus Date: Fri, 20 Jun 2025 22:47:43 +0900 Subject: [PATCH 7/9] fix typo --- .../Services/SeasonPreparationService.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/ArenaService.Shared/Services/SeasonPreparationService.cs b/ArenaService.Shared/Services/SeasonPreparationService.cs index a8a198c..937de39 100644 --- a/ArenaService.Shared/Services/SeasonPreparationService.cs +++ b/ArenaService.Shared/Services/SeasonPreparationService.cs @@ -49,8 +49,10 @@ ILogger logger public async Task PrepareSeasonAsync((Season Season, Round Round) seasonAndRound) { - var prevSeason = await _seasonService.GetLastSeasonByBlockIndexAsync(seasonAndRound.Season.StartBlock); - var prevSeasonId = prevSeason.Season.Id; + var prevSeason = await _seasonService.GetLastSeasonByBlockIndexAsync( + seasonAndRound.Season.StartBlock + ); + var prevSeasonId = prevSeason.Id; Dictionary? medalCounts = null; int skip = 0; @@ -168,7 +170,12 @@ private async Task InitializeRankings( Round round ) { - await _rankingRepo.InitRankingAsync(rankingData, season.Id, round.RoundIndex, season.RoundInterval); + await _rankingRepo.InitRankingAsync( + rankingData, + season.Id, + round.RoundIndex, + season.RoundInterval + ); await _rankingRepo.InitRankingAsync( rankingData, season.Id, @@ -193,7 +200,11 @@ await _clanRankingRepo.InitRankingAsync( season.RoundInterval ); } - await _rankingService.UpdateAllClanRankingAsync(season.Id, round.RoundIndex, season.RoundInterval); + await _rankingService.UpdateAllClanRankingAsync( + season.Id, + round.RoundIndex, + season.RoundInterval + ); await _rankingService.UpdateAllClanRankingAsync( season.Id, round.RoundIndex + 1, From 88d64bc2afe6c62617239823dae64683bec62bb4 Mon Sep 17 00:00:00 2001 From: Atralupus Date: Mon, 23 Jun 2025 10:33:14 +0900 Subject: [PATCH 8/9] Fix cache clear func in backoffice --- .../Pages/CacheInitialization.razor | 17 +- .../Components/Pages/ManageSeasons.razor | 465 +++++++++++++----- .../Components/Pages/RankingCache.razor | 216 ++++++++ .../Components/Pages/Seasons.razor | 433 ---------------- .../Components/Shared/NavMenu.razor | 4 +- .../Repositories/RankingRepository.cs | 44 +- .../Repositories/SeasonCacheRepository.cs | 26 + .../Services/CacheInitializationService.cs | 41 +- 8 files changed, 629 insertions(+), 617 deletions(-) create mode 100644 ArenaService.BackOffice/Components/Pages/RankingCache.razor delete mode 100644 ArenaService.BackOffice/Components/Pages/Seasons.razor diff --git a/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor index 11c4813..3bca332 100644 --- a/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor +++ b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor @@ -87,7 +87,7 @@

모든 랭킹 캐시를 초기화합니다. 이 작업은 되돌릴 수 없습니다.

- + Page @(currentPage) / @totalPages + +
+} + +@if (selectedSeason != null) +{ +

📋 Selected Season's Round List

- + - - - - - - - -
IDRound ID Round Index Start Block End Block
@currentRound?.Id@currentRound?.RoundIndex@currentRound?.StartBlock@currentRound?.EndBlock
- -

📊 Ranking Data Availability

- - - - - - - - - - @foreach (var roundRanking in rankingCounts) + @foreach (var round in rounds) { - - - + + + + }
RoundRanking Data CountStatus
@roundRanking.RoundOffset@roundRanking.RankingCount@(roundRanking.RankingCount > 0 ? "✅ Ready" : "❌ Incomplete")@round.Id@round.RoundIndex@round.StartBlock@round.EndBlock
-} -else -{ -

⚠️ No active season currently.

-} -
+

🔧 Adjust Season End Block

+
+ +
+
+ + +
+ +
+ ⚠️ Warning: This action will affect all subsequent seasons and rounds. + If you decrease the end block, some rounds may be deleted or adjusted. +
+} - +

🆕 Add New Season

- - + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ - - -@if (seasonMessage is not null) +@if (message is not null) { -

@seasonMessage

+

@message

} -
+@code { + private List paginatedSeasons = new(); + private List rounds = new(); + private Season? selectedSeason; + private int currentPage = 1; + private int pageSize = 10; + private int totalSeasons = 0; + private bool loading = true; - -
- - -
+ private int newStartBlock; + private int newRoundInterval; + private int newRoundCount; + private ArenaType newArenaType = ArenaType.SEASON; + private int newRequiredMedalCount; + private int newTotalPrize; + private int newBattlePolicyId; + private int newRefreshPolicyId; + private string? message; - + private int editingSeasonId; + private Season editingSeason = new(); -@if (roundMessage is not null) -{ -

@roundMessage

-} + private long newEndBlock; + private int newSeasonGroupId; -@code { - private (int Id, long StartBlock, long EndBlock)? currentSeason; - private (int Id, int RoundIndex, long StartBlock, long EndBlock)? currentRound; - private List<(int RoundOffset, int RankingCount)> rankingCounts = new(); - private int seasonId; - private int roundId; - private string? seasonMessage; - private string? roundMessage; + private HashSet deletableSeasonIds = new(); protected override async Task OnInitializedAsync() { - try - { - currentSeason = await SeasonCacheRepo.GetSeasonAsync(); - currentRound = await SeasonCacheRepo.GetRoundAsync(); + newStartBlock = await SeasonRepository.GetLastSeasonEndBlockAsync() + 1 ?? 1; + totalSeasons = await SeasonRepository.GetTotalSeasonsCountAsync(); + await LoadSeasons(); + } - if (currentSeason.HasValue && currentRound.HasValue) + private async Task LoadSeasons() + { + loading = true; + paginatedSeasons = await SeasonRepository.GetSeasonsPagedAsync(currentPage, pageSize, q => q.Include(s => + s.Rounds).Include(s => s.BattleTicketPolicy).Include(s => s.RefreshTicketPolicy)); + + // 현재 캐싱된 block index 가져오기 + var currentBlockIndex = await SeasonCacheRepo.GetBlockIndexAsync(); + deletableSeasonIds.Clear(); + + foreach (var season in paginatedSeasons) + { + if (season.StartBlock >= currentBlockIndex) { - await LoadRankingCounts(currentSeason.Value.Id, currentRound.Value.Id); + deletableSeasonIds.Add(season.Id); } } + + loading = false; + } + + private async Task AddSeason() + { + try + { + await SeasonRepository.AddSeasonWithRoundsAsync( + newStartBlock, + newRoundInterval, + newRoundCount, + newSeasonGroupId, + newArenaType, + newRequiredMedalCount, + newTotalPrize, + newBattlePolicyId, + newRefreshPolicyId + ); + + totalSeasons = await SeasonRepository.GetTotalSeasonsCountAsync(); + + NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true); + } catch (Exception ex) { - Console.WriteLine($"⚠️ Error occurred while loading active season data: {ex.Message}"); + message = $"❌ Failed to add season: {ex.Message}"; } } - private async Task LoadRankingCounts(int seasonId, int currentRoundId) + private async Task SelectSeason(Season season) { - rankingCounts.Clear(); + selectedSeason = season; + rounds = season.Rounds.OrderBy(r => r.StartBlock).ToList(); + newEndBlock = season.EndBlock; + } - for (int offset = -1; offset <= 2; offset++) + private async Task NextPage() + { + if (CanGoNext) { - int roundToCheck = currentRoundId + offset; - int rankingCount = await RankingRepo.GetRankingCountAsync(seasonId, roundToCheck); - rankingCounts.Add((currentRoundId + offset, rankingCount)); + currentPage++; + await LoadSeasons(); } } - private async Task InitializeSeason() + private async Task PreviousPage() { - seasonMessage = "Initializing season..."; - try + if (CanGoPrevious) { - var season = await SeasonRepo.GetSeasonAsync(seasonId, q => q.Include(s => s.Rounds)); - - if (season == null) - { - seasonMessage = "❌ Season not found."; - return; - } + currentPage--; + await LoadSeasons(); + } + } - var firstRound = season.Rounds.OrderBy(r => r.StartBlock).FirstOrDefault(); + private int totalPages => (int)Math.Ceiling((double)totalSeasons / pageSize); + private bool CanGoPrevious => currentPage > 1; + private bool CanGoNext => currentPage < totalPages; - if (firstRound == null) - { - seasonMessage = "⚠️ No rounds exist for this season."; - return; - } + private void StartEdit(Season season) + { + editingSeasonId = season.Id; + editingSeason = new Season + { + Id = season.Id, + SeasonGroupId = season.SeasonGroupId, + ArenaType = season.ArenaType, + RoundInterval = season.RoundInterval, + RequiredMedalCount = season.RequiredMedalCount, + TotalPrize = season.TotalPrize, + BattleTicketPolicyId = season.BattleTicketPolicyId, + RefreshTicketPolicyId = season.RefreshTicketPolicyId + }; + } - await SeasonPreparationService.PrepareSeasonAsync((season, firstRound)); + private async Task SaveSeason(int seasonId) + { + try + { + await SeasonRepository.UpdateSeasonAsync( + seasonId, + editingSeason.SeasonGroupId, + editingSeason.ArenaType, + editingSeason.RoundInterval, + editingSeason.RequiredMedalCount, + editingSeason.TotalPrize, + editingSeason.BattleTicketPolicyId, + editingSeason.RefreshTicketPolicyId + ); - seasonMessage = "✅ Season initialized successfully!"; - NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true); + editingSeasonId = 0; + message = "✅ Season updated successfully!"; + await LoadSeasons(); } catch (Exception ex) { - seasonMessage = $"❌ Error occurred: {ex.Message}"; + message = $"❌ Failed to save season: {ex.Message}"; } } - private async Task PrepareNextRound() + private void CancelEdit() { - roundMessage = "Preparing next round..."; - try - { - var round = await RoundRepo.GetRoundAsync(roundId, q => q.Include(r => r.Season)); - var season = await SeasonRepo.GetSeasonAsync(round!.SeasonId, q => q.Include(s => s.Rounds)); + editingSeasonId = 0; + message = null; + } - if (round == null || round.Season == null) - { - roundMessage = "❌ Round not found."; - return; - } + private async Task AdjustSeasonEndBlock() + { + if (selectedSeason == null) return; - await RoundPreparationService.PrepareNextRoundWithSnapshotAsync((season, round)); + try + { + await SeasonBlockAdjustmentService.AdjustSeasonEndBlockAsync(selectedSeason.Id, newEndBlock); + message = "✅ Season end block adjusted successfully!"; + selectedSeason = null; + rounds.Clear(); + await LoadSeasons(); + } + catch (Exception ex) + { + message = $"❌ Failed to adjust season end block: {ex.Message}"; + } + } - roundMessage = "✅ Next round prepared successfully!"; - NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true); + private async Task DeleteSeason(int seasonId) + { + try + { + await SeasonService.DeleteSeasonAsync(seasonId); + message = "✅ Season deleted successfully!"; + totalSeasons = await SeasonRepository.GetTotalSeasonsCountAsync(); + await LoadSeasons(); } catch (Exception ex) { - roundMessage = $"❌ Error occurred: {ex.Message}"; + message = $"❌ Failed to delete season: {ex.Message}"; } } } diff --git a/ArenaService.BackOffice/Components/Pages/RankingCache.razor b/ArenaService.BackOffice/Components/Pages/RankingCache.razor new file mode 100644 index 0000000..924d1cb --- /dev/null +++ b/ArenaService.BackOffice/Components/Pages/RankingCache.razor @@ -0,0 +1,216 @@ +@page "/manage-seasons" +@using Microsoft.AspNetCore.Authorization +@using ArenaService.Shared.Repositories +@using ArenaService.Shared.Services +@using ArenaService.Shared.Models +@using Microsoft.EntityFrameworkCore +@attribute [Authorize] +@rendermode InteractiveServer +@inject ISeasonRepository SeasonRepo +@inject ISeasonCacheRepository SeasonCacheRepo +@inject IRankingRepository RankingRepo +@inject IRoundRepository RoundRepo +@inject ISeasonPreparationService SeasonPreparationService +@inject IRoundPreparationService RoundPreparationService +@inject NavigationManager NavigationManager + +

🏆 Season Management

+ + +

📅 Currently Active Season

+@if (currentSeason != null) +{ + + + + + + + + + + + + + + + +
IDStart BlockEnd Block
@currentSeason?.Id@currentSeason?.StartBlock@currentSeason?.EndBlock
+ +

📅 Currently Active Round

+ + + + + + + + + + + + + + + + + +
IDRound IndexStart BlockEnd Block
@currentRound?.Id@currentRound?.RoundIndex@currentRound?.StartBlock@currentRound?.EndBlock
+ +

📊 Ranking Data Availability

+ + + + + + + + + + @foreach (var roundRanking in rankingCounts) + { + + + + + + } + +
RoundRanking Data CountStatus
@roundRanking.RoundOffset@roundRanking.RankingCount@(roundRanking.RankingCount > 0 ? "✅ Ready" : "❌ Incomplete")
+} +else +{ +

⚠️ No active season currently.

+} + +
+ + +
+ + +
+ + + +@if (seasonMessage is not null) +{ +

@seasonMessage

+} + +
+ + +
+ + +
+ + + +@if (roundMessage is not null) +{ +

@roundMessage

+} + +@code { + private (int Id, long StartBlock, long EndBlock)? currentSeason; + private (int Id, int RoundIndex, long StartBlock, long EndBlock)? currentRound; + private List<(int RoundOffset, int RankingCount)> rankingCounts = new(); + private int seasonId; + private int roundId; + private string? seasonMessage; + private string? roundMessage; + + protected override async Task OnInitializedAsync() + { + try + { + currentSeason = await SeasonCacheRepo.GetSeasonAsync(); + currentRound = await SeasonCacheRepo.GetRoundAsync(); + + if (currentSeason.HasValue && currentRound.HasValue) + { + await LoadRankingCounts(currentSeason.Value.Id, currentRound.Value.RoundIndex); + } + } + catch (Exception ex) + { + Console.WriteLine($"⚠️ Error occurred while loading active season data: {ex.Message}"); + } + } + + private async Task LoadRankingCounts(int seasonId, int currentRoundIndex) + { + rankingCounts.Clear(); + + for (int offset = -1; offset <= 1; offset++) + { + int roundToCheck = currentRoundIndex + offset; + if (roundToCheck < 0) { + continue; + } + + int rankingCount = await RankingRepo.GetRankingCountAsync(seasonId, roundToCheck); + rankingCounts.Add((roundToCheck, rankingCount)); + } + } + + private async Task InitializeSeason() + { + seasonMessage = "Initializing season..."; + try + { + var season = await SeasonRepo.GetSeasonAsync(seasonId, q => q.Include(s => s.Rounds)); + + if (season == null) + { + seasonMessage = "❌ Season not found."; + return; + } + + var firstRound = season.Rounds.OrderBy(r => r.RoundIndex).FirstOrDefault(); + + if (firstRound == null) + { + seasonMessage = "⚠️ No rounds exist for this season."; + return; + } + + await SeasonPreparationService.PrepareSeasonAsync((season, firstRound)); + + seasonMessage = "✅ Season initialized successfully!"; + NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true); + } + catch (Exception ex) + { + seasonMessage = $"❌ Error occurred: {ex.Message}"; + } + } + + private async Task PrepareNextRound() + { + roundMessage = "Preparing next round..."; + try + { + var round = await RoundRepo.GetRoundAsync(roundId, q => q.Include(r => r.Season)); + var season = await SeasonRepo.GetSeasonAsync(round!.SeasonId, q => q.Include(s => s.Rounds)); + + if (round == null || round.Season == null) + { + roundMessage = "❌ Round not found."; + return; + } + + await RoundPreparationService.PrepareNextRoundWithSnapshotAsync((season, round)); + + roundMessage = "✅ Next round prepared successfully!"; + NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true); + } + catch (Exception ex) + { + roundMessage = $"❌ Error occurred: {ex.Message}"; + } + } +} diff --git a/ArenaService.BackOffice/Components/Pages/Seasons.razor b/ArenaService.BackOffice/Components/Pages/Seasons.razor deleted file mode 100644 index 173af90..0000000 --- a/ArenaService.BackOffice/Components/Pages/Seasons.razor +++ /dev/null @@ -1,433 +0,0 @@ -@page "/seasons" -@using Microsoft.AspNetCore.Authorization -@using ArenaService.Shared.Constants -@using ArenaService.Shared.Services -@using ArenaService.Shared.Models -@using ArenaService.Shared.Repositories -@using Microsoft.EntityFrameworkCore -@attribute [Authorize] -@rendermode InteractiveServer -@inject ISeasonRepository SeasonRepository -@inject ISeasonCacheRepository SeasonCacheRepo -@inject ISeasonBlockAdjustmentService SeasonBlockAdjustmentService -@inject ISeasonService SeasonService -@inject NavigationManager NavigationManager - -

🏆 Season List

- -@if (loading) -{ -

Loading...

-} -else -{ -

📅 Season List

- - - - - - - - - - - - - - - - - - @foreach (var season in paginatedSeasons) - { - - - - - - - - - - - - - - } - -
IDSeason Group IDStart BlockEnd BlockTypeRound IntervalRequired MedalsTotal PrizeBattle Ticket PolicyRefresh Ticket PolicyActions
@season.Id - @if (editingSeasonId == season.Id) - { - - } - else - { - @season.SeasonGroupId - } - @season.StartBlock@season.EndBlock - @if (editingSeasonId == season.Id) - { - - } - else - { - @season.ArenaType - } - - @if (editingSeasonId == season.Id) - { - - } - else - { - @season.RoundInterval - } - - @if (editingSeasonId == season.Id) - { - - } - else - { - @season.RequiredMedalCount - } - - @if (editingSeasonId == season.Id) - { - - } - else - { - @season.TotalPrize - } - - @if (editingSeasonId == season.Id) - { - - } - else - { - @season.BattleTicketPolicy.Name - } - - @if (editingSeasonId == season.Id) - { - - } - else - { - @season.RefreshTicketPolicy.Name - } - - @if (editingSeasonId == season.Id) - { - - - } - else - { - - - @if (deletableSeasonIds.Contains(season.Id)) - { - - } - else - { - - } - } -
- - -} - -@if (selectedSeason != null) -{ -

📋 Selected Season's Round List

- - - - - - - - - - - @foreach (var round in rounds) - { - - - - - - - } - -
Round IDRound IndexStart BlockEnd Block
@round.Id@round.RoundIndex@round.StartBlock@round.EndBlock
- -

🔧 Adjust Season End Block

-
- -
-
- - -
- -
- ⚠️ Warning: This action will affect all subsequent seasons and rounds. - If you decrease the end block, some rounds may be deleted or adjusted. -
-} - -

🆕 Add New Season

-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- - -@if (message is not null) -{ -

@message

-} - -@code { - private List paginatedSeasons = new(); - private List rounds = new(); - private Season? selectedSeason; - private int currentPage = 1; - private int pageSize = 10; - private int totalSeasons = 0; - private bool loading = true; - - private int newStartBlock; - private int newRoundInterval; - private int newRoundCount; - private ArenaType newArenaType = ArenaType.SEASON; - private int newRequiredMedalCount; - private int newTotalPrize; - private int newBattlePolicyId; - private int newRefreshPolicyId; - private string? message; - - private int editingSeasonId; - private Season editingSeason = new(); - - private long newEndBlock; - private int newSeasonGroupId; - - private HashSet deletableSeasonIds = new(); - - protected override async Task OnInitializedAsync() - { - newStartBlock = await SeasonRepository.GetLastSeasonEndBlockAsync() + 1 ?? 1; - totalSeasons = await SeasonRepository.GetTotalSeasonsCountAsync(); - await LoadSeasons(); - } - - private async Task LoadSeasons() - { - loading = true; - paginatedSeasons = await SeasonRepository.GetSeasonsPagedAsync(currentPage, pageSize, q => q.Include(s => - s.Rounds).Include(s => s.BattleTicketPolicy).Include(s => s.RefreshTicketPolicy)); - - // 현재 캐싱된 block index 가져오기 - var currentBlockIndex = await SeasonCacheRepo.GetBlockIndexAsync(); - deletableSeasonIds.Clear(); - - foreach (var season in paginatedSeasons) - { - if (season.StartBlock >= currentBlockIndex) - { - deletableSeasonIds.Add(season.Id); - } - } - - loading = false; - } - - private async Task AddSeason() - { - try - { - await SeasonRepository.AddSeasonWithRoundsAsync( - newStartBlock, - newRoundInterval, - newRoundCount, - newSeasonGroupId, - newArenaType, - newRequiredMedalCount, - newTotalPrize, - newBattlePolicyId, - newRefreshPolicyId - ); - - totalSeasons = await SeasonRepository.GetTotalSeasonsCountAsync(); - - NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true); - } - catch (Exception ex) - { - message = $"❌ Failed to add season: {ex.Message}"; - } - } - - private async Task SelectSeason(Season season) - { - selectedSeason = season; - rounds = season.Rounds.OrderBy(r => r.StartBlock).ToList(); - newEndBlock = season.EndBlock; - } - - private async Task NextPage() - { - if (CanGoNext) - { - currentPage++; - await LoadSeasons(); - } - } - - private async Task PreviousPage() - { - if (CanGoPrevious) - { - currentPage--; - await LoadSeasons(); - } - } - - private int totalPages => (int)Math.Ceiling((double)totalSeasons / pageSize); - private bool CanGoPrevious => currentPage > 1; - private bool CanGoNext => currentPage < totalPages; - - private void StartEdit(Season season) - { - editingSeasonId = season.Id; - editingSeason = new Season - { - Id = season.Id, - SeasonGroupId = season.SeasonGroupId, - ArenaType = season.ArenaType, - RoundInterval = season.RoundInterval, - RequiredMedalCount = season.RequiredMedalCount, - TotalPrize = season.TotalPrize, - BattleTicketPolicyId = season.BattleTicketPolicyId, - RefreshTicketPolicyId = season.RefreshTicketPolicyId - }; - } - - private async Task SaveSeason(int seasonId) - { - try - { - await SeasonRepository.UpdateSeasonAsync( - seasonId, - editingSeason.SeasonGroupId, - editingSeason.ArenaType, - editingSeason.RoundInterval, - editingSeason.RequiredMedalCount, - editingSeason.TotalPrize, - editingSeason.BattleTicketPolicyId, - editingSeason.RefreshTicketPolicyId - ); - - editingSeasonId = 0; - message = "✅ Season updated successfully!"; - await LoadSeasons(); - } - catch (Exception ex) - { - message = $"❌ Failed to save season: {ex.Message}"; - } - } - - private void CancelEdit() - { - editingSeasonId = 0; - message = null; - } - - private async Task AdjustSeasonEndBlock() - { - if (selectedSeason == null) return; - - try - { - await SeasonBlockAdjustmentService.AdjustSeasonEndBlockAsync(selectedSeason.Id, newEndBlock); - message = "✅ Season end block adjusted successfully!"; - selectedSeason = null; - rounds.Clear(); - await LoadSeasons(); - } - catch (Exception ex) - { - message = $"❌ Failed to adjust season end block: {ex.Message}"; - } - } - - private async Task DeleteSeason(int seasonId) - { - try - { - await SeasonService.DeleteSeasonAsync(seasonId); - message = "✅ Season deleted successfully!"; - totalSeasons = await SeasonRepository.GetTotalSeasonsCountAsync(); - await LoadSeasons(); - } - catch (Exception ex) - { - message = $"❌ Failed to delete season: {ex.Message}"; - } - } -} diff --git a/ArenaService.BackOffice/Components/Shared/NavMenu.razor b/ArenaService.BackOffice/Components/Shared/NavMenu.razor index 6f3dd1a..b65153c 100644 --- a/ArenaService.BackOffice/Components/Shared/NavMenu.razor +++ b/ArenaService.BackOffice/Components/Shared/NavMenu.razor @@ -15,13 +15,13 @@
- + Manage Seasons
- + Ranking Cache
diff --git a/ArenaService.Shared/Repositories/RankingRepository.cs b/ArenaService.Shared/Repositories/RankingRepository.cs index bc1ddad..9832bea 100644 --- a/ArenaService.Shared/Repositories/RankingRepository.cs +++ b/ArenaService.Shared/Repositories/RankingRepository.cs @@ -31,15 +31,16 @@ int roundInterval bool isFirstRound ); - Task CopyRoundDataAsync(int seasonId, int sourceRoundIndex, int targetRoundIndex, int roundInterval); + Task CopyRoundDataAsync( + int seasonId, + int sourceRoundIndex, + int targetRoundIndex, + int roundInterval + ); Task GetRankingCountAsync(int seasonId, int roundIndex); - Task ClearRankingCacheAsync(int seasonId, int roundIndex); - Task ClearAllRankingCacheAsync(); - - Task ClearSeasonAndRoundCacheAsync(); } public class RankingRepository : IRankingRepository @@ -168,7 +169,12 @@ public async Task GetScoreAsync(Address avatarAddress, int seasonId, int ro public async Task< Dictionary - > SelectBattleOpponentsAsync(Address avatarAddress, int seasonId, int roundIndex, bool isFirstRound) + > SelectBattleOpponentsAsync( + Address avatarAddress, + int seasonId, + int roundIndex, + bool isFirstRound + ) { string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); string participantKey = string.Format( @@ -332,37 +338,11 @@ private async Task InsureRankingStatus(int seasonId, int roundIndex) } } - public async Task ClearRankingCacheAsync(int seasonId, int roundIndex) - { - string rankingKey = string.Format(RankingKeyFormat, seasonId, roundIndex); - string statusKey = string.Format(StatusKeyFormat, seasonId, roundIndex); - - await _redis.KeyDeleteAsync(rankingKey); - await _redis.KeyDeleteAsync(statusKey); - } - public async Task ClearAllRankingCacheAsync() { var server = _redis.Multiplexer.GetServer(_redis.Multiplexer.GetEndPoints().First()); var keys = server.Keys(pattern: "season:*:round:*:ranking"); - - foreach (var key in keys) - { - await _redis.KeyDeleteAsync(key); - } - var statusKeys = server.Keys(pattern: "season:*:round:*:ranking:status"); - foreach (var key in statusKeys) - { - await _redis.KeyDeleteAsync(key); - } - } - - public async Task ClearSeasonAndRoundCacheAsync() - { - var server = _redis.Multiplexer.GetServer(_redis.Multiplexer.GetEndPoints().First()); - var keys = server.Keys(pattern: "season:*:round:*:ranking"); - foreach (var key in keys) { await _redis.KeyDeleteAsync(key); diff --git a/ArenaService.Shared/Repositories/SeasonCacheRepository.cs b/ArenaService.Shared/Repositories/SeasonCacheRepository.cs index 50f6470..d9cc411 100644 --- a/ArenaService.Shared/Repositories/SeasonCacheRepository.cs +++ b/ArenaService.Shared/Repositories/SeasonCacheRepository.cs @@ -12,6 +12,10 @@ public interface ISeasonCacheRepository Task SetBlockIndexAsync(long blockIndex); Task SetSeasonAsync(int seasonId, long startBlock, long endBlock); Task SetRoundAsync(int roundId, int roundIndex, long startBlock, long endBlock); + Task DeleteBlockIndexAsync(); + Task DeleteSeasonAsync(); + Task DeleteRoundAsync(); + Task DeleteAllAsync(); } public class SeasonCacheRepository : ISeasonCacheRepository @@ -99,6 +103,28 @@ public async Task SetRoundAsync(int roundId, int roundIndex, long startBlock, lo await _redis.StringSetAsync($"{PREFIX}:{RoundKey}", json); } + public async Task DeleteBlockIndexAsync() + { + await _redis.KeyDeleteAsync($"{PREFIX}:{BlockIndexKey}"); + } + + public async Task DeleteSeasonAsync() + { + await _redis.KeyDeleteAsync($"{PREFIX}:{SeasonKey}"); + } + + public async Task DeleteRoundAsync() + { + await _redis.KeyDeleteAsync($"{PREFIX}:{RoundKey}"); + } + + public async Task DeleteAllAsync() + { + await _redis.KeyDeleteAsync($"{PREFIX}:{BlockIndexKey}"); + await _redis.KeyDeleteAsync($"{PREFIX}:{SeasonKey}"); + await _redis.KeyDeleteAsync($"{PREFIX}:{RoundKey}"); + } + private class CachedSeason { public int Id { get; set; } diff --git a/ArenaService.Shared/Services/CacheInitializationService.cs b/ArenaService.Shared/Services/CacheInitializationService.cs index 0d8baea..a53c7a9 100644 --- a/ArenaService.Shared/Services/CacheInitializationService.cs +++ b/ArenaService.Shared/Services/CacheInitializationService.cs @@ -4,47 +4,44 @@ namespace ArenaService.Shared.Services; public interface ICacheInitializationService { - Task InitializeCacheAsync(int seasonId, int roundIndex); - Task InitializeAllCacheAsync(); - Task InitializeSeasonAndRoundCacheAsync(); + Task InitializeRankingCacheAsync(int seasonId, int roundIndex); } public class CacheInitializationService : ICacheInitializationService { private readonly IRankingRepository _rankingRepository; private readonly IRankingSnapshotRepository _rankingSnapshotRepository; + private readonly IParticipantRepository _participantRepository; + private readonly ISeasonCacheRepository _seasonCacheRepository; public CacheInitializationService( IRankingRepository rankingRepository, - IRankingSnapshotRepository rankingSnapshotRepository) + IRankingSnapshotRepository rankingSnapshotRepository, + IParticipantRepository participantRepository, + ISeasonCacheRepository seasonCacheRepository + ) { _rankingRepository = rankingRepository; _rankingSnapshotRepository = rankingSnapshotRepository; + _participantRepository = participantRepository; + _seasonCacheRepository = seasonCacheRepository; } - public async Task InitializeCacheAsync(int seasonId, int roundIndex) + public async Task InitializeRankingCacheAsync(int seasonId, int roundIndex) { - var rankingCount = await _rankingRepository.GetRankingCountAsync(seasonId, roundIndex); - var snapshotCount = await _rankingSnapshotRepository.GetRankingSnapshotsCount(seasonId, roundIndex); - - if (rankingCount == 0 || snapshotCount < rankingCount) + var snapshotCount = await _rankingSnapshotRepository.GetRankingSnapshotsCount( + seasonId, + roundIndex + ); + var participantCount = await _participantRepository.GetParticipantCountAsync(seasonId); + + if (snapshotCount < participantCount - 50) { return false; } - await _rankingRepository.ClearRankingCacheAsync(seasonId, roundIndex); - return true; - } - - public async Task InitializeAllCacheAsync() - { await _rankingRepository.ClearAllRankingCacheAsync(); + await _seasonCacheRepository.DeleteAllAsync(); return true; } - - public async Task InitializeSeasonAndRoundCacheAsync() - { - await _rankingRepository.ClearSeasonAndRoundCacheAsync(); - return true; - } -} \ No newline at end of file +} From 5f0ea6fc470d53a3946446d3dd958ed6eb68e32f Mon Sep 17 00:00:00 2001 From: Atralupus Date: Mon, 23 Jun 2025 11:06:07 +0900 Subject: [PATCH 9/9] Restore cache clear --- .../Pages/CacheInitialization.razor | 36 ++++++++++++++++--- .../Components/Pages/ManageSeasons.razor | 2 +- .../Components/Pages/RankingCache.razor | 4 +-- .../Repositories/ParticipantRepository.cs | 2 +- .../Services/CacheInitializationService.cs | 4 +-- 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor index 3bca332..d64048a 100644 --- a/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor +++ b/ArenaService.BackOffice/Components/Pages/CacheInitialization.razor @@ -2,9 +2,13 @@ @using ArenaService.Shared.Services @using ArenaService.Shared.Repositories @using ArenaService.Shared.Models +@using Microsoft.AspNetCore.Authorization +@rendermode InteractiveServer +@attribute [Authorize] @inject ICacheInitializationService CacheInitializationService @inject ISeasonCacheRepository SeasonCacheRepo @inject IRankingRepository RankingRepo +@inject IJSRuntime JSRuntime 캐시 초기화 @@ -87,7 +91,7 @@

모든 랭킹 캐시를 초기화합니다. 이 작업은 되돌릴 수 없습니다.

- + + 버튼 상태: isLoading=@isLoading, currentSeason=@(currentSeason != null), currentRound=@(currentRound != null) +
@@ -121,6 +128,7 @@ { try { + Console.WriteLine("OnInitializedAsync 시작"); currentSeason = await SeasonCacheRepo.GetSeasonAsync(); currentRound = await SeasonCacheRepo.GetRoundAsync(); @@ -128,11 +136,25 @@ { await LoadRankingCounts(currentSeason.Value.Id, currentRound.Value.RoundIndex); } + + Console.WriteLine($"초기화 완료 - isLoading: {isLoading}, currentSeason: {currentSeason}, currentRound: {currentRound}"); + StateHasChanged(); } catch (Exception ex) { + Console.WriteLine($"OnInitializedAsync 오류: {ex}"); message = $"시즌 정보를 불러오는 중 오류가 발생했습니다: {ex.Message}"; alertClass = "alert-danger"; + StateHasChanged(); + } + } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await JSRuntime.InvokeVoidAsync("console.log", "CacheInitialization 페이지가 로드되었습니다."); + await JSRuntime.InvokeVoidAsync("console.log", "SignalR 연결 상태를 확인하세요."); } } @@ -143,7 +165,7 @@ for (int offset = -1; offset <= 1; offset++) { int roundToCheck = currentRoundIndex + offset; - if (roundToCheck < 0) { + if (roundToCheck < 1) { continue; } @@ -154,19 +176,23 @@ private async Task InitializeRankingCacheAsync() { + Console.WriteLine("InitializeRankingCacheAsync 시작"); isLoading = true; message = ""; + StateHasChanged(); try { - var result = await CacheInitializationService.InitializeRankingCacheAsync(currentSeason.Value.Id, currentRound.Value.RoundIndex); + Console.WriteLine($"시즌 ID: {currentSeason!.Value.Id}, 라운드 인덱스: {currentRound!.Value.RoundIndex}"); + var result = await CacheInitializationService.InitializeRankingCacheAsync(currentSeason!.Value.Id, currentRound!.Value.Id); + + Console.WriteLine($"캐시 초기화 결과: {result}"); if (result) { message = "모든 랭킹 캐시가 성공적으로 초기화되었습니다."; alertClass = "alert-success"; - // 페이지 새로고침하여 최신 정보 표시 await Task.Delay(1000); await LoadRankingCounts(currentSeason!.Value.Id, currentRound!.Value.RoundIndex); } @@ -178,12 +204,14 @@ } catch (Exception ex) { + Console.WriteLine($"오류 발생: {ex}"); message = $"캐시 초기화 중 오류가 발생했습니다: {ex.Message}"; alertClass = "alert-danger"; } finally { isLoading = false; + StateHasChanged(); } } } \ No newline at end of file diff --git a/ArenaService.BackOffice/Components/Pages/ManageSeasons.razor b/ArenaService.BackOffice/Components/Pages/ManageSeasons.razor index 173af90..b37dc6a 100644 --- a/ArenaService.BackOffice/Components/Pages/ManageSeasons.razor +++ b/ArenaService.BackOffice/Components/Pages/ManageSeasons.razor @@ -1,4 +1,4 @@ -@page "/seasons" +@page "/manage-seasons" @using Microsoft.AspNetCore.Authorization @using ArenaService.Shared.Constants @using ArenaService.Shared.Services diff --git a/ArenaService.BackOffice/Components/Pages/RankingCache.razor b/ArenaService.BackOffice/Components/Pages/RankingCache.razor index 924d1cb..d059732 100644 --- a/ArenaService.BackOffice/Components/Pages/RankingCache.razor +++ b/ArenaService.BackOffice/Components/Pages/RankingCache.razor @@ -1,4 +1,4 @@ -@page "/manage-seasons" +@page "/ranking-cache" @using Microsoft.AspNetCore.Authorization @using ArenaService.Shared.Repositories @using ArenaService.Shared.Services @@ -148,7 +148,7 @@ else for (int offset = -1; offset <= 1; offset++) { int roundToCheck = currentRoundIndex + offset; - if (roundToCheck < 0) { + if (roundToCheck < 1) { continue; } diff --git a/ArenaService.Shared/Repositories/ParticipantRepository.cs b/ArenaService.Shared/Repositories/ParticipantRepository.cs index 27cb7e3..050d55f 100644 --- a/ArenaService.Shared/Repositories/ParticipantRepository.cs +++ b/ArenaService.Shared/Repositories/ParticipantRepository.cs @@ -86,7 +86,7 @@ public async Task AddParticipantsAsync(List users, int seasonId) public async Task GetParticipantCountAsync(int seasonId) { return await _context - .RankingSnapshots.AsQueryable() + .Participants.AsQueryable() .AsNoTracking() .Where(p => p.SeasonId == seasonId) .CountAsync(); diff --git a/ArenaService.Shared/Services/CacheInitializationService.cs b/ArenaService.Shared/Services/CacheInitializationService.cs index a53c7a9..31d3e82 100644 --- a/ArenaService.Shared/Services/CacheInitializationService.cs +++ b/ArenaService.Shared/Services/CacheInitializationService.cs @@ -27,11 +27,11 @@ ISeasonCacheRepository seasonCacheRepository _seasonCacheRepository = seasonCacheRepository; } - public async Task InitializeRankingCacheAsync(int seasonId, int roundIndex) + public async Task InitializeRankingCacheAsync(int seasonId, int roundId) { var snapshotCount = await _rankingSnapshotRepository.GetRankingSnapshotsCount( seasonId, - roundIndex + roundId ); var participantCount = await _participantRepository.GetParticipantCountAsync(seasonId);