Merge pull request #292 from notion-dotnet/3.1.0

KoditkarVedant · web-flow · commit 1a3efb1c3ce9 · 2022-08-20T16:13:12.000+05:30
3.1.0
diff --git a/Src/Notion.Client/Api/Databases/RequestParams/DatabasesCreateParameters/DatabasesCreateParameters.cs b/Src/Notion.Client/Api/Databases/RequestParams/DatabasesCreateParameters/DatabasesCreateParameters.cs
@@ -19,5 +19,9 @@ public class DatabasesCreateParameters : IDatabasesCreateBodyParameters, IDataba
 
         [JsonProperty("cover")]
         public FileObject Cover { get; set; }
+
+        public bool? IsInline { get; set; }
+
+        public string Description { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Api/Databases/RequestParams/DatabasesCreateParameters/IDatabasesCreateBodyParameters.cs b/Src/Notion.Client/Api/Databases/RequestParams/DatabasesCreateParameters/IDatabasesCreateBodyParameters.cs
@@ -13,5 +13,11 @@ public interface IDatabasesCreateBodyParameters
 
         [JsonProperty("title")]
         List<RichTextBaseInput> Title { get; set; }
+
+        [JsonProperty("is_inline")]
+        bool? IsInline { get; set; }
+
+        [JsonProperty("description")]
+        string Description { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Api/Databases/RequestParams/DatabasesUpdateParameters/DatabasesUpdateParameters.cs b/Src/Notion.Client/Api/Databases/RequestParams/DatabasesUpdateParameters/DatabasesUpdateParameters.cs
@@ -3,26 +3,20 @@
 
 namespace Notion.Client
 {
-    public interface IDatabasesUpdateBodyParameters
-    {
-        [JsonProperty("properties")]
-        Dictionary<string, IUpdatePropertySchema> Properties { get; set; }
-
-        [JsonProperty("title")]
-        List<RichTextBaseInput> Title { get; set; }
-
-        [JsonProperty("icon")]
-        IPageIcon Icon { get; set; }
-
-        [JsonProperty("cover")]
-        FileObject Cover { get; set; }
-    }
-
     public class DatabasesUpdateParameters : IDatabasesUpdateBodyParameters
     {
         public Dictionary<string, IUpdatePropertySchema> Properties { get; set; }
+
         public List<RichTextBaseInput> Title { get; set; }
+
         public IPageIcon Icon { get; set; }
+
         public FileObject Cover { get; set; }
+
+        public bool Archived { get; set; }
+
+        public bool? IsInline { get; set; }
+
+        public string Description { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Api/Databases/RequestParams/DatabasesUpdateParameters/IDatabasesUpdateBodyParameters.cs b/Src/Notion.Client/Api/Databases/RequestParams/DatabasesUpdateParameters/IDatabasesUpdateBodyParameters.cs
@@ -0,0 +1,29 @@
+﻿using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public interface IDatabasesUpdateBodyParameters
+    {
+        [JsonProperty("properties")]
+        Dictionary<string, IUpdatePropertySchema> Properties { get; set; }
+
+        [JsonProperty("title")]
+        List<RichTextBaseInput> Title { get; set; }
+
+        [JsonProperty("icon")]
+        IPageIcon Icon { get; set; }
+
+        [JsonProperty("cover")]
+        FileObject Cover { get; set; }
+
+        [JsonProperty("archived")]
+        bool Archived { get; set; }
+
+        [JsonProperty("is_inline")]
+        bool? IsInline { get; set; }
+
+        [JsonProperty("description")]
+        string Description { get; set; }
+    }
+}
diff --git a/Src/Notion.Client/Models/Database/Database.cs b/Src/Notion.Client/Models/Database/Database.cs
@@ -37,8 +37,20 @@ public class Database : IObject, IObjectModificationData
         [JsonProperty("url")]
         public string Url { get; set; }
 
+        /// <summary>
+        /// The archived status of the database.
+        /// </summary>
+        [JsonProperty("archived")]
+        public bool Archived { get; set; }
+
         public PartialUser CreatedBy { get; set; }
 
         public PartialUser LastEditedBy { get; set; }
+
+        [JsonProperty("is_inline")]
+        public bool IsInline { get; set; }
+
+        [JsonProperty("description")]
+        public string Description { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Models/Database/Properties/Property.cs b/Src/Notion.Client/Models/Database/Properties/Property.cs
@@ -22,6 +22,7 @@ namespace Notion.Client
     [JsonSubtypes.KnownSubType(typeof(RichTextProperty), PropertyType.RichText)]
     [JsonSubtypes.KnownSubType(typeof(RollupProperty), PropertyType.Rollup)]
     [JsonSubtypes.KnownSubType(typeof(SelectProperty), PropertyType.Select)]
+    [JsonSubtypes.KnownSubType(typeof(StatusProperty), PropertyType.Status)]
     [JsonSubtypes.KnownSubType(typeof(TitleProperty), PropertyType.Title)]
     [JsonSubtypes.KnownSubType(typeof(UrlProperty), PropertyType.Url)]
     public class Property
diff --git a/Src/Notion.Client/Models/Database/Properties/PropertyType.cs b/Src/Notion.Client/Models/Database/Properties/PropertyType.cs
@@ -62,6 +62,9 @@ public enum PropertyType
         LastEditedBy,
 
         [EnumMember(Value = "last_edited_time")]
-        LastEditedTime
+        LastEditedTime,
+
+        [EnumMember(Value = "status")]
+        Status,
     }
 }
diff --git a/Src/Notion.Client/Models/Database/Properties/StatusProperty.cs b/Src/Notion.Client/Models/Database/Properties/StatusProperty.cs
@@ -0,0 +1,13 @@
+﻿using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class StatusProperty : Property
+    {
+        public override PropertyType Type => PropertyType.Status;
+
+        [JsonProperty("status")]
+        public Dictionary<string, object> Status { get; set; }
+    }
+}
diff --git a/Src/Notion.Client/Models/Filters/TimestampCreatedTimeFilter.cs b/Src/Notion.Client/Models/Filters/TimestampCreatedTimeFilter.cs
@@ -0,0 +1,47 @@
+﻿using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class TimestampCreatedTimeFilter : Filter
+    {
+        [JsonProperty("timestamp")]
+        public string Timestamp = "created_time";
+
+        [JsonProperty("created_time")]
+        public DateFilter.Condition CreatedTime { get; set; }
+
+        public TimestampCreatedTimeFilter(
+            DateTime? equal = null,
+            DateTime? before = null,
+            DateTime? after = null,
+            DateTime? onOrBefore = null,
+            DateTime? onOrAfter = null,
+            Dictionary<string, object> pastWeek = null,
+            Dictionary<string, object> pastMonth = null,
+            Dictionary<string, object> pastYear = null,
+            Dictionary<string, object> nextWeek = null,
+            Dictionary<string, object> nextMonth = null,
+            Dictionary<string, object> nextYear = null,
+            bool? isEmpty = null,
+            bool? isNotEmpty = null)
+        {
+            CreatedTime = new DateFilter.Condition(
+                equal: equal,
+                before: before,
+                after: after,
+                onOrBefore: onOrBefore,
+                onOrAfter: onOrAfter,
+                pastWeek: pastWeek,
+                pastMonth: pastMonth,
+                pastYear: pastYear,
+                nextWeek: nextWeek,
+                nextMonth: nextMonth,
+                nextYear: nextYear,
+                isEmpty: isEmpty,
+                isNotEmpty: isNotEmpty
+            );
+        }
+    }
+}
diff --git a/Src/Notion.Client/Models/Filters/TimestampLastEditedTimeFilter.cs b/Src/Notion.Client/Models/Filters/TimestampLastEditedTimeFilter.cs
@@ -0,0 +1,47 @@
+﻿using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class TimestampLastEditedTimeFilter : Filter
+    {
+        [JsonProperty("timestamp")]
+        public string Timestamp = "last_modified_time";
+
+        [JsonProperty("last_edited_time")]
+        public DateFilter.Condition LastEditedTime { get; set; }
+
+        public TimestampLastEditedTimeFilter(
+            DateTime? equal = null,
+            DateTime? before = null,
+            DateTime? after = null,
+            DateTime? onOrBefore = null,
+            DateTime? onOrAfter = null,
+            Dictionary<string, object> pastWeek = null,
+            Dictionary<string, object> pastMonth = null,
+            Dictionary<string, object> pastYear = null,
+            Dictionary<string, object> nextWeek = null,
+            Dictionary<string, object> nextMonth = null,
+            Dictionary<string, object> nextYear = null,
+            bool? isEmpty = null,
+            bool? isNotEmpty = null)
+        {
+            LastEditedTime = new DateFilter.Condition(
+                equal: equal,
+                before: before,
+                after: after,
+                onOrBefore: onOrBefore,
+                onOrAfter: onOrAfter,
+                pastWeek: pastWeek,
+                pastMonth: pastMonth,
+                pastYear: pastYear,
+                nextWeek: nextWeek,
+                nextMonth: nextMonth,
+                nextYear: nextYear,
+                isEmpty: isEmpty,
+                isNotEmpty: isNotEmpty
+            );
+        }
+    }
+}
diff --git a/Src/Notion.Client/Models/PropertyValue/PropertyValue.cs b/Src/Notion.Client/Models/PropertyValue/PropertyValue.cs
@@ -25,6 +25,7 @@ namespace Notion.Client
     [JsonSubtypes.KnownSubType(typeof(RichTextPropertyValue), PropertyValueType.RichText)]
     [JsonSubtypes.KnownSubType(typeof(RollupPropertyValue), PropertyValueType.Rollup)]
     [JsonSubtypes.KnownSubType(typeof(SelectPropertyValue), PropertyValueType.Select)]
