chore: cliend datamodel refactoring

WotBlitzStatisticsPro.Blazor/Generated/State/AccountInfoResponseData.WotBlitzStatisticsProClient.StrawberryShake.cs

@@ -5,17 +5,18 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
 {
     ///<summary>Information about player</summary>
     [global::System.CodeDom.Compiler.GeneratedCode("StrawberryShake", "11.2.2.0")]
-    public partial class AccountInfoResponseData
+    public partial class AccountInfoResponseData : IStatisticsData
     {
-        public AccountInfoResponseData(global::System.String __typename, global::System.Int64? accountId = default !, global::System.DateTimeOffset? createdAt = default !, global::System.DateTimeOffset? lastBattleTime = default !, global::System.String? nickname = default !, global::System.Int64? maxFragsTankId = default !, global::System.Int64? maxXpTankId = default !, global::System.Int64? battles = default !, global::System.Int64? capturePoints = default !, global::System.Int64? damageDealt = default !, global::System.Int64? damageReceived = default !, global::System.Int64? droppedCapturePoints = default !, global::System.Int64? frags = default !, global::System.Int64? frags8P = default !, global::System.Int64? hits = default !, global::System.Int64? losses = default !, global::System.Int64? maxFrags = default !, global::System.Int64? maxXp = default !, global::System.Int64? shots = default !, global::System.Int64? spotted = default !, global::System.Int64? survivedBattles = default !, global::System.Int64? winAndSurvived = default !, global::System.Int64? wins = default !, global::System.Int64? xp = default !, global::System.Double? wn7 = default !, global::System.Decimal? winRate = default !, global::System.Decimal? avgDamage = default !, global::System.Decimal? avgXp = default !, global::System.Decimal? damageCoefficient = default !, global::System.Decimal? survivalRate = default !, global::System.Double? avgTier = default !, global::WotBlitzStatisticsPro.Blazor.GraphQl.State.ClanInfoResponseData? clanInfo = default !, global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData>? tanks = default !)
+        public AccountInfoResponseData(global::System.String __typename, global::System.Int64? accountId = default !, global::System.DateTimeOffset? createdAt = default !, global::System.String? nickname = default !, global::System.Int64? maxFragsTankId = default !, global::System.Int64? maxXpTankId = default !, global::System.Double? avgTier = default !, global::System.DateTimeOffset? lastBattleTime = default !, global::System.Int64? battles = default !, global::System.Int64? capturePoints = default !, global::System.Int64? damageDealt = default !, global::System.Int64? damageReceived = default !, global::System.Int64? droppedCapturePoints = default !, global::System.Int64? frags = default !, global::System.Int64? frags8P = default !, global::System.Int64? hits = default !, global::System.Int64? losses = default !, global::System.Int64? maxFrags = default !, global::System.Int64? maxXp = default !, global::System.Int64? shots = default !, global::System.Int64? spotted = default !, global::System.Int64? survivedBattles = default !, global::System.Int64? winAndSurvived = default !, global::System.Int64? wins = default !, global::System.Int64? xp = default !, global::System.Double? wn7 = default !, global::System.Decimal? winRate = default !, global::System.Decimal? avgDamage = default !, global::System.Decimal? avgXp = default !, global::System.Decimal? damageCoefficient = default !, global::System.Decimal? survivalRate = default !, global::WotBlitzStatisticsPro.Blazor.GraphQl.State.ClanInfoResponseData? clanInfo = default !, global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData>? tanks = default !)
         {
             this.__typename = __typename ?? throw new global::System.ArgumentNullException(nameof(__typename));
             AccountId = accountId;
             CreatedAt = createdAt;
-            LastBattleTime = lastBattleTime;
             Nickname = nickname;
             MaxFragsTankId = maxFragsTankId;
             MaxXpTankId = maxXpTankId;
+            AvgTier = avgTier;
+            LastBattleTime = lastBattleTime;
             Battles = battles;
             CapturePoints = capturePoints;
             DamageDealt = damageDealt;
@@ -39,7 +40,6 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             AvgXp = avgXp;
             DamageCoefficient = damageCoefficient;
             SurvivalRate = survivalRate;
-            AvgTier = avgTier;
             ClanInfo = clanInfo;
             Tanks = tanks;
         }
@@ -52,9 +52,6 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
         ///<summary>Account creation date</summary>
         public global::System.DateTimeOffset? CreatedAt { get; }
 
-        ///<summary>Last battle time</summary>
-        public global::System.DateTimeOffset? LastBattleTime { get; }
-
         ///<summary>Player's nick</summary>
         public global::System.String? Nickname { get; }
 
@@ -64,6 +61,12 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
         ///<summary>Tank Id which created max experience per battle</summary>
         public global::System.Int64? MaxXpTankId { get; }
 
+        ///<summary>Average tier</summary>
+        public global::System.Double? AvgTier { get; }
+
+        ///<summary>Last battle time</summary>
+        public global::System.DateTimeOffset? LastBattleTime { get; }
+
         ///<summary>Battles count</summary>
         public global::System.Int64? Battles { get; }
 
@@ -106,7 +109,7 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
         ///<summary>Total count of survived battles</summary>
         public global::System.Int64? SurvivedBattles { get; }
 
-        ///<summary>Total count of survived and winned battles</summary>
+        ///<summary>Total count of survived and won battles</summary>
         public global::System.Int64? WinAndSurvived { get; }
 
         ///<summary>Total wins count</summary>
@@ -133,13 +136,10 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
         ///<summary>Rate of survival</summary>
         public global::System.Decimal? SurvivalRate { get; }
 
-        ///<summary>Average tier</summary>
-        public global::System.Double? AvgTier { get; }
-
         ///<summary>Clan info</summary>
         public global::WotBlitzStatisticsPro.Blazor.GraphQl.State.ClanInfoResponseData? ClanInfo { get; }
 
         ///<summary>All player's tanks</summary>
-        public global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData>? Tanks { get; }
+        public global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData>? Tanks { get; }
     }
 }

