Added TFT Endpoints : Issue#640

RiotSharp.Test/CommonTestBase.cs

@@ -31,6 +31,8 @@ public class CommonTestBase
         public static string Summoner3Name = "xsunx";
         public static Region Summoner3Region = (Region)Enum.Parse(typeof(Region), "Ru");
 
+        public static Region TftSummonerRegion = (Region)Enum.Parse(typeof(Region), "Americas");
+
         /// <summary>
         /// Ensures that test returns data (Shows test warnings for 404 status exceptions)
         /// </summary>

RiotSharp.Test/RiotApiTest.cs

@@ -158,6 +158,7 @@ public void GetChallengerLeagueAsync_Test()
             });
         }
 
+
         [TestMethod]
         [TestCategory("RiotApi"), TestCategory("Async")]
         public void GetMasterLeagueAsync_Test()
@@ -169,6 +170,7 @@ public void GetMasterLeagueAsync_Test()
                 Assert.IsTrue(league.Result.Entries.Count > 0);
             });
         }
+
         #endregion
 
         #region Match Tests
@@ -348,6 +350,7 @@ public void GetMatchListAsync_Index_Test()
                 Assert.IsTrue(matches.Count <= endIndex - beginIndex);
             });
         }
+
         #endregion
 
         #region Spectator Tests
@@ -476,5 +479,110 @@ public void GetThirdPartyCodeAsync_Test()
             }, "Third party code was not found for the summoner. (404)");
         }
         #endregion
+
+        #region TFT Summoner Tests 
+
+        [TestMethod]
+        [TestCategory("RiotApi"), TestCategory("Async")]
+        public void GetTftSummonerBySummonerIdAsync_ExistingId_ReturnsSummoner()
+        {
+            EnsureCredibility(() =>
+            {
+                var summoner = Api.TftSummoner.GetTftSummonerBySummonerIdAsync(Summoner1And2Region,
+                    Summoner1Id);
+
+                Assert.AreEqual(Summoner1Name, summoner.Result.Name);
+            });
+        }
+
+        [TestMethod]
+        [TestCategory("RiotApi"), TestCategory("Async")]
+        public void GetTftSummonerByPuuidAsync_ExistingId_ReturnsSummoner()
+        {
+            EnsureCredibility(() =>
+            {
+                var summoner = Api.TftSummoner.GetTftSummonerByPuuidAsync(Summoner1And2Region,
+                    Summoner1Puuid);
+
+                Assert.AreEqual(Summoner1Name, summoner.Result.Name);
+            });
+        }
+
+        [TestMethod]
+        [TestCategory("RiotApi"), TestCategory("Async")]
+        public void GetTftSummonerByNameAsync_ExistingName_ReturnsSummoner()
+        {
+            EnsureCredibility(() =>
+            {
+                var summoner = Api.TftSummoner.GetTftSummonerByNameAsync(Summoner1And2Region,
+                    Summoner1Name);
+
+                Assert.AreEqual(Summoner1Id, summoner.Result.Id);
+            });
+        }
+
+        [TestMethod]
+        [TestCategory("RiotApi"), TestCategory("Async")]
+        public void GetTftSummonerByAccountIdAsync_ExistingAccountId_ReturnsSummoner()
+        {
+            EnsureCredibility(() =>
+            {
+                var summoner = Api.TftSummoner.GetTftSummonerByAccountIdAsync(Summoner1And2Region,
+                    Summoner1AccountId);
+
+                Assert.AreEqual(Summoner1Name, summoner.Result.Name);
+            });
+        }
+        #endregion
+
+        #region TFT League Tests
+
+        [TestMethod]
+        [TestCategory("RiotApi"), TestCategory("Async")]
+        public void GetTftLeagueByTierDivisionAsync_Test()
+        {
+            EnsureCredibility(() =>
+            {
+                var league = Api.TftLeague.GetTftLeagueByTierDivisionAsync(Summoner1And2Region,
+                    Endpoints.LeagueEndpoint.Enums.Tier.Bronze,
+                    Endpoints.LeagueEndpoint.Enums.Division.I);
+
+                Assert.IsTrue(league.Result.Count > 0);
+            });
+        }
+
+        [TestMethod]
+        [TestCategory("RiotApi"), TestCategory("Async")]
+        public void GetTftGrandmasterLeagueAsync_Test()
+        {
+            EnsureCredibility(() =>
+            {
+                var league = Api.TftLeague.GetTftGrandmasterLeagueAsync(Summoner1And2Region);
+                Assert.IsTrue(league.Result.Entries.Count > 0);
+            });
+        }
+
+        [TestMethod]
+        [TestCategory("RiotApi"), TestCategory("Async")]
+        public void GetTftChallengerLeagueAsync_Test()
+        {
+            EnsureCredibility(() =>
+            {
+                var league = Api.TftLeague.GetTftChallengerLeagueAsync(Summoner1And2Region);
+                Assert.IsTrue(league.Result.Entries.Count > 0);
+            });
+        }
+
+        [TestMethod]
+        [TestCategory("RiotApi"), TestCategory("Async")]
+        public void GetTftMasterLeagueAsync_Test()
+        {
+            EnsureCredibility(() =>
+            {
+                var league = Api.TftLeague.GetTftMasterLeagueAsync(Summoner1And2Region);
+                Assert.IsTrue(league.Result.Entries.Count > 0);
+            });
+        }
+        #endregion
     }
 }

