rename text property of blocks to rich_text

KoditkarVedant · KoditkarVedant · commit 2219fc4b74f2 · 2022-07-10T23:54:25.000+05:30
diff --git a/Src/Notion.Client/Models/Blocks/BulletedListItemBlock.cs b/Src/Notion.Client/Models/Blocks/BulletedListItemBlock.cs
@@ -12,8 +12,8 @@ public class BulletedListItemBlock : Block, IColumnChildrenBlock, INonColumnBloc
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }
diff --git a/Src/Notion.Client/Models/Blocks/CalloutBlock.cs b/Src/Notion.Client/Models/Blocks/CalloutBlock.cs
@@ -12,8 +12,8 @@ public class CalloutBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
 
             [JsonProperty("icon")]
             public IPageIcon Icon { get; set; }
diff --git a/Src/Notion.Client/Models/Blocks/CodeBlock.cs b/Src/Notion.Client/Models/Blocks/CodeBlock.cs
@@ -12,8 +12,8 @@ public class CodeBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
 
             [JsonProperty("language")]
             public string Language { get; set; }
diff --git a/Src/Notion.Client/Models/Blocks/HeadingOneBlock.cs b/Src/Notion.Client/Models/Blocks/HeadingOneBlock.cs
@@ -14,8 +14,8 @@ public class HeadingOneBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
         }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/HeadingThreeeBlock.cs b/Src/Notion.Client/Models/Blocks/HeadingThreeeBlock.cs
@@ -14,8 +14,8 @@ public class HeadingThreeeBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
         }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/HeadingTwoBlock.cs b/Src/Notion.Client/Models/Blocks/HeadingTwoBlock.cs
@@ -14,8 +14,8 @@ public class HeadingTwoBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
         }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/NumberedListItemBlock.cs b/Src/Notion.Client/Models/Blocks/NumberedListItemBlock.cs
@@ -12,8 +12,8 @@ public class NumberedListItemBlock : Block, IColumnChildrenBlock, INonColumnBloc
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }
diff --git a/Src/Notion.Client/Models/Blocks/ParagraphBlock.cs b/Src/Notion.Client/Models/Blocks/ParagraphBlock.cs
@@ -12,8 +12,8 @@ public class ParagraphBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }
diff --git a/Src/Notion.Client/Models/Blocks/QuoteBlock.cs b/Src/Notion.Client/Models/Blocks/QuoteBlock.cs
@@ -12,8 +12,8 @@ public class QuoteBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }
diff --git a/Src/Notion.Client/Models/Blocks/TemplateBlock.cs b/Src/Notion.Client/Models/Blocks/TemplateBlock.cs
@@ -12,8 +12,8 @@ public class TemplateBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Data
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<ITemplateChildrendBlock> Children { get; set; }
diff --git a/Src/Notion.Client/Models/Blocks/ToDoBlock.cs b/Src/Notion.Client/Models/Blocks/ToDoBlock.cs
@@ -12,8 +12,8 @@ public class ToDoBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
 
             [JsonProperty("checked")]
             public bool IsChecked { get; set; }
