From 48209a130b39a3c91b0e8afb6d6cf5df3f3509b3 Mon Sep 17 00:00:00 2001
From: Serraniel <mail@serraniel.dev>
Date: Wed, 1 Mar 2023 12:52:30 +0100
Subject: [PATCH] Refactors API fetching for tests and fixes a typo

---
 src/Client/ApiClient.cs                       | 16 +++--
 src/Client/Responses/EnumerableApiResponse.cs | 54 +++--------------
 src/Client/Responses/PageableApiResponse.cs   | 59 +++++++++++++++++++
 3 files changed, 79 insertions(+), 50 deletions(-)
 create mode 100644 src/Client/Responses/PageableApiResponse.cs

diff --git a/src/Client/ApiClient.cs b/src/Client/ApiClient.cs
index d16cb8c..079d0c2 100644
--- a/src/Client/ApiClient.cs
+++ b/src/Client/ApiClient.cs
@@ -45,15 +45,21 @@ public class ApiClient
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
         };
 
-        var response = await _client.GetFromJsonAsync<TResponseType>(requestUri, options);
+        var response = await _client.GetFromJsonAsync<TResponseGeneric>(requestUri, options);
 
-        if (response is IPageableApiResponse<TResponseType, TResponseGeneric> pageAbleApiResponse)
+        // TODO: Find good way to handle pageable requests
+        /*if (response is IPageableApiResponse<TResponseType, TResponseGeneric> pageAbleApiResponse)
         {
             pageAbleApiResponse.CurrentApiClient = this;
             pageAbleApiResponse.RememberRequestUri(requestUri);
-        }
+        }*/
 
-        return response;
+        var result = new TResponseType
+        {
+            Data = response
+        };
+
+        return result;
     }
 
     public async Task<EnumerableApiResponse<T>?> FetchDataAsync<T>(string? query = null, int page = 1)
@@ -71,7 +77,7 @@ public class ApiClient
         return await FetchDataAsync<SingleApiResponse<T>, T>($"{endpoint.ApiUri()}/id={id}");
     }
 
-    public async Task<SingleApiResponse<T>?> FetchByUuigAsync<T>(int uuid) where T : EndpointObject
+    public async Task<SingleApiResponse<T>?> FetchByUuidAsync<T>(int uuid) where T : EndpointObject
     {
         var endpoint = EndpointFactory.GetApiEndpoint<T>();
 
diff --git a/src/Client/Responses/EnumerableApiResponse.cs b/src/Client/Responses/EnumerableApiResponse.cs
index 056572a..168f883 100644
--- a/src/Client/Responses/EnumerableApiResponse.cs
+++ b/src/Client/Responses/EnumerableApiResponse.cs
@@ -1,58 +1,22 @@
-using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using System.Linq;
+using System.Text.Json.Serialization;
 using JpnCardsPokemonSdk.Client.Endpoints;
 
 namespace JpnCardsPokemonSdk.Client.Responses;
 
-public class EnumerableApiResponse<T> : IApiResponse<IEnumerable<T>>,
-    IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>> where T : EndpointObject
+public class EnumerableApiResponse<T> : IApiResponse<IEnumerable<T>>, IEnumerable<T> where T : EndpointObject
 {
-    private string? RequestUri { get; set; }
+    [JsonPropertyName("")] public IEnumerable<T>? Data { get; set; }
 
-    public int TotalPages => (int)Math.Ceiling((decimal)(
-        (IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>)this).TotalCount / (
-        (IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>)this).PageSize);
-
-    public IEnumerable<T>? Data { get; set; }
-
-    ApiClient? IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>.CurrentApiClient { get; set; }
-
-    int IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>.Page { get; set; }
-
-    int IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>.PageSize { get; set; }
-
-    int IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>.Count { get; set; }
-
-#if !(NETCOREAPP3_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER)
-    bool IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>.HasNextPage()
+    public IEnumerator<T> GetEnumerator()
     {
-        return ((IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>)this).Page < ((IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>)this).TotalCount;
-    }
-#endif
-
-    int IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>.TotalCount { get; set; }
-
-    async Task<EnumerableApiResponse<T>> IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>.
-        FetchNextPageAsync()
-    {
-        return await ((IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>)this).FetchPageAsync((
-            (IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>)this).Page + 1);
+        return Data?.GetEnumerator() ?? Enumerable.Empty<T>().GetEnumerator();
     }
 
-    async Task<EnumerableApiResponse<T>?> IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>.
-        FetchPageAsync(int page)
+    IEnumerator IEnumerable.GetEnumerator()
     {
-        var requestUri = RequestUri + "&page=" + page;
-
-        return await ((IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>)this).CurrentApiClient
-            ?.FetchDataAsync<EnumerableApiResponse<T>, IEnumerable<T>>(requestUri)!;
-    }
-
-    void IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>.RememberRequestUri(string requestUri)
-    {
-        // Remember full Uri without page
-        RequestUri = Regex.Replace(requestUri, @"page=\d*&?", "");
+        return GetEnumerator();
     }
 }
\ No newline at end of file
diff --git a/src/Client/Responses/PageableApiResponse.cs b/src/Client/Responses/PageableApiResponse.cs
new file mode 100644
index 0000000..a8c31a0
--- /dev/null
+++ b/src/Client/Responses/PageableApiResponse.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using JpnCardsPokemonSdk.Client.Endpoints;
+
+namespace JpnCardsPokemonSdk.Client.Responses;
+
+public class PageableApiResponse<T> : EnumerableApiResponse<T>,
+    IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>
+    where T : EndpointObject
+{
+    private string? RequestUri { get; set; }
+
+    public int TotalPages => (int)Math.Ceiling((decimal)(
+        (IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>)this).TotalCount / (
+        (IPageableApiResponse<EnumerableApiResponse<T>, IEnumerable<T>>)this).PageSize);
+
+    ApiClient? IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>.CurrentApiClient { get; set; }
+
+    int IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>.Page { get; set; }
+
+    int IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>.PageSize { get; set; }
+
+    int IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>.Count { get; set; }
+
+    int IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>.TotalCount { get; set; }
+
+
+#if !(NETCOREAPP3_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER)
+    bool IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>.HasNextPage()
+    {
+        return ((IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>)this).Page <
+               ((IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>)this).TotalCount;
+    }
+#endif
+
+    async Task<PageableApiResponse<T>> IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>.
+        FetchNextPageAsync()
+    {
+        return await ((IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>)this).FetchPageAsync((
+            (IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>)this).Page + 1);
+    }
+
+    async Task<PageableApiResponse<T>?> IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>.
+        FetchPageAsync(int page)
+    {
+        var requestUri = RequestUri + "&page=" + page;
+
+        return await ((IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>)this).CurrentApiClient
+            ?.FetchDataAsync<PageableApiResponse<T>, IEnumerable<T>>(requestUri)!;
+    }
+
+    void IPageableApiResponse<PageableApiResponse<T>, IEnumerable<T>>.RememberRequestUri(string requestUri)
+    {
+        // Remember full Uri without page
+        RequestUri = Regex.Replace(requestUri, @"page=\d*&?", "");
+    }
+}
\ No newline at end of file