RiotSharp/Endpoints/Interfaces/ITftLeagueEndpoint.cs

@@ -0,0 +1,59 @@
+using RiotSharp.Endpoints.LeagueEndpoint;
+using RiotSharp.Endpoints.TftLeagueEndpoint;
+using RiotSharp.Misc;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RiotSharp.Endpoints.Interfaces
+{
+    public interface ITftLeagueEndpoint
+    {
+        /// <summary>
+        /// Get the TFT grandmaster league
+        /// </summary>
+        /// <param name="region">Participants server region</param>
+        /// <returns><see cref="LeagueEntry"> class</returns>
+        Task<TftLeague> GetTftGrandmasterLeagueAsync(Region region);
+
+        /// <summary>
+        /// Get the TFT challenger league
+        /// </summary>
+        /// <param name="region">Participants server region</param>
+        /// <returns><see cref="League"> class</returns>
+        Task<TftLeague> GetTftChallengerLeagueAsync(Region region);
+
+        /// <summary>
+        /// Get the TFT master league
+        /// </summary>
+        /// <param name="region">Participants server region</param>
+        /// <returns><see cref="League"> class</returns>
+        Task<TftLeague> GetTftMasterLeagueAsync(Region region);
+
+        /// <summary>
+        /// Gets a list of TFT league entries
+        /// </summary>
+        /// <param name="region">Summoners server region</param>
+        /// <param name="encryptedSummonerId">Summoners encrypted id</param>
+        /// <returns>List of <see cref="LeagueEntry"> class</returns>
+        Task<List<TftLeagueEntry>> GetTftLeagueEntriesBySummonerAsync(Region region, string encryptedSummonerId);
+
+        /// <summary>
+        /// Gets a list of league entries for a given tier/division
+        /// </summary>
+        /// <param name="region">Participants server region</param>
+        /// <param name="tier">Tier to get league entries from</param>
+        /// <param name="division">Tier division to get league entries from</param>
+        /// <returns>List of <see cref="LeagueEntry"> class</returns>
+        Task<List<TftLeagueEntry>> GetTftLeagueByTierDivisionAsync(Region region, LeagueEndpoint.Enums.Tier tier, LeagueEndpoint.Enums.Division division);
+
+        /// <summary>
+        /// Gets the TFT league by league uuid
+        /// </summary>
+        /// <param name="region">Participants server region</param>
+        /// <param name="leagueId">UUID of the league</param>
+        /// <returns><see cref="League"> object/returns>
+        Task<TftLeague> GetTftLeagueByIdAsync(Region region, string leagueId);
+    }
+}

