(GH-367) Blocks.GetAllAsync must return PaginatedResponseWithLinks

Jericho · Apr 15, 2021 · 148ef70 · 148ef70
1 parent 5ddda64
commit 148ef70
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Source/StrongGrid.IntegrationTests/Tests/Blocks.cs b/Source/StrongGrid.IntegrationTests/Tests/Blocks.cs
@@ -19,7 +19,7 @@ public async Task RunAsync(IBaseClient client, TextWriter log, CancellationToken
 			var endDate = new DateTime(thisYear, 12, 31, 23, 59, 59);
 
 			var blocks = await client.Blocks.GetAllAsync(startDate, endDate, 25, 0, null, cancellationToken).ConfigureAwait(false);
-			await log.WriteLineAsync($"All blocks retrieved. There are {blocks.Length} blocks in {lastYear} and {thisYear}").ConfigureAwait(false);
+			await log.WriteLineAsync($"All blocks retrieved. There are {blocks.Records.Length} blocks in {lastYear} and {thisYear}").ConfigureAwait(false);
 		}
 	}
 }
diff --git a/Source/StrongGrid/Resources/Blocks.cs b/Source/StrongGrid/Resources/Blocks.cs
@@ -1,7 +1,6 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using Pathoschild.Http.Client;
 using StrongGrid.Models;
-using StrongGrid.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -42,9 +41,9 @@ internal Blocks(Pathoschild.Http.Client.IClient client)
 		/// <param name="onBehalfOf">The user to impersonate.</param>
 		/// <param name="cancellationToken">Cancellation token.</param>
 		/// <returns>
-		/// An array of <see cref="Block">Blocks</see>.
+		/// The <see cref="PaginatedResponseWithLinks{Block}">Blocks</see>.
 		/// </returns>
-		public Task<Block[]> GetAllAsync(DateTime? startDate = null, DateTime? endDate = null, int limit = 25, int offset = 0, string onBehalfOf = null, CancellationToken cancellationToken = default)
+		public Task<PaginatedResponseWithLinks<Block>> GetAllAsync(DateTime? startDate = null, DateTime? endDate = null, int limit = 25, int offset = 0, string onBehalfOf = null, CancellationToken cancellationToken = default)
 		{
 			return _client
 				.GetAsync(_endpoint)
@@ -54,7 +53,7 @@ public Task<Block[]> GetAllAsync(DateTime? startDate = null, DateTime? endDate =
 				.WithArgument("limit", limit)
 				.WithArgument("offset", offset)
 				.WithCancellationToken(cancellationToken)
-				.AsObject<Block[]>();
+				.AsPaginatedResponseWithLinks<Block>();
 		}
 
 		/// <summary>

diff --git a/Source/StrongGrid/Resources/IBlocks.cs b/Source/StrongGrid/Resources/IBlocks.cs
@@ -1,4 +1,4 @@
-using StrongGrid.Models;
+using StrongGrid.Models;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -24,9 +24,9 @@ public interface IBlocks
 		/// <param name="onBehalfOf">The user to impersonate.</param>
 		/// <param name="cancellationToken">Cancellation token.</param>
 		/// <returns>
-		/// An array of <see cref="Block">Blocks</see>.
+		/// The <see cref="PaginatedResponseWithLinks{Block}">Blocks</see>.
 		/// </returns>
-		Task<Block[]> GetAllAsync(DateTime? startDate = null, DateTime? endDate = null, int limit = 25, int offset = 0, string onBehalfOf = null, CancellationToken cancellationToken = default);
+		Task<PaginatedResponseWithLinks<Block>> GetAllAsync(DateTime? startDate = null, DateTime? endDate = null, int limit = 25, int offset = 0, string onBehalfOf = null, CancellationToken cancellationToken = default);
 
 		/// <summary>
 		/// Retrieve the blocks for a specific email address.