[RED-1966] Adds support to an iterator and more CBP endpoints

README.md

@@ -11,7 +11,7 @@ A .netstandard NuGet package for use with the  Zendesk v2 API.
 
 #### The deprecation and replacement of Status API endpoints
 
-More detailed information on the exact changes and motivation can be found [here](https://support.zendesk.com/hc/en-us/articles/5414949730842). 
+More detailed information on the exact changes and motivation can be found [here](https://support.zendesk.com/hc/en-us/articles/5414949730842).
 
 For the sake of this library, it means the following methods have been removed:
 
@@ -50,6 +50,7 @@ Groups:
 Help Center:
 - GET api/v2/help_center/articles
 - GET api/v2/help_center/categories
+- GET api/v2/help_center/sections
 
 Organization:
 - GET /api/v2/organization_fields
@@ -63,11 +64,19 @@ Tickets:
 - GET /api/v2/tickets
 - GET /api/v2/tickets/{ticketId}/comments
 - GET /api/v2/ticket_fields
-- GET /api/v2/ticket_audits - [Cursor Variant](https://developer.zendesk.com/api-reference/ticketing/tickets/ticket_audits/#pagination)
+- GET /api/v2/ticket_audits
+- GET
 
 Satisfaction ratings:
 - GET /api/v2/satisfaction_ratings
 
+Requests
+- GET /api/v2/requests
+- GET /api/v2/requests/{requestId}/comments
+
+Job Statuses
+- GET /api/v2/job_statuses
+
 [Further reading on Zendesk Pagination changes](https://support.zendesk.com/hc/en-us/articles/4402610093338-Introducing-Pagination-Changes-Zendesk-API)
 
 ## 3.x.x

src/ZendeskApi.Client/Extensions/HttpClientExtensions.cs

@@ -73,5 +73,11 @@ public static Task<HttpResponseMessage> GetAsync(this HttpClient client, string
 
             return client.GetAsync(requestUri, cancellationToken);
         }
+
+        // to be used within the PaginatedResource, where the next page is a complete URL with cursors already predefined in the query string.
+        public static Task<HttpResponseMessage> GetPageAsync(this HttpClient client, string requestUri, CancellationToken cancellationToken = default)
+        {
+            return client.GetAsync(requestUri, cancellationToken);
+        }
     }
 }

src/ZendeskApi.Client/IZendeskClient.cs

@@ -28,5 +28,6 @@ public interface IZendeskClient
         IHelpCenterResource HelpCenter { get; }
         ILocaleResource Locales { get; }
         ITagsResource Tags { get; }
+        IPaginatedResource PaginatedResource { get; }
     }
-}
+}

src/ZendeskApi.Client/Models/CursorPaginatedIterator.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using ZendeskApi.Client;
+using ZendeskApi.Client.Responses;
+
+public class CursorPaginatedIterator<T> : IEnumerable<T>
+{
+
+    public ICursorPagination<T> Response { get; set; }
+
+    private IZendeskClient client;
+
+
+    private string ResponseType { get; }
+
+    public CursorPaginatedIterator(ICursorPagination<T> response, IZendeskClient client)
+    {
+        Response = response;
+        this.client = client;
+        ResponseType = response.GetType().FullName;
+    }
+
+    public bool HasMore() => Response.Meta.HasMore;
+
+    public IEnumerator<T> GetEnumerator()
+    {
+        return Response.GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return Response.GetEnumerator();
+    }
+
+
+    public async Task NextPage()
+    {
+        Console.WriteLine("fetching the next page... ");
+        await ExecuteRequest(Response.Links.Next);
+    }
+
+    public async Task PrevPage()
+    {
+        await ExecuteRequest(Response.Links.Prev);
+    }
+
+    public async IAsyncEnumerable<T> All()
+    {
+        foreach (var item in Response)
+        {
+            yield return item;
+        }
+        while (HasMore())
+        {
+            await NextPage();
+            foreach (var item in Response)
+            {
+                yield return item;
+            }
+        } 
+        yield break;
+    }
+
+    private async Task ExecuteRequest(string requestUrl)
+    {
+        var httpResponseMessage = await client.PaginatedResource.GetPage(requestUrl);
+        var responseBody = await httpResponseMessage.Content.ReadAsStringAsync();
+        Response = (ICursorPagination<T>)JsonConvert.DeserializeObject(responseBody, Type.GetType(ResponseType));
+    }
+
+}

src/ZendeskApi.Client/Resources/Interfaces/IJobStatusResource.cs

@@ -13,18 +13,22 @@ public interface IJobStatusResource
         /// <summary>
         /// Shows the current statuses for background jobs running.
         /// </summary>
