Use IBlockObjectRequest in Block Append Children api

KoditkarVedant · KoditkarVedant · commit f5f69be7cf24 · 2023-10-15T05:06:27.000+05:30
diff --git a/Src/Notion.Client/Api/Blocks/AppendChildren/Request/BlockAppendChildrenRequest.cs b/Src/Notion.Client/Api/Blocks/AppendChildren/Request/BlockAppendChildrenRequest.cs
@@ -4,7 +4,7 @@ namespace Notion.Client
 {
     public class BlockAppendChildrenRequest : IBlockAppendChildrenBodyParameters, IBlockAppendChildrenPathParameters
     {
-        public IEnumerable<IBlock> Children { get; set; }
+        public IEnumerable<IBlockObjectRequest> Children { get; set; }
 
         public string After { get; set; }
 
diff --git a/Src/Notion.Client/Api/Blocks/AppendChildren/Request/IBlockAppendChildrenBodyParameters.cs b/Src/Notion.Client/Api/Blocks/AppendChildren/Request/IBlockAppendChildrenBodyParameters.cs
@@ -3,11 +3,10 @@
 
 namespace Notion.Client
 {
-    // TODO: need an input version of Block
     public interface IBlockAppendChildrenBodyParameters
     {
         [JsonProperty("children")]
-        IEnumerable<IBlock> Children { get; set; }
+        IEnumerable<IBlockObjectRequest> Children { get; set; }
 
         /// <summary>
         ///     The ID of the existing block that the new block should be appended after.
@@ -18,7 +17,7 @@ public interface IBlockAppendChildrenBodyParameters
 
     internal class BlockAppendChildrenBodyParameters : IBlockAppendChildrenBodyParameters
     {
-        public IEnumerable<IBlock> Children { get; set; }
+        public IEnumerable<IBlockObjectRequest> Children { get; set; }
 
         public string After { get; set; }
 
diff --git a/Test/Notion.IntegrationTests/BlocksClientTests.cs b/Test/Notion.IntegrationTests/BlocksClientTests.cs
@@ -33,14 +33,14 @@ public async Task AppendChildrenAsync_AppendsBlocksGivenBlocks()
             new BlockAppendChildrenRequest
             {
                 BlockId = _page.Id,
-                Children = new List<IBlock>
+                Children = new List<IBlockObjectRequest>
                 {
-                    new BreadcrumbBlock { Breadcrumb = new BreadcrumbBlock.Data() },
-                    new DividerBlock { Divider = new DividerBlock.Data() },
-                    new TableOfContentsBlock { TableOfContents = new TableOfContentsBlock.Data() },
-                    new CalloutBlock
+                    new BreadcrumbBlockRequest { Breadcrumb = new BreadcrumbBlockRequest.Data() },
+                    new DividerBlockRequest { Divider = new DividerBlockRequest.Data() },
+                    new TableOfContentsBlockRequest { TableOfContents = new TableOfContentsBlockRequest.Data() },
+                    new CalloutBlockRequest
                     {
-                        Callout = new CalloutBlock.Info
+                        Callout = new CalloutBlockRequest.Info
                         {
                             RichText = new List<RichTextBaseInput>
                             {
@@ -62,7 +62,10 @@ public async Task UpdateBlockAsync_UpdatesGivenBlock()
             new BlockAppendChildrenRequest
             {
                 BlockId = _page.Id,
-                Children = new List<IBlock> { new BreadcrumbBlock { Breadcrumb = new BreadcrumbBlock.Data() } }
+                Children = new List<IBlockObjectRequest>
+                {
+                    new BreadcrumbBlockRequest { Breadcrumb = new BreadcrumbBlockRequest.Data() }
+                }
             }
         );
 
@@ -82,10 +85,10 @@ public async Task DeleteAsync_DeleteBlockWithGivenId()
             new BlockAppendChildrenRequest
             {
                 BlockId = _page.Id,
-                Children = new List<IBlock>
+                Children = new List<IBlockObjectRequest>
                 {
-                    new DividerBlock { Divider = new DividerBlock.Data() },
-                    new TableOfContentsBlock { TableOfContents = new TableOfContentsBlock.Data() }
+                    new DividerBlockRequest { Divider = new DividerBlockRequest.Data() },
+                    new TableOfContentsBlockRequest { TableOfContents = new TableOfContentsBlockRequest.Data() }
                 }
             }
         );
@@ -96,13 +99,13 @@ public async Task DeleteAsync_DeleteBlockWithGivenId()
     [Theory]
     [MemberData(nameof(BlockData))]
     public async Task UpdateAsync_UpdatesGivenBlock(
-        IBlock block, IUpdateBlock updateBlock, Action<IBlock, INotionClient> assert)
+        IBlockObjectRequest block, IUpdateBlock updateBlock, Action<IBlock, INotionClient> assert)
     {
         var blocks = await Client.Blocks.AppendChildrenAsync(
             new BlockAppendChildrenRequest
             {
                 BlockId = _page.Id,
-                Children = new List<IBlock> { block }
+                Children = new List<IBlockObjectRequest> { block }
             }
         );
 
@@ -125,9 +128,9 @@ private static IEnumerable<object[]> BlockData()
         {
             new object[]
             {
-                new BookmarkBlock
+                new BookmarkBlockRequest
                 {
-                    Bookmark = new BookmarkBlock.Info
+                    Bookmark = new BookmarkBlockRequest.Info
                     {
                         Url = "https://developers.notion.com/reference/rich-text",
                         Caption = new List<RichTextBase>
@@ -156,7 +159,7 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new EquationBlock { Equation = new EquationBlock.Info { Expression = "e=mc^3" } },
+                new EquationBlockRequest { Equation = new EquationBlockRequest.Info { Expression = "e=mc^3" } },
                 new EquationUpdateBlock { Equation = new EquationUpdateBlock.Info { Expression = "e=mc^2" } },
                 new Action<IBlock, INotionClient>((block, _) =>
                 {
@@ -166,7 +169,7 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new DividerBlock { Divider = new DividerBlock.Data() }, new DividerUpdateBlock(),
+                new DividerBlockRequest { Divider = new DividerBlockRequest.Data() }, new DividerUpdateBlock(),
                 new Action<IBlock, INotionClient>((block, client) =>
                 {
                     Assert.NotNull(block);
@@ -175,7 +178,7 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new AudioBlock
+                new AudioBlockRequest
                 {
                     Audio = new ExternalFile
                     {
@@ -206,7 +209,7 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new TableOfContentsBlock { TableOfContents = new TableOfContentsBlock.Data() },
+                new TableOfContentsBlockRequest { TableOfContents = new TableOfContentsBlockRequest.Data() },
                 new TableOfContentsUpdateBlock(), new Action<IBlock, INotionClient>((block, client) =>
                 {
                     Assert.NotNull(block);
@@ -215,9 +218,9 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new CalloutBlock
+                new CalloutBlockRequest
                 {
-                    Callout = new CalloutBlock.Info
+                    Callout = new CalloutBlockRequest.Info
                     {
                         RichText = new List<RichTextBaseInput>
                         {
@@ -245,9 +248,9 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new QuoteBlock
+                new QuoteBlockRequest
                 {
-                    Quote = new QuoteBlock.Info
+                    Quote = new QuoteBlockRequest.Info
                     {
                         RichText = new List<RichTextBaseInput>
                         {
@@ -275,7 +278,7 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new ImageBlock
+                new ImageBlockRequest
                 {
                     Image = new ExternalFile
                     {
@@ -308,9 +311,9 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new EmbedBlock
+                new EmbedBlockRequest
                 {
-                    Embed = new EmbedBlock.Info
+                    Embed = new EmbedBlockRequest.Info
                     {
                         Url = "https://zephoria.com/wp-content/uploads/2014/08/online-community.jpg"
                     }
@@ -333,7 +336,7 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new LinkToPageBlock
+                new LinkToPageBlockRequest
                 {
                     LinkToPage = new PageParent
                     {
@@ -359,16 +362,16 @@ private static IEnumerable<object[]> BlockData()
             },
             new object[]
             {
-                new TableBlock
+                new TableBlockRequest
                 {
-                    Table = new TableBlock.Info
+                    Table = new TableBlockRequest.Info
                     {
                         TableWidth = 1,
                         Children = new[]
                         {
-                            new TableRowBlock
+                            new TableRowBlockRequest
                             {
-                                TableRow = new TableRowBlock.Info
+                                TableRow = new TableRowBlockRequest.Info
                                 {
                                     Cells = new[]
                                     {
diff --git a/Test/Notion.UnitTests/BlocksClientTests.cs b/Test/Notion.UnitTests/BlocksClientTests.cs
@@ -63,21 +63,21 @@ public async Task AppendBlockChildren()
         var request = new BlockAppendChildrenRequest
         {
             BlockId = blockId,
-            Children = new List<IBlock>
+            Children = new List<IBlockObjectRequest>
             {
-                new HeadingTwoBlock
+                new HeadingTwoBlockRequest
                 {
-                    Heading_2 = new HeadingTwoBlock.Info
+                    Heading_2 = new HeadingTwoBlockRequest.Info
                     {
                         RichText = new List<RichTextBase>
                         {
                             new RichTextText { Text = new Text { Content = "Lacinato kale" } }
                         }
                     }
                 },
-                new ParagraphBlock
+                new ParagraphBlockRequest
                 {
-                    Paragraph = new ParagraphBlock.Info
+                    Paragraph = new ParagraphBlockRequest.Info
                     {
                         RichText = new List<RichTextBase>
                         {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace Notion.Client`
`4`	`4`	`{`
`5`	`5`	`public class BlockAppendChildrenRequest : IBlockAppendChildrenBodyParameters, IBlockAppendChildrenPathParameters`
`6`	`6`	`{`
`7`		`- public IEnumerable<IBlock> Children { get; set; }`
	`7`	`+ public IEnumerable<IBlockObjectRequest> Children { get; set; }`
`8`	`8`
`9`	`9`	`public string After { get; set; }`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,10 @@`
`3`	`3`
`4`	`4`	`namespace Notion.Client`
`5`	`5`	`{`
`6`		`- // TODO: need an input version of Block`
`7`	`6`	`public interface IBlockAppendChildrenBodyParameters`
`8`	`7`	`{`
`9`	`8`	`[JsonProperty("children")]`
`10`		`- IEnumerable<IBlock> Children { get; set; }`
	`9`	`+ IEnumerable<IBlockObjectRequest> Children { get; set; }`
`11`	`10`
`12`	`11`	`/// <summary>`
`13`	`12`	`/// The ID of the existing block that the new block should be appended after.`
`@@ -18,7 +17,7 @@ public interface IBlockAppendChildrenBodyParameters`
`18`	`17`
`19`	`18`	`internal class BlockAppendChildrenBodyParameters : IBlockAppendChildrenBodyParameters`
`20`	`19`	`{`
`21`		`- public IEnumerable<IBlock> Children { get; set; }`
	`20`	`+ public IEnumerable<IBlockObjectRequest> Children { get; set; }`
`22`	`21`
`23`	`22`	`public string After { get; set; }`
`24`	`23`
Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,14 @@ public async Task AppendChildrenAsync_AppendsBlocksGivenBlocks()`
`33`	`33`	`new BlockAppendChildrenRequest`
`34`	`34`	`{`
`35`	`35`	`BlockId = _page.Id,`
`36`		`- Children = new List<IBlock>`
	`36`	`+ Children = new List<IBlockObjectRequest>`
`37`	`37`	`{`
`38`		`- new BreadcrumbBlock { Breadcrumb = new BreadcrumbBlock.Data() },`
`39`		`- new DividerBlock { Divider = new DividerBlock.Data() },`
`40`		`- new TableOfContentsBlock { TableOfContents = new TableOfContentsBlock.Data() },`
`41`		`- new CalloutBlock`
	`38`	`+ new BreadcrumbBlockRequest { Breadcrumb = new BreadcrumbBlockRequest.Data() },`
	`39`	`+ new DividerBlockRequest { Divider = new DividerBlockRequest.Data() },`
	`40`	`+ new TableOfContentsBlockRequest { TableOfContents = new TableOfContentsBlockRequest.Data() },`
	`41`	`+ new CalloutBlockRequest`
`42`	`42`	`{`
`43`		`- Callout = new CalloutBlock.Info`
	`43`	`+ Callout = new CalloutBlockRequest.Info`
`44`	`44`	`{`
`45`	`45`	`RichText = new List<RichTextBaseInput>`
`46`	`46`	`{`
`@@ -62,7 +62,10 @@ public async Task UpdateBlockAsync_UpdatesGivenBlock()`
`62`	`62`	`new BlockAppendChildrenRequest`
`63`	`63`	`{`
`64`	`64`	`BlockId = _page.Id,`
`65`		`- Children = new List<IBlock> { new BreadcrumbBlock { Breadcrumb = new BreadcrumbBlock.Data() } }`
	`65`	`+ Children = new List<IBlockObjectRequest>`
	`66`	`+ {`
	`67`	`+ new BreadcrumbBlockRequest { Breadcrumb = new BreadcrumbBlockRequest.Data() }`
	`68`	`+ }`
`66`	`69`	`}`
`67`	`70`	`);`
`68`	`71`
`@@ -82,10 +85,10 @@ public async Task DeleteAsync_DeleteBlockWithGivenId()`
`82`	`85`	`new BlockAppendChildrenRequest`
`83`	`86`	`{`
`84`	`87`	`BlockId = _page.Id,`
`85`		`- Children = new List<IBlock>`
	`88`	`+ Children = new List<IBlockObjectRequest>`
`86`	`89`	`{`
`87`		`- new DividerBlock { Divider = new DividerBlock.Data() },`
`88`		`- new TableOfContentsBlock { TableOfContents = new TableOfContentsBlock.Data() }`
	`90`	`+ new DividerBlockRequest { Divider = new DividerBlockRequest.Data() },`
	`91`	`+ new TableOfContentsBlockRequest { TableOfContents = new TableOfContentsBlockRequest.Data() }`
`89`	`92`	`}`
`90`	`93`	`}`
`91`	`94`	`);`
`@@ -96,13 +99,13 @@ public async Task DeleteAsync_DeleteBlockWithGivenId()`
`96`	`99`	`[Theory]`
`97`	`100`	`[MemberData(nameof(BlockData))]`
`98`	`101`	`public async Task UpdateAsync_UpdatesGivenBlock(`
`99`		`- IBlock block, IUpdateBlock updateBlock, Action<IBlock, INotionClient> assert)`
	`102`	`+ IBlockObjectRequest block, IUpdateBlock updateBlock, Action<IBlock, INotionClient> assert)`
`100`	`103`	`{`
`101`	`104`	`var blocks = await Client.Blocks.AppendChildrenAsync(`
`102`	`105`	`new BlockAppendChildrenRequest`
`103`	`106`	`{`
`104`	`107`	`BlockId = _page.Id,`
`105`		`- Children = new List<IBlock> { block }`
	`108`	`+ Children = new List<IBlockObjectRequest> { block }`
`106`	`109`	`}`
`107`	`110`	`);`
`108`	`111`
`@@ -125,9 +128,9 @@ private static IEnumerable<object[]> BlockData()`
`125`	`128`	`{`
`126`	`129`	`new object[]`
`127`	`130`	`{`
`128`		`- new BookmarkBlock`
	`131`	`+ new BookmarkBlockRequest`
`129`	`132`	`{`
`130`		`- Bookmark = new BookmarkBlock.Info`
	`133`	`+ Bookmark = new BookmarkBlockRequest.Info`
`131`	`134`	`{`
`132`	`135`	`Url = "https://developers.notion.com/reference/rich-text",`
`133`	`136`	`Caption = new List<RichTextBase>`
`@@ -156,7 +159,7 @@ private static IEnumerable<object[]> BlockData()`
`156`	`159`	`},`
`157`	`160`	`new object[]`
`158`	`161`	`{`
`159`		`- new EquationBlock { Equation = new EquationBlock.Info { Expression = "e=mc^3" } },`
	`162`	`+ new EquationBlockRequest { Equation = new EquationBlockRequest.Info { Expression = "e=mc^3" } },`
`160`	`163`	`new EquationUpdateBlock { Equation = new EquationUpdateBlock.Info { Expression = "e=mc^2" } },`
`161`	`164`	`new Action<IBlock, INotionClient>((block, _) =>`
`162`	`165`	`{`
`@@ -166,7 +169,7 @@ private static IEnumerable<object[]> BlockData()`
`166`	`169`	`},`
`167`	`170`	`new object[]`
`168`	`171`	`{`
`169`		`- new DividerBlock { Divider = new DividerBlock.Data() }, new DividerUpdateBlock(),`
	`172`	`+ new DividerBlockRequest { Divider = new DividerBlockRequest.Data() }, new DividerUpdateBlock(),`
`170`	`173`	`new Action<IBlock, INotionClient>((block, client) =>`
`171`	`174`	`{`
`172`	`175`	`Assert.NotNull(block);`
`@@ -175,7 +178,7 @@ private static IEnumerable<object[]> BlockData()`
`175`	`178`	`},`
`176`	`179`	`new object[]`
`177`	`180`	`{`
`178`		`- new AudioBlock`
	`181`	`+ new AudioBlockRequest`
`179`	`182`	`{`
`180`	`183`	`Audio = new ExternalFile`
`181`	`184`	`{`
`@@ -206,7 +209,7 @@ private static IEnumerable<object[]> BlockData()`
`206`	`209`	`},`
`207`	`210`	`new object[]`
`208`	`211`	`{`
`209`		`- new TableOfContentsBlock { TableOfContents = new TableOfContentsBlock.Data() },`
	`212`	`+ new TableOfContentsBlockRequest { TableOfContents = new TableOfContentsBlockRequest.Data() },`
`210`	`213`	`new TableOfContentsUpdateBlock(), new Action<IBlock, INotionClient>((block, client) =>`
`211`	`214`	`{`
`212`	`215`	`Assert.NotNull(block);`
`@@ -215,9 +218,9 @@ private static IEnumerable<object[]> BlockData()`
`215`	`218`	`},`
`216`	`219`	`new object[]`
`217`	`220`	`{`
`218`		`- new CalloutBlock`
	`221`	`+ new CalloutBlockRequest`
`219`	`222`	`{`
`220`		`- Callout = new CalloutBlock.Info`
	`223`	`+ Callout = new CalloutBlockRequest.Info`
`221`	`224`	`{`
`222`	`225`	`RichText = new List<RichTextBaseInput>`
`223`	`226`	`{`
`@@ -245,9 +248,9 @@ private static IEnumerable<object[]> BlockData()`
`245`	`248`	`},`
`246`	`249`	`new object[]`
`247`	`250`	`{`
`248`		`- new QuoteBlock`
	`251`	`+ new QuoteBlockRequest`
`249`	`252`	`{`
`250`		`- Quote = new QuoteBlock.Info`
	`253`	`+ Quote = new QuoteBlockRequest.Info`
`251`	`254`	`{`
`252`	`255`	`RichText = new List<RichTextBaseInput>`
`253`	`256`	`{`
`@@ -275,7 +278,7 @@ private static IEnumerable<object[]> BlockData()`
`275`	`278`	`},`
`276`	`279`	`new object[]`
`277`	`280`	`{`
`278`		`- new ImageBlock`
	`281`	`+ new ImageBlockRequest`
`279`	`282`	`{`
`280`	`283`	`Image = new ExternalFile`
`281`	`284`	`{`
`@@ -308,9 +311,9 @@ private static IEnumerable<object[]> BlockData()`
`308`	`311`	`},`
`309`	`312`	`new object[]`
`310`	`313`	`{`
`311`		`- new EmbedBlock`
	`314`	`+ new EmbedBlockRequest`
`312`	`315`	`{`
`313`		`- Embed = new EmbedBlock.Info`
	`316`	`+ Embed = new EmbedBlockRequest.Info`
`314`	`317`	`{`
`315`	`318`	`Url = "https://zephoria.com/wp-content/uploads/2014/08/online-community.jpg"`
`316`	`319`	`}`
`@@ -333,7 +336,7 @@ private static IEnumerable<object[]> BlockData()`
`333`	`336`	`},`
`334`	`337`	`new object[]`
`335`	`338`	`{`
`336`		`- new LinkToPageBlock`
	`339`	`+ new LinkToPageBlockRequest`
`337`	`340`	`{`
`338`	`341`	`LinkToPage = new PageParent`
`339`	`342`	`{`
`@@ -359,16 +362,16 @@ private static IEnumerable<object[]> BlockData()`
`359`	`362`	`},`
`360`	`363`	`new object[]`
`361`	`364`	`{`
`362`		`- new TableBlock`
	`365`	`+ new TableBlockRequest`
`363`	`366`	`{`
`364`		`- Table = new TableBlock.Info`
	`367`	`+ Table = new TableBlockRequest.Info`
`365`	`368`	`{`
`366`	`369`	`TableWidth = 1,`
`367`	`370`	`Children = new[]`
`368`	`371`	`{`
`369`		`- new TableRowBlock`
	`372`	`+ new TableRowBlockRequest`
`370`	`373`	`{`
`371`		`- TableRow = new TableRowBlock.Info`
	`374`	`+ TableRow = new TableRowBlockRequest.Info`
`372`	`375`	`{`
`373`	`376`	`Cells = new[]`
`374`	`377`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,21 +63,21 @@ public async Task AppendBlockChildren()`
`63`	`63`	`var request = new BlockAppendChildrenRequest`
`64`	`64`	`{`
`65`	`65`	`BlockId = blockId,`
`66`		`- Children = new List<IBlock>`
	`66`	`+ Children = new List<IBlockObjectRequest>`
`67`	`67`	`{`
`68`		`- new HeadingTwoBlock`
	`68`	`+ new HeadingTwoBlockRequest`
`69`	`69`	`{`
`70`		`- Heading_2 = new HeadingTwoBlock.Info`
	`70`	`+ Heading_2 = new HeadingTwoBlockRequest.Info`
`71`	`71`	`{`
`72`	`72`	`RichText = new List<RichTextBase>`
`73`	`73`	`{`
`74`	`74`	`new RichTextText { Text = new Text { Content = "Lacinato kale" } }`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`},`
`78`		`- new ParagraphBlock`
	`78`	`+ new ParagraphBlockRequest`
`79`	`79`	`{`
`80`		`- Paragraph = new ParagraphBlock.Info`
	`80`	`+ Paragraph = new ParagraphBlockRequest.Info`
`81`	`81`	`{`
`82`	`82`	`RichText = new List<RichTextBase>`
`83`	`83`	`{`