Merge pull request #203 from notion-dotnet/feature/176-add-update-callout-block-type

Add support for callout block type ✨

Author: KoditkarVedant

Src/Notion.Client/Api/Blocks/RequestParams/BlocksUpdateParameters/UpdateBlocks/CalloutUpdateBlock.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class CalloutUpdateBlock : UpdateBlock, IUpdateBlock
+    {
+        [JsonProperty("callout")]
+        public Info Callout { get; set; }
+
+        public class Info
+        {
+            [JsonProperty("text")]
+            public IEnumerable<RichTextBaseInput> Text { get; set; }
+
+            [JsonProperty("icon")]
+            public IPageIcon Icon { get; set; }
+        }
+    }
+}

Src/Notion.Client/Api/Pages/RequestParams/PagesCreateParameters/PagesCreateParametersBuilder.cs

@@ -5,8 +5,8 @@ namespace Notion.Client
     public class PagesCreateParametersBuilder
     {
         private IPageParentInput parent;
-        private Dictionary<string, PropertyValue> properties = new Dictionary<string, PropertyValue>();
-        private IList<Block> children = new List<Block>();
+        private readonly Dictionary<string, PropertyValue> properties = new Dictionary<string, PropertyValue>();
+        private readonly IList<Block> children = new List<Block>();
         private IPageIcon icon;
         private FileObject cover;
 

Src/Notion.Client/Models/Blocks/Block.cs

@@ -8,6 +8,7 @@ namespace Notion.Client
     [JsonSubtypes.KnownSubType(typeof(AudioBlock), BlockType.Audio)]
     [JsonSubtypes.KnownSubType(typeof(BookmarkBlock), BlockType.Bookmark)]
     [JsonSubtypes.KnownSubType(typeof(BulletedListItemBlock), BlockType.BulletedListItem)]
+    [JsonSubtypes.KnownSubType(typeof(CalloutBlock), BlockType.Callout)]
     [JsonSubtypes.KnownSubType(typeof(ChildPageBlock), BlockType.ChildPage)]
     [JsonSubtypes.KnownSubType(typeof(ChildDatabaseBlock), BlockType.ChildDatabase)]
     [JsonSubtypes.KnownSubType(typeof(CodeBlock), BlockType.Code)]

Src/Notion.Client/Models/Blocks/BlockType.cs

@@ -70,6 +70,9 @@ public enum BlockType
         [EnumMember(Value = "table_of_contents")]
         TableOfContents,
 
+        [EnumMember(Value = "callout")]
+        Callout,
+
         [EnumMember(Value = "unsupported")]
         Unsupported
     }

Src/Notion.Client/Models/Blocks/CalloutBlock.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class CalloutBlock : Block
+    {
+        public override BlockType Type => BlockType.Callout;
+
+        [JsonProperty("callout")]
+        public Info Callout { get; set; }
+
+        public class Info
+        {
+            [JsonProperty("text")]
+            public IEnumerable<RichTextBase> Text { get; set; }
+
+            [JsonProperty("icon")]
+            public IPageIcon Icon { get; set; }
+
+            [JsonProperty("children")]
+            public IEnumerable<Block> Children { get; set; }
+        }
+    }
+}

Test/Notion.IntegrationTests/IBlocksClientTests.cs