-        [Obsolete("Use `GetAllAsync` instead.")]
+        [Obsolete("Use `GetAllAsync` with CursorPager instead.")]
         Task<IPagination<JobStatusResponse>> ListAsync(
             PagerParameters pagerParameters = null,
             CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Shows the current statuses for background jobs running.
         /// </summary>
+        [Obsolete("Use `GetAllAsync` with CursorPager instead.")]
         Task<IPagination<JobStatusResponse>> GetAllAsync(
             PagerParameters pagerParameters = null,
             CancellationToken cancellationToken = default(CancellationToken));
 
+        Task<ICursorPagination<JobStatusResponse>> GetAllAsync(
+        CursorPager pagerParameters = null,
+        CancellationToken cancellationToken = default(CancellationToken));
         #endregion
 
         #region Show

src/ZendeskApi.Client/Resources/Interfaces/IPaginatedResource.cs

@@ -0,0 +1,14 @@
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace ZendeskApi.Client.Resources.Interfaces
+{
+    public interface IPaginatedResource
+    {
+        Task<HttpResponseMessage> GetPage(
+             string url,
+             CancellationToken cancellationToken = default);
+    }
+}
+

src/ZendeskApi.Client/Resources/Interfaces/IRequestsResource.cs

@@ -14,6 +14,10 @@ Task<IPagination<Request>> GetAllAsync(
             PagerParameters pager = null,
             CancellationToken cancellationToken = default);
 
+        Task<ICursorPagination<Request>> GetAllAsync(
+            CursorPager pager,
+            CancellationToken cancellationToken = default);
+
         Task<Request> GetAsync(
             long requestId,
             CancellationToken cancellationToken = default);
@@ -29,6 +33,11 @@ Task<IPagination<TicketComment>> GetAllComments(
             PagerParameters pager = null,
             CancellationToken cancellationToken = default);
 
+        Task<ICursorPagination<TicketComment>> GetAllComments(
+            long requestId,
+            CursorPager pager,
+            CancellationToken cancellationToken = default);
+
         Task<TicketComment> GetTicketCommentAsync(
             long requestId, 
             long commentId,

src/ZendeskApi.Client/Resources/Interfaces/Ticket/ITicketAuditResource.cs

@@ -8,6 +8,7 @@ namespace ZendeskApi.Client.Resources
     public interface ITicketAuditResource
     {
         Task<TicketAuditResponse> GetAllAsync(CursorPagerVariant pager = null, CancellationToken cancellationToken = default);
+        Task<TicketAuditCursorResponse> GetAllAsync(CursorPager pager, CancellationToken cancellationToken = default);
         Task<TicketAuditResponse> GetAllByTicketAsync(long ticketId, CancellationToken cancellationToken = default);
         Task<SingleTicketAuditResponse> Get(int ticketId, int auditId, CancellationToken cancellationToken = default);
     }

src/ZendeskApi.Client/Resources/JobStatusResource.cs

@@ -19,7 +19,7 @@ public JobStatusResource(
             : base(apiClient, logger, "job_statuses")
         { }
 
-        [Obsolete("Use `GetAllAsync` instead.")]
+        [Obsolete("Use `GetAllAsync` with CursorPager instead.")]
         public async Task<IPagination<JobStatusResponse>> ListAsync(
             PagerParameters pagerParameters = null,
             CancellationToken cancellationToken = default(CancellationToken))
@@ -29,6 +29,18 @@ public async Task<IPagination<JobStatusResponse>> ListAsync(
                 cancellationToken);
         }
 
+        public async Task<ICursorPagination<JobStatusResponse>> GetAllAsync(CursorPager pagerParameters, CancellationToken cancellationToken = default)
+        {
+            return await GetAsync<JobStatusListCursorResponse>(
+                ResourceUri,
+                "list-job-statuses",
+                "ListAsync",
+                pagerParameters,
+                null,
+                cancellationToken: cancellationToken);
+        }
+
+        [Obsolete("Use `GetAllAsync` with CursorPager instead.")]
         public async Task<IPagination<JobStatusResponse>> GetAllAsync(
             PagerParameters pagerParameters = null,
             CancellationToken cancellationToken = default(CancellationToken))

src/ZendeskApi.Client/Resources/PaginatedResource.cs

@@ -0,0 +1,24 @@
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ZendeskApi.Client.Resources.Interfaces;
+
+namespace ZendeskApi.Client.Resources
+{
+    public class PaginatedResource : AbstractBaseResource<PaginatedResource>, IPaginatedResource
+    {
+        public PaginatedResource(
+            IZendeskApiClient apiClient,
+            ILogger logger)
+            : base(apiClient, logger, "")
+        { }
+
+        public async Task<HttpResponseMessage> GetPage(string url, CancellationToken cancellationToken = default)
+        {
+            using var client = ApiClient.CreateClient();
+            return await client.GetAsync(url);
+        }
+    }
+}
+

src/ZendeskApi.Client/Resources/RequestsResource.cs

@@ -34,6 +34,18 @@ public async Task<IPagination<Request>> GetAllAsync(
                 cancellationToken: cancellationToken);
         }
 
+        public async Task<ICursorPagination<Request>> GetAllAsync(
+            CursorPager pager,
+            CancellationToken cancellationToken = default)
+        {
+            return await GetAsync<RequestsCursorResponse>(
+                ResourceUri,
+                "list-requests",
+                "GetAllAsync",
+                pager,
+                cancellationToken: cancellationToken);
+        }
+
 
         public async Task<Request> GetAsync(
             long requestId,
@@ -79,6 +91,17 @@ public async Task<IPagination<TicketComment>> GetAllComments(
                 cancellationToken);
         }
 
+        public async Task<ICursorPagination<TicketComment>> GetAllComments(long requestId, CursorPager pager, CancellationToken cancellationToken = default)
+        {
+            return await GetWithNotFoundCheckAsync<TicketCommentsListCursorResponse>(
+                string.Format(CommentsResourceUri, requestId),
+                "getting-comments",
+                $"GetAllComments({requestId})",
+                $"Could not find any comments for request {requestId} as request was not found",
+                pager,
+                cancellationToken);
+        }
+
         public async Task<TicketComment> GetTicketCommentAsync(
             long requestId, 
             long commentId,
@@ -121,5 +144,6 @@ public async Task<Request> UpdateAsync(
             return response?
                 .Request;
         }
+
     }
 }

