Merge pull request #418 from kosaku-hayashi/issue-416-support-button-property

KoditkarVedant · web-flow · commit 8a0223004343 · 2024-10-29T19:18:57.000+05:30
Added support for button properties.
diff --git a/Src/Notion.Client/Models/Database/Properties/ButtonProperty.cs b/Src/Notion.Client/Models/Database/Properties/ButtonProperty.cs
@@ -0,0 +1,16 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json;
+using System.Threading.Tasks;
+
+namespace Notion.Client
+{
+    public class ButtonProperty : Property
+    {
+        public override PropertyType Type => PropertyType.Button;
+
+        [JsonProperty("button")]
+        public Dictionary<string,object> Button { get; set; }
+    }
+}
diff --git a/Src/Notion.Client/Models/Database/Properties/Property.cs b/Src/Notion.Client/Models/Database/Properties/Property.cs
@@ -26,6 +26,7 @@ namespace Notion.Client
     [JsonSubtypes.KnownSubTypeAttribute(typeof(TitleProperty), PropertyType.Title)]
     [JsonSubtypes.KnownSubTypeAttribute(typeof(UrlProperty), PropertyType.Url)]
     [JsonSubtypes.KnownSubTypeAttribute(typeof(UniqueIdProperty), PropertyType.UniqueId)]
+    [JsonSubtypes.KnownSubTypeAttribute(typeof(ButtonProperty), PropertyType.Button)]
     public class Property
     {
         [JsonProperty("id")]
diff --git a/Src/Notion.Client/Models/Database/Properties/PropertyType.cs b/Src/Notion.Client/Models/Database/Properties/PropertyType.cs
@@ -71,5 +71,8 @@ public enum PropertyType
 
         [EnumMember(Value = "unique_id")]
         UniqueId,
+
+        [EnumMember(Value = "button")]
+        Button,
     }
 }
diff --git a/Src/Notion.Client/Models/PropertyValue/ButtonPropertyValue.cs b/Src/Notion.Client/Models/PropertyValue/ButtonPropertyValue.cs
@@ -0,0 +1,17 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class ButtonPropertyValue : PropertyValue
+    {
+        public override PropertyValueType Type => PropertyValueType.Button;
+
+        [JsonProperty("button")]
+        public ButtonValue Button { get; set; }
+
+        public class ButtonValue { }
+    }
+}
diff --git a/Src/Notion.Client/Models/PropertyValue/PropertyValue.cs b/Src/Notion.Client/Models/PropertyValue/PropertyValue.cs
@@ -30,6 +30,7 @@ namespace Notion.Client
     [JsonSubtypes.KnownSubTypeAttribute(typeof(TitlePropertyValue), PropertyValueType.Title)]
     [JsonSubtypes.KnownSubTypeAttribute(typeof(UrlPropertyValue), PropertyValueType.Url)]
     [JsonSubtypes.KnownSubTypeAttribute(typeof(UniqueIdPropertyValue), PropertyValueType.UniqueId)]
+    [JsonSubtypes.KnownSubTypeAttribute(typeof(ButtonPropertyValue), PropertyValueType.Button)]
     [JsonSubtypes.KnownSubTypeAttribute(typeof(VerificationPropertyValue), PropertyValueType.Verification)]
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
diff --git a/Src/Notion.Client/Models/PropertyValue/PropertyValueType.cs b/Src/Notion.Client/Models/PropertyValue/PropertyValueType.cs
@@ -77,5 +77,8 @@ public enum PropertyValueType
 
         [EnumMember(Value = "verification")]
         Verification,
+
+        [EnumMember(Value = "button")]
+        Button,
     }
 }
diff --git a/Test/Notion.UnitTests/PagesClientTests.cs b/Test/Notion.UnitTests/PagesClientTests.cs
@@ -222,7 +222,7 @@ public async Task TrashPageAsync()
 
         page.Id.Should().Be(pageId);
         page.InTrash.Should().BeTrue();
-        page.Properties.Should().HaveCount(2);
+        page.Properties.Should().HaveCount(3);
         var updatedProperty = page.Properties.First(x => x.Key == "In stock");
 
         var checkboxPropertyValue = (CheckboxPropertyItem)await _client.RetrievePagePropertyItemAsync(
diff --git a/Test/Notion.UnitTests/PropertyTests.cs b/Test/Notion.UnitTests/PropertyTests.cs
@@ -27,6 +27,7 @@ public class PropertyTests
     [InlineData(typeof(TitleProperty), PropertyType.Title)]
     [InlineData(typeof(UrlProperty), PropertyType.Url)]
     [InlineData(typeof(UniqueIdProperty), PropertyType.UniqueId)]
+    [InlineData(typeof(ButtonProperty),PropertyType.Button)]
     public void TestPropertyType(Type type, PropertyType expectedPropertyType)
     {
         var typeInstance = (Property)Activator.CreateInstance(type);
@@ -56,6 +57,7 @@ public void TestPropertyType(Type type, PropertyType expectedPropertyType)
     [InlineData(typeof(TitleProperty), "title")]
     [InlineData(typeof(UrlProperty), "url")]
     [InlineData(typeof(UniqueIdProperty), "unique_id")]
+    [InlineData(typeof(ButtonProperty), "button")]
     public void TestPropertyTypeText(Type type, string expectedPropertyType)
     {
         var typeInstance = (Property)Activator.CreateInstance(type);
diff --git a/Test/Notion.UnitTests/data/databases/DatabaseRetrieveResponse.json b/Test/Notion.UnitTests/data/databases/DatabaseRetrieveResponse.json
@@ -90,6 +90,12 @@
         }
       }
     },