diff --git a/Src/Notion.Client/Models/Blocks/ToggleBlock.cs b/Src/Notion.Client/Models/Blocks/ToggleBlock.cs
@@ -12,8 +12,8 @@ public class ToggleBlock : Block, IColumnChildrenBlock, INonColumnBlock
 
         public class Info
         {
-            [JsonProperty("text")]
-            public IEnumerable<RichTextBase> Text { get; set; }
+            [JsonProperty("rich_text")]
+            public IEnumerable<RichTextBase> RichText { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }
diff --git a/Test/Notion.IntegrationTests/IBlocksClientTests.cs b/Test/Notion.IntegrationTests/IBlocksClientTests.cs
@@ -58,7 +58,7 @@ public async Task AppendChildrenAsync_AppendsBlocksGivenBlocks()
                         {
                             Callout = new CalloutBlock.Info
                             {
-                                Text = new List<RichTextBaseInput> {
+                                RichText = new List<RichTextBaseInput> {
                                     new RichTextTextInput
                                     {
                                         Text = new Text
@@ -321,7 +321,7 @@ private static IEnumerable<object[]> BlockData()
                     {
                         Callout = new CalloutBlock.Info
                         {
-                            Text = new List<RichTextBaseInput>
+                            RichText = new List<RichTextBaseInput>
                             {
                                 new RichTextTextInput
                                 {
@@ -354,7 +354,7 @@ private static IEnumerable<object[]> BlockData()
                         Assert.NotNull(block);
                         var calloutBlock = Assert.IsType<CalloutBlock>(block);
 
-                        Assert.Equal("Test 2", calloutBlock.Callout.Text.OfType<RichTextText>().First().Text.Content);
+                        Assert.Equal("Test 2", calloutBlock.Callout.RichText.OfType<RichTextText>().First().Text.Content);
                     })
                 },
                 new object[]
@@ -363,7 +363,7 @@ private static IEnumerable<object[]> BlockData()
                     {
                         Quote = new QuoteBlock.Info
                         {
-                            Text = new List<RichTextBaseInput>
+                            RichText = new List<RichTextBaseInput>
                             {
                                 new RichTextTextInput
                                 {
@@ -396,7 +396,7 @@ private static IEnumerable<object[]> BlockData()
                         Assert.NotNull(block);
                         var quoteBlock = Assert.IsType<QuoteBlock>(block);
 
-                        Assert.Equal("Test 2", quoteBlock.Quote.Text.OfType<RichTextText>().First().Text.Content);
+                        Assert.Equal("Test 2", quoteBlock.Quote.RichText.OfType<RichTextText>().First().Text.Content);
                     })
                 },
                 new object[]
@@ -459,7 +459,7 @@ private static IEnumerable<object[]> BlockData()
                     {
                         Template = new TemplateBlock.Data
                         {
-                            Text = new List<RichTextBase>
+                            RichText = new List<RichTextBase>
                             {
                                 new RichTextText
                                 {
@@ -502,9 +502,9 @@ private static IEnumerable<object[]> BlockData()
                         Assert.NotNull(block);
                         var templateBlock = Assert.IsType<TemplateBlock>(block);
 
-                        Assert.Single(templateBlock.Template.Text);
+                        Assert.Single(templateBlock.Template.RichText);
                         Assert.Null(templateBlock.Template.Children);
-                        Assert.Equal("Test Template 2", templateBlock.Template.Text.OfType<RichTextText>().First().Text.Content);
+                        Assert.Equal("Test Template 2", templateBlock.Template.RichText.OfType<RichTextText>().First().Text.Content);
                     })
                 },
                 new object[]
diff --git a/Test/Notion.UnitTests/BlocksClientTests.cs b/Test/Notion.UnitTests/BlocksClientTests.cs
@@ -65,7 +65,7 @@ public async Task AppendBlockChildren()
                     {
                         Heading_2 = new HeadingTwoBlock.Info
                         {
-                            Text = new List<RichTextBase>
+                            RichText = new List<RichTextBase>
                             {
                                 new RichTextText
                                 {
@@ -81,7 +81,7 @@ public async Task AppendBlockChildren()
                     {
                         Paragraph = new ParagraphBlock.Info
                         {
-                            Text = new List<RichTextBase>
+                            RichText = new List<RichTextBase>
                             {
                                 new RichTextText
                                 {
@@ -110,14 +110,14 @@ public async Task AppendBlockChildren()
                 {
                     block.Type.Should().Be(BlockType.Heading_2);
                     var headingBlock = (HeadingTwoBlock)block;
-                    var text = headingBlock.Heading_2.Text.OfType<RichTextText>().FirstOrDefault();
+                    var text = headingBlock.Heading_2.RichText.OfType<RichTextText>().FirstOrDefault();
                     text.Text.Content.Should().Be("Lacinato kale");
                 },
                 block =>
                 {
                     block.Type.Should().Be(BlockType.Paragraph);
                     var paragraphBlock = (ParagraphBlock)block;
-                    var text = paragraphBlock.Paragraph.Text.OfType<RichTextText>().LastOrDefault();
+                    var text = paragraphBlock.Paragraph.RichText.OfType<RichTextText>().LastOrDefault();
                     text.Text.Content.Should().Be("Lacinato kale is a variety of kale with a long tradition in Italian cuisine, especially that of Tuscany. It is also known as Tuscan kale, Italian kale, dinosaur kale, kale, flat back kale, palm tree kale, or black Tuscan palm.");
                     text.Text.Link.Url.Should().Be("https://en.wikipedia.org/wiki/Lacinato_kale");
                 }
@@ -145,9 +145,9 @@ public async Task RetrieveAsync()
             block.Type.Should().Be(BlockType.ToDo);
 
             var todoBlock = ((ToDoBlock)block);
-            todoBlock.ToDo.Text.Should().ContainSingle();
-            todoBlock.ToDo.Text.First().Should().BeAssignableTo<RichTextText>();
-            ((RichTextText)todoBlock.ToDo.Text.First()).Text.Content.Should().Be("Lacinato kale");
+            todoBlock.ToDo.RichText.Should().ContainSingle();
+            todoBlock.ToDo.RichText.First().Should().BeAssignableTo<RichTextText>();
+            ((RichTextText)todoBlock.ToDo.RichText.First()).Text.Content.Should().Be("Lacinato kale");
         }
 
         [Fact]
@@ -189,9 +189,9 @@ public async Task UpdateAsync()
             block.Type.Should().Be(BlockType.ToDo);
 
             var todoBlock = ((ToDoBlock)block);
-            todoBlock.ToDo.Text.Should().ContainSingle();
-            todoBlock.ToDo.Text.First().Should().BeAssignableTo<RichTextText>();
-            ((RichTextText)todoBlock.ToDo.Text.First()).Text.Content.Should().Be("Lacinato kale");
+            todoBlock.ToDo.RichText.Should().ContainSingle();
+            todoBlock.ToDo.RichText.First().Should().BeAssignableTo<RichTextText>();
+            ((RichTextText)todoBlock.ToDo.RichText.First()).Text.Content.Should().Be("Lacinato kale");
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class BulletedListItemBlock : Block, IColumnChildrenBlock, INonColumnBloc`
`12`	`12`
`13`	`13`	`public class Info`
`14`	`14`	`{`
`15`		`- [JsonProperty("text")]`
`16`		`- public IEnumerable<RichTextBase> Text { get; set; }`
	`15`	`+ [JsonProperty("rich_text")]`
	`16`	`+ public IEnumerable<RichTextBase> RichText { get; set; }`
`17`	`17`
`18`	`18`	`[JsonProperty("children")]`
`19`	`19`	`public IEnumerable<INonColumnBlock> Children { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class CalloutBlock : Block, IColumnChildrenBlock, INonColumnBlock`
`12`	`12`
`13`	`13`	`public class Info`
`14`	`14`	`{`
`15`		`- [JsonProperty("text")]`
`16`		`- public IEnumerable<RichTextBase> Text { get; set; }`
	`15`	`+ [JsonProperty("rich_text")]`
	`16`	`+ public IEnumerable<RichTextBase> RichText { get; set; }`
`17`	`17`
`18`	`18`	`[JsonProperty("icon")]`
`19`	`19`	`public IPageIcon Icon { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class CodeBlock : Block, IColumnChildrenBlock, INonColumnBlock`
`12`	`12`
`13`	`13`	`public class Info`
`14`	`14`	`{`
`15`		`- [JsonProperty("text")]`
`16`		`- public IEnumerable<RichTextBase> Text { get; set; }`
	`15`	`+ [JsonProperty("rich_text")]`
	`16`	`+ public IEnumerable<RichTextBase> RichText { get; set; }`
`17`	`17`
`18`	`18`	`[JsonProperty("language")]`
`19`	`19`	`public string Language { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ public class HeadingOneBlock : Block, IColumnChildrenBlock, INonColumnBlock`
`14`	`14`
`15`	`15`	`public class Info`
`16`	`16`	`{`
`17`		`- [JsonProperty("text")]`
`18`		`- public IEnumerable<RichTextBase> Text { get; set; }`
	`17`	`+ [JsonProperty("rich_text")]`
	`18`	`+ public IEnumerable<RichTextBase> RichText { get; set; }`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ public class HeadingThreeeBlock : Block, IColumnChildrenBlock, INonColumnBlock`
`14`	`14`
`15`	`15`	`public class Info`
`16`	`16`	`{`
`17`		`- [JsonProperty("text")]`
`18`		`- public IEnumerable<RichTextBase> Text { get; set; }`
	`17`	`+ [JsonProperty("rich_text")]`
	`18`	`+ public IEnumerable<RichTextBase> RichText { get; set; }`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class NumberedListItemBlock : Block, IColumnChildrenBlock, INonColumnBloc`
`12`	`12`
`13`	`13`	`public class Info`
`14`	`14`	`{`
`15`		`- [JsonProperty("text")]`
`16`		`- public IEnumerable<RichTextBase> Text { get; set; }`
	`15`	`+ [JsonProperty("rich_text")]`
	`16`	`+ public IEnumerable<RichTextBase> RichText { get; set; }`
`17`	`17`
`18`	`18`	`[JsonProperty("children")]`
`19`	`19`	`public IEnumerable<INonColumnBlock> Children { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class ParagraphBlock : Block, IColumnChildrenBlock, INonColumnBlock`
`12`	`12`
`13`	`13`	`public class Info`
`14`	`14`	`{`
`15`		`- [JsonProperty("text")]`
`16`		`- public IEnumerable<RichTextBase> Text { get; set; }`
	`15`	`+ [JsonProperty("rich_text")]`
	`16`	`+ public IEnumerable<RichTextBase> RichText { get; set; }`
`17`	`17`
`18`	`18`	`[JsonProperty("children")]`
`19`	`19`	`public IEnumerable<INonColumnBlock> Children { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class QuoteBlock : Block, IColumnChildrenBlock, INonColumnBlock`
`12`	`12`
`13`	`13`	`public class Info`
`14`	`14`	`{`
`15`		`- [JsonProperty("text")]`
`16`		`- public IEnumerable<RichTextBase> Text { get; set; }`
	`15`	`+ [JsonProperty("rich_text")]`
	`16`	`+ public IEnumerable<RichTextBase> RichText { get; set; }`
`17`	`17`
`18`	`18`	`[JsonProperty("children")]`
`19`	`19`	`public IEnumerable<INonColumnBlock> Children { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class TemplateBlock : Block, IColumnChildrenBlock, INonColumnBlock`
`12`	`12`
`13`	`13`	`public class Data`
`14`	`14`	`{`
`15`		`- [JsonProperty("text")]`
`16`		`- public IEnumerable<RichTextBase> Text { get; set; }`
	`15`	`+ [JsonProperty("rich_text")]`
	`16`	`+ public IEnumerable<RichTextBase> RichText { get; set; }`
`17`	`17`
`18`	`18`	`[JsonProperty("children")]`
`19`	`19`	`public IEnumerable<ITemplateChildrendBlock> Children { get; set; }`