Merge pull request #81 from notion-dotnet/feature/58-database-objects-now-returns-parent-property

Database objects now returns parent property 💖

Author: KoditkarVedant

Src/Notion.Client/Models/Database/Database.cs

@@ -7,6 +7,7 @@ namespace Notion.Client
     public class Database : IObject
     {
         public ObjectType Object => ObjectType.Database;
+
         public string Id { get; set; }
 
         [JsonProperty("created_time")]
@@ -18,5 +19,7 @@ public class Database : IObject
         public List<RichTextBase> Title { get; set; }
 
         public Dictionary<string, Property> Properties { get; set; }
+
+        public IDatabaseParent Parent { get; set; }
     }
 }

Src/Notion.Client/Models/Database/IDatabaseParent.cs

@@ -0,0 +1,12 @@
+using JsonSubTypes;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    [JsonConverter(typeof(JsonSubtypes), "type")]
+    [JsonSubtypes.KnownSubType(typeof(PageParent), ParentType.PageId)]
+    [JsonSubtypes.KnownSubType(typeof(WorkspaceParent), ParentType.Workspace)]
+    public interface IDatabaseParent : IParent
+    {
+    }
+}

Src/Notion.Client/Models/Page/Parent.cs renamed to 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; }
     }
 }

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; }
 

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; }

Src/Notion.Client/Models/Page/WorkspaceParent.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; }
     }

Src/Notion.Client/Models/Page/DatabaseParent.cs renamed to Src/Notion.Client/Models/Parents/DatabaseParent.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; }
+    }
+}

Src/Notion.Client/Models/Parents/IParent.cs

@@ -2,9 +2,10 @@
 
 namespace Notion.Client
 {
-    public class PageParent : Parent
+    public class PageParent : IPageParent, IDatabaseParent
     {
         [JsonProperty("page_id")]
         public string PageId { get; set; }
+        public ParentType Type { get; set; }
     }
 }

Src/Notion.Client/Models/Page/PageParent.cs renamed to Src/Notion.Client/Models/Parents/PageParent.cs

@@ -12,6 +12,7 @@ public enum ParentType
 
         [EnumMember(Value = "page_id")]
         PageId,
+
         [EnumMember(Value = "workspace")]
         Workspace
     }