Merge pull request #790 from ipdae/20241022-bump-headless

20241022 bump headless

NineChronicles.DataProvider.Tests/WorldBossRankingRewardQueryTest.cs

@@ -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;
     }

NineChronicles.DataProvider/DataRendering/BattleArenaData.cs

@@ -8,6 +8,7 @@ namespace NineChronicles.DataProvider.DataRendering
     using Nekoyume.Extensions;
     using Nekoyume.Model.Arena;
     using Nekoyume.Model.EnumType;
+    using Nekoyume.Model.Item;
     using Nekoyume.Model.State;
     using Nekoyume.Module;
     using Nekoyume.TableData;
@@ -70,7 +71,7 @@ DateTimeOffset blockTime
                 winCount > 0)
             {
                 var materialSheet = sheets.GetSheet<MaterialItemSheet>();
-                var medal = ArenaHelper.GetMedal(championshipId, round, materialSheet);
+                var medal = ItemFactory.CreateMaterial(materialSheet, arenaData.MedalId);
                 if (medal != null)
                 {
                     medalCount += winCount;

NineChronicles.DataProvider/Queries/NineChroniclesSummaryQuery.cs

@@ -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)
@@ -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");
@@ -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)
@@ -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;
@@ -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);
                 }
             }
 
@@ -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));
         }
     }
 }