notion-dotnet · KoditkarVedant · Oct 14, 2023 · Oct 14, 2023 · Oct 14, 2023 · Oct 14, 2023
diff --git a/Src/Notion.Client/Api/Blocks/AppendChildren/BlocksClient.cs b/Src/Notion.Client/Api/Blocks/AppendChildren/BlocksClient.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Notion.Client
+{
+    public sealed partial class BlocksClient
+    {
+        public async Task<AppendChildrenResponse> AppendChildrenAsync(
+            BlockAppendChildrenRequest request,
+            CancellationToken cancellationToken = default)
+        {
+            if (string.IsNullOrWhiteSpace(request.BlockId))
+            {
+                throw new ArgumentNullException(nameof(request.BlockId));
+            }
+
+            var url = ApiEndpoints.BlocksApiUrls.AppendChildren(request.BlockId);
+
+            var body = (IBlockAppendChildrenBodyParameters)request;
+
+            return await _client.PatchAsync<AppendChildrenResponse>(url, body, cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/...tParams/BlocksAppendChildrenParameters.cs → ...ren/Request/BlockAppendChildrenRequest.cs b/...tParams/BlocksAppendChildrenParameters.cs → ...ren/Request/BlockAppendChildrenRequest.cs
@@ -2,10 +2,12 @@
 
 namespace Notion.Client
 {
-    public class BlocksAppendChildrenParameters : IBlocksAppendChildrenBodyParameters
+    public class BlockAppendChildrenRequest : IBlockAppendChildrenBodyParameters, IBlockAppendChildrenPathParameters
     {
         public IEnumerable<IBlock> Children { get; set; }
 
         public string After { get; set; }
+
+        public string BlockId { get; set; }
     }
 }
diff --git a/...ms/IBlocksAppendChildrenBodyParameters.cs → ...est/IBlockAppendChildrenBodyParameters.cs b/...ms/IBlocksAppendChildrenBodyParameters.cs → ...est/IBlockAppendChildrenBodyParameters.cs
@@ -4,7 +4,7 @@
 namespace Notion.Client
 {
     // TODO: need an input version of Block
-    public interface IBlocksAppendChildrenBodyParameters
+    public interface IBlockAppendChildrenBodyParameters
     {
         [JsonProperty("children")]
         IEnumerable<IBlock> Children { get; set; }

diff --git a/Src/Notion.Client/Api/Blocks/AppendChildren/Request/IBlockAppendChildrenPathParameters.cs b/Src/Notion.Client/Api/Blocks/AppendChildren/Request/IBlockAppendChildrenPathParameters.cs
@@ -0,0 +1,7 @@
+namespace Notion.Client
+{
+    public interface IBlockAppendChildrenPathParameters
+    {
+        public string BlockId { get; set; }
+    }
+}
diff --git a/Src/Notion.Client/Api/Blocks/AppendChildren/Response/AppendChildrenResponse.cs b/Src/Notion.Client/Api/Blocks/AppendChildren/Response/AppendChildrenResponse.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class AppendChildrenResponse : PaginatedList<IBlock>
+    {
+        [JsonProperty("block")]
+        public Dictionary<string, object> Block { get; set; }
+    }
+}
diff --git a/Src/Notion.Client/Api/Blocks/BlocksClient.cs b/Src/Notion.Client/Api/Blocks/BlocksClient.cs
@@ -6,7 +6,7 @@
 
 namespace Notion.Client
 {
-    public class BlocksClient : IBlocksClient
+    public sealed partial class BlocksClient : IBlocksClient
     {
         private readonly IRestClient _client;
 
@@ -15,44 +15,6 @@ public BlocksClient(IRestClient client)
             _client = client;
         }
 
-        public async Task<PaginatedList<IBlock>> RetrieveChildrenAsync(
-            string blockId,
-            BlocksRetrieveChildrenParameters parameters = null, CancellationToken cancellationToken = default)
-        {
-            if (string.IsNullOrWhiteSpace(blockId))
-            {
-                throw new ArgumentNullException(nameof(blockId));
-            }
-
-            var url = BlocksApiUrls.RetrieveChildren(blockId);
-
-            var queryParameters = (IBlocksRetrieveChildrenQueryParameters)parameters;
-
-            var queryParams = new Dictionary<string, string>
-            {
-                { "start_cursor", queryParameters?.StartCursor },
-                { "page_size", queryParameters?.PageSize?.ToString() }
-            };
-
-            return await _client.GetAsync<PaginatedList<IBlock>>(url, queryParams, cancellationToken: cancellationToken);
-        }
-
-        public async Task<PaginatedList<IBlock>> AppendChildrenAsync(
-            string blockId,
-            BlocksAppendChildrenParameters parameters = null, CancellationToken cancellationToken = default)
-        {
-            if (string.IsNullOrWhiteSpace(blockId))
-            {
-                throw new ArgumentNullException(nameof(blockId));
-            }
-
-            var url = BlocksApiUrls.AppendChildren(blockId);
-
-            var body = (IBlocksAppendChildrenBodyParameters)parameters;
-
-            return await _client.PatchAsync<PaginatedList<IBlock>>(url, body, cancellationToken: cancellationToken);
-        }
-
         public async Task<IBlock> RetrieveAsync(string blockId, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrWhiteSpace(blockId))

diff --git a/Src/Notion.Client/Api/Blocks/IBlocksClient.cs b/Src/Notion.Client/Api/Blocks/IBlocksClient.cs
@@ -18,21 +18,33 @@ public interface IBlocksClient
         /// <param name="blockId"></param>
         /// <param name="updateBlock"></param>
         /// <returns>Block</returns>
-        Task<IBlock> UpdateAsync(string blockId, IUpdateBlock updateBlock, CancellationToken cancellationToken = default);
+        Task<IBlock> UpdateAsync(string blockId, IUpdateBlock updateBlock,
+            CancellationToken cancellationToken = default);
 
-        Task<PaginatedList<IBlock>> RetrieveChildrenAsync(
-            string blockId,
-            BlocksRetrieveChildrenParameters parameters = null, CancellationToken cancellationToken = default);
+        /// <summary>
+        ///     Returns a paginated array of child block objects contained in the block using the ID specified.
+        ///     <br/>
+        ///     In order to receive a complete representation of a block, you may need to recursively retrieve the
+        ///     block children of child blocks.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        Task<RetrieveChildrenResponse> RetrieveChildrenAsync(
+            BlockRetrieveChildrenRequest request,
+            CancellationToken cancellationToken = default
+        );
 
         /// <summary>
         ///     Creates and appends new children blocks to the parent block_id specified.
         /// </summary>
-        /// <param name="blockId">Identifier for a block</param>
-        /// <param name="parameters"></param>
+        /// <param name="request"></param>
+        /// <param name="cancellationToken"></param>
         /// <returns>A paginated list of newly created first level children block objects.</returns>
-        Task<PaginatedList<IBlock>> AppendChildrenAsync(
-            string blockId,
-            BlocksAppendChildrenParameters parameters = null, CancellationToken cancellationToken = default);
+        Task<AppendChildrenResponse> AppendChildrenAsync(
+            BlockAppendChildrenRequest request,
+            CancellationToken cancellationToken = default
+        );
 
         /// <summary>
         ///     Sets a Block object, including page blocks, to archived: true using the ID specified.

diff --git a/Src/Notion.Client/Api/Blocks/RequestParams/BlocksRetrieveChildrenParameters.cs b/Src/Notion.Client/Api/Blocks/RequestParams/BlocksRetrieveChildrenParameters.cs
diff --git a/Src/Notion.Client/Api/Blocks/RequestParams/IBlocksRetrieveChildrenQueryParameters.cs b/Src/Notion.Client/Api/Blocks/RequestParams/IBlocksRetrieveChildrenQueryParameters.cs
diff --git a/Src/Notion.Client/Api/Blocks/RetrieveChildren/BlocksClient.cs b/Src/Notion.Client/Api/Blocks/RetrieveChildren/BlocksClient.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Notion.Client
+{
+    public sealed partial class BlocksClient
+    {
+        public async Task<RetrieveChildrenResponse> RetrieveChildrenAsync(
+            BlockRetrieveChildrenRequest request,
+            CancellationToken cancellationToken = default)
+        {
+            if (string.IsNullOrWhiteSpace(request.BlockId))
+            {
+                throw new ArgumentNullException(nameof(request.BlockId));
+            }
+
+            var url = ApiEndpoints.BlocksApiUrls.RetrieveChildren(request.BlockId);
+
+            var queryParameters = (IBlockRetrieveChildrenQueryParameters)request;
+
+            var queryParams = new Dictionary<string, string>
+            {
+                { "start_cursor", queryParameters?.StartCursor },
+                { "page_size", queryParameters?.PageSize?.ToString() }
+            };
+
+            return await _client.GetAsync<RetrieveChildrenResponse>(
+                url,
+                queryParams,
+                cancellationToken: cancellationToken
+            );
+        }
+    }
+}
diff --git a/Src/Notion.Client/Api/Blocks/RetrieveChildren/Request/BlockRetrieveChildrenRequest.cs b/Src/Notion.Client/Api/Blocks/RetrieveChildren/Request/BlockRetrieveChildrenRequest.cs
@@ -0,0 +1,13 @@
+namespace Notion.Client
+{
+    public class BlockRetrieveChildrenRequest :
+        IBlockRetrieveChildrenQueryParameters,
+        IBlockRetrieveChildrenPathParameters
+    {
+        public string StartCursor { get; set; }
+
+        public int? PageSize { get; set; }
+
+        public string BlockId { get; set; }
+    }
+}
diff --git a/...Notion.Client/Api/Blocks/RetrieveChildren/Request/IBlockRetrieveChildrenPathParameters.cs b/...Notion.Client/Api/Blocks/RetrieveChildren/Request/IBlockRetrieveChildrenPathParameters.cs
@@ -0,0 +1,7 @@
+namespace Notion.Client
+{
+    public interface IBlockRetrieveChildrenPathParameters
+    {
+        public string BlockId { get; set; }
+    }
+}
diff --git a/...otion.Client/Api/Blocks/RetrieveChildren/Request/IBlockRetrieveChildrenQueryParameters.cs b/...otion.Client/Api/Blocks/RetrieveChildren/Request/IBlockRetrieveChildrenQueryParameters.cs
@@ -0,0 +1,6 @@
+namespace Notion.Client
+{
+    public interface IBlockRetrieveChildrenQueryParameters : IPaginationParameters
+    {
+    }
+}
diff --git a/Src/Notion.Client/Api/Blocks/RetrieveChildren/Response/RetrieveChildrenResponse.cs b/Src/Notion.Client/Api/Blocks/RetrieveChildren/Response/RetrieveChildrenResponse.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class RetrieveChildrenResponse : PaginatedList<IBlock>
+    {
+        [JsonProperty("block")]
+        public Dictionary<string, object> Block { get; set; }
+    }
+}
diff --git a/Src/Notion.Client/Api/Databases/Query/Response/DatabaseQueryResponse.cs b/Src/Notion.Client/Api/Databases/Query/Response/DatabaseQueryResponse.cs
@@ -1,7 +1,12 @@
-namespace Notion.Client
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
 {
     // ReSharper disable once ClassNeverInstantiated.Global
     public class DatabaseQueryResponse : PaginatedList<IWikiDatabase>
     {
+        [JsonProperty("database")]
+        public Dictionary<string, object> Database { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Api/Search/ISearchClient.cs b/Src/Notion.Client/Api/Search/ISearchClient.cs
@@ -11,10 +11,14 @@ public interface ISearchClient
         ///     Searches all original pages, databases, and child pages/databases that are shared with the integration.
         ///     It will not return linked databases, since these duplicate their source databases.
         /// </summary>
-        /// <param name="parameters">Search filters and body parameters</param>
+        /// <param name="request">Search filters and body parameters</param>
+        /// <param name="cancellationToken"></param>
         /// <returns>
         ///     <see cref="PaginatedList{IObject}" />
         /// </returns>
-        Task<PaginatedList<IObject>> SearchAsync(SearchParameters parameters, CancellationToken cancellationToken = default);
+        Task<SearchResponse> SearchAsync(
+            SearchRequest request,
+            CancellationToken cancellationToken = default
+        );
     }
 }
diff --git a/...earch/Parameters/ISearchBodyParameters.cs → ...i/Search/Request/ISearchBodyParameters.cs b/...earch/Parameters/ISearchBodyParameters.cs → ...i/Search/Request/ISearchBodyParameters.cs
diff --git a/.../Api/Search/Parameters/SearchDirection.cs → ...ent/Api/Search/Request/SearchDirection.cs b/.../Api/Search/Parameters/SearchDirection.cs → ...ent/Api/Search/Request/SearchDirection.cs
diff --git a/...ent/Api/Search/Parameters/SearchFilter.cs → ...Client/Api/Search/Request/SearchFilter.cs b/...ent/Api/Search/Parameters/SearchFilter.cs → ...Client/Api/Search/Request/SearchFilter.cs
diff --git a/...Api/Search/Parameters/SearchObjectType.cs → ...nt/Api/Search/Request/SearchObjectType.cs b/...Api/Search/Parameters/SearchObjectType.cs → ...nt/Api/Search/Request/SearchObjectType.cs
diff --git a/...Api/Search/Parameters/SearchParameters.cs → ...lient/Api/Search/Request/SearchRequest.cs b/...Api/Search/Parameters/SearchParameters.cs → ...lient/Api/Search/Request/SearchRequest.cs
@@ -1,6 +1,6 @@
 namespace Notion.Client
 {
-    public class SearchParameters : ISearchBodyParameters
+    public class SearchRequest : ISearchBodyParameters
     {
         public string Query { get; set; }
 

diff --git a/...lient/Api/Search/Parameters/SearchSort.cs → ...n.Client/Api/Search/Request/SearchSort.cs b/...lient/Api/Search/Parameters/SearchSort.cs → ...n.Client/Api/Search/Request/SearchSort.cs
diff --git a/Src/Notion.Client/Api/Search/Response/SearchResponse.cs b/Src/Notion.Client/Api/Search/Response/SearchResponse.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class SearchResponse : PaginatedList<IObject>
+    {
+        [JsonProperty("page_or_database")]
+        public Dictionary<string, object> PageOrDatabase { get; set; }
+    }
+}
diff --git a/Src/Notion.Client/Api/Search/SearchClient.cs b/Src/Notion.Client/Api/Search/SearchClient.cs
@@ -4,7 +4,7 @@
 
 namespace Notion.Client
 {
-    public class SearchClient : ISearchClient
+    public sealed class SearchClient : ISearchClient
     {
         private readonly IRestClient _client;
 
@@ -13,13 +13,15 @@ public SearchClient(IRestClient client)
             _client = client;
         }
 
-        public async Task<PaginatedList<IObject>> SearchAsync(SearchParameters parameters, CancellationToken cancellationToken = default)
+        public async Task<SearchResponse> SearchAsync(
+            SearchRequest request,
+            CancellationToken cancellationToken = default)
         {
             var url = SearchApiUrls.Search();
 
-            var body = (ISearchBodyParameters)parameters;
+            var body = (ISearchBodyParameters)request;
 
-            return await _client.PostAsync<PaginatedList<IObject>>(url, body, cancellationToken: cancellationToken);
+            return await _client.PostAsync<SearchResponse>(url, body, cancellationToken: cancellationToken);
         }
     }
 }
diff --git a/Src/Notion.Client/Api/Users/IUsersClient.cs b/Src/Notion.Client/Api/Users/IUsersClient.cs
@@ -19,13 +19,23 @@ public interface IUsersClient
         ///     Returns a paginated list of Users for the workspace.
         ///     The response may contain fewer than page_size of results.
         /// </summary>
+        /// <param name="cancellationToken"></param>
         /// <returns>
-        ///     <see cref="PaginatedList{User}" />
+        ///     <see cref="ListUsersResponse" />
         /// </returns>
-        Task<PaginatedList<User>> ListAsync(CancellationToken cancellationToken = default);
+        Task<ListUsersResponse> ListAsync(CancellationToken cancellationToken = default);
 
-        Task<PaginatedList<User>> ListAsync(
-            ListUsersParameters listUsersParameters,
+        /// <summary>
+        ///     Returns a paginated list of Users for the workspace.
+        ///     The response may contain fewer than page_size of results.
+        /// </summary>
+        /// <param name="listUsersRequest"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns>
+        ///      <see cref="ListUsersResponse" />
+        /// </returns>
+        Task<ListUsersResponse> ListAsync(
+            ListUsersRequest listUsersRequest,
             CancellationToken cancellationToken = default
         );
 

diff --git a/...Users/List/Request/ListUsersParameters.cs → ...pi/Users/List/Request/ListUsersRequest.cs b/...Users/List/Request/ListUsersParameters.cs → ...pi/Users/List/Request/ListUsersRequest.cs
@@ -4,7 +4,7 @@ public interface IListUsersQueryParameters : IPaginationParameters
     {
     }
 
-    public class ListUsersParameters : IListUsersQueryParameters
+    public class ListUsersRequest : IListUsersQueryParameters
     {
         public string StartCursor { get; set; }
 

diff --git a/Src/Notion.Client/Api/Users/List/Response/ListUsersResponse.cs b/Src/Notion.Client/Api/Users/List/Response/ListUsersResponse.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class ListUsersResponse : PaginatedList<User>
+    {
+        [JsonProperty("user")]
+        public Dictionary<string, object> User { get; set; }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up @@
         {
         }
-        public class ListUsersParameters : IListUsersQueryParameters
+        public class ListUsersRequest : IListUsersQueryParameters
         {
             public string StartCursor { get; set; }
@@ Expand Down @@