Skip to content

Commit

Permalink
Merge pull request #791 from ipdae/210-merge-dev
Browse files Browse the repository at this point in the history 
v200240 Pull development changes
  • Loading branch information
@ipdae
ipdae authored Oct 22, 2024
2 parents fb04ae9 + e5eca6b commit 7b646ef
Show file tree
Hide file tree
Showing 5 changed files with 147 additions and 46 deletions.
60 changes: 40 additions & 20 deletions NineChronicles.DataProvider.Tests/WorldBossRankingQueryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,18 @@ public async Task WorldBossRanking_Sort()
new PrivateKey().Address,
new PrivateKey().Address,
new PrivateKey().Address,
new PrivateKey().Address,
new PrivateKey().Address,
new PrivateKey().Address,
};
var totalScores = new List<int>
{
100,
100,
90,
90,
80,
70,
};
var targetAvatarAddress = avatarAddresses[0];
var queryAddress = targetAvatarAddress.ToString();
Expand All @@ -130,24 +142,21 @@ public async Task WorldBossRanking_Sort()
}}
}}
}}";
for (int idx = 0; idx < 2; idx++)
for (int i = 0; i < 6; i++)
{
for (int i = 0; i < 3; i++)
{
var avatarAddress = avatarAddresses[i];
var model = new RaiderModel(
idx + 1,
i.ToString(),
idx,
idx + 1,
i + 2,
GameConfig.DefaultAvatarArmorId,
i,
avatarAddress.ToHex(),
0
);
Context.Raiders.Add(model);
}
var avatarAddress = avatarAddresses[i];
var model = new RaiderModel(
1,
i.ToString(),
i + 1,
totalScores[i],
i + 2,
GameConfig.DefaultAvatarArmorId,
i,
avatarAddress.ToHex(),
0
);
Context.Raiders.Add(model);
}

var block = new BlockModel
Expand All @@ -169,15 +178,26 @@ public async Task WorldBossRanking_Sort()
Context.Blocks.Add(block);

