Update Query database endpoint to return both Page and Database

Author: KoditkarVedant

Src/Notion.Client/Api/Databases/DatabasesClient.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using static Notion.Client.ApiEndpoints;
 
 namespace Notion.Client
 {
-    public class DatabasesClient : IDatabasesClient
+    public sealed partial class DatabasesClient : IDatabasesClient
     {
         private readonly IRestClient _client;
 
@@ -20,24 +18,6 @@ public async Task<Database> RetrieveAsync(string databaseId, CancellationToken c
             return await _client.GetAsync<Database>(DatabasesApiUrls.Retrieve(databaseId), cancellationToken: cancellationToken);
         }
 
-        public async Task<PaginatedList<Page>> QueryAsync(
-            string databaseId,
-            DatabasesQueryParameters databasesQueryParameters, CancellationToken cancellationToken = default)
-        {
-            var body = (IDatabaseQueryBodyParameters)databasesQueryParameters;
-            var queryParameters = (IDatabaseQueryQueryParameters)databasesQueryParameters;
-
-            var queryParams = queryParameters.FilterProperties?
-                .Select(x => new KeyValuePair<string, string>("filter_properties", x));
-
-            return await _client.PostAsync<PaginatedList<Page>>(
-                DatabasesApiUrls.Query(databaseId),
-                body,
-                queryParams,
-                cancellationToken: cancellationToken
-            );
-        }
-
         public async Task<Database> CreateAsync(DatabasesCreateParameters databasesCreateParameters, CancellationToken cancellationToken = default)
         {
             var body = (IDatabasesCreateBodyParameters)databasesCreateParameters;

Src/Notion.Client/Api/Databases/IDatabasesClient.cs

@@ -24,7 +24,7 @@ public interface IDatabasesClient
         /// <returns>
         ///     <see cref="PaginatedList{T}" />
         /// </returns>
-        Task<PaginatedList<Page>> QueryAsync(string databaseId, DatabasesQueryParameters databasesQueryParameters, CancellationToken cancellationToken = default);
+        Task<DatabaseQueryResponse> QueryAsync(string databaseId, DatabasesQueryParameters databasesQueryParameters, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Creates a database as a subpage in the specified parent page, with the specified properties schema.

Src/Notion.Client/Api/Databases/Query/DatabasesClient.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Notion.Client
+{
+    public sealed partial class DatabasesClient
+    {
+        public async Task<DatabaseQueryResponse> QueryAsync(
+            string databaseId,
+            DatabasesQueryParameters databasesQueryParameters, CancellationToken cancellationToken = default)
+        {
+            var body = (IDatabaseQueryBodyParameters)databasesQueryParameters;
+            var queryParameters = (IDatabaseQueryQueryParameters)databasesQueryParameters;
+
+            var queryParams = queryParameters.FilterProperties?
+                .Select(x => new KeyValuePair<string, string>("filter_properties", x));
+
+            return await _client.PostAsync<DatabaseQueryResponse>(
+                ApiEndpoints.DatabasesApiUrls.Query(databaseId),
+                body,
+                queryParams,
+                cancellationToken: cancellationToken
+            );
+        }
+    }
+}

…equestParams/DatabasesQueryParameters.cs …uery/Request/DatabasesQueryParameters.csSrc/Notion.Client/Api/Databases/RequestParams/DatabasesQueryParameters.cs renamed to Src/Notion.Client/Api/Databases/Query/Request/DatabasesQueryParameters.cs Src/Notion.Client/Api/Databases/RequestParams/DatabasesQueryParameters.cs renamed to Src/Notion.Client/Api/Databases/Query/Request/DatabasesQueryParameters.cs

@@ -0,0 +1,7 @@
+namespace Notion.Client
+{
+    // ReSharper disable once ClassNeverInstantiated.Global
+    public class DatabaseQueryResponse : PaginatedList<IWikiDatabase>
+    {
+    }
+}

…stParams/IDatabaseQueryBodyParameters.cs …/Request/IDatabaseQueryBodyParameters.csSrc/Notion.Client/Api/Databases/RequestParams/IDatabaseQueryBodyParameters.cs renamed to Src/Notion.Client/Api/Databases/Query/Request/IDatabaseQueryBodyParameters.cs Src/Notion.Client/Api/Databases/RequestParams/IDatabaseQueryBodyParameters.cs renamed to Src/Notion.Client/Api/Databases/Query/Request/IDatabaseQueryBodyParameters.cs

@@ -64,8 +64,9 @@ public async Task QueryAsync()
 
         pagesPaginatedList.Results.Should().ContainSingle();
 
-        foreach (var page in pagesPaginatedList.Results)
+        foreach (var iWikiDatabase in pagesPaginatedList.Results)
         {
+            var page = (Page)iWikiDatabase;
             page.Parent.Should().BeAssignableTo<IPageParent>();
             page.Object.Should().Be(ObjectType.Page);
         }
@@ -476,8 +477,9 @@ var jsonData
 
         pagesPaginatedList.Results.Should().ContainSingle();
 
-        foreach (var page in pagesPaginatedList.Results)
+        foreach (var iWikiDatabase in pagesPaginatedList.Results)
         {
+            var page = (Page)iWikiDatabase;
             page.Parent.Should().BeAssignableTo<IPageParent>();
             page.Object.Should().Be(ObjectType.Page);