fix unit test about arena-medal id

planetarium · Oct 8, 2024 · 1452582 · 1452582
1 parent cfd499e
commit 1452582
Show file tree

Hide file tree

Showing 4 changed files with 149 additions and 103 deletions.
diff --git a/Lib9c/Action/BattleArena.cs b/Lib9c/Action/BattleArena.cs
@@ -437,7 +437,7 @@ public override IWorld Execute(IActionContext context)
             {
                 if (roundData.MedalId == 0)
                 {
-
+                    throw new MedalIdNotFoundException($"{addressesHex}{roundData.ChampionshipId}-{roundData.Round}.MedalId is zero. Need to set MedalId column at ArenaSheet.");
                 }
 
                 var materialSheet = sheets.GetSheet<MaterialItemSheet>();

diff --git a/Lib9c/Arena/ArenaHelper.cs b/Lib9c/Arena/ArenaHelper.cs
@@ -59,12 +59,17 @@ public static int GetMedalTotalCount(ArenaSheet.Row row, AvatarState avatarState
             var count = 0;
             foreach (var data in row.Round)
             {
+                var itemId = data.MedalId;
+                if (data.MedalId == 0)
+                {
+                    continue;
+                }
+
                 if (!data.ArenaType.Equals(ArenaType.Season))
                 {
                     continue;
                 }
 
-                var itemId = data.MedalId;
                 if (avatarState.inventory.TryGetItem(itemId, out var item))
                 {
                     count += item.count;

diff --git a/Lib9c/Exceptions/MedalIdNotFoundException.cs b/Lib9c/Exceptions/MedalIdNotFoundException.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Nekoyume.Exceptions
+{
+    [Serializable]
+    public class MedalIdNotFoundException : Exception
+    {
+        public MedalIdNotFoundException()
+        {
+        }
+
+        public MedalIdNotFoundException(string message)
+            : base(message)
+        {
+        }
+
+        public MedalIdNotFoundException(
+            string message,
+            Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        public MedalIdNotFoundException(
+            string actionType,
+            string addressesHex,
+            int requiredAmount,
+            int currentAmount)
+            : base($"[{actionType}][{addressesHex}] required({requiredAmount}), current({currentAmount})")
+        {
+        }
+
+        protected MedalIdNotFoundException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
diff --git a/Lib9c/TableCSV/Arena/ArenaSheet.csv b/Lib9c/TableCSV/Arena/ArenaSheet.csv
@@ -1,101 +1,101 @@
-id,round,arena_type,start_block_index,end_block_index,required_medal_count,entrance_fee,ticket_price,additional_ticket_price,max_purchase_count,max_purchase_count_during_interval
-1,1,OffSeason,1,4440400,0,0,5,2,80,79
-1,2,Season,4440401,4541200,0,1,50,20,80,79
-1,3,OffSeason,4541201,4591600,0,0,5,2,80,79
-1,4,Season,4591601,4692400,0,1,50,20,80,79
-1,5,OffSeason,4692401,4793200,0,0,5,2,80,79
-1,6,Season,4793201,4843600,0,1,50,20,80,79
-1,7,OffSeason,4843601,4894000,0,0,5,2,80,79
-1,8,Championship,4894001,4994800,200,2,100,40,80,79
-2,1,OffSeason,4994801,5095600,0,0,5,2,80,79
-2,2,Season,5095601,5196400,0,1,50,20,80,79
-2,3,OffSeason,5196401,5246800,0,0,5,2,80,79
-2,4,Season,5246801,5347600,0,1,50,20,80,79
-2,5,OffSeason,5347601,5398000,0,0,5,2,80,79
-2,6,Championship,5398001,5498800,160,2,100,40,40,8
-2,7,OffSeason,5498801,5599600,0,0,5,2,40,8
-2,8,OffSeason,5599601,5700400,160,2,100,40,40,8
-3,1,OffSeason,5700401,5801200,0,0,5,2,80,8
-3,2,Season,5801201,5902000,0,1,50,20,80,8
-3,3,OffSeason,5902001,6002800,0,0,5,2,80,8
-3,4,Season,6002801,6103600,0,1,50,20,40,8
-3,5,OffSeason,6103601,6204400,0,0,5,2,40,8
-3,6,Championship,6204401,6305200,160,2,100,40,40,8
-4,1,OffSeason,6305201,6506800,0,0,5,2,40,8
-4,2,Season,6506801,6607600,0,1,50,20,40,8
-4,3,OffSeason,6607601,6708400,0,0,5,2,40,8
-4,4,Season,6708401,6809200,0,1,50,20,40,8
-4,5,OffSeason,6809201,6910000,0,0,5,2,40,8
-4,6,Championship,6910001,7010800,160,2,100,40,40,8
-5,1,OffSeason,7010801,7111600,0,0,5,2,40,8
-5,2,Season,7111601,7212400,0,1,50,20,40,8
-5,3,OffSeason,7212401,7313200,0,0,5,2,40,8
-5,4,Season,7313201,7414000,0,1,50,20,40,8
-5,5,OffSeason,7414001,7514800,0,0,5,2,40,8
-5,6,Championship,7514801,7615600,160,2,100,40,40,8
-6,1,OffSeason,7615601,7716400,0,0,5,2,40,8
-6,2,Season,7716401,7817200,0,1,50,20,40,8
-6,3,OffSeason,7817201,7918000,0,0,5,2,40,8
-6,4,Season,7918001,8018800,0,1,50,20,40,8
-6,5,OffSeason,8018801,8119600,0,0,5,2,40,8
-6,6,Championship,8119601,8220400,160,2,100,40,40,8
-7,1,OffSeason,8220401,8341360,0,0,5,2,40,8
-7,2,Season,8341361,8462320,0,1,50,20,40,8
-7,3,OffSeason,8462321,8613520,0,0,5,2,40,8
-7,4,Season,8613521,8764720,0,1,50,20,40,8
-7,5,OffSeason,8764721,8991520,0,0,5,2,40,8
-7,6,Championship,8991521,9142720,160,2,100,40,40,8
-8,1,OffSeason,9142721,9238200,0,0,5,2,40,8
-8,2,Season,9238201,9389400,0,1,50,20,40,8
-8,3,OffSeason,9389401,9540600,0,0,5,2,40,8
-8,4,Season,9540601,9691800,0,1,50,20,40,8
-8,5,OffSeason,9691801,9874418,0,0,5,2,40,8
-8,6,Championship,9874419,10025618,0,2,100,40,40,8
-9,1,OffSeason,10025619,10288900,0,0,5,2,40,8
-9,2,Season,10288901,10440100,0,1,50,20,40,8
-9,3,OffSeason,10440101,10720900,0,0,5,2,40,8
-9,4,Season,10720901,10872100,0,1,50,20,40,8
-9,5,OffSeason,10872101,11131300,0,0,5,2,40,8
-9,6,Championship,11131301,11282500,0,2,100,40,40,8
-10,1,OffSeason,11282501,11433700,0,0,5,2,40,8
-10,2,Season,11433701,11584900,0,1,50,20,40,8
-10,3,OffSeason,11584901,11736100,0,0,5,2,40,8
-10,4,Season,11736101,11887300,0,1,50,20,40,8
-10,5,OffSeason,11887301,12038500,0,0,5,2,40,8
-10,6,Championship,12038501,12189700,160,2,100,40,40,8
-11,1,OffSeason,12189701,12340900,0,0,5,2,40,8
-11,2,Season,12340901,12492100,0,1,50,20,40,8
-11,3,OffSeason,12492101,12643300,0,0,5,2,40,8
-11,4,Season,12643301,12794500,0,1,50,20,40,8
-11,5,OffSeason,12794501,12945700,0,0,5,2,40,8
-11,6,Championship,12945701,13096900,160,2,100,40,40,8
-12,1,OffSeason,13096901,13248100,0,0,5,2,40,8
-12,2,Season,13248101,13399300,0,1,50,20,40,8
-12,3,OffSeason,13399301,13550500,0,0,5,2,40,8
-12,4,Season,13550501,13701700,0,1,50,20,40,8
-12,5,OffSeason,13701701,13852900,0,0,5,2,40,8
-12,6,Championship,13852901,14004100,160,2,100,40,40,8
-13,1,OffSeason,14004101,14155300,0,0,5,2,40,8
-13,2,Season,14155301,14306500,0,1,50,20,40,8
-13,3,OffSeason,14306501,14457700,0,0,5,2,40,8
-13,4,Season,14457701,14608900,0,1,50,20,40,8
-13,5,OffSeason,14608901,14760100,0,0,5,2,40,8
-13,6,Championship,14760101,14911300,160,2,100,40,40,8
-14,1,OffSeason,14911301,15062500,0,0,5,2,40,8
-14,2,Season,15062501,15213700,0,1,50,20,40,8
-14,3,OffSeason,15213701,15364900,0,0,5,2,40,8
-14,4,Season,15364901,15516100,0,1,50,20,40,8
-14,5,OffSeason,15516101,15667300,0,0,5,2,40,8
-14,6,Championship,15667301,15818500,160,2,100,40,40,8
-15,1,OffSeason,15818501,15969700,0,0,5,2,40,8
-15,2,Season,15969701,16120900,0,1,50,20,40,8
-15,3,OffSeason,16120901,16272100,0,0,5,2,40,8
-15,4,Season,16272101,16423300,0,1,50,20,40,8
-15,5,OffSeason,16423301,16574500,0,0,5,2,40,8
-15,6,Championship,16574501,16725700,160,2,100,40,40,8
-16,1,OffSeason,16725701,16876900,0,0,5,2,40,8
-16,2,Season,16876901,17028100,0,1,50,20,40,8
-16,3,OffSeason,17028101,17179300,0,0,5,2,40,8
-16,4,Season,17179301,17330500,0,1,50,20,40,8
-16,5,OffSeason,17330501,17481700,0,0,5,2,40,8
-16,6,Championship,17481701,17632900,160,2,100,40,40,8
+id,round,arena_type,start_block_index,end_block_index,required_medal_count,entrance_fee,ticket_price,additional_ticket_price,max_purchase_count,max_purchase_count_during_interval,medal_id
+1,1,OffSeason,1,4440400,0,0,5,2,80,79,0
+1,2,Season,4440401,4541200,0,1,50,20,80,79,700002
+1,3,OffSeason,4541201,4591600,0,0,5,2,80,79,0
+1,4,Season,4591601,4692400,0,1,50,20,80,79,700104
+1,5,OffSeason,4692401,4793200,0,0,5,2,80,79,0
+1,6,Season,4793201,4843600,0,1,50,20,80,79,700106
+1,7,OffSeason,4843601,4894000,0,0,5,2,80,79,0
+1,8,Championship,4894001,4994800,200,2,100,40,80,79,700108
+2,1,OffSeason,4994801,5095600,0,0,5,2,80,79,0
+2,2,Season,5095601,5196400,0,1,50,20,80,79,700204
+2,3,OffSeason,5196401,5246800,0,0,5,2,80,79,0
+2,4,Season,5246801,5347600,0,1,50,20,80,79,700206
+2,5,OffSeason,5347601,5398000,0,0,5,2,80,79,0
+2,6,Championship,5398001,5498800,160,2,100,40,40,8,700208
+2,7,OffSeason,5498801,5599600,0,0,5,2,40,8,0
+2,8,OffSeason,5599601,5700400,160,2,100,40,40,8,0
+3,1,OffSeason,5700401,5801200,0,0,5,2,80,8,0
+3,2,Season,5801201,5902000,0,1,50,20,80,8,700302
+3,3,OffSeason,5902001,6002800,0,0,5,2,80,8,0
+3,4,Season,6002801,6103600,0,1,50,20,40,8,700304
+3,5,OffSeason,6103601,6204400,0,0,5,2,40,8,0
+3,6,Championship,6204401,6305200,160,2,100,40,40,8,700306
+4,1,OffSeason,6305201,6506800,0,0,5,2,40,8,0
+4,2,Season,6506801,6607600,0,1,50,20,40,8,700402
+4,3,OffSeason,6607601,6708400,0,0,5,2,40,8,0
+4,4,Season,6708401,6809200,0,1,50,20,40,8,700404
+4,5,OffSeason,6809201,6910000,0,0,5,2,40,8,0
+4,6,Championship,6910001,7010800,160,2,100,40,40,8,700406
+5,1,OffSeason,7010801,7111600,0,0,5,2,40,8,0
+5,2,Season,7111601,7212400,0,1,50,20,40,8,700502
+5,3,OffSeason,7212401,7313200,0,0,5,2,40,8,0
+5,4,Season,7313201,7414000,0,1,50,20,40,8,700504
+5,5,OffSeason,7414001,7514800,0,0,5,2,40,8,0
+5,6,Championship,7514801,7615600,160,2,100,40,40,8,700506
+6,1,OffSeason,7615601,7716400,0,0,5,2,40,8,0
+6,2,Season,7716401,7817200,0,1,50,20,40,8,700602
+6,3,OffSeason,7817201,7918000,0,0,5,2,40,8,0
+6,4,Season,7918001,8018800,0,1,50,20,40,8,700604
+6,5,OffSeason,8018801,8119600,0,0,5,2,40,8,0
+6,6,Championship,8119601,8220400,160,2,100,40,40,8,700606
+7,1,OffSeason,8220401,8341360,0,0,5,2,40,8,0
+7,2,Season,8341361,8462320,0,1,50,20,40,8,700702
+7,3,OffSeason,8462321,8613520,0,0,5,2,40,8,0
+7,4,Season,8613521,8764720,0,1,50,20,40,8,700704
+7,5,OffSeason,8764721,8991520,0,0,5,2,40,8,0
+7,6,Championship,8991521,9142720,160,2,100,40,40,8,700706
+8,1,OffSeason,9142721,9238200,0,0,5,2,40,8,0
+8,2,Season,9238201,9389400,0,1,50,20,40,8,700802
+8,3,OffSeason,9389401,9540600,0,0,5,2,40,8,0
+8,4,Season,9540601,9691800,0,1,50,20,40,8,700804
+8,5,OffSeason,9691801,9874418,0,0,5,2,40,8,0
+8,6,Championship,9874419,10025618,0,2,100,40,40,8,700806
+9,1,OffSeason,10025619,10288900,0,0,5,2,40,8,0
+9,2,Season,10288901,10440100,0,1,50,20,40,8,700902
+9,3,OffSeason,10440101,10720900,0,0,5,2,40,8,0
+9,4,Season,10720901,10872100,0,1,50,20,40,8,700904
+9,5,OffSeason,10872101,11131300,0,0,5,2,40,8,0
+9,6,Championship,11131301,11282500,0,2,100,40,40,8,700906
+10,1,OffSeason,11282501,11433700,0,0,5,2,40,8,0
+10,2,Season,11433701,11584900,0,1,50,20,40,8,701002
+10,3,OffSeason,11584901,11736100,0,0,5,2,40,8,0
+10,4,Season,11736101,11887300,0,1,50,20,40,8,701004
+10,5,OffSeason,11887301,12038500,0,0,5,2,40,8,0
+10,6,Championship,12038501,12189700,160,2,100,40,40,8,701006
+11,1,OffSeason,12189701,12340900,0,0,5,2,40,8,0
+11,2,Season,12340901,12492100,0,1,50,20,40,8,701102
+11,3,OffSeason,12492101,12643300,0,0,5,2,40,8,0
+11,4,Season,12643301,12794500,0,1,50,20,40,8,701104
+11,5,OffSeason,12794501,12945700,0,0,5,2,40,8,0
+11,6,Championship,12945701,13096900,160,2,100,40,40,8,701106
+12,1,OffSeason,13096901,13248100,0,0,5,2,40,8,0
+12,2,Season,13248101,13399300,0,1,50,20,40,8,701202
+12,3,OffSeason,13399301,13550500,0,0,5,2,40,8,0
+12,4,Season,13550501,13701700,0,1,50,20,40,8,701204
+12,5,OffSeason,13701701,13852900,0,0,5,2,40,8,0
+12,6,Championship,13852901,14004100,160,2,100,40,40,8,701206
+13,1,OffSeason,14004101,14155300,0,0,5,2,40,8,0
+13,2,Season,14155301,14306500,0,1,50,20,40,8,701302
+13,3,OffSeason,14306501,14457700,0,0,5,2,40,8,0
+13,4,Season,14457701,14608900,0,1,50,20,40,8,701304
+13,5,OffSeason,14608901,14760100,0,0,5,2,40,8,0
+13,6,Championship,14760101,14911300,160,2,100,40,40,8,701306
+14,1,OffSeason,14911301,15062500,0,0,5,2,40,8,0
+14,2,Season,15062501,15213700,0,1,50,20,40,8,701402
+14,3,OffSeason,15213701,15364900,0,0,5,2,40,8,0
+14,4,Season,15364901,15516100,0,1,50,20,40,8,701404
+14,5,OffSeason,15516101,15667300,0,0,5,2,40,8,0
+14,6,Championship,15667301,15818500,160,2,100,40,40,8,701406
+15,1,OffSeason,15818501,15969700,0,0,5,2,40,8,0
+15,2,Season,15969701,16120900,0,1,50,20,40,8,701502
+15,3,OffSeason,16120901,16272100,0,0,5,2,40,8,0
+15,4,Season,16272101,16423300,0,1,50,20,40,8,701504
+15,5,OffSeason,16423301,16574500,0,0,5,2,40,8,0
+15,6,Championship,16574501,16725700,160,2,100,40,40,8,701506
+16,1,OffSeason,16725701,16876900,0,0,5,2,40,8,0
+16,2,Season,16876901,17028100,0,1,50,20,40,8,701602
+16,3,OffSeason,17028101,17179300,0,0,5,2,40,8,0
+16,4,Season,17179301,17330500,0,1,50,20,40,8,701604
+16,5,OffSeason,17330501,17481700,0,0,5,2,40,8,0
+16,6,Championship,17481701,17632900,160,2,100,40,40,8,701606
-Original file line number
+Diff line change
@@ Expand Up / @@ -437,7 +437,7 @@ public override IWorld Execute(IActionContext context) @@
                 {
                     if (roundData.MedalId == 0)
                     {
+                        throw new MedalIdNotFoundException($"{addressesHex}{roundData.ChampionshipId}-{roundData.Round}.MedalId is zero. Need to set MedalId column at ArenaSheet.");
                     }
                     var materialSheet = sheets.GetSheet<MaterialItemSheet>();
@@ Expand Down @@