await Context.SaveChangesAsync();
Assert.Equal(6, Context.Raiders.Count());
var result = await ExecuteAsync(query);
var data = (Dictionary<string, object>)((Dictionary<string, object>)((ExecutionNode)result.Data).ToValue())["worldBossRanking"];
Assert.Equal(1L, data["blockIndex"]);
var models = (object[]) data["rankingInfo"];
Assert.Equal(3, models.Length);
for (int j = 0; j < 3; j++)
// season 1
Assert.Equal(6, models.Length);
var expectedRanking = new Dictionary<int, int>()
{
[0] = 2,
[1] = 2,
[2] = 4,
[3] = 4,
[4] = 5,
[5] = 6,
};
for (int j = 0; j < 6; j++)
{
var model = (Dictionary<string, object>)models[j];
Assert.Equal(3, model["ranking"]);
Assert.Equal(expectedRanking[j], model["ranking"]);
Assert.Contains(new Address((string)model["address"]), avatarAddresses);
}
}
Expand Down
26 changes: 16 additions & 10 deletions NineChronicles.DataProvider.Tests/WorldBossRankingRewardQueryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,16 +313,22 @@ protected override IWorldState GetMockState()
".Serialize())
.SetState(
Addresses.GetSheetAddress<WorldBossRankingRewardSheet>(),
@"id,boss_id,ranking_min,ranking_max,rate_min,rate_max,rune_1_id,rune_1_qty,rune_2_id,rune_2_qty,rune_3_id,rune_3_qty,crystal
1,900001,1,1,0,0,1001,3500,1002,1200,1003,300,900000
2,900001,2,2,0,0,1001,2200,1002,650,1003,150,625000
3,900001,3,3,0,0,1001,1450,1002,450,1003,100,400000
4,900001,4,10,0,0,1001,1000,1002,330,1003,70,250000
5,900001,11,100,0,0,1001,560,1002,150,1003,40,150000
6,900001,0,0,1,30,1001,370,1002,105,1003,25,100000
7,900001,0,0,31,50,1001,230,1002,60,1003,10,50000
8,900001,0,0,51,70,1001,75,1002,20,1003,5,25000
9,900001,0,0,71,100,1001,40,1002,10,0,0,15000".Serialize())
@"id,boss_id,ranking_min,ranking_max,rate_min,rate_max,rune_1_id,rune_1_qty,rune_2_id,rune_2_qty,rune_3_id,rune_3_qty,crystal,item_1_id,item_1_qty,item_2_id,item_2_qty
1,900001,1,1,0,0,1001,3500,1002,1200,1003,300,900000,600201,100,500000,1000
2,900001,2,2,0,0,1001,2200,1002,650,1003,150,625000,600201,100,500000,1000
3,900001,3,3,0,0,1001,1450,1002,450,1003,100,400000,600201,100,500000,1000
4,900001,4,10,0,0,1001,1000,1002,330,1003,70,250000,600201,100,500000,1000
5,900001,11,100,0,0,1001,560,1002,150,1003,40,150000,600201,100,500000,1000
6,900001,0,0,1,30,1001,370,1002,105,1003,25,100000,600201,50,500000,100
7,900001,0,0,31,50,1001,230,1002,60,1003,10,50000,600201,50,500000,100
8,900001,0,0,51,70,1001,75,1002,20,1003,5,25000,600201,50,500000,100
9,900001,0,0,71,100,1001,40,1002,10,0,0,15000,600201,50,500000,100".Serialize())
.SetState(
Addresses.GetSheetAddress<MaterialItemSheet>(),
@"id,_name,item_sub_type,grade,elemental_type
500000,AP 스톤,ApStone,4,Normal
600201,Golden Dust,EquipmentMaterial,4,Normal
".Serialize())
);
return mockWorldState;
}
Expand Down
7 changes: 7 additions & 0 deletions NineChronicles.DataProvider/DataRendering/BattleArenaData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace NineChronicles.DataProvider.DataRendering
using Libplanet.Types.Assets;
using Nekoyume.Model.Arena;
using Nekoyume.Model.EnumType;
using Nekoyume.Model.Item;
using Nekoyume.Model.State;
using Nekoyume.Module;
using Nekoyume.TableData;
Expand Down Expand Up @@ -51,6 +52,12 @@ DateTimeOffset blockTime
if (arenaData.ArenaType != ArenaType.OffSeason && winCount > 0)
{
medalCount += winCount;
var materialSheet = outputStates.GetSheet<MaterialItemSheet>();
var medal = ItemFactory.CreateMaterial(materialSheet, arenaData.MedalId);
if (medal != null)
{
medalCount += winCount;
}
}