RiotSharp/Endpoints/Interfaces/ITftMatchEndpoint.cs

@@ -0,0 +1,28 @@
+using RiotSharp.Endpoints.TftMatchEndpoint;
+using RiotSharp.Misc;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RiotSharp.Endpoints.Interfaces
+{
+    public interface ITftMatchEndpoint
+    {
+        /// <summary>
+        /// Gets a list of match ids by puuid
+        /// </summary>
+        /// <param name="region">Region in which the summoner is.</param>
+        /// <param name="puuid"></param>
+        /// <returns>A list of strings</returns>
+        Task<List<string>> GetTftMatchIdsByPuuidAsync(Region region, string puuid, int count = 20);
+
+        /// <summary>
+        /// Get a match by id
+        /// </summary>
+        /// <param name="region">Region in which the summoner is.</param>
+        /// <param name="matchId">The match id for the match wanting to be retrieved</param>
+        /// <returns><see cref="Match"> object </returns>
+        Task<TftMatch> GetTftMatchByIdAsync(Region region, string matchId);
+    }
+}

RiotSharp/Endpoints/Interfaces/ITftSummonerEndpoint.cs

@@ -0,0 +1,47 @@
+using RiotSharp.Endpoints.TftSummonerEndpoint;
+using RiotSharp.Misc;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RiotSharp.Endpoints.Interfaces
+{
+    /// <summary>
+    /// Tft Summoner Endpoint.
+    /// </summary>
+    public interface ITftSummonerEndpoint
+    {
+        /// <summary>
+        /// Get a Teamfight Tactics summoner by account id asynchronously.
+        /// </summary>
+        /// <param name="region">Region in which you wish to look for a summoner.</param>
+        /// <param name="accountId">Account id of the summoner you're looking for.</param>
+        /// <returns>A summoner.</returns>
+        Task<TftSummoner> GetTftSummonerByAccountIdAsync(Region region, string accountId);
+
+        /// <summary>
+        /// Get a Teamfight Tactics summoner by name asynchronously.
+        /// </summary>
+        /// <param name="region">Region in which you wish to look for a summoner.</param>
+        /// <param name="summonerName">Name of the summoner you're looking for.</param>
+        /// <returns>A summoner.</returns>
+        Task<TftSummoner> GetTftSummonerByNameAsync(Region region, string summonerName);
+
+        /// <summary>
+        /// Get a Teamfight Tactics summoner by puuid asynchronously.
+        /// </summary>
+        /// <param name="region">Region in which you wish to look for a summoner.</param>
+        /// <param name="puuid">PUUID of the summoner you're looking for.</param>
+        /// <returns>A summoner.</returns>
+        Task<TftSummoner> GetTftSummonerByPuuidAsync(Region region, string summonerName);
+
+        /// <summary>
+        /// Get a Teamfight Tactics summoner by summoner id asynchronously.
+        /// </summary>
+        /// <param name="region">Region in which you wish to look for a summoner.</param>
+        /// <param name="summonerId">Id of the summoner you're looking for.</param>
+        /// <returns>A summoner.</returns>
+        Task<TftSummoner> GetTftSummonerBySummonerIdAsync(Region region, string summonerId);
+    }
+}

RiotSharp/Endpoints/LeagueEndpoint/LeagueEndpoint.cs

@@ -36,6 +36,7 @@ public async Task<League> GetChallengerLeagueAsync(Region region, string queue)
         {
             var json = await _requester.CreateGetRequestAsync(LeagueRootUrl + string.Format(LeagueChallengerUrl, queue),
                 region).ConfigureAwait(false);
+
             return JsonConvert.DeserializeObject<League>(json);
         }
 
