diff --git a/Nhl.Api.Common/Http/NhlScoresHtmlReportsApiHttpClient.cs b/Nhl.Api.Common/Http/NhlScoresHtmlReportsApiHttpClient.cs index c5ddec6..fa84d33 100644 --- a/Nhl.Api.Common/Http/NhlScoresHtmlReportsApiHttpClient.cs +++ b/Nhl.Api.Common/Http/NhlScoresHtmlReportsApiHttpClient.cs @@ -1,7 +1,5 @@ using System; using System.Net.Http; -using System.Threading; -using System.Threading.Tasks; namespace Nhl.Api.Common.Http; /// diff --git a/Nhl.Api.Domain/Models/Draft/PlayerDraftRanking.cs b/Nhl.Api.Domain/Models/Draft/PlayerDraftRanking.cs index e5a4dac..dcc5ead 100644 --- a/Nhl.Api.Domain/Models/Draft/PlayerDraftRanking.cs +++ b/Nhl.Api.Domain/Models/Draft/PlayerDraftRanking.cs @@ -1,5 +1,5 @@ -using Newtonsoft.Json; using System.Collections.Generic; +using Newtonsoft.Json; namespace Nhl.Api.Models.Draft; diff --git a/Nhl.Api.Domain/Services/NhlGameService.cs b/Nhl.Api.Domain/Services/NhlGameService.cs index 13a1d75..9a163ee 100644 --- a/Nhl.Api.Domain/Services/NhlGameService.cs +++ b/Nhl.Api.Domain/Services/NhlGameService.cs @@ -1,12 +1,11 @@ +using System; using System.Collections.Generic; using System.Globalization; +using System.Linq; using System.Text.RegularExpressions; -using System; using System.Threading.Tasks; using Nhl.Api.Common.Http; using Nhl.Api.Models.Game; -using System.Linq; -using Nhl.Api.Models.Schedule; namespace Nhl.Api.Services; diff --git a/Nhl.Api.Domain/Services/NhlTeamService.cs b/Nhl.Api.Domain/Services/NhlTeamService.cs index 5ff1952..6085e16 100644 --- a/Nhl.Api.Domain/Services/NhlTeamService.cs +++ b/Nhl.Api.Domain/Services/NhlTeamService.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Linq; using Nhl.Api.Common.Extensions; diff --git a/Nhl.Api.Tests/GameTests.cs b/Nhl.Api.Tests/GameTests.cs index 9666b09..9a3d23f 100644 --- a/Nhl.Api.Tests/GameTests.cs +++ b/Nhl.Api.Tests/GameTests.cs @@ -1,6 +1,4 @@ using System.Linq; -using System.Text.RegularExpressions; -using Nhl.Api.Common.Http; namespace Nhl.Api.Tests; diff --git a/Nhl.Api.Tests/StatisticsTests.cs b/Nhl.Api.Tests/StatisticsTests.cs index 4b041ec..2081c17 100644 --- a/Nhl.Api.Tests/StatisticsTests.cs +++ b/Nhl.Api.Tests/StatisticsTests.cs @@ -1,6 +1,5 @@ using System.Collections.Concurrent; using System.Linq; -using System.Security.AccessControl; using System.Threading; using Newtonsoft.Json; using Nhl.Api.Enumerations.Game; @@ -451,7 +450,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result await using var nhlApi = new NhlApi(); - var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression); + var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals, + limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -483,7 +483,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result .Build(); - var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season19992000, expression); + var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season19992000, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals, + limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -507,7 +508,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result // Act var expression = expressionFilter.Build(); - var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20102011, expression); + var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20102011, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals, + limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -544,7 +546,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result .Build(); - var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression); + var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals, + limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -598,7 +601,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result .EndGroup() .Build(); - var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression); + var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals, + limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -637,7 +641,8 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali await using var nhlApi = new NhlApi(); - var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression); + var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerRealtimeStatisticsFilterToSortBy: PlayerRealtimeStatisticsFilter.MissedShotWideOfNet, + limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -670,7 +675,8 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali .Build(); - var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20202021, expression); + var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20202021, expression, playerRealtimeStatisticsFilterToSortBy: PlayerRealtimeStatisticsFilter.EmptyNetAssists, + limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -694,7 +700,8 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali // Act var expression = expressionFilter.Build(); - var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20102011, expression); + var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20102011, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals, + limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -734,7 +741,8 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali .Build(); - var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression); + var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerRealtimeStatisticsFilterToSortBy: PlayerRealtimeStatisticsFilter.TakeawaysPer60, + limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -789,7 +797,7 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali .EndGroup() .Build(); - var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression); + var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerRealtimeStatisticsFilterToSortBy: PlayerRealtimeStatisticsFilter.TakeawaysPer60, limit: 50, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); @@ -815,7 +823,7 @@ public async Task GetGoalieStatisticsBySeasonAndFilterAsync_Returns_Valid_Result await using var nhlApi = new NhlApi(); // Act - var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, ExpressionPlayerFilter.Empty); + var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, ExpressionPlayerFilter.Empty, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals, limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(result); @@ -838,7 +846,7 @@ public async Task GetGoalieStatisticsBySeasonAndFilterAsync_Returns_Valid_Result .LessThanOrEqualTo(3.15) .Build(); - var result = await nhlApi.GetGoalieStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression); + var result = await nhlApi.GetGoalieStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, goalieStatisticsFilterToSortBy: GoalieStatisticsFilter.Wins, limit: 5, offsetStart: 0, gameType: GameType.RegularSeason); // Assert Assert.IsNotNull(expression); diff --git a/Nhl.Api/Src/GameApi/NhlGameApi.cs b/Nhl.Api/Src/GameApi/NhlGameApi.cs index cfb3ea1..e2e7fa6 100644 --- a/Nhl.Api/Src/GameApi/NhlGameApi.cs +++ b/Nhl.Api/Src/GameApi/NhlGameApi.cs @@ -1,7 +1,3 @@ -using System.Globalization; -using System.Text.RegularExpressions; -using Nhl.Api.Common.Http; -using Nhl.Api.Models.Game; using Nhl.Api.Services; namespace Nhl.Api;