src/ZendeskApi.Client/Resources/Ticket/TicketAuditResource.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -17,6 +18,7 @@ public TicketAuditResource(IZendeskApiClient apiClient, ILogger logger) : base(a
         {
         }
 
+        [Obsolete("Use `GetAllAsync` with CursorPager parameter instead.")]
         public async Task<TicketAuditResponse> GetAllAsync(CursorPagerVariant pager = null, CancellationToken cancellationToken = default)
         {
             return await GetAsync<TicketAuditResponse>(
@@ -27,6 +29,17 @@ public async Task<TicketAuditResponse> GetAllAsync(CursorPagerVariant pager = nu
                 cancellationToken);
         }
 
+        public async Task<TicketAuditCursorResponse> GetAllAsync(CursorPager pager, CancellationToken cancellationToken = default)
+        {
+            return await GetAsync<TicketAuditCursorResponse>(
+                ResourceUri,
+                "list-all-ticket-audits",
+                "GetAllAsync",
+                pager,
+                null,
+                cancellationToken);
+        }
+
         public async Task<TicketAuditResponse> GetAllByTicketAsync(long ticketId, CancellationToken cancellationToken = default)
         {
             return await GetAsync<TicketAuditResponse>(

src/ZendeskApi.Client/Responses/ICursorPaginationResponse.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Newtonsoft.Json;

src/ZendeskApi.Client/Responses/JobStatus/JobStatusListCursorResponse.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using ZendeskApi.Client.Models;
+
+namespace ZendeskApi.Client.Responses
+{
+    [JsonObject]
+    public class JobStatusListCursorResponse : CursorPaginationResponse<JobStatusResponse>
+    {
+        [JsonProperty("job_statuses")]
+        public IEnumerable<JobStatusResponse> JobStatuses { get; set; }
+
+        protected override IEnumerable<JobStatusResponse> Enumerable => JobStatuses;
+    }
+}

src/ZendeskApi.Client/Responses/Request/RequestsCursorResponse.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using ZendeskApi.Client.Models;
+
+namespace ZendeskApi.Client.Responses
+{
+    [JsonObject]
+    public class RequestsCursorResponse : CursorPaginationResponse<Request>
+    {
+        [JsonProperty("requests")]
+        public IEnumerable<Request> Requests { get; set; }
+
+        protected override IEnumerable<Request> Enumerable => Requests;
+    }
+}

src/ZendeskApi.Client/Responses/Ticket/TicketAuditCursorResponse.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using ZendeskApi.Client.Models;
+
+namespace ZendeskApi.Client.Responses
+{
+    [JsonObject]
+    public class TicketAuditCursorResponse : CursorPaginationResponse<TicketAudit>
+    {
+        [JsonProperty("audits")]
+        public IEnumerable<TicketAudit> Audits { get; set; }
+
+        protected override IEnumerable<TicketAudit> Enumerable => Audits;
+    }
+}

src/ZendeskApi.Client/ZendeskClient.cs

@@ -89,5 +89,8 @@ public ZendeskClient(IZendeskApiClient apiClient, ILogger logger = null)
 
         private Lazy<ITagsResource> TagsLazy => new Lazy<ITagsResource>(() => new TagsResource(_apiClient, _logger));
         public ITagsResource Tags => TagsLazy.Value;
+
+        private Lazy<IPaginatedResource> PaginatedResourceLazy => new Lazy<IPaginatedResource>(() => new PaginatedResource(_apiClient, _logger));
+        public IPaginatedResource PaginatedResource => PaginatedResourceLazy.Value;
     }
 }