Move Legends to Builds

sliekens · Nov 12, 2023 · 9b55e19 · 9b55e19
1 parent 6e356da
commit 9b55e19
Show file tree

Hide file tree

Showing 19 changed files with 113 additions and 109 deletions.
diff --git a/GW2SDK.Tests/Features/Hero/Builds/Invariants.cs b/GW2SDK.Tests/Features/Hero/Builds/Invariants.cs
@@ -28,4 +28,8 @@ internal static void Big_profession_icon_is_not_null(this Specialization actual)
 
     internal static void Id_is_positive(this Trait actual) =>
         Assert.InRange(actual.Id, 1, int.MaxValue);
+
+    internal static void Has_id(this Legend actual) => Assert.NotEmpty(actual.Id);
+
+    internal static void Has_code(this Legend actual) => Assert.True(actual.Code > 0);
 }
diff --git a/GW2SDK.Tests/Features/Legends/LegendById.cs → ....Tests/Features/Hero/Builds/LegendById.cs b/GW2SDK.Tests/Features/Legends/LegendById.cs → ....Tests/Features/Hero/Builds/LegendById.cs
@@ -1,6 +1,6 @@
 using GuildWars2.Tests.TestInfrastructure;
 
-namespace GuildWars2.Tests.Features.Legends;
+namespace GuildWars2.Tests.Features.Hero.Builds;
 
 public class LegendById
 {
@@ -12,7 +12,7 @@ public async Task Can_be_found(string id)
     {
         var sut = Composer.Resolve<Gw2Client>();
 
-        var (actual, _) = await sut.Legends.GetLegendById(id);
+        var (actual, _) = await sut.Hero.Builds.GetLegendById(id);
 
         Assert.Equal(id, actual.Id);
         actual.Has_code();

diff --git a/GW2SDK.Tests/Features/Legends/Legends.cs → GW2SDK.Tests/Features/Hero/Builds/Legends.cs b/GW2SDK.Tests/Features/Legends/Legends.cs → GW2SDK.Tests/Features/Hero/Builds/Legends.cs
@@ -1,6 +1,6 @@
 using GuildWars2.Tests.TestInfrastructure;
 
-namespace GuildWars2.Tests.Features.Legends;
+namespace GuildWars2.Tests.Features.Hero.Builds;
 
 public class Legends
 {
@@ -9,7 +9,7 @@ public async Task Can_be_listed()
     {
         var sut = Composer.Resolve<Gw2Client>();
 
-        var (actual, context) = await sut.Legends.GetLegends();
+        var (actual, context) = await sut.Hero.Builds.GetLegends();
 
         Assert.NotEmpty(actual);
         Assert.NotNull(context.ResultContext);

diff --git a/...Tests/Features/Legends/LegendsByFilter.cs → ...s/Features/Hero/Builds/LegendsByFilter.cs b/...Tests/Features/Legends/LegendsByFilter.cs → ...s/Features/Hero/Builds/LegendsByFilter.cs
@@ -1,6 +1,6 @@
 using GuildWars2.Tests.TestInfrastructure;
 
-namespace GuildWars2.Tests.Features.Legends;
+namespace GuildWars2.Tests.Features.Hero.Builds;
 
 public class LegendsByFilter
 {
@@ -16,7 +16,7 @@ public async Task Can_be_filtered_by_id()
             "Legend5"
         };
 
-        var (actual, context) = await sut.Legends.GetLegendsByIds(ids);
+        var (actual, context) = await sut.Hero.Builds.GetLegendsByIds(ids);
 
         Assert.Equal(ids.Count, actual.Count);
         Assert.NotNull(context.ResultContext);

diff --git a/...K.Tests/Features/Legends/LegendsByPage.cs → ...sts/Features/Hero/Builds/LegendsByPage.cs b/...K.Tests/Features/Legends/LegendsByPage.cs → ...sts/Features/Hero/Builds/LegendsByPage.cs
@@ -1,6 +1,6 @@
 using GuildWars2.Tests.TestInfrastructure;
 
-namespace GuildWars2.Tests.Features.Legends;
+namespace GuildWars2.Tests.Features.Hero.Builds;
 
 public class LegendsByPage
 {
@@ -10,7 +10,7 @@ public async Task Can_be_filtered_by_page()
         var sut = Composer.Resolve<Gw2Client>();
 
         const int pageSize = 3;
-        var (actual, context) = await sut.Legends.GetLegendsByPage(0, pageSize);
+        var (actual, context) = await sut.Hero.Builds.GetLegendsByPage(0, pageSize);
 
         Assert.NotNull(context.PageContext);
         Assert.Equal(pageSize, context.PageContext.PageSize);

diff --git a/...DK.Tests/Features/Legends/LegendsIndex.cs → ...ests/Features/Hero/Builds/LegendsIndex.cs b/...DK.Tests/Features/Legends/LegendsIndex.cs → ...ests/Features/Hero/Builds/LegendsIndex.cs
@@ -1,6 +1,6 @@
 using GuildWars2.Tests.TestInfrastructure;
 
-namespace GuildWars2.Tests.Features.Legends;
+namespace GuildWars2.Tests.Features.Hero.Builds;
 
 public class LegendsIndex
 {
@@ -9,7 +9,7 @@ public async Task Can_be_listed()
     {
         var sut = Composer.Resolve<Gw2Client>();
 
-        var (actual, context) = await sut.Legends.GetLegendsIndex();
+        var (actual, context) = await sut.Hero.Builds.GetLegendsIndex();
 
         Assert.NotEmpty(actual);
         Assert.NotNull(context.ResultContext);

diff --git a/GW2SDK.Tests/Features/Legends/Invariants.cs b/GW2SDK.Tests/Features/Legends/Invariants.cs
diff --git a/GW2SDK/CompatibilitySuppressions.xml b/GW2SDK/CompatibilitySuppressions.xml
@@ -1226,6 +1226,13 @@
     <Right>lib/net462/GW2SDK.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:GuildWars2.Legends.Legend</Target>
+    <Left>lib/net462/GW2SDK.dll</Left>
+    <Right>lib/net462/GW2SDK.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:GuildWars2.Legends.LegendsQuery</Target>
@@ -3319,6 +3326,13 @@
     <Right>lib/net6.0/GW2SDK.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:GuildWars2.Legends.Legend</Target>
+    <Left>lib/net6.0/GW2SDK.dll</Left>
+    <Right>lib/net6.0/GW2SDK.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:GuildWars2.Legends.LegendsQuery</Target>
@@ -5412,6 +5426,13 @@
     <Right>lib/netstandard2.0/GW2SDK.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:GuildWars2.Legends.Legend</Target>
+    <Left>lib/netstandard2.0/GW2SDK.dll</Left>
+    <Right>lib/netstandard2.0/GW2SDK.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:GuildWars2.Legends.LegendsQuery</Target>

diff --git a/GW2SDK/Features/Gw2Client.cs b/GW2SDK/Features/Gw2Client.cs
@@ -6,7 +6,6 @@
 using GuildWars2.Hero;
 using GuildWars2.Items;
 using GuildWars2.ItemStats;
-using GuildWars2.Legends;
 using GuildWars2.Metadata;
 using GuildWars2.Pve;
 using GuildWars2.Pvp;
@@ -49,9 +48,6 @@ public Gw2Client(HttpClient httpClient)
     /// <inheritdoc cref="ItemStatsClient" />
     public ItemStatsClient ItemStats => new(httpClient);
 
-    /// <inheritdoc cref="LegendsClient" />
-    public LegendsClient Legends => new(httpClient);
-
     /// <inheritdoc cref="ExplorationClient" />
     public ExplorationClient Exploration => new(httpClient);
 

diff --git a/GW2SDK/Features/Hero/Builds/BuildsClient.cs b/GW2SDK/Features/Hero/Builds/BuildsClient.cs
@@ -2,8 +2,8 @@
 
 namespace GuildWars2.Hero.Builds;
 
-/// <summary>Query methods for build templates, skills, specializations, traits and builds in the build storage on the
-/// account.</summary>
+/// <summary>Query methods for build templates, skills, specializations, traits, legends (Revenant) and builds in the build
+/// storage on the account.</summary>
 [PublicAPI]
 public sealed class BuildsClient
 {
@@ -211,7 +211,9 @@ public BuildsClient(HttpClient httpClient)
     /// <summary>Retrieves the IDs of all skills.</summary>
     /// <param name="cancellationToken">A token to cancel the request.</param>
     /// <returns>A task that represents the API request.</returns>
-    public Task<(HashSet<int> Value, MessageContext Context)> GetSkillsIndex(CancellationToken cancellationToken = default)
+    public Task<(HashSet<int> Value, MessageContext Context)> GetSkillsIndex(
+        CancellationToken cancellationToken = default
+    )
     {
         SkillsIndexRequest request = new();
         return request.SendAsync(httpClient, cancellationToken);
@@ -387,7 +389,9 @@ public BuildsClient(HttpClient httpClient)
     /// <summary>Retrieves the IDs of all traits.</summary>
     /// <param name="cancellationToken">A token to cancel the request.</param>
     /// <returns>A task that represents the API request.</returns>
-    public Task<(HashSet<int> Value, MessageContext Context)> GetTraitsIndex(CancellationToken cancellationToken = default)
+    public Task<(HashSet<int> Value, MessageContext Context)> GetTraitsIndex(
+        CancellationToken cancellationToken = default
+    )
     {
         TraitsIndexRequest request = new();
         return request.SendAsync(httpClient, cancellationToken);
@@ -461,4 +465,66 @@ public BuildsClient(HttpClient httpClient)
     }
 
     #endregion v2/traits
+
+    #region v2/legends
+
+    public Task<(HashSet<string> Value, MessageContext Context)> GetLegendsIndex(
+        CancellationToken cancellationToken = default
+    )
+    {
+        LegendsIndexRequest request = new();
+        return request.SendAsync(httpClient, cancellationToken);
+    }
+
+    public Task<(Legend Value, MessageContext Context)> GetLegendById(
+        string legendId,
+        CancellationToken cancellationToken = default
+    )
+    {
+        LegendByIdRequest request = new(legendId)
+        {
+            MissingMemberBehavior = MissingMemberBehavior.Error
+        };
+        return request.SendAsync(httpClient, cancellationToken);
+    }
+
+    public Task<(HashSet<Legend> Value, MessageContext Context)> GetLegendsByIds(
+        IReadOnlyCollection<string> legendIds,
+        MissingMemberBehavior missingMemberBehavior = default,
+        CancellationToken cancellationToken = default
+    )
+    {
+        LegendsByIdsRequest request = new(legendIds)
+        {
+            MissingMemberBehavior = missingMemberBehavior
+        };
+        return request.SendAsync(httpClient, cancellationToken);
+    }
+
+    public Task<(HashSet<Legend> Value, MessageContext Context)> GetLegendsByPage(
+        int pageIndex,
+        int? pageSize = default,
+        MissingMemberBehavior missingMemberBehavior = default,
+        CancellationToken cancellationToken = default
+    )
+    {
+        LegendsByPageRequest request = new(pageIndex)
+        {
+            PageSize = pageSize,
+            MissingMemberBehavior = missingMemberBehavior
+        };
+
+        return request.SendAsync(httpClient, cancellationToken);
+    }
+
+    public Task<(HashSet<Legend> Value, MessageContext Context)> GetLegends(
+        MissingMemberBehavior missingMemberBehavior = default,
+        CancellationToken cancellationToken = default
+    )
+    {
+        LegendsRequest request = new() { MissingMemberBehavior = missingMemberBehavior };
+        return request.SendAsync(httpClient, cancellationToken);
+    }
+
+    #endregion v2/legends
 }
diff --git a/...eatures/Legends/Http/LegendByIdRequest.cs → ...res/Hero/Builds/Http/LegendByIdRequest.cs b/...eatures/Legends/Http/LegendByIdRequest.cs → ...res/Hero/Builds/Http/LegendByIdRequest.cs
@@ -1,6 +1,6 @@
 using GuildWars2.Http;
 
-namespace GuildWars2.Legends.Http;
+namespace GuildWars2.Hero.Builds.Http;
 
 internal sealed class LegendByIdRequest : IHttpRequest<Legend>
 {

diff --git a/...tures/Legends/Http/LegendsByIdsRequest.cs → ...s/Hero/Builds/Http/LegendsByIdsRequest.cs b/...tures/Legends/Http/LegendsByIdsRequest.cs → ...s/Hero/Builds/Http/LegendsByIdsRequest.cs
@@ -1,7 +1,7 @@
 using GuildWars2.Http;
 using GuildWars2.Json;
 
-namespace GuildWars2.Legends.Http;
+namespace GuildWars2.Hero.Builds.Http;
 
 internal sealed class LegendsByIdsRequest : IHttpRequest<HashSet<Legend>>
 {

diff --git a/...ures/Legends/Http/LegendsByPageRequest.cs → .../Hero/Builds/Http/LegendsByPageRequest.cs b/...ures/Legends/Http/LegendsByPageRequest.cs → .../Hero/Builds/Http/LegendsByPageRequest.cs
@@ -1,7 +1,7 @@
 using GuildWars2.Http;
 using GuildWars2.Json;
 
-namespace GuildWars2.Legends.Http;
+namespace GuildWars2.Hero.Builds.Http;
 
 internal sealed class LegendsByPageRequest : IHttpRequest<HashSet<Legend>>
 {

diff --git a/...tures/Legends/Http/LegendsIndexRequest.cs → ...s/Hero/Builds/Http/LegendsIndexRequest.cs b/...tures/Legends/Http/LegendsIndexRequest.cs → ...s/Hero/Builds/Http/LegendsIndexRequest.cs
@@ -1,7 +1,7 @@
 using GuildWars2.Http;
 using GuildWars2.Json;
 
-namespace GuildWars2.Legends.Http;
+namespace GuildWars2.Hero.Builds.Http;
 
 internal sealed class LegendsIndexRequest : IHttpRequest<HashSet<string>>
 {

diff --git a/...K/Features/Legends/Http/LegendsRequest.cs → ...atures/Hero/Builds/Http/LegendsRequest.cs b/...K/Features/Legends/Http/LegendsRequest.cs → ...atures/Hero/Builds/Http/LegendsRequest.cs
@@ -1,7 +1,7 @@
 using GuildWars2.Http;
 using GuildWars2.Json;
 
-namespace GuildWars2.Legends.Http;
+namespace GuildWars2.Hero.Builds.Http;
 
 internal sealed class LegendsRequest : IHttpRequest<HashSet<Legend>>
 {

diff --git a/GW2SDK/Features/Legends/Legend.cs → GW2SDK/Features/Hero/Builds/Legend.cs b/GW2SDK/Features/Legends/Legend.cs → GW2SDK/Features/Hero/Builds/Legend.cs
@@ -1,4 +1,4 @@
-namespace GuildWars2.Legends;
+namespace GuildWars2.Hero.Builds;
 
 [PublicAPI]
 [DataTransferObject]

diff --git a/GW2SDK/Features/Legends/LegendJson.cs → GW2SDK/Features/Hero/Builds/LegendJson.cs b/GW2SDK/Features/Legends/LegendJson.cs → GW2SDK/Features/Hero/Builds/LegendJson.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using GuildWars2.Json;
 
-namespace GuildWars2.Legends;
+namespace GuildWars2.Hero.Builds;
 
 internal static class LegendJson
 {

diff --git a/GW2SDK/Features/Legends/LegendsClient.cs b/GW2SDK/Features/Legends/LegendsClient.cs