@@ -44,6 +45,7 @@ public async Task<League> GetMasterLeagueAsync(Region region, string queue)
         {
             var json = await _requester.CreateGetRequestAsync(LeagueRootUrl + string.Format(LeagueMasterUrl, queue),
                 region).ConfigureAwait(false);
+
             return JsonConvert.DeserializeObject<League>(json);
         }
 
@@ -84,5 +86,6 @@ public async Task<League> GetLeagueByIdAsync(Region region, string leagueId)
 
             return JsonConvert.DeserializeObject<League>(json);
         }
+
     }
 }

RiotSharp/Endpoints/MatchEndpoint/MatchEndpoint.cs

@@ -21,6 +21,7 @@ public class MatchEndpoint : IMatchEndpoint
         private const string MatchListByAccountIdUrl = "/by-account/{0}";
         private const string TimelineByMatchIdUrl = "/by-match/{0}";
         private const string MatchCache = "match-{0}_{1}";
+
         private const string MatchTimeLineCacheKey = "match-timeline-{0}_{1}";
         private static readonly TimeSpan MatchTtl = TimeSpan.FromDays(60);
 
@@ -33,6 +34,7 @@ public MatchEndpoint(IRateLimitedRequester requester, ICache cache)
             _cache = cache;
         }
 
+        /// <inheritdoc />
         public async Task<List<long>> GetMatchIdsByTournamentCodeAsync(Region region, string tournamentCode)
         {
             var json = await _requester.CreateGetRequestAsync(MatchRootUrl +
@@ -42,6 +44,7 @@ public async Task<List<long>> GetMatchIdsByTournamentCodeAsync(Region region, st
             return JsonConvert.DeserializeObject<List<long>>(json);
         }
 
+        /// <inheritdoc />
         public async Task<Match> GetMatchAsync(Region region, long matchId)
         {
             var matchInCache = _cache.Get<string, Match>(string.Format(MatchCache, region, matchId));
@@ -56,6 +59,7 @@ public async Task<Match> GetMatchAsync(Region region, long matchId)
             return match;
         }
 
+        /// <inheritdoc />
         public async Task<MatchList> GetMatchListAsync(Region region, string accountId, List<int> championIds = null, List<int> queues = null, List<Season> seasons = null,
             DateTime? beginTime = null, DateTime? endTime = null, long? beginIndex = null, long? endIndex = null)
         {
@@ -67,6 +71,7 @@ public async Task<MatchList> GetMatchListAsync(Region region, string accountId,
             return JsonConvert.DeserializeObject<MatchList>(json);
         }
 
+        /// <inheritdoc />
         public async Task<MatchTimeline> GetMatchTimelineAsync(Region region, long matchId)
         {
             var cacheKey = string.Format(MatchTimeLineCacheKey, region, matchId);

RiotSharp/Endpoints/TftLeagueEndpoint/TftLeague.cs

@@ -0,0 +1,44 @@
+using Newtonsoft.Json;
+using RiotSharp.Endpoints.LeagueEndpoint.Enums;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace RiotSharp.Endpoints.TftLeagueEndpoint
+{
+    public class TftLeague
+    {
+        internal TftLeague() { }
+
+        /// <summary>
+        /// The requested tft league entries.
+        /// </summary>
+        [JsonProperty("entries")]
+        public List<TftLeagueItem> Entries { get; set; }
+
+        /// <summary>
+        /// This name is an internal place-holder name only.
+        /// Display and localization of names in the game client are handled client-side.
+        /// </summary>
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The tft league id.
+        /// </summary>
+        [JsonProperty("leagueId")]
+        public string LeagueId { get; set; }
+
+        /// <summary>
+        /// Tft league queue (eg: RankedSolo5x5).
+        /// </summary>
+        [JsonProperty("queue")]
+        public string Queue { get; set; }
+
+        /// <summary>
+        /// Tft League tier (eg: Challenger).
+        /// </summary>
+        [JsonProperty("tier")]
+        public Tier Tier { get; set; }
+    }
+}