+    "SimpleButton": {
+      "id":"_ri%7C",
+      "name":"SimpleButton",
+      "type":"button",
+      "button": {}
+    },
     "Name": {
       "id": "title",
       "name": "Name",
diff --git a/Test/Notion.UnitTests/data/databases/DatabasesListResponse.json b/Test/Notion.UnitTests/data/databases/DatabasesListResponse.json
@@ -81,6 +81,12 @@
             }
           }
         },
+        "SimpleButton": {
+          "id":"_ri%7C",
+          "name":"SimpleButton",
+          "type":"button",
+          "button": {}
+        },
         "Name": {
           "id": "title",
           "name": "Name",
diff --git a/Test/Notion.UnitTests/data/databases/DatabasesQueryResponse.json b/Test/Notion.UnitTests/data/databases/DatabasesQueryResponse.json
@@ -45,6 +45,11 @@
           "id": "{>U;",
           "type": "checkbox",
           "checkbox": false
+        },
+        "Add Page Button": {
+          "id":"_ri%7C",
+          "type":"button",
+          "button": {}
         }
       }
     }
diff --git a/Test/Notion.UnitTests/data/pages/TrashPageResponse.json b/Test/Notion.UnitTests/data/pages/TrashPageResponse.json
@@ -11,6 +11,11 @@
       "type": "checkbox",
       "checkbox": true
     },
+    "Add Page Button": {
+        "id":"_ri%7C",
+        "type":"button",
+        "button": {}
+    },
     "Name": {
       "id": "title",
       "type": "title",

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ namespace Notion.Client`
`26`	`26`	`[JsonSubtypes.KnownSubTypeAttribute(typeof(TitleProperty), PropertyType.Title)]`
`27`	`27`	`[JsonSubtypes.KnownSubTypeAttribute(typeof(UrlProperty), PropertyType.Url)]`
`28`	`28`	`[JsonSubtypes.KnownSubTypeAttribute(typeof(UniqueIdProperty), PropertyType.UniqueId)]`
	`29`	`+ [JsonSubtypes.KnownSubTypeAttribute(typeof(ButtonProperty), PropertyType.Button)]`
`29`	`30`	`public class Property`
`30`	`31`	`{`
`31`	`32`	`[JsonProperty("id")]`
Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,8 @@ public enum PropertyType`
`71`	`71`
`72`	`72`	`[EnumMember(Value = "unique_id")]`
`73`	`73`	`UniqueId,`
	`74`	`+`
	`75`	`+ [EnumMember(Value = "button")]`
	`76`	`+ Button,`
`74`	`77`	`}`
`75`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,5 +77,8 @@ public enum PropertyValueType`
`77`	`77`
`78`	`78`	`[EnumMember(Value = "verification")]`
`79`	`79`	`Verification,`
	`80`	`+`
	`81`	`+ [EnumMember(Value = "button")]`
	`82`	`+ Button,`
`80`	`83`	`}`
`81`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,12 @@`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`},`
	`93`	`+ "SimpleButton": {`
	`94`	`+ "id":"_ri%7C",`
	`95`	`+ "name":"SimpleButton",`
	`96`	`+ "type":"button",`
	`97`	`+ "button": {}`
	`98`	`+ },`
`93`	`99`	`"Name": {`
`94`	`100`	`"id": "title",`
`95`	`101`	`"name": "Name",`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,12 @@`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`},`
	`84`	`+ "SimpleButton": {`
	`85`	`+ "id":"_ri%7C",`
	`86`	`+ "name":"SimpleButton",`
	`87`	`+ "type":"button",`
	`88`	`+ "button": {}`
	`89`	`+ },`
`84`	`90`	`"Name": {`
`85`	`91`	`"id": "title",`
`86`	`92`	`"name": "Name",`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,11 @@`
`45`	`45`	`"id": "{>U;",`
`46`	`46`	`"type": "checkbox",`
`47`	`47`	`"checkbox": false`
	`48`	`+ },`
	`49`	`+ "Add Page Button": {`
	`50`	`+ "id":"_ri%7C",`
	`51`	`+ "type":"button",`
	`52`	`+ "button": {}`
`48`	`53`	`}`
`49`	`54`	`}`
`50`	`55`	`}`