@@ -10,15 +10,21 @@ namespace Notion.IntegrationTests
 {
     public class IBlocksClientTests
     {
-        [Fact]
-        public async Task AppendChildrenAsync_AppendsBlocksGivenBlocks()
+        private readonly INotionClient _client;
+
+        public IBlocksClientTests()
         {
             var options = new ClientOptions
             {
                 AuthToken = Environment.GetEnvironmentVariable("NOTION_AUTH_TOKEN")
             };
-            INotionClient _client = NotionClientFactory.Create(options);
 
+            _client = NotionClientFactory.Create(options);
+        }
+
+        [Fact]
+        public async Task AppendChildrenAsync_AppendsBlocksGivenBlocks()
+        {
             var pageId = "3c357473a28149a488c010d2b245a589";
 
             var page = await _client.Pages.CreateAsync(
@@ -47,12 +53,27 @@ public async Task AppendChildrenAsync_AppendsBlocksGivenBlocks()
                         new TableOfContentsBlock
                         {
                             TableOfContents = new TableOfContentsBlock.Data()
+                        },
+                        new CalloutBlock
+                        {
+                            Callout = new CalloutBlock.Info
+                            {
+                                Text = new List<RichTextBaseInput> {
+                                    new RichTextTextInput
+                                    {
+                                        Text = new Text
+                                        {
+                                            Content = "Test"
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                 }
             );
 
-            blocks.Results.Should().HaveCount(3);
+            blocks.Results.Should().HaveCount(4);
 
             // cleanup
             await _client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters
@@ -64,12 +85,6 @@ public async Task AppendChildrenAsync_AppendsBlocksGivenBlocks()
         [Fact]
         public async Task UpdateBlockAsync_UpdatesGivenBlock()
         {
-            var options = new ClientOptions
-            {
-                AuthToken = Environment.GetEnvironmentVariable("NOTION_AUTH_TOKEN")
-            };
-            INotionClient _client = NotionClientFactory.Create(options);
-
             var pageId = "3c357473a28149a488c010d2b245a589";
 
             var page = await _client.Pages.CreateAsync(
@@ -111,12 +126,6 @@ public async Task UpdateBlockAsync_UpdatesGivenBlock()
         [Fact]
         public async Task DeleteAsync_DeleteBlockWithGivenId()
         {
-            var options = new ClientOptions
-            {
-                AuthToken = Environment.GetEnvironmentVariable("NOTION_AUTH_TOKEN")
-            };
-            INotionClient _client = NotionClientFactory.Create(options);
-
             var pageId = "3c357473a28149a488c010d2b245a589";
 
             var page = await _client.Pages.CreateAsync(
@@ -159,12 +168,6 @@ public async Task DeleteAsync_DeleteBlockWithGivenId()
         [MemberData(nameof(BlockData))]
         public async Task UpdateAsync_UpdatesGivenBlock(Block block, IUpdateBlock updateBlock, Action<Block> assert)
         {
-            var options = new ClientOptions
-            {
-                AuthToken = Environment.GetEnvironmentVariable("NOTION_AUTH_TOKEN")
-            };
-            INotionClient _client = NotionClientFactory.Create(options);
-
             var pageParentId = "3c357473a28149a488c010d2b245a589";
 
             var page = await _client.Pages.CreateAsync(
@@ -311,6 +314,48 @@ private static IEnumerable<object[]> BlockData()
                         Assert.NotNull(block);
                         Assert.IsType<TableOfContentsBlock>(block);
                     })
+                },
+                new object[]
+                {
+                    new CalloutBlock
+                    {
+                        Callout = new CalloutBlock.Info
+                        {
+                            Text = new List<RichTextBaseInput>
+                            {
+                                new RichTextTextInput
+                                {
+                                    Text = new Text
+                                    {
+                                        Content = "Test"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    new CalloutUpdateBlock()
+                    {
+                        Callout = new CalloutUpdateBlock.Info
+                        {
+                            Text = new List<RichTextBaseInput>
+                            {
+                                new RichTextTextInput
+                                {
+                                    Text = new Text
+                                    {
+                                        Content = "Test 2"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    new Action<Block>((block) =>
+                    {
+                        Assert.NotNull(block);
+                        var calloutBlock = Assert.IsType<CalloutBlock>(block);
+
+                        Assert.Equal("Test 2", calloutBlock.Callout.Text.OfType<RichTextText>().First().Text.Content);
+                    })
                 }
             };
         }

Test/Notion.UnitTests/FilterTests.cs

@@ -21,7 +21,7 @@ public JsonSerializerSettings GetSerializerSettings()
     }
     public class FilterTests
     {
-        private SerializerSettingsSource _settingsSource = new SerializerSettingsSource(new ClientOptions());
+        private readonly SerializerSettingsSource _settingsSource = new SerializerSettingsSource(new ClientOptions());
 
         private string SerializeFilter(Filter filter)
         {