Merge pull request #77 from peppage/master

add short description and price overview to app details data

Author: Justin Skiles

src/SteamWebAPI2/AutoMapperConfiguration.cs

@@ -579,6 +579,7 @@ public static void Initialize()
                     x.CreateMap<Metacritic, StoreMetacriticModel>();
                     x.CreateMap<Platforms, StorePlatformsModel>();
                     x.CreateMap<PackageGroup, StorePackageGroupModel>();
+                    x.CreateMap<Price, StorePriceOverview>();
                     x.CreateMap<Sub, StoreSubModel>();
 
                     x.CreateMap<FeaturedCategoriesContainer, StoreFeaturedCategoriesModel>();
@@ -658,4 +659,4 @@ public static void Reset()
             mapper = null;
         }
     }
-}
+}

src/SteamWebAPI2/Interfaces/SteamStore.cs

@@ -2,12 +2,21 @@
 using SteamWebAPI2.Models.SteamStore;
 using SteamWebAPI2.Utilities;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace SteamWebAPI2.Interfaces
 {
     public class SteamStore : SteamStoreInterface, ISteamStore
     {
+        public SteamStore() : base()
+        {
+        }
+
+        public SteamStore(HttpClient httpClient) : base(httpClient)
+        {
+        }
+
         /// <summary>
         /// Maps to the steam store api endpoint: GET http://store.steampowered.com/api/appdetails/
         /// </summary>
@@ -52,4 +61,4 @@ public async Task<StoreFeaturedProductsModel> GetStoreFeaturedProductsAsync()
             return featuredProductsModel;
         }
     }
-}
+}

src/SteamWebAPI2/Models/SteamStore/AppDetailsContainer.cs

@@ -159,6 +159,27 @@ internal class SupportInfo
         public string Email { get; set; }
     }
 
+    internal class Price
+    {
+        [JsonProperty("currency")]
+        public string Currency { get; set; }
+
+        [JsonProperty("initial")]
+        public uint Initial { get; set; }
+
+        [JsonProperty("final")]
+        public uint Final { get; set; }
+
+        [JsonProperty("discount_percent")]
+        public uint DiscountPercent { get; set; }
+
+        [JsonProperty("initial_formatted")]
+        public string InitialFormatted { get; set; }
+
+        [JsonProperty("final_formatted")]
+        public string FinalFormatted { get; set; }
+    }
+
     internal class Data
     {
         [JsonProperty("type")]
@@ -185,6 +206,9 @@ internal class Data
         [JsonProperty("about_the_game")]
         public string AboutTheGame { get; set; }
 
+        [JsonProperty("short_description")]
+        public string ShortDescription { get; set; }
+
         [JsonProperty("supported_languages")]
         public string SupportedLanguages { get; set; }
 
@@ -206,6 +230,9 @@ internal class Data
         [JsonProperty("developers")]
         public string[] Developers { get; set; }
 
+        [JsonProperty("price_overview")]
+        public Price PriceOverview { get; set; }
+
         [JsonProperty("publishers")]
         public string[] Publishers { get; set; }
 
@@ -255,4 +282,4 @@ internal class AppDetailsContainer
         [JsonProperty("data")]
         public Data Data { get; set; }
     }
-}
+}

src/SteamWebAPI2/SteamStoreInterface.cs

@@ -2,8 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace SteamWebAPI2
@@ -15,7 +14,7 @@ public abstract class SteamStoreInterface
     {
         private const string steamStoreApiBaseUrl = "http://store.steampowered.com/api/";
         private readonly SteamStoreRequest steamStoreRequest;
-        
+
         /// <summary>
         /// Constructs and maps the default objects for Steam Store Web API use
         /// </summary>
@@ -26,6 +25,17 @@ public SteamStoreInterface()
             AutoMapperConfiguration.Initialize();
         }
 
+        /// <summary>
+        /// Constructs and maps based on a custom http client
+        /// </summary>
+        /// <param name="httpClient">Client to make requests with</param>
+        public SteamStoreInterface(HttpClient httpClient)
+        {
+            this.steamStoreRequest = new SteamStoreRequest(steamStoreApiBaseUrl, httpClient);
+
+            AutoMapperConfiguration.Initialize();
+        }
+
         /// <summary>
         /// Constructs and maps based on a custom Steam Store Web API URL
         /// </summary>
@@ -37,6 +47,18 @@ public SteamStoreInterface(string steamStoreApiBaseUrl)
             AutoMapperConfiguration.Initialize();
         }
 
+        /// <summary>
+        /// Constructs and maps based on a custom http client and custom Steam Store Web API URL
+        /// </summary>
+        /// <param name="steamStoreApiBaseUrl">Steam Store Web API URL</param>
+        /// <param name="httpClient">Client to make requests with</param>
+        public SteamStoreInterface(string steamStoreApiBaseUrl, HttpClient httpClient)
+        {
+            this.steamStoreRequest = new SteamStoreRequest(steamStoreApiBaseUrl, httpClient);
+
+            AutoMapperConfiguration.Initialize();
+        }
+
         /// <summary>
         /// Calls a endpoint on the constructed Web API with parameters
         /// </summary>

src/SteamWebAPI2/SteamStoreRequest.cs

@@ -14,6 +14,7 @@ namespace SteamWebAPI2
     internal class SteamStoreRequest
     {
         private string steamStoreApiBaseUrl;
+        private readonly HttpClient httpClient;
 
         /// <summary>
         /// Constructs a Steam Store Web API request
@@ -29,6 +30,17 @@ public SteamStoreRequest(string steamStoreApiBaseUrl)
             this.steamStoreApiBaseUrl = steamStoreApiBaseUrl;
         }
 
+        public SteamStoreRequest(string steamStoreApiBaseUrl, HttpClient httpClient)
+        {
+            if (String.IsNullOrEmpty(steamStoreApiBaseUrl))
+            {
+                throw new ArgumentNullException("steamStoreApiBaseUrl");
+            }
+
+            this.steamStoreApiBaseUrl = steamStoreApiBaseUrl;
+            this.httpClient = httpClient;
+        }
+
         /// <summary>
         /// Sends a request to a Steam Store Web API endpoint
         /// </summary>
@@ -71,10 +83,10 @@ public async Task<T> SendStoreRequestAsync<T>(string endpointName, IList<SteamWe
         /// </summary>
         /// <param name="command">Command (method endpoint) to send to an interface</param>
         /// <returns>HTTP response as a string without tabs and newlines</returns>
-        private static async Task<string> GetHttpStringResponseAsync(string command)
+        private async Task<string> GetHttpStringResponseAsync(string command)
         {
-            HttpClient httpClient = new HttpClient();
-            string response = await httpClient.GetStringAsync(command);
+            HttpClient client = httpClient ?? new HttpClient();
+            string response = await client.GetStringAsync(command);
             response = response.Replace("\n", "");
             response = response.Replace("\t", "");
             return response;