+    [JsonSubtypes.KnownSubType(typeof(StatusPropertyValue), PropertyValueType.Status)]
     [JsonSubtypes.KnownSubType(typeof(TitlePropertyValue), PropertyValueType.Title)]
     [JsonSubtypes.KnownSubType(typeof(UrlPropertyValue), PropertyValueType.Url)]
     public class PropertyValue
diff --git a/Src/Notion.Client/Models/PropertyValue/PropertyValueType.cs b/Src/Notion.Client/Models/PropertyValue/PropertyValueType.cs
@@ -65,6 +65,9 @@ public enum PropertyValueType
         LastEditedTime,
 
         [EnumMember(Value = "last_edited_by")]
-        LastEditedBy
+        LastEditedBy,
+
+        [EnumMember(Value = "status")]
+        Status,
     }
 }
diff --git a/Src/Notion.Client/Models/PropertyValue/StatusPropertyValue.cs b/Src/Notion.Client/Models/PropertyValue/StatusPropertyValue.cs
@@ -0,0 +1,72 @@
+﻿using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace Notion.Client
+{
+    /// <summary>
+    /// Status property value objects contain page status
+    /// </summary>
+    public class StatusPropertyValue : PropertyValue
+    {
+        public override PropertyValueType Type => PropertyValueType.Status;
+
+        [JsonProperty("status")]
+        public Data Status { get; set; }
+
+        public class Data
+        {
+            /// <summary>
+            /// ID of the option.
+            /// </summary>
+            [JsonProperty("id")]
+            public string Id { get; set; }
+
+            /// <summary>
+            /// Name of the option as it appears in Notion.
+            /// </summary>
+            [JsonProperty("name")]
+            public string Name { get; set; }
+
+            /// <summary>
+            /// Color of the option.
+            /// </summary>
+            [JsonProperty("color")]
+            [JsonConverter(typeof(StringEnumConverter))]
+            public Color Color { get; set; }
+        }
+
+        public enum Color
+        {
+            [EnumMember(Value = "default")]
+            Default,
+
+            [EnumMember(Value = "gray")]
+            Gray,
+
+            [EnumMember(Value = "brown")]
+            Brown,
+
+            [EnumMember(Value = "orange")]
+            Orange,
+
+            [EnumMember(Value = "yellow")]
+            Yellow,
+
+            [EnumMember(Value = "green")]
+            Green,
+
+            [EnumMember(Value = "blue")]
+            Blue,
+
+            [EnumMember(Value = "purple")]
+            Purple,
+
+            [EnumMember(Value = "pink")]
+            Pink,
+
+            [EnumMember(Value = "red")]
+            Red,
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,9 @@ public class DatabasesCreateParameters : IDatabasesCreateBodyParameters, IDataba`
`19`	`19`
`20`	`20`	`[JsonProperty("cover")]`
`21`	`21`	`public FileObject Cover { get; set; }`
	`22`	`+`
	`23`	`+ public bool? IsInline { get; set; }`
	`24`	`+`
	`25`	`+ public string Description { get; set; }`
`22`	`26`	`}`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,11 @@ public interface IDatabasesCreateBodyParameters`
`13`	`13`
`14`	`14`	`[JsonProperty("title")]`
`15`	`15`	`List<RichTextBaseInput> Title { get; set; }`
	`16`	`+`
	`17`	`+ [JsonProperty("is_inline")]`
	`18`	`+ bool? IsInline { get; set; }`
	`19`	`+`
	`20`	`+ [JsonProperty("description")]`
	`21`	`+ string Description { get; set; }`
`16`	`22`	`}`
`17`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ public enum PropertyType`
`62`	`62`	`LastEditedBy,`
`63`	`63`
`64`	`64`	`[EnumMember(Value = "last_edited_time")]`
`65`		`- LastEditedTime`
	`65`	`+ LastEditedTime,`
	`66`	`+`
	`67`	`+ [EnumMember(Value = "status")]`
	`68`	`+ Status,`
`66`	`69`	`}`
`67`	`70`	`}`