Merge branch 'main' into 258-update-page-object-only-has-property-id

KoditkarVedant · KoditkarVedant · commit 42368c582a7e · 2022-08-20T19:43:24.000+05:30
diff --git a/Src/Notion.Client/Constants.cs b/Src/Notion.Client/Constants.cs
@@ -6,6 +6,6 @@ namespace Notion.Client
     internal class Constants
     {
         internal static string BASE_URL = "https://api.notion.com/";
-        internal static string DEFAULT_NOTION_VERSION = "2022-02-22";
+        internal static string DEFAULT_NOTION_VERSION = "2022-06-28";
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/Block.cs b/Src/Notion.Client/Models/Blocks/Block.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using Notion.Client.Models.Blocks;
 
 namespace Notion.Client
 {
@@ -19,5 +20,10 @@ public abstract class Block : IBlock
         public PartialUser CreatedBy { get; set; }
 
         public PartialUser LastEditedBy { get; set; }
+
+        /// <summary>
+        /// Information about the block's parent.
+        /// </summary>
+        public IBlockParent Parent { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/IBlock.cs b/Src/Notion.Client/Models/Blocks/IBlock.cs
@@ -1,6 +1,7 @@
 ﻿using JsonSubTypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using Notion.Client.Models.Blocks;
 
 namespace Notion.Client
 {
@@ -44,5 +45,8 @@ public interface IBlock : IObject, IObjectModificationData
 
         [JsonProperty("has_children")]
         bool HasChildren { get; set; }
+
+        [JsonProperty("parent")]
+        IBlockParent Parent { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/IBlockParent.cs b/Src/Notion.Client/Models/Blocks/IBlockParent.cs
@@ -0,0 +1,14 @@
+﻿using JsonSubTypes;
+using Newtonsoft.Json;
+
+namespace Notion.Client.Models.Blocks
+{
+    [JsonConverter(typeof(JsonSubtypes), "type")]
+    [JsonSubtypes.KnownSubType(typeof(DatabaseParent), ParentType.DatabaseId)]
+    [JsonSubtypes.KnownSubType(typeof(PageParent), ParentType.PageId)]
+    [JsonSubtypes.KnownSubType(typeof(WorkspaceParent), ParentType.Workspace)]
+    [JsonSubtypes.KnownSubType(typeof(BlockParent), ParentType.BlockId)]
+    public interface IBlockParent
+    {
+    }
+}
diff --git a/Src/Notion.Client/Models/Database/IDatabaseParent.cs b/Src/Notion.Client/Models/Database/IDatabaseParent.cs
@@ -6,6 +6,7 @@ namespace Notion.Client
     [JsonConverter(typeof(JsonSubtypes), "type")]
     [JsonSubtypes.KnownSubType(typeof(PageParent), ParentType.PageId)]
     [JsonSubtypes.KnownSubType(typeof(WorkspaceParent), ParentType.Workspace)]
+    [JsonSubtypes.KnownSubType(typeof(BlockParent), ParentType.BlockId)]
     public interface IDatabaseParent : IParent
     {
     }
diff --git a/Src/Notion.Client/Models/Page/IPageParent.cs b/Src/Notion.Client/Models/Page/IPageParent.cs
@@ -7,6 +7,7 @@ namespace Notion.Client
     [JsonSubtypes.KnownSubType(typeof(DatabaseParent), ParentType.DatabaseId)]
     [JsonSubtypes.KnownSubType(typeof(PageParent), ParentType.PageId)]
     [JsonSubtypes.KnownSubType(typeof(WorkspaceParent), ParentType.Workspace)]
+    [JsonSubtypes.KnownSubType(typeof(BlockParent), ParentType.BlockId)]
     public interface IPageParent : IParent
     {
     }
diff --git a/Src/Notion.Client/Models/Parents/BlockParent.cs b/Src/Notion.Client/Models/Parents/BlockParent.cs
@@ -0,0 +1,18 @@
+﻿using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class BlockParent : IPageParent, IDatabaseParent
+    {
+        /// <summary>
+        /// Always has a value "block_id"
+        /// </summary>
+        public ParentType Type { get; set; }
+
+        /// <summary>
+        /// The ID of the block that the element belongs to.
+        /// </summary>
+        [JsonProperty("block_id")]
+        public string BlockId { get; set; }
+    }
+}
diff --git a/Src/Notion.Client/Models/Parents/ParentType.cs b/Src/Notion.Client/Models/Parents/ParentType.cs
@@ -14,6 +14,9 @@ public enum ParentType
         PageId,
 
         [EnumMember(Value = "workspace")]
-        Workspace
+        Workspace,
+
+        [EnumMember(Value = "block_id")]
+        BlockId,
     }
 }
diff --git a/Src/Notion.Client/Notion.Client.csproj b/Src/Notion.Client/Notion.Client.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>3.1.0-preview</VersionPrefix>
+    <VersionPrefix>4.0.0-preview</VersionPrefix>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>7.3</LangVersion>
     

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ namespace Notion.Client`
`6`	`6`	`internal class Constants`
`7`	`7`	`{`
`8`	`8`	`internal static string BASE_URL = "https://api.notion.com/";`
`9`		`- internal static string DEFAULT_NOTION_VERSION = "2022-02-22";`
	`9`	`+ internal static string DEFAULT_NOTION_VERSION = "2022-06-28";`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using Notion.Client.Models.Blocks;`
`2`	`3`
`3`	`4`	`namespace Notion.Client`
`4`	`5`	`{`
`@@ -19,5 +20,10 @@ public abstract class Block : IBlock`
`19`	`20`	`public PartialUser CreatedBy { get; set; }`
`20`	`21`
`21`	`22`	`public PartialUser LastEditedBy { get; set; }`
	`23`	`+`
	`24`	`+ /// <summary>`
	`25`	`+ /// Information about the block's parent.`
	`26`	`+ /// </summary>`
	`27`	`+ public IBlockParent Parent { get; set; }`
`22`	`28`	`}`
`23`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using JsonSubTypes;`
`2`	`2`	`using Newtonsoft.Json;`
`3`	`3`	`using Newtonsoft.Json.Converters;`
	`4`	`+using Notion.Client.Models.Blocks;`
`4`	`5`
`5`	`6`	`namespace Notion.Client`
`6`	`7`	`{`
`@@ -44,5 +45,8 @@ public interface IBlock : IObject, IObjectModificationData`
`44`	`45`
`45`	`46`	`[JsonProperty("has_children")]`
`46`	`47`	`bool HasChildren { get; set; }`
	`48`	`+`
	`49`	`+ [JsonProperty("parent")]`
	`50`	`+ IBlockParent Parent { get; set; }`
`47`	`51`	`}`
`48`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace Notion.Client`
`6`	`6`	`[JsonConverter(typeof(JsonSubtypes), "type")]`
`7`	`7`	`[JsonSubtypes.KnownSubType(typeof(PageParent), ParentType.PageId)]`
`8`	`8`	`[JsonSubtypes.KnownSubType(typeof(WorkspaceParent), ParentType.Workspace)]`
	`9`	`+ [JsonSubtypes.KnownSubType(typeof(BlockParent), ParentType.BlockId)]`
`9`	`10`	`public interface IDatabaseParent : IParent`
`10`	`11`	`{`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ namespace Notion.Client`
`7`	`7`	`[JsonSubtypes.KnownSubType(typeof(DatabaseParent), ParentType.DatabaseId)]`
`8`	`8`	`[JsonSubtypes.KnownSubType(typeof(PageParent), ParentType.PageId)]`
`9`	`9`	`[JsonSubtypes.KnownSubType(typeof(WorkspaceParent), ParentType.Workspace)]`
	`10`	`+ [JsonSubtypes.KnownSubType(typeof(BlockParent), ParentType.BlockId)]`
`10`	`11`	`public interface IPageParent : IParent`
`11`	`12`	`{`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ public enum ParentType`
`14`	`14`	`PageId,`
`15`	`15`
`16`	`16`	`[EnumMember(Value = "workspace")]`
`17`		`- Workspace`
	`17`	`+ Workspace,`
	`18`	`+`
	`19`	`+ [EnumMember(Value = "block_id")]`
	`20`	`+ BlockId,`
`18`	`21`	`}`
`19`	`22`	`}`