Improved conversion between data models for GetHeroes and GetGameItems methods.

Fixed a regression related to parameters introduced in a recent commit.
Added default "en_us" language to GetHeroes, GetGameItems, and GetLeagueListing methods.

Author: babelshift

SteamWebAPI2.Net451/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="AutoMapper" version="4.2.1" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
-  <package id="Steam.Models" version="1.0.0.28" targetFramework="net451" />
+  <package id="Steam.Models" version="1.0.0.29" targetFramework="net451" />
 </packages>

SteamWebAPI2.Net452/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="AutoMapper" version="4.2.1" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
-  <package id="Steam.Models" version="1.0.0.28" targetFramework="net452" />
+  <package id="Steam.Models" version="1.0.0.29" targetFramework="net452" />
 </packages>

SteamWebAPI2.Portable/project.json

@@ -8,7 +8,7 @@
     "Microsoft.NETCore": "5.0.0",
     "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
     "Newtonsoft.Json": "8.0.3",
-    "Steam.Models": "1.0.0.28"
+    "Steam.Models": "1.0.0.29"
   },
   "frameworks": {
     "dotnet": {

SteamWebAPI2/AutoMapperConfiguration.cs

@@ -33,6 +33,9 @@ public static void Initialize()
             {
                 config = new MapperConfiguration(x =>
                 {
+                    x.CreateMap<Hero, HeroModel>();
+                    x.CreateMap<GameItem, GameItemModel>();
+
                     x.CreateMap<SchemaResult, SchemaModel>();
                     //x.CreateMap<SchemaAdditionalHiddenBodygroups, SchemaAdditionalHiddenBodygroupsModel>();
                     //x.CreateMap<SchemaAttributeControlledAttachedParticle, SchemaAttributeControlledAttachedParticleModel>();

SteamWebAPI2/Interfaces/DOTA2Econ.cs

@@ -27,25 +27,15 @@ public DOTA2Econ(string steamWebApiKey)
         /// </summary>
         /// <param name="language"></param>
         /// <returns></returns>
-        public async Task<IReadOnlyCollection<GameItemModel>> GetGameItemsAsync(string language = "")
+        public async Task<IReadOnlyCollection<GameItemModel>> GetGameItemsAsync(string language = "en_us")
         {
             List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();
 
             parameters.AddIfHasValue(language, "language");
 
-            var gameItems = await CallMethodAsync<GameItemResultContainer>("GetGameItems", 1);
+            var gameItems = await CallMethodAsync<GameItemResultContainer>("GetGameItems", 1, parameters);
 
-            var gameItemModels = gameItems.Result.Items.Select(x => new GameItemModel()
-            {
-                Id = x.Id,
-                Cost = x.Cost,
-                IsAvailableAtSecretShop = x.SecretShop == 1 ? true : false,
-                IsAvailableAtSideShop = x.SideShop == 1 ? true : false,
-                IsRecipe = x.Recipe == 1 ? true : false,
-                Name = x.Name
-            })
-            .ToList()
-            .AsReadOnly();
+            var gameItemModels = AutoMapperConfiguration.Mapper.Map<IList<GameItem>, IReadOnlyCollection<GameItemModel>>(gameItems.Result.Items);
 
             return gameItemModels;
         }
@@ -105,7 +95,7 @@ private static int GetCorrectedId(int id, string name)
         /// <param name="language"></param>
         /// <param name="itemizedOnly"></param>
         /// <returns></returns>
-        public async Task<IReadOnlyCollection<HeroModel>> GetHeroesAsync(string language = "", bool itemizedOnly = false)
+        public async Task<IReadOnlyCollection<HeroModel>> GetHeroesAsync(string language = "en_us", bool itemizedOnly = false)
         {
             List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();
 
@@ -116,13 +106,7 @@ public async Task<IReadOnlyCollection<HeroModel>> GetHeroesAsync(string language
 
             var heroes = await CallMethodAsync<HeroResultContainer>("GetHeroes", 1, parameters);
 
-            var heroModels = heroes.Result.Heroes.Select(x => new HeroModel()
-            {
-                Id = x.Id,
-                Name = x.Name
-            })
-            .ToList()
-            .AsReadOnly();
+            var heroModels = AutoMapperConfiguration.Mapper.Map<IList<Hero>, IReadOnlyCollection<HeroModel>>(heroes.Result.Heroes);
 
             return heroModels;
         }

SteamWebAPI2/Interfaces/DOTA2Match.cs

@@ -16,9 +16,13 @@ public DOTA2Match(string steamWebApiKey)
         {
         }
 
-        public async Task<IReadOnlyCollection<LeagueModel>> GetLeagueListingAsync()
+        public async Task<IReadOnlyCollection<LeagueModel>> GetLeagueListingAsync(string language = "en_us")
         {
-            var leagueListing = await CallMethodAsync<LeagueResultContainer>("GetLeagueListing", 1);
+            List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();
+            
+            parameters.AddIfHasValue(language, "language");
+
+            var leagueListing = await CallMethodAsync<LeagueResultContainer>("GetLeagueListing", 1, parameters);
 
             var leagueModels = leagueListing.Result.Leagues.Select(x => new LeagueModel()
             {

SteamWebAPI2/Interfaces/IDOTA2Match.cs

@@ -7,7 +7,7 @@ namespace SteamWebAPI2.Interfaces
 {
     public interface IDOTA2Match
     {
-        Task<IReadOnlyCollection<LeagueModel>> GetLeagueListingAsync();
+        Task<IReadOnlyCollection<LeagueModel>> GetLeagueListingAsync(string language);
         Task<IReadOnlyCollection<LiveLeagueGameModel>> GetLiveLeagueGamesAsync(int? leagueId = default(int?), long? matchId = default(long?));
         Task<MatchDetailModel> GetMatchDetailsAsync(long matchId);
         Task<MatchHistoryModel> GetMatchHistoryAsync(int? heroId = default(int?), int? gameMode = default(int?), int? skill = default(int?), string minPlayers = "", string accountId = "", string leagueId = "", long? startAtMatchId = default(long?), string matchesRequested = "", string tournamentGamesOnly = "");

SteamWebAPI2/Models/DOTA2/GameItemResultContainer.cs

@@ -16,6 +16,13 @@ internal class GameItem
         public int SideShop { get; set; }
 
         public int Recipe { get; set; }
+
+        [JsonProperty(PropertyName = "localized_name")]
+        public string LocalizedName { get; set; }
+
+        public bool IsAvailableAtSecretShop {  get { return SecretShop == 1 ? true : false; } }
+        public bool IsAvailableAtSideShop { get { return SideShop == 1 ? true : false; } }
+        public bool IsRecipe { get { return Recipe == 1 ? true : false; } }
     }
 
     internal class GameItemResult

SteamWebAPI2/SteamWebInterface.cs

@@ -71,7 +71,7 @@ internal async Task<T> CallMethodAsync<T>(string methodName, int version, IList<
             Debug.Assert(!String.IsNullOrEmpty(methodName));
             Debug.Assert(version > 0);
 
-            return await steamWebRequest.SendWebRequestAsync<T>(interfaceName, methodName, version);
+            return await steamWebRequest.SendWebRequestAsync<T>(interfaceName, methodName, version, parameters);
         }
     }
 }

SteamWebAPI2/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="AutoMapper" version="4.2.1" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
-  <package id="Steam.Models" version="1.0.0.28" targetFramework="net46" />
+  <package id="Steam.Models" version="1.0.0.29" targetFramework="net46" />
 </packages>