WotBlitzStatisticsPro.Blazor/Generated/State/IStatisticsData.WotBlitzStatisticsProClient.StrawberryShake.cs

@@ -0,0 +1,12 @@
+// <auto-generated/>
+#nullable enable
+
+namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
+{
+    ///<summary>Information about player</summary>
+    [global::System.CodeDom.Compiler.GeneratedCode("StrawberryShake", "11.2.2.0")]
+    public partial interface IStatisticsData
+    {
+        global::System.String __typename { get; }
+    }
+}

WotBlitzStatisticsPro.Blazor/Generated/State/PlayerBuilder.WotBlitzStatisticsProClient.StrawberryShake.cs

@@ -84,7 +84,7 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             return (_resultDataFactory.Create(resultInfo), resultInfo);
         }
 
-        private global::WotBlitzStatisticsPro.Blazor.GraphQl.State.AccountInfoResponseData DeserializeNonNullableIPlayer_AccountInfo(global::System.Text.Json.JsonElement? obj)
+        private global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData DeserializeNonNullableIPlayer_AccountInfo(global::System.Text.Json.JsonElement? obj)
         {
             if (!obj.HasValue)
             {
@@ -94,7 +94,7 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             var typename = obj.Value.GetProperty("__typename").GetString();
             if (typename?.Equals("AccountInfoResponse", global::System.StringComparison.Ordinal) ?? false)
             {
-                return new global::WotBlitzStatisticsPro.Blazor.GraphQl.State.AccountInfoResponseData(typename, accountId: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "accountId")), createdAt: DeserializeNonNullableDateTimeOffset(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "createdAt")), lastBattleTime: DeserializeNonNullableDateTimeOffset(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "lastBattleTime")), nickname: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "nickname")), maxFragsTankId: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxFragsTankId")), maxXpTankId: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxXpTankId")), battles: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "battles")), capturePoints: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "capturePoints")), damageDealt: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageDealt")), damageReceived: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageReceived")), droppedCapturePoints: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "droppedCapturePoints")), frags: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "frags")), frags8P: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "frags8P")), hits: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "hits")), losses: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "losses")), maxFrags: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxFrags")), maxXp: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxXp")), shots: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "shots")), spotted: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "spotted")), survivedBattles: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "survivedBattles")), winAndSurvived: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "winAndSurvived")), wins: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "wins")), xp: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "xp")), wn7: DeserializeNonNullableDouble(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "wn7")), winRate: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "winRate")), avgDamage: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgDamage")), avgXp: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgXp")), damageCoefficient: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageCoefficient")), survivalRate: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "survivalRate")), avgTier: DeserializeNonNullableDouble(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgTier")), clanInfo: DeserializeIPlayer_AccountInfo_ClanInfo(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "clanInfo")), tanks: DeserializeIPlayer_AccountInfo_TanksNonNullableArray(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tanks")));
+                return new global::WotBlitzStatisticsPro.Blazor.GraphQl.State.AccountInfoResponseData(typename, accountId: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "accountId")), createdAt: DeserializeNonNullableDateTimeOffset(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "createdAt")), nickname: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "nickname")), maxFragsTankId: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxFragsTankId")), maxXpTankId: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxXpTankId")), avgTier: DeserializeNonNullableDouble(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgTier")), lastBattleTime: DeserializeNonNullableDateTimeOffset(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "lastBattleTime")), battles: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "battles")), capturePoints: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "capturePoints")), damageDealt: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageDealt")), damageReceived: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageReceived")), droppedCapturePoints: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "droppedCapturePoints")), frags: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "frags")), frags8P: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "frags8P")), hits: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "hits")), losses: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "losses")), maxFrags: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxFrags")), maxXp: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxXp")), shots: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "shots")), spotted: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "spotted")), survivedBattles: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "survivedBattles")), winAndSurvived: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "winAndSurvived")), wins: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "wins")), xp: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "xp")), wn7: DeserializeNonNullableDouble(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "wn7")), winRate: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "winRate")), avgDamage: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgDamage")), avgXp: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgXp")), damageCoefficient: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageCoefficient")), survivalRate: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "survivalRate")), clanInfo: DeserializeIPlayer_AccountInfo_ClanInfo(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "clanInfo")), tanks: DeserializeIPlayer_AccountInfo_TanksNonNullableArray(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tanks")));
             }
 
             throw new global::System.NotSupportedException();
