Replace Parent with IPageParent interface 🏷️

KoditkarVedant · KoditkarVedant · commit 9d7159640537 · 2021-08-14T22:25:33.000+05:30
* Introduced IParent &amp; IPageParent interface
* Group parent type to
diff --git a/Src/Notion.Client/Models/Page/IPageParent.cs b/Src/Notion.Client/Models/Page/IPageParent.cs
@@ -1,16 +1,13 @@
 ﻿using JsonSubTypes;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
 namespace Notion.Client
 {
     [JsonConverter(typeof(JsonSubtypes), "type")]
     [JsonSubtypes.KnownSubType(typeof(DatabaseParent), ParentType.DatabaseId)]
     [JsonSubtypes.KnownSubType(typeof(PageParent), ParentType.PageId)]
     [JsonSubtypes.KnownSubType(typeof(WorkspaceParent), ParentType.Workspace)]
-    public class Parent
+    public interface IPageParent : IParent
     {
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ParentType Type { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Models/Page/NewPage.cs b/Src/Notion.Client/Models/Page/NewPage.cs
@@ -17,14 +17,14 @@ public NewPage()
         /// Constructor that adds required <c>Parent</c> property. Used when you don't want to
         /// assign properties in separate operations.
         /// </summary>
-        public NewPage(Parent parent)
+        public NewPage(IPageParent parent)
         {
             Parent = parent;
             Properties = new Dictionary<string, PropertyValue>();
             Children = new List<Block>();
         }
 
-        public Parent Parent { get; set; }
+        public IPageParent Parent { get; set; }
 
         public Dictionary<string, PropertyValue> Properties { get; set; }
 
diff --git a/Src/Notion.Client/Models/Page/Page.cs b/Src/Notion.Client/Models/Page/Page.cs
@@ -7,8 +7,10 @@ namespace Notion.Client
     public class Page : IObject
     {
         public ObjectType Object => ObjectType.Page;
+
         public string Id { get; set; }
-        public Parent Parent { get; set; }
+
+        public IPageParent Parent { get; set; }
 
         [JsonProperty("created_time")]
         public DateTime CreatedTime { get; set; }
diff --git a/Src/Notion.Client/Models/Page/WorkspaceParent.cs b/Src/Notion.Client/Models/Page/WorkspaceParent.cs
diff --git a/Src/Notion.Client/Models/Parents/DatabaseParent.cs b/Src/Notion.Client/Models/Parents/DatabaseParent.cs
@@ -2,8 +2,10 @@
 
 namespace Notion.Client
 {
-    public class DatabaseParent : Parent
+    public class DatabaseParent : IPageParent
     {
+        public ParentType Type { get; set; }
+
         [JsonProperty("database_id")]
         public string DatabaseId { get; set; }
     }
diff --git a/Src/Notion.Client/Models/Parents/IParent.cs b/Src/Notion.Client/Models/Parents/IParent.cs
@@ -0,0 +1,11 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace Notion.Client
+{
+    public interface IParent
+    {
+        [JsonConverter(typeof(StringEnumConverter))]
+        ParentType Type { get; set; }
+    }
+}
diff --git a/Src/Notion.Client/Models/Parents/PageParent.cs b/Src/Notion.Client/Models/Parents/PageParent.cs
@@ -2,9 +2,10 @@
 
 namespace Notion.Client
 {
-    public class PageParent : Parent
+    public class PageParent : IPageParent
     {
         [JsonProperty("page_id")]
         public string PageId { get; set; }
+        public ParentType Type { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Models/Parents/ParentType.cs b/Src/Notion.Client/Models/Parents/ParentType.cs
@@ -12,6 +12,7 @@ public enum ParentType
 
         [EnumMember(Value = "page_id")]
         PageId,
+
         [EnumMember(Value = "workspace")]
         Workspace
     }
diff --git a/Src/Notion.Client/Models/Parents/WorkspaceParent.cs b/Src/Notion.Client/Models/Parents/WorkspaceParent.cs
@@ -0,0 +1,7 @@
+﻿namespace Notion.Client
+{
+    public class WorkspaceParent : IPageParent
+    {
+        public ParentType Type { get; set; }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,13 @@`
`1`	`1`	`using JsonSubTypes;`
`2`	`2`	`using Newtonsoft.Json;`
`3`		`-using Newtonsoft.Json.Converters;`
`4`	`3`
`5`	`4`	`namespace Notion.Client`
`6`	`5`	`{`
`7`	`6`	`[JsonConverter(typeof(JsonSubtypes), "type")]`
`8`	`7`	`[JsonSubtypes.KnownSubType(typeof(DatabaseParent), ParentType.DatabaseId)]`
`9`	`8`	`[JsonSubtypes.KnownSubType(typeof(PageParent), ParentType.PageId)]`
`10`	`9`	`[JsonSubtypes.KnownSubType(typeof(WorkspaceParent), ParentType.Workspace)]`
`11`		`- public class Parent`
	`10`	`+ public interface IPageParent : IParent`
`12`	`11`	`{`
`13`		`- [JsonConverter(typeof(StringEnumConverter))]`
`14`		`- public ParentType Type { get; set; }`
`15`	`12`	`}`
`16`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ public NewPage()`
`17`	`17`	`/// Constructor that adds required <c>Parent</c> property. Used when you don't want to`
`18`	`18`	`/// assign properties in separate operations.`
`19`	`19`	`/// </summary>`
`20`		`- public NewPage(Parent parent)`
	`20`	`+ public NewPage(IPageParent parent)`
`21`	`21`	`{`
`22`	`22`	`Parent = parent;`
`23`	`23`	`Properties = new Dictionary<string, PropertyValue>();`
`24`	`24`	`Children = new List<Block>();`
`25`	`25`	`}`
`26`	`26`
`27`		`- public Parent Parent { get; set; }`
	`27`	`+ public IPageParent Parent { get; set; }`
`28`	`28`
`29`	`29`	`public Dictionary<string, PropertyValue> Properties { get; set; }`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace Notion.Client`
`4`	`4`	`{`
`5`		`- public class DatabaseParent : Parent`
	`5`	`+ public class DatabaseParent : IPageParent`
`6`	`6`	`{`
	`7`	`+ public ParentType Type { get; set; }`
	`8`	`+`
`7`	`9`	`[JsonProperty("database_id")]`
`8`	`10`	`public string DatabaseId { get; set; }`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace Notion.Client`
`4`	`4`	`{`
`5`		`- public class PageParent : Parent`
	`5`	`+ public class PageParent : IPageParent`
`6`	`6`	`{`
`7`	`7`	`[JsonProperty("page_id")]`
`8`	`8`	`public string PageId { get; set; }`
	`9`	`+ public ParentType Type { get; set; }`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public enum ParentType`
`12`	`12`
`13`	`13`	`[EnumMember(Value = "page_id")]`
`14`	`14`	`PageId,`
	`15`	`+`
`15`	`16`	`[EnumMember(Value = "workspace")]`
`16`	`17`	`Workspace`
`17`	`18`	`}`