From 9b80314b928589916e3a2be6621ae13d5696b332 Mon Sep 17 00:00:00 2001 From: Mikhail Shabanov Date: Sun, 7 Jun 2020 14:48:39 +0200 Subject: [PATCH] Renamed account info model --- WotBlitzStatisticsPro.WgApiClient/IWargamingApiClient.cs | 2 +- ...AccountFullStatistics.cs => WotAccountFullStatistics.cs} | 2 +- .../Model/{AccountInfo.cs => WotAccountInfo.cs} | 6 +++--- .../{AccountPrivateInfo.cs => WotAccountPrivateInfo.cs} | 6 +++--- ...dContacts.cs => WotAccountPrivateInfoGroupedContacts.cs} | 2 +- ...Restrictions.cs => WotAccountPrivateInfoRestrictions.cs} | 2 +- .../Model/{AccountStatistics.cs => WotAccountStatistics.cs} | 4 ++-- WotBlitzStatisticsPro.WgApiClient/WargamingApiClient.cs | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) rename WotBlitzStatisticsPro.WgApiClient/Model/{AccountFullStatistics.cs => WotAccountFullStatistics.cs} (98%) rename WotBlitzStatisticsPro.WgApiClient/Model/{AccountInfo.cs => WotAccountInfo.cs} (87%) rename WotBlitzStatisticsPro.WgApiClient/Model/{AccountPrivateInfo.cs => WotAccountPrivateInfo.cs} (88%) rename WotBlitzStatisticsPro.WgApiClient/Model/{AccountPrivateInfoGroupedContacts.cs => WotAccountPrivateInfoGroupedContacts.cs} (90%) rename WotBlitzStatisticsPro.WgApiClient/Model/{AccountPrivateInfoRestrictions.cs => WotAccountPrivateInfoRestrictions.cs} (81%) rename WotBlitzStatisticsPro.WgApiClient/Model/{AccountStatistics.cs => WotAccountStatistics.cs} (80%) diff --git a/WotBlitzStatisticsPro.WgApiClient/IWargamingApiClient.cs b/WotBlitzStatisticsPro.WgApiClient/IWargamingApiClient.cs index 9f393df..ad0a120 100644 --- a/WotBlitzStatisticsPro.WgApiClient/IWargamingApiClient.cs +++ b/WotBlitzStatisticsPro.WgApiClient/IWargamingApiClient.cs @@ -15,7 +15,7 @@ namespace WotBlitzStatisticsPro.WgApiClient RealmType realmType = RealmType.Ru, RequestLanguage language = RequestLanguage.En); - Task GetPlayerAccountInfo(long accountId, + Task GetPlayerAccountInfo(long accountId, RealmType realmType = RealmType.Ru, RequestLanguage language = RequestLanguage.En); diff --git a/WotBlitzStatisticsPro.WgApiClient/Model/AccountFullStatistics.cs b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountFullStatistics.cs similarity index 98% rename from WotBlitzStatisticsPro.WgApiClient/Model/AccountFullStatistics.cs rename to WotBlitzStatisticsPro.WgApiClient/Model/WotAccountFullStatistics.cs index ead9c28..64692e4 100644 --- a/WotBlitzStatisticsPro.WgApiClient/Model/AccountFullStatistics.cs +++ b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountFullStatistics.cs @@ -2,7 +2,7 @@ namespace WotBlitzStatisticsPro.WgApiClient.Model { - public class AccountFullStatistics + public class WotAccountFullStatistics { /// /// Battles count diff --git a/WotBlitzStatisticsPro.WgApiClient/Model/AccountInfo.cs b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountInfo.cs similarity index 87% rename from WotBlitzStatisticsPro.WgApiClient/Model/AccountInfo.cs rename to WotBlitzStatisticsPro.WgApiClient/Model/WotAccountInfo.cs index 3713b93..f04b1de 100644 --- a/WotBlitzStatisticsPro.WgApiClient/Model/AccountInfo.cs +++ b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountInfo.cs @@ -2,7 +2,7 @@ namespace WotBlitzStatisticsPro.WgApiClient.Model { - public class AccountInfo + public class WotAccountInfo { /// /// Player account identifier @@ -38,12 +38,12 @@ namespace WotBlitzStatisticsPro.WgApiClient.Model /// Private account data /// [JsonProperty("private")] - public AccountPrivateInfo Private { get; set; } + public WotAccountPrivateInfo Private { get; set; } /// /// Player's statistics /// [JsonProperty("statistics")] - public AccountStatistics Statistics { get; set; } + public WotAccountStatistics Statistics { get; set; } } } diff --git a/WotBlitzStatisticsPro.WgApiClient/Model/AccountPrivateInfo.cs b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountPrivateInfo.cs similarity index 88% rename from WotBlitzStatisticsPro.WgApiClient/Model/AccountPrivateInfo.cs rename to WotBlitzStatisticsPro.WgApiClient/Model/WotAccountPrivateInfo.cs index 78f248d..3a42d18 100644 --- a/WotBlitzStatisticsPro.WgApiClient/Model/AccountPrivateInfo.cs +++ b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountPrivateInfo.cs @@ -2,7 +2,7 @@ namespace WotBlitzStatisticsPro.WgApiClient.Model { - public class AccountPrivateInfo + public class WotAccountPrivateInfo { /// /// Account ban info @@ -57,13 +57,13 @@ namespace WotBlitzStatisticsPro.WgApiClient.Model ///Дополнительное поле. /// [JsonProperty("grouped_contacts")] - public AccountPrivateInfoGroupedContacts GroupedContacts { get; set; } + public WotAccountPrivateInfoGroupedContacts GroupedContacts { get; set; } /// ///Ограничения аккаунта /// [JsonProperty("restrictions")] - public AccountPrivateInfoRestrictions Restrictions { get; set; } + public WotAccountPrivateInfoRestrictions Restrictions { get; set; } } } diff --git a/WotBlitzStatisticsPro.WgApiClient/Model/AccountPrivateInfoGroupedContacts.cs b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountPrivateInfoGroupedContacts.cs similarity index 90% rename from WotBlitzStatisticsPro.WgApiClient/Model/AccountPrivateInfoGroupedContacts.cs rename to WotBlitzStatisticsPro.WgApiClient/Model/WotAccountPrivateInfoGroupedContacts.cs index 1909159..eeeb8b1 100644 --- a/WotBlitzStatisticsPro.WgApiClient/Model/AccountPrivateInfoGroupedContacts.cs +++ b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountPrivateInfoGroupedContacts.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace WotBlitzStatisticsPro.WgApiClient.Model { - public class AccountPrivateInfoGroupedContacts + public class WotAccountPrivateInfoGroupedContacts { /// /// Blocked accountIds diff --git a/WotBlitzStatisticsPro.WgApiClient/Model/AccountPrivateInfoRestrictions.cs b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountPrivateInfoRestrictions.cs similarity index 81% rename from WotBlitzStatisticsPro.WgApiClient/Model/AccountPrivateInfoRestrictions.cs rename to WotBlitzStatisticsPro.WgApiClient/Model/WotAccountPrivateInfoRestrictions.cs index a6b0f80..5da51a4 100644 --- a/WotBlitzStatisticsPro.WgApiClient/Model/AccountPrivateInfoRestrictions.cs +++ b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountPrivateInfoRestrictions.cs @@ -2,7 +2,7 @@ namespace WotBlitzStatisticsPro.WgApiClient.Model { - public class AccountPrivateInfoRestrictions + public class WotAccountPrivateInfoRestrictions { /// /// Clan chat ban time diff --git a/WotBlitzStatisticsPro.WgApiClient/Model/AccountStatistics.cs b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountStatistics.cs similarity index 80% rename from WotBlitzStatisticsPro.WgApiClient/Model/AccountStatistics.cs rename to WotBlitzStatisticsPro.WgApiClient/Model/WotAccountStatistics.cs index 8dc7303..eac1228 100644 --- a/WotBlitzStatisticsPro.WgApiClient/Model/AccountStatistics.cs +++ b/WotBlitzStatisticsPro.WgApiClient/Model/WotAccountStatistics.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace WotBlitzStatisticsPro.WgApiClient.Model { - public class AccountStatistics + public class WotAccountStatistics { /// /// Amount of destroyed by player tanks. @@ -15,6 +15,6 @@ namespace WotBlitzStatisticsPro.WgApiClient.Model /// Full player's statistics /// [JsonProperty("all")] - public AccountFullStatistics All { get; set; } + public WotAccountFullStatistics All { get; set; } } } diff --git a/WotBlitzStatisticsPro.WgApiClient/WargamingApiClient.cs b/WotBlitzStatisticsPro.WgApiClient/WargamingApiClient.cs index 32c1621..a67d87c 100644 --- a/WotBlitzStatisticsPro.WgApiClient/WargamingApiClient.cs +++ b/WotBlitzStatisticsPro.WgApiClient/WargamingApiClient.cs @@ -93,11 +93,11 @@ namespace WotBlitzStatisticsPro.WgApiClient - public async Task GetPlayerAccountInfo(long accountId, + public async Task GetPlayerAccountInfo(long accountId, RealmType realmType = RealmType.Ru, RequestLanguage language = RequestLanguage.En) { - var account = await GetFromBlitzApi>( + var account = await GetFromBlitzApi>( realmType, language, "account/info/",