@@ -196,14 +196,14 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             return _dateTimeParser.Parse(obj.Value.GetString()!);
         }
 
-        private global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData>? DeserializeIPlayer_AccountInfo_TanksNonNullableArray(global::System.Text.Json.JsonElement? obj)
+        private global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData>? DeserializeIPlayer_AccountInfo_TanksNonNullableArray(global::System.Text.Json.JsonElement? obj)
         {
             if (!obj.HasValue)
             {
                 return null;
             }
 
-            var tankInfoResponses = new global::System.Collections.Generic.List<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData>();
+            var tankInfoResponses = new global::System.Collections.Generic.List<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData>();
             foreach (global::System.Text.Json.JsonElement child in obj.Value.EnumerateArray())
             {
                 tankInfoResponses.Add(DeserializeNonNullableIPlayer_AccountInfo_Tanks(child));
@@ -212,7 +212,7 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             return tankInfoResponses;
         }
 
-        private global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData DeserializeNonNullableIPlayer_AccountInfo_Tanks(global::System.Text.Json.JsonElement? obj)
+        private global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData DeserializeNonNullableIPlayer_AccountInfo_Tanks(global::System.Text.Json.JsonElement? obj)
         {
             if (!obj.HasValue)
             {
@@ -222,7 +222,7 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             var typename = obj.Value.GetProperty("__typename").GetString();
             if (typename?.Equals("TankInfoResponse", global::System.StringComparison.Ordinal) ?? false)
             {
-                return new global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData(typename, tankId: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankId")), battleLifeTimeInSeconds: DeserializeNonNullableInt32(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "battleLifeTimeInSeconds")), lastBattleTime: DeserializeNonNullableDateTimeOffset(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "lastBattleTime")), markOfMastery: DeserializeNonNullableMarkOfMastery(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "markOfMastery")), battles: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "battles")), capturePoints: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "capturePoints")), damageDealt: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageDealt")), damageReceived: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageReceived")), droppedCapturePoints: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "droppedCapturePoints")), frags: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "frags")), frags8P: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "frags8P")), hits: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "hits")), losses: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "losses")), maxFrags: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxFrags")), maxXp: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxXp")), shots: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "shots")), spotted: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "spotted")), survivedBattles: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "survivedBattles")), winAndSurvived: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "winAndSurvived")), wins: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "wins")), xp: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "xp")), wn7: DeserializeNonNullableDouble(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "wn7")), winRate: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "winRate")), avgDamage: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgDamage")), avgXp: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgXp")), damageCoefficient: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageCoefficient")), survivalRate: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "survivalRate")), avgBattleLifeTimeInMinutes: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgBattleLifeTimeInMinutes")), name: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "name")), tankNationId: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankNationId")), tankNation: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankNation")), tier: DeserializeNonNullableInt32(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tier")), tankTypeId: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankTypeId")), tankType: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankType")), isPremium: DeserializeNonNullableBoolean(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "isPremium")), previewImage: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "previewImage")), normalImage: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "normalImage")));
+                return new global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData(typename, tankId: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankId")), battleLifeTimeInSeconds: DeserializeNonNullableInt32(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "battleLifeTimeInSeconds")), markOfMastery: DeserializeNonNullableMarkOfMastery(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "markOfMastery")), avgBattleLifeTimeInMinutes: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgBattleLifeTimeInMinutes")), name: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "name")), tankNationId: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankNationId")), tankNation: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankNation")), tier: DeserializeNonNullableInt32(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tier")), tankTypeId: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankTypeId")), tankType: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "tankType")), isPremium: DeserializeNonNullableBoolean(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "isPremium")), previewImage: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "previewImage")), normalImage: DeserializeString(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "normalImage")), lastBattleTime: DeserializeNonNullableDateTimeOffset(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "lastBattleTime")), battles: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "battles")), capturePoints: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "capturePoints")), damageDealt: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageDealt")), damageReceived: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageReceived")), droppedCapturePoints: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "droppedCapturePoints")), frags: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "frags")), frags8P: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "frags8P")), hits: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "hits")), losses: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "losses")), maxFrags: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxFrags")), maxXp: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "maxXp")), shots: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "shots")), spotted: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "spotted")), survivedBattles: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "survivedBattles")), winAndSurvived: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "winAndSurvived")), wins: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "wins")), xp: DeserializeNonNullableInt64(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "xp")), wn7: DeserializeNonNullableDouble(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "wn7")), winRate: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "winRate")), avgDamage: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgDamage")), avgXp: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "avgXp")), damageCoefficient: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "damageCoefficient")), survivalRate: DeserializeNonNullableDecimal(global::StrawberryShake.Json.JsonElementExtensions.GetPropertyOrNull(obj, "survivalRate")));
             }
 
             throw new global::System.NotSupportedException();

WotBlitzStatisticsPro.Blazor/Generated/State/PlayerResultFactory.WotBlitzStatisticsProClient.StrawberryShake.cs

@@ -30,12 +30,157 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             throw new global::System.ArgumentException("PlayerResultInfo expected.");
         }
 
-        private global::WotBlitzStatisticsPro.Blazor.GraphQl.IPlayer_AccountInfo MapNonNullableIPlayer_AccountInfo(global::WotBlitzStatisticsPro.Blazor.GraphQl.State.AccountInfoResponseData data, global::StrawberryShake.IEntityStoreSnapshot snapshot)
+        private global::WotBlitzStatisticsPro.Blazor.GraphQl.IPlayer_AccountInfo MapNonNullableIPlayer_AccountInfo(global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData data, global::StrawberryShake.IEntityStoreSnapshot snapshot)
         {
-            IPlayer_AccountInfo returnValue = default !;
-            if (data.__typename.Equals("AccountInfoResponse", global::System.StringComparison.Ordinal))
+            IPlayer_AccountInfo? returnValue;
+            if (data is global::WotBlitzStatisticsPro.Blazor.GraphQl.State.AccountInfoResponseData accountInfoResponse)
             {
-                returnValue = new Player_AccountInfo_AccountInfoResponse(data.AccountId ?? throw new global::System.ArgumentNullException(), data.CreatedAt ?? throw new global::System.ArgumentNullException(), data.LastBattleTime ?? throw new global::System.ArgumentNullException(), data.Nickname, data.MaxFragsTankId ?? throw new global::System.ArgumentNullException(), data.MaxXpTankId ?? throw new global::System.ArgumentNullException(), data.Battles ?? throw new global::System.ArgumentNullException(), data.CapturePoints ?? throw new global::System.ArgumentNullException(), data.DamageDealt ?? throw new global::System.ArgumentNullException(), data.DamageReceived ?? throw new global::System.ArgumentNullException(), data.DroppedCapturePoints ?? throw new global::System.ArgumentNullException(), data.Frags ?? throw new global::System.ArgumentNullException(), data.Frags8P ?? throw new global::System.ArgumentNullException(), data.Hits ?? throw new global::System.ArgumentNullException(), data.Losses ?? throw new global::System.ArgumentNullException(), data.MaxFrags ?? throw new global::System.ArgumentNullException(), data.MaxXp ?? throw new global::System.ArgumentNullException(), data.Shots ?? throw new global::System.ArgumentNullException(), data.Spotted ?? throw new global::System.ArgumentNullException(), data.SurvivedBattles ?? throw new global::System.ArgumentNullException(), data.WinAndSurvived ?? throw new global::System.ArgumentNullException(), data.Wins ?? throw new global::System.ArgumentNullException(), data.Xp ?? throw new global::System.ArgumentNullException(), data.Wn7 ?? throw new global::System.ArgumentNullException(), data.WinRate ?? throw new global::System.ArgumentNullException(), data.AvgDamage ?? throw new global::System.ArgumentNullException(), data.AvgXp ?? throw new global::System.ArgumentNullException(), data.DamageCoefficient ?? throw new global::System.ArgumentNullException(), data.SurvivalRate ?? throw new global::System.ArgumentNullException(), data.AvgTier ?? throw new global::System.ArgumentNullException(), MapIPlayer_AccountInfo_ClanInfo(data.ClanInfo, snapshot), MapIPlayer_AccountInfo_TanksNonNullableArray(data.Tanks, snapshot));
+                if (!accountInfoResponse.AccountId.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.CreatedAt.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.MaxFragsTankId.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.MaxXpTankId.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.AvgTier.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.LastBattleTime.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Battles.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.CapturePoints.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.DamageDealt.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.DamageReceived.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.DroppedCapturePoints.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Frags.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Frags8P.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Hits.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Losses.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.MaxFrags.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.MaxXp.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Shots.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Spotted.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.SurvivedBattles.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.WinAndSurvived.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Wins.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Xp.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.Wn7.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.WinRate.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.AvgDamage.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.AvgXp.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.DamageCoefficient.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!accountInfoResponse.SurvivalRate.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                returnValue = new global::WotBlitzStatisticsPro.Blazor.GraphQl.Player_AccountInfo_AccountInfoResponse(accountInfoResponse.AccountId!.Value, accountInfoResponse.CreatedAt!.Value, accountInfoResponse.Nickname, accountInfoResponse.MaxFragsTankId!.Value, accountInfoResponse.MaxXpTankId!.Value, accountInfoResponse.AvgTier!.Value, accountInfoResponse.LastBattleTime!.Value, accountInfoResponse.Battles!.Value, accountInfoResponse.CapturePoints!.Value, accountInfoResponse.DamageDealt!.Value, accountInfoResponse.DamageReceived!.Value, accountInfoResponse.DroppedCapturePoints!.Value, accountInfoResponse.Frags!.Value, accountInfoResponse.Frags8P!.Value, accountInfoResponse.Hits!.Value, accountInfoResponse.Losses!.Value, accountInfoResponse.MaxFrags!.Value, accountInfoResponse.MaxXp!.Value, accountInfoResponse.Shots!.Value, accountInfoResponse.Spotted!.Value, accountInfoResponse.SurvivedBattles!.Value, accountInfoResponse.WinAndSurvived!.Value, accountInfoResponse.Wins!.Value, accountInfoResponse.Xp!.Value, accountInfoResponse.Wn7!.Value, accountInfoResponse.WinRate!.Value, accountInfoResponse.AvgDamage!.Value, accountInfoResponse.AvgXp!.Value, accountInfoResponse.DamageCoefficient!.Value, accountInfoResponse.SurvivalRate!.Value, MapIPlayer_AccountInfo_ClanInfo(accountInfoResponse.ClanInfo, snapshot), MapIPlayer_AccountInfo_TanksNonNullableArray(accountInfoResponse.Tanks, snapshot));
             }
             else
             {
@@ -65,7 +210,7 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             return returnValue;
         }
 
-        private global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.IPlayer_AccountInfo_Tanks>? MapIPlayer_AccountInfo_TanksNonNullableArray(global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData>? list, global::StrawberryShake.IEntityStoreSnapshot snapshot)
+        private global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.IPlayer_AccountInfo_Tanks>? MapIPlayer_AccountInfo_TanksNonNullableArray(global::System.Collections.Generic.IReadOnlyList<global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData>? list, global::StrawberryShake.IEntityStoreSnapshot snapshot)
         {
             if (list is null)
             {
@@ -73,7 +218,7 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             }
 
             var tankInfoResponses = new global::System.Collections.Generic.List<global::WotBlitzStatisticsPro.Blazor.GraphQl.IPlayer_AccountInfo_Tanks>();
-            foreach (global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData child in list)
+            foreach (global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData child in list)
             {
                 tankInfoResponses.Add(MapNonNullableIPlayer_AccountInfo_Tanks(child, snapshot));
             }
@@ -81,12 +226,162 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             return tankInfoResponses;
         }
 
-        private global::WotBlitzStatisticsPro.Blazor.GraphQl.IPlayer_AccountInfo_Tanks MapNonNullableIPlayer_AccountInfo_Tanks(global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData data, global::StrawberryShake.IEntityStoreSnapshot snapshot)
+        private global::WotBlitzStatisticsPro.Blazor.GraphQl.IPlayer_AccountInfo_Tanks MapNonNullableIPlayer_AccountInfo_Tanks(global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData data, global::StrawberryShake.IEntityStoreSnapshot snapshot)
         {
-            IPlayer_AccountInfo_Tanks returnValue = default !;
-            if (data.__typename.Equals("TankInfoResponse", global::System.StringComparison.Ordinal))
+            IPlayer_AccountInfo_Tanks? returnValue;
+            if (data is global::WotBlitzStatisticsPro.Blazor.GraphQl.State.TankInfoResponseData tankInfoResponse)
             {
-                returnValue = new Player_AccountInfo_Tanks_TankInfoResponse(data.TankId ?? throw new global::System.ArgumentNullException(), data.BattleLifeTimeInSeconds ?? throw new global::System.ArgumentNullException(), data.LastBattleTime ?? throw new global::System.ArgumentNullException(), data.MarkOfMastery ?? throw new global::System.ArgumentNullException(), data.Battles ?? throw new global::System.ArgumentNullException(), data.CapturePoints ?? throw new global::System.ArgumentNullException(), data.DamageDealt ?? throw new global::System.ArgumentNullException(), data.DamageReceived ?? throw new global::System.ArgumentNullException(), data.DroppedCapturePoints ?? throw new global::System.ArgumentNullException(), data.Frags ?? throw new global::System.ArgumentNullException(), data.Frags8P ?? throw new global::System.ArgumentNullException(), data.Hits ?? throw new global::System.ArgumentNullException(), data.Losses ?? throw new global::System.ArgumentNullException(), data.MaxFrags ?? throw new global::System.ArgumentNullException(), data.MaxXp ?? throw new global::System.ArgumentNullException(), data.Shots ?? throw new global::System.ArgumentNullException(), data.Spotted ?? throw new global::System.ArgumentNullException(), data.SurvivedBattles ?? throw new global::System.ArgumentNullException(), data.WinAndSurvived ?? throw new global::System.ArgumentNullException(), data.Wins ?? throw new global::System.ArgumentNullException(), data.Xp ?? throw new global::System.ArgumentNullException(), data.Wn7 ?? throw new global::System.ArgumentNullException(), data.WinRate ?? throw new global::System.ArgumentNullException(), data.AvgDamage ?? throw new global::System.ArgumentNullException(), data.AvgXp ?? throw new global::System.ArgumentNullException(), data.DamageCoefficient ?? throw new global::System.ArgumentNullException(), data.SurvivalRate ?? throw new global::System.ArgumentNullException(), data.AvgBattleLifeTimeInMinutes ?? throw new global::System.ArgumentNullException(), data.Name, data.TankNationId, data.TankNation, data.Tier ?? throw new global::System.ArgumentNullException(), data.TankTypeId, data.TankType, data.IsPremium ?? throw new global::System.ArgumentNullException(), data.PreviewImage, data.NormalImage);
+                if (!tankInfoResponse.TankId.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.BattleLifeTimeInSeconds.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.MarkOfMastery.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.AvgBattleLifeTimeInMinutes.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Tier.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.IsPremium.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.LastBattleTime.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Battles.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.CapturePoints.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.DamageDealt.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.DamageReceived.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.DroppedCapturePoints.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Frags.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Frags8P.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Hits.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Losses.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.MaxFrags.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.MaxXp.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Shots.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Spotted.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.SurvivedBattles.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.WinAndSurvived.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Wins.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Xp.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.Wn7.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.WinRate.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.AvgDamage.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.AvgXp.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.DamageCoefficient.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                if (!tankInfoResponse.SurvivalRate.HasValue)
+                {
+                    throw new global::System.ArgumentNullException();
+                }
+
+                returnValue = new global::WotBlitzStatisticsPro.Blazor.GraphQl.Player_AccountInfo_Tanks_TankInfoResponse(tankInfoResponse.TankId!.Value, tankInfoResponse.BattleLifeTimeInSeconds!.Value, tankInfoResponse.MarkOfMastery!.Value, tankInfoResponse.AvgBattleLifeTimeInMinutes!.Value, tankInfoResponse.Name, tankInfoResponse.TankNationId, tankInfoResponse.TankNation, tankInfoResponse.Tier!.Value, tankInfoResponse.TankTypeId, tankInfoResponse.TankType, tankInfoResponse.IsPremium!.Value, tankInfoResponse.PreviewImage, tankInfoResponse.NormalImage, tankInfoResponse.LastBattleTime!.Value, tankInfoResponse.Battles!.Value, tankInfoResponse.CapturePoints!.Value, tankInfoResponse.DamageDealt!.Value, tankInfoResponse.DamageReceived!.Value, tankInfoResponse.DroppedCapturePoints!.Value, tankInfoResponse.Frags!.Value, tankInfoResponse.Frags8P!.Value, tankInfoResponse.Hits!.Value, tankInfoResponse.Losses!.Value, tankInfoResponse.MaxFrags!.Value, tankInfoResponse.MaxXp!.Value, tankInfoResponse.Shots!.Value, tankInfoResponse.Spotted!.Value, tankInfoResponse.SurvivedBattles!.Value, tankInfoResponse.WinAndSurvived!.Value, tankInfoResponse.Wins!.Value, tankInfoResponse.Xp!.Value, tankInfoResponse.Wn7!.Value, tankInfoResponse.WinRate!.Value, tankInfoResponse.AvgDamage!.Value, tankInfoResponse.AvgXp!.Value, tankInfoResponse.DamageCoefficient!.Value, tankInfoResponse.SurvivalRate!.Value);
             }
             else
             {

WotBlitzStatisticsPro.Blazor/Generated/State/PlayerResultInfo.WotBlitzStatisticsProClient.StrawberryShake.cs

@@ -8,7 +8,7 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
     {
         private readonly global::System.Collections.Generic.IReadOnlyCollection<global::StrawberryShake.EntityId> _entityIds;
         private readonly global::System.UInt64 _version;
-        public PlayerResultInfo(global::WotBlitzStatisticsPro.Blazor.GraphQl.State.AccountInfoResponseData accountInfo, global::WotBlitzStatisticsPro.Blazor.GraphQl.State.AccountAchievementsResponseData accountMedals, global::System.Collections.Generic.IReadOnlyCollection<global::StrawberryShake.EntityId> entityIds, global::System.UInt64 version)
+        public PlayerResultInfo(global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData accountInfo, global::WotBlitzStatisticsPro.Blazor.GraphQl.State.AccountAchievementsResponseData accountMedals, global::System.Collections.Generic.IReadOnlyCollection<global::StrawberryShake.EntityId> entityIds, global::System.UInt64 version)
         {
             AccountInfo = accountInfo;
             AccountMedals = accountMedals;
@@ -19,7 +19,7 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
         /// <summary>
         /// Gathers all account information
         /// </summary>
-        public global::WotBlitzStatisticsPro.Blazor.GraphQl.State.AccountInfoResponseData AccountInfo { get; }
+        public global::WotBlitzStatisticsPro.Blazor.GraphQl.State.IStatisticsData AccountInfo { get; }
 
         /// <summary>
         /// Returns information about player's achievements

WotBlitzStatisticsPro.Blazor/Generated/State/TankInfoResponseData.WotBlitzStatisticsProClient.StrawberryShake.cs

@@ -5,15 +5,25 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
 {
     ///<summary>Information about player's tank</summary>
     [global::System.CodeDom.Compiler.GeneratedCode("StrawberryShake", "11.2.2.0")]
-    public partial class TankInfoResponseData
+    public partial class TankInfoResponseData : IStatisticsData
     {
-        public TankInfoResponseData(global::System.String __typename, global::System.Int64? tankId = default !, global::System.Int32? battleLifeTimeInSeconds = default !, global::System.DateTimeOffset? lastBattleTime = default !, global::WotBlitzStatisticsPro.Blazor.GraphQl.MarkOfMastery? markOfMastery = default !, global::System.Int64? battles = default !, global::System.Int64? capturePoints = default !, global::System.Int64? damageDealt = default !, global::System.Int64? damageReceived = default !, global::System.Int64? droppedCapturePoints = default !, global::System.Int64? frags = default !, global::System.Int64? frags8P = default !, global::System.Int64? hits = default !, global::System.Int64? losses = default !, global::System.Int64? maxFrags = default !, global::System.Int64? maxXp = default !, global::System.Int64? shots = default !, global::System.Int64? spotted = default !, global::System.Int64? survivedBattles = default !, global::System.Int64? winAndSurvived = default !, global::System.Int64? wins = default !, global::System.Int64? xp = default !, global::System.Double? wn7 = default !, global::System.Decimal? winRate = default !, global::System.Decimal? avgDamage = default !, global::System.Decimal? avgXp = default !, global::System.Decimal? damageCoefficient = default !, global::System.Decimal? survivalRate = default !, global::System.Decimal? avgBattleLifeTimeInMinutes = default !, global::System.String? name = default !, global::System.String? tankNationId = default !, global::System.String? tankNation = default !, global::System.Int32? tier = default !, global::System.String? tankTypeId = default !, global::System.String? tankType = default !, global::System.Boolean? isPremium = default !, global::System.String? previewImage = default !, global::System.String? normalImage = default !)
+        public TankInfoResponseData(global::System.String __typename, global::System.Int64? tankId = default !, global::System.Int32? battleLifeTimeInSeconds = default !, global::WotBlitzStatisticsPro.Blazor.GraphQl.MarkOfMastery? markOfMastery = default !, global::System.Decimal? avgBattleLifeTimeInMinutes = default !, global::System.String? name = default !, global::System.String? tankNationId = default !, global::System.String? tankNation = default !, global::System.Int32? tier = default !, global::System.String? tankTypeId = default !, global::System.String? tankType = default !, global::System.Boolean? isPremium = default !, global::System.String? previewImage = default !, global::System.String? normalImage = default !, global::System.DateTimeOffset? lastBattleTime = default !, global::System.Int64? battles = default !, global::System.Int64? capturePoints = default !, global::System.Int64? damageDealt = default !, global::System.Int64? damageReceived = default !, global::System.Int64? droppedCapturePoints = default !, global::System.Int64? frags = default !, global::System.Int64? frags8P = default !, global::System.Int64? hits = default !, global::System.Int64? losses = default !, global::System.Int64? maxFrags = default !, global::System.Int64? maxXp = default !, global::System.Int64? shots = default !, global::System.Int64? spotted = default !, global::System.Int64? survivedBattles = default !, global::System.Int64? winAndSurvived = default !, global::System.Int64? wins = default !, global::System.Int64? xp = default !, global::System.Double? wn7 = default !, global::System.Decimal? winRate = default !, global::System.Decimal? avgDamage = default !, global::System.Decimal? avgXp = default !, global::System.Decimal? damageCoefficient = default !, global::System.Decimal? survivalRate = default !)
         {
             this.__typename = __typename ?? throw new global::System.ArgumentNullException(nameof(__typename));
             TankId = tankId;
             BattleLifeTimeInSeconds = battleLifeTimeInSeconds;
-            LastBattleTime = lastBattleTime;
             MarkOfMastery = markOfMastery;
+            AvgBattleLifeTimeInMinutes = avgBattleLifeTimeInMinutes;
+            Name = name;
+            TankNationId = tankNationId;
+            TankNation = tankNation;
+            Tier = tier;
+            TankTypeId = tankTypeId;
+            TankType = tankType;
+            IsPremium = isPremium;
+            PreviewImage = previewImage;
+            NormalImage = normalImage;
+            LastBattleTime = lastBattleTime;
             Battles = battles;
             CapturePoints = capturePoints;
             DamageDealt = damageDealt;
@@ -37,16 +47,6 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
             AvgXp = avgXp;
             DamageCoefficient = damageCoefficient;
             SurvivalRate = survivalRate;
-            AvgBattleLifeTimeInMinutes = avgBattleLifeTimeInMinutes;
-            Name = name;
-            TankNationId = tankNationId;
-            TankNation = tankNation;
-            Tier = tier;
-            TankTypeId = tankTypeId;
-            TankType = tankType;
-            IsPremium = isPremium;
-            PreviewImage = previewImage;
-            NormalImage = normalImage;
         }
 
         public global::System.String __typename { get; }
@@ -57,81 +57,9 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
         ///<summary>Total time in battle until tank killed</summary>
         public global::System.Int32? BattleLifeTimeInSeconds { get; }
 
-        ///<summary>Last battle</summary>
-        public global::System.DateTimeOffset? LastBattleTime { get; }
-
         ///<summary>Mark of Mastery</summary>
         public global::WotBlitzStatisticsPro.Blazor.GraphQl.MarkOfMastery? MarkOfMastery { get; }
 
-        ///<summary>Battles count</summary>
-        public global::System.Int64? Battles { get; }
-
-        ///<summary>Base capture points</summary>
-        public global::System.Int64? CapturePoints { get; }
-
-        ///<summary>Damage dealt</summary>
-        public global::System.Int64? DamageDealt { get; }
-
-        ///<summary>Damage received</summary>
-        public global::System.Int64? DamageReceived { get; }
-
-        ///<summary>Base dropped capture points</summary>
-        public global::System.Int64? DroppedCapturePoints { get; }
-
-        ///<summary>Frags count</summary>
-        public global::System.Int64? Frags { get; }
-
-        ///<summary>Frags count after 8 tier</summary>
-        public global::System.Int64? Frags8P { get; }
-
-        ///<summary>Hits count</summary>
-        public global::System.Int64? Hits { get; }
-
-        ///<summary>Losses count</summary>
-        public global::System.Int64? Losses { get; }
-
-        ///<summary>Max frags per battle</summary>
-        public global::System.Int64? MaxFrags { get; }
-
-        ///<summary>Max XP per battle</summary>
-        public global::System.Int64? MaxXp { get; }
-
-        ///<summary>Shots count</summary>
-        public global::System.Int64? Shots { get; }
-
-        ///<summary>Spotted vehicles count</summary>
-        public global::System.Int64? Spotted { get; }
-
-        ///<summary>Amount of survived battles</summary>
-        public global::System.Int64? SurvivedBattles { get; }
-
-        ///<summary>Amount of survived and wined battles</summary>
-        public global::System.Int64? WinAndSurvived { get; }
-
-        ///<summary>Wins count</summary>
-        public global::System.Int64? Wins { get; }
-
-        ///<summary>Total experience</summary>
-        public global::System.Int64? Xp { get; }
-
-        ///<summary>Wn7 coefficient</summary>
-        public global::System.Double? Wn7 { get; }
-
-        ///<summary>Tank's win rate</summary>
-        public global::System.Decimal? WinRate { get; }
-
-        ///<summary>Average tank's damage</summary>
-        public global::System.Decimal? AvgDamage { get; }
-
-        ///<summary>Average XP</summary>
-        public global::System.Decimal? AvgXp { get; }
-
-        ///<summary>Damage coefficient</summary>
-        public global::System.Decimal? DamageCoefficient { get; }
-
-        ///<summary>Rate of survival</summary>
-        public global::System.Decimal? SurvivalRate { get; }
-
         ///<summary>Average life time in battle until tank is killed.</summary>
         public global::System.Decimal? AvgBattleLifeTimeInMinutes { get; }
 
@@ -161,5 +89,77 @@ namespace WotBlitzStatisticsPro.Blazor.GraphQl.State
 
         ///<summary>Vehicle normal image</summary>
         public global::System.String? NormalImage { get; }
+
+        ///<summary>Last battle time</summary>
+        public global::System.DateTimeOffset? LastBattleTime { get; }
+
+        ///<summary>Battles count</summary>
+        public global::System.Int64? Battles { get; }
+
+        ///<summary>Capture points</summary>
+        public global::System.Int64? CapturePoints { get; }
+
+        ///<summary>Total damage amount</summary>
+        public global::System.Int64? DamageDealt { get; }
+
+        ///<summary>Total amount of received damage</summary>
+        public global::System.Int64? DamageReceived { get; }
+
+        ///<summary>Dropped capture points</summary>
+        public global::System.Int64? DroppedCapturePoints { get; }
+
+        ///<summary>Total amount of frags</summary>
+        public global::System.Int64? Frags { get; }
+
+        ///<summary>Total amount of fras grater ten 8 lvl</summary>
+        public global::System.Int64? Frags8P { get; }
+
+        ///<summary>Total amount of hits</summary>
+        public global::System.Int64? Hits { get; }
+
+        ///<summary>Total amount of losses</summary>
+        public global::System.Int64? Losses { get; }
+
+        ///<summary>Max frags per battle</summary>
+        public global::System.Int64? MaxFrags { get; }
+
+        ///<summary>Max experience per battle</summary>
+        public global::System.Int64? MaxXp { get; }
+
+        ///<summary>Total shots count</summary>
+        public global::System.Int64? Shots { get; }
+
+        ///<summary>Total count of spotted vehicles</summary>
+        public global::System.Int64? Spotted { get; }
+
+        ///<summary>Total count of survived battles</summary>
+        public global::System.Int64? SurvivedBattles { get; }
+
+        ///<summary>Total count of survived and won battles</summary>
+        public global::System.Int64? WinAndSurvived { get; }
+
+        ///<summary>Total wins count</summary>
+        public global::System.Int64? Wins { get; }
+
+        ///<summary>Total amount of experience</summary>
+        public global::System.Int64? Xp { get; }
+
+        ///<summary>Wn7 coefficient</summary>
+        public global::System.Double? Wn7 { get; }
+
+        ///<summary>Player's win rate</summary>
+        public global::System.Decimal? WinRate { get; }
+
+        ///<summary>Player's average damage</summary>
+        public global::System.Decimal? AvgDamage { get; }
+
+        ///<summary>Player's average XP</summary>
+        public global::System.Decimal? AvgXp { get; }
+
+        ///<summary>Damage coefficient</summary>
+        public global::System.Decimal? DamageCoefficient { get; }
+
+        ///<summary>Rate of survival</summary>
+        public global::System.Decimal? SurvivalRate { get; }
     }
 }