var battleArenaModel = new BattleArenaModel()
Expand Down
23 changes: 13 additions & 10 deletions NineChronicles.DataProvider/Queries/NineChroniclesSummaryQuery.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public NineChroniclesSummaryQuery(MySqlStore store, StandaloneContext standalone
var avatarAddress = context.GetArgument<Address>("avatarAddress");
// Use database block tip because sync db & store delay.
var (sheet, runeSheet, rankingRewardSheet) = GetWorldBossSheets(Store, stateContext, raidId);
var (sheet, runeSheet, rankingRewardSheet, materialItemSheet) = GetWorldBossSheets(Store, stateContext, raidId);
var blockIndex = Store.GetTip();
var bossRow = sheet.OrderedList!.First(r => r.Id == raidId);
if (bossRow.EndedBlockIndex <= blockIndex)
Expand All @@ -299,7 +299,7 @@ public NineChroniclesSummaryQuery(MySqlStore store, StandaloneContext standalone
var raider = raiders.First(r => r.Address == avatarAddress.ToHex());
// calculate rewards.
return GetWorldBossRankingReward(raidId, totalCount, raider, rankingRewardSheet, bossRow, runeSheet);
return GetWorldBossRankingReward(raidId, totalCount, raider, rankingRewardSheet, bossRow, runeSheet, materialItemSheet);
}
throw new ExecutionError("can't receive");
Expand Down Expand Up @@ -333,7 +333,7 @@ public NineChroniclesSummaryQuery(MySqlStore store, StandaloneContext standalone
// Check calculate state end.
// Use database block tip because sync db & store delay.
var (sheet, runeSheet, rankingRewardSheet) = GetWorldBossSheets(Store, stateContext, raidId);
var (sheet, runeSheet, rankingRewardSheet, materialItemSheet) = GetWorldBossSheets(Store, stateContext, raidId);
var blockIndex = Store.GetTip();
var bossRow = sheet.OrderedList!.First(r => r.Id == raidId);
if (bossRow.EndedBlockIndex <= blockIndex)
Expand All @@ -344,7 +344,7 @@ public NineChroniclesSummaryQuery(MySqlStore store, StandaloneContext standalone
var result = new List<(WorldBossRankingModel, List<FungibleAssetValue>)>();
foreach (var raider in raiders)
{
result.Add(GetWorldBossRankingReward(raidId, totalCount, raider, rankingRewardSheet, bossRow, runeSheet));
result.Add(GetWorldBossRankingReward(raidId, totalCount, raider, rankingRewardSheet, bossRow, runeSheet, materialItemSheet));
}
return result;
Expand Down Expand Up @@ -390,23 +390,26 @@ private static WorldBossRankingRewardSheet.Row FindRow(WorldBossRankingRewardShe
?? sheet.OrderedList?.LastOrDefault(r => r.BossId == bossId && r.RateMin <= rate && rate <= r.RateMax))!;
}

private static (WorldBossListSheet, RuneSheet, WorldBossRankingRewardSheet) GetWorldBossSheets(MySqlStore store, StateContext stateContext, int raidId)
private static (WorldBossListSheet, RuneSheet, WorldBossRankingRewardSheet, MaterialItemSheet) GetWorldBossSheets(MySqlStore store, StateContext stateContext, int raidId)
{
if (store.MigrationExists(raidId))
{
var worldBossListSheetAddress = Addresses.GetSheetAddress<WorldBossListSheet>();
var runeSheetAddress = Addresses.GetSheetAddress<RuneSheet>();
var rewardSheetAddress = Addresses.GetSheetAddress<WorldBossRankingRewardSheet>();
var values = stateContext.WorldState.GetLegacyStates(new[] { worldBossListSheetAddress, runeSheetAddress, rewardSheetAddress });
if (values[0] is Text wbs && values[1] is Text rs && values[2] is Text wrs)
var materialItemSheetAddress = Addresses.GetSheetAddress<MaterialItemSheet>();
var values = stateContext.WorldState.GetLegacyStates(new[] { worldBossListSheetAddress, runeSheetAddress, rewardSheetAddress, materialItemSheetAddress });
if (values[0] is Text wbs && values[1] is Text rs && values[2] is Text wrs && values[3] is Text ms)
{
var sheet = new WorldBossListSheet();
sheet.Set(wbs);
var runeSheet = new RuneSheet();
runeSheet.Set(rs);
var rankingRewardSheet = new WorldBossRankingRewardSheet();
rankingRewardSheet.Set(wrs);
return (sheet, runeSheet, rankingRewardSheet);
var materialItemSheet = new MaterialItemSheet();
materialItemSheet.Set(ms);
return (sheet, runeSheet, rankingRewardSheet, materialItemSheet);
}
}

Expand All @@ -422,12 +425,12 @@ private static int GetRankingRate(int raidId, int ranking, int totalCount)
return rate;
}

private static (WorldBossRankingModel, List<FungibleAssetValue>) GetWorldBossRankingReward(int raidId, int totalCount, WorldBossRankingModel raider, WorldBossRankingRewardSheet rankingRewardSheet, WorldBossListSheet.Row bossRow, RuneSheet runeSheet)
private static (WorldBossRankingModel, List<FungibleAssetValue>) GetWorldBossRankingReward(int raidId, int totalCount, WorldBossRankingModel raider, WorldBossRankingRewardSheet rankingRewardSheet, WorldBossListSheet.Row bossRow, RuneSheet runeSheet, MaterialItemSheet materialItemSheet)
{
var ranking = raider.Ranking;
var rate = GetRankingRate(raidId, ranking, totalCount);
var row = FindRow(rankingRewardSheet, bossRow.BossId, ranking, rate);
return (raider, row.GetRewards(runeSheet));
return (raider, row.GetRewards(runeSheet, materialItemSheet));
}
}
}
77 changes: 71 additions & 6 deletions NineChronicles.DataProvider/Store/MySqlStore.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2254,21 +2254,86 @@ public void StoreWorldBossMigration(int raidId)
public List<WorldBossRankingModel> GetWorldBossRanking(int raidId, int? queryOffset, int? queryLimit)
{
using NineChroniclesContext? ctx = _dbContextFactory.CreateDbContext();
List<WorldBossRankingModel> query = ctx
.Raiders
.Where(i => i.RaidId == raidId)
.OrderByDescending(i => i.TotalScore)
.Select(i => new WorldBossRankingModel
{
Ranking = 0,
AvatarName = i.AvatarName,
HighScore = (int)i.HighScore,
TotalScore = (int)i.TotalScore,
Cp = i.Cp,
Level = i.Level,
Address = i.Address,
IconId = i.IconId,
})
.ToList();
int? currentScore = null;
var currentRank = 1;
var trunk = new List<WorldBossRankingModel>();
var result = new List<WorldBossRankingModel>();
for (int i = 0; i < query.Count; i++)
{
var model = query[i];
if (!currentScore.HasValue)
{
currentScore = model.TotalScore;
trunk.Add(model);
continue;
}

if (currentScore.Value == model.TotalScore)
{
trunk.Add(model);
currentRank++;
if (i < query.Count - 1)
{
continue;
}

foreach (var modelInTrunk in trunk)
{
modelInTrunk.Ranking = currentRank;
result.Add(modelInTrunk);
}

trunk.Clear();

continue;
}

foreach (var modelInTrunk in trunk)
{
modelInTrunk.Ranking = currentRank;
result.Add(modelInTrunk);
}

trunk.Clear();
if (i < query.Count - 1)
{
trunk.Add(model);
currentScore = model.TotalScore;
currentRank++;
continue;
}

model.Ranking = currentRank + 1;
result.Add(model);
}

// Call ToList for convert query result from IQueryable
IEnumerable<WorldBossRankingModel> query = ctx.Set<WorldBossRankingModel>()
.FromSqlRaw("SET @prev_score = (SELECT max(`TotalScore`) FROM `Raiders` WHERE `RaidId` = {0}); SET @rank = (SELECT count(*) FROM `Raiders` WHERE `RaidId` = {0} AND `TotalScore` = @prev_score); SELECT `AvatarName`, `HighScore`, `TotalScore`, `Cp`, `Level`, `Address`, `IconId`, @rank := IF(@prev_score = TotalScore, @rank, @rank + 1) as `Ranking` FROM `Raiders` WHERE `RaidId` = {0} ORDER BY `TotalScore` DESC", raidId).ToList();
if (queryOffset.HasValue)
{
query = query.Skip(queryOffset.Value);
result = result.Skip(queryOffset.Value).ToList();
}

if (queryLimit.HasValue)
{
query = query.Take(queryLimit.Value);
result = result.Take(queryLimit.Value).ToList();
}

return query.OrderBy(i => i.Ranking).ToList();
return result.OrderBy(i => i.Ranking).ToList();
}

public int GetTotalRaiders(int raidId)
Expand Down

0 comments on commit 7b646ef

Please sign in to comment.