From af3d0bccee263474f680c4440f1b0d1b72249f63 Mon Sep 17 00:00:00 2001 From: Tomi Parviainen Date: Mon, 18 Dec 2023 20:16:23 +0200 Subject: [PATCH] feat: #178 Remove obsolete APIs (#179) Remove GetClanVersusRankingAsync and GetPlayerVersusRankingAsync APIs because they do not exist anymore. --- src/ClashOfClans.Models/ClanVersusRanking.cs | 30 ---------------- .../ClanVersusRankingList.cs | 8 ----- .../PlayerVersusRanking.cs | 28 --------------- .../PlayerVersusRankingList.cs | 8 ----- .../LocationsTests.cs | 36 ------------------- src/ClashOfClans/Api/Locations.cs | 24 ------------- src/ClashOfClans/ILocations.cs | 22 ------------ 7 files changed, 156 deletions(-) delete mode 100644 src/ClashOfClans.Models/ClanVersusRanking.cs delete mode 100644 src/ClashOfClans.Models/ClanVersusRankingList.cs delete mode 100644 src/ClashOfClans.Models/PlayerVersusRanking.cs delete mode 100644 src/ClashOfClans.Models/PlayerVersusRankingList.cs diff --git a/src/ClashOfClans.Models/ClanVersusRanking.cs b/src/ClashOfClans.Models/ClanVersusRanking.cs deleted file mode 100644 index 1e1a09d0..00000000 --- a/src/ClashOfClans.Models/ClanVersusRanking.cs +++ /dev/null @@ -1,30 +0,0 @@ -namespace ClashOfClans.Models -{ - public class ClanVersusRanking : Identity - { - private int? _clanLevel; - private int? _members; - private int? _rank; - private int? _previousRank; - private int? _clanVersusPoints; - private int? _clanBuilderBasePoints; - - public Location Location { get; set; } = default!; - - public UrlContainer BadgeUrls { get; set; } = default!; - - public int ClanLevel { get => _clanLevel ?? default; set => _clanLevel = value; } - - public int Members { get => _members ?? default; set => _members = value; } - - public int? ClanPoints { get; set; } - - public int Rank { get => _rank ?? default; set => _rank = value; } - - public int PreviousRank { get => _previousRank ?? default; set => _previousRank = value; } - - public int ClanVersusPoints { get => _clanVersusPoints ?? default; set => _clanVersusPoints = value; } - - public int ClanBuilderBasePoints { get => _clanBuilderBasePoints ?? default; set => _clanBuilderBasePoints = value; } - } -} diff --git a/src/ClashOfClans.Models/ClanVersusRankingList.cs b/src/ClashOfClans.Models/ClanVersusRankingList.cs deleted file mode 100644 index 773839f4..00000000 --- a/src/ClashOfClans.Models/ClanVersusRankingList.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections.Generic; - -namespace ClashOfClans.Models -{ - public class ClanVersusRankingList : List - { - } -} diff --git a/src/ClashOfClans.Models/PlayerVersusRanking.cs b/src/ClashOfClans.Models/PlayerVersusRanking.cs deleted file mode 100644 index 90e9b8bc..00000000 --- a/src/ClashOfClans.Models/PlayerVersusRanking.cs +++ /dev/null @@ -1,28 +0,0 @@ -namespace ClashOfClans.Models -{ - public class PlayerVersusRanking : Identity - { - private int? _expLevel; - private int? _rank; - private int? _previousRank; - private int? _versusTrophies; - private int? _versusBattleWins; - private int? _builderBaseTrophies; - - public int ExpLevel { get => _expLevel ?? default; set => _expLevel = value; } - - public int Rank { get => _rank ?? default; set => _rank = value; } - - public int PreviousRank { get => _previousRank ?? default; set => _previousRank = value; } - - public int VersusTrophies { get => _versusTrophies ?? default; set => _versusTrophies = value; } - - public int VersusBattleWins { get => _versusBattleWins ?? default; set => _versusBattleWins = value; } - - public int BuilderBaseTrophies { get => _builderBaseTrophies ?? default; set => _builderBaseTrophies = value; } - - public PlayerRankingClan? Clan { get; set; } - - public BuilderBaseLeague? BuilderBaseLeague { get; set; } - } -} diff --git a/src/ClashOfClans.Models/PlayerVersusRankingList.cs b/src/ClashOfClans.Models/PlayerVersusRankingList.cs deleted file mode 100644 index 7808ad80..00000000 --- a/src/ClashOfClans.Models/PlayerVersusRankingList.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections.Generic; - -namespace ClashOfClans.Models -{ - public class PlayerVersusRankingList : List - { - } -} diff --git a/src/ClashOfClans.Tests.Integration/LocationsTests.cs b/src/ClashOfClans.Tests.Integration/LocationsTests.cs index c777827a..95d0aff6 100644 --- a/src/ClashOfClans.Tests.Integration/LocationsTests.cs +++ b/src/ClashOfClans.Tests.Integration/LocationsTests.cs @@ -119,42 +119,6 @@ public async Task GetPlayerRankingsForASpecificLocation() Assert.IsTrue(playerRankingList.Count <= ItemLimit, $"Id {location.Id}"); } - [TestMethod] - public async Task GetClanVersusRankingsForASpecificLocation() - { - // Arrange - var location = GetRandom(_locations, l => l.IsCountry); - var query = new Query - { - Limit = ItemLimit - }; - - // Act - var clanRankingList = (ClanVersusRankingList)await _coc.Locations.GetClanVersusRankingAsync(location.Id, query); - - // Assert - Assert.IsNotNull(clanRankingList); - Assert.AreEqual(ItemLimit, clanRankingList.Count, $"Id {location.Id}"); - } - - [TestMethod] - public async Task GetPlayerVersusRankingsForASpecificLocation() - { - // Arrange - var location = GetRandom(_locations, l => l.IsCountry); - var query = new Query - { - Limit = ItemLimit - }; - - // Act - var playerVersusRankingList = (PlayerVersusRankingList)await _coc.Locations.GetPlayerVersusRankingAsync(location.Id, query); - - // Assert - Assert.IsNotNull(playerVersusRankingList); - Assert.IsTrue(playerVersusRankingList.Count <= ItemLimit, $"Id {location.Id}"); - } - [TestMethod] public async Task GetCapitalRankingsForASpecificLocation() { diff --git a/src/ClashOfClans/Api/Locations.cs b/src/ClashOfClans/Api/Locations.cs index d52437ec..692972de 100644 --- a/src/ClashOfClans/Api/Locations.cs +++ b/src/ClashOfClans/Api/Locations.cs @@ -60,30 +60,6 @@ public Task> GetPlayerRankingAsync(int? locationI return _gameData.QueryAsync(request); } - public Task> GetClanVersusRankingAsync(int? locationId, Query? query = default) - { - var request = new AutoValidatedRequest - { - Query = query, - LocationId = locationId, - Uri = $"/locations/{locationId}/rankings/clans-versus" - }; - - return _gameData.QueryAsync(request); - } - - public Task> GetPlayerVersusRankingAsync(int? locationId, Query? query = default) - { - var request = new AutoValidatedRequest - { - Query = query, - LocationId = locationId, - Uri = $"/locations/{locationId}/rankings/players-versus" - }; - - return _gameData.QueryAsync(request); - } - public Task> GetClanCapitalRankingAsync(int? locationId, Query? query = default) { var request = new AutoValidatedRequest diff --git a/src/ClashOfClans/ILocations.cs b/src/ClashOfClans/ILocations.cs index 4b0005fd..ebaa69d7 100644 --- a/src/ClashOfClans/ILocations.cs +++ b/src/ClashOfClans/ILocations.cs @@ -48,28 +48,6 @@ public interface ILocations /// Player ranking list Task> GetPlayerRankingAsync(int? locationId, Query? query = default); - /// - /// Get clan versus rankings for a specific location - /// - /// Identifier of the location to retrieve - /// Optional query parameters - /// Communication error with the backend API - /// Argument is invalid - /// Clan ranking list - [Obsolete("This route is deprecated and will be removed in the future. Call GetClanBuilderBaseRankingAsync instead.")] - Task> GetClanVersusRankingAsync(int? locationId, Query? query = default); - - /// - /// Get player versus rankings for a specific location - /// - /// Identifier of the location to retrieve - /// Optional query parameters - /// Communication error with the backend API - /// Argument is invalid - /// Player versus ranking list - [Obsolete("This route is deprecated and will be removed in the future. Call GetPlayerBuilderBaseRankingAsync instead.")] - Task> GetPlayerVersusRankingAsync(int? locationId, Query? query = default); - /// /// Get capital rankings for a specific location ///