Merge pull request #304 from notion-dotnet/302-make-color-enum-proper…

…ty-nullable Make color enum property nullable
notion-dotnet · Aug 20, 2022 · 6c4e614 · 6c4e614
2 parents 5023e2c + a7eef15
commit 6c4e614
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 18 deletions.
diff --git a/...pi/Databases/RequestParams/DatabasesCreateParameters/PropertySchema/SelectOptionSchema.cs b/...pi/Databases/RequestParams/DatabasesCreateParameters/PropertySchema/SelectOptionSchema.cs
@@ -10,6 +10,6 @@ public class SelectOptionSchema
 
         [JsonProperty("color")]
         [JsonConverter(typeof(StringEnumConverter))]
-        public Color Color { get; set; }
+        public Color? Color { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/BulletedListItemBlock.cs b/Src/Notion.Client/Models/Blocks/BulletedListItemBlock.cs
@@ -18,7 +18,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }

diff --git a/Src/Notion.Client/Models/Blocks/CalloutBlock.cs b/Src/Notion.Client/Models/Blocks/CalloutBlock.cs
@@ -21,7 +21,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }

diff --git a/Src/Notion.Client/Models/Blocks/HeadingOneBlock.cs b/Src/Notion.Client/Models/Blocks/HeadingOneBlock.cs
@@ -20,7 +20,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
         }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/HeadingThreeeBlock.cs b/Src/Notion.Client/Models/Blocks/HeadingThreeeBlock.cs
@@ -20,7 +20,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
         }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/HeadingTwoBlock.cs b/Src/Notion.Client/Models/Blocks/HeadingTwoBlock.cs
@@ -20,7 +20,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
         }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/NumberedListItemBlock.cs b/Src/Notion.Client/Models/Blocks/NumberedListItemBlock.cs
@@ -18,7 +18,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }

diff --git a/Src/Notion.Client/Models/Blocks/ParagraphBlock.cs b/Src/Notion.Client/Models/Blocks/ParagraphBlock.cs
@@ -18,7 +18,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }

diff --git a/Src/Notion.Client/Models/Blocks/QuoteBlock.cs b/Src/Notion.Client/Models/Blocks/QuoteBlock.cs
@@ -18,7 +18,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }

diff --git a/Src/Notion.Client/Models/Blocks/TableOfContentsBlock.cs b/Src/Notion.Client/Models/Blocks/TableOfContentsBlock.cs
@@ -14,7 +14,7 @@ public class Data
         {
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
         }
     }
 }
diff --git a/Src/Notion.Client/Models/Blocks/ToDoBlock.cs b/Src/Notion.Client/Models/Blocks/ToDoBlock.cs
@@ -21,7 +21,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }

diff --git a/Src/Notion.Client/Models/Blocks/ToggleBlock.cs b/Src/Notion.Client/Models/Blocks/ToggleBlock.cs
@@ -18,7 +18,7 @@ public class Info
 
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
 
             [JsonProperty("children")]
             public IEnumerable<INonColumnBlock> Children { get; set; }

diff --git a/Src/Notion.Client/Models/Database/Properties/SelectProperty.cs b/Src/Notion.Client/Models/Database/Properties/SelectProperty.cs
@@ -35,7 +35,7 @@ public class SelectOption
         /// </summary>
         [JsonProperty("color")]
         [JsonConverter(typeof(StringEnumConverter))]
-        public Color Color { get; set; }
+        public Color? Color { get; set; }
     }
 
     public class MultiSelectProperty : Property

diff --git a/Src/Notion.Client/Models/Database/RichText/RichTextBase.cs b/Src/Notion.Client/Models/Database/RichText/RichTextBase.cs
@@ -43,6 +43,6 @@ public class Annotations
 
         [JsonProperty("color")]
         [JsonConverter(typeof(StringEnumConverter))]
-        public Color Color { get; set; }
+        public Color? Color { get; set; }
     }
 }
diff --git a/Src/Notion.Client/Models/PropertyValue/StatusPropertyValue.cs b/Src/Notion.Client/Models/PropertyValue/StatusPropertyValue.cs
@@ -33,7 +33,7 @@ public class Data
             /// </summary>
             [JsonProperty("color")]
             [JsonConverter(typeof(StringEnumConverter))]
-            public Color Color { get; set; }
+            public Color? Color { get; set; }
         }
 
         public enum Color

diff --git a/Test/Notion.IntegrationTests/IPageClientTests.cs b/Test/Notion.IntegrationTests/IPageClientTests.cs
@@ -142,7 +142,7 @@ public async Task Test_RetrievePagePropertyItemAsync()
 
             var listProperty = (ListPropertyItem)property;
 
-            listProperty.Type.Should().BeNull();
+            listProperty.Type.Should().NotBeNull();
             listProperty.Results.Should().SatisfyRespectively(p =>
             {
                 p.Should().BeOfType<TitlePropertyItem>();
@@ -202,7 +202,11 @@ public async Task Test_UpdatePageProperty_with_date_as_null()
 
             var page = await _client.Pages.CreateAsync(pagesCreateParameters);
 
-            var setDate = page.Properties[datePropertyName] as DatePropertyValue;
+            var setDate = (DatePropertyItem)await _client.Pages.RetrievePagePropertyItem(new RetrievePropertyItemParameters
+            {
+                PageId = page.Id,
+                PropertyId = page.Properties[datePropertyName].Id
+            });
 
             setDate?.Date?.Start.Should().Be(Convert.ToDateTime("2020-12-08T12:00:00Z"));
 
@@ -215,7 +219,11 @@ public async Task Test_UpdatePageProperty_with_date_as_null()
                 Properties = testProps
             });
 
-            var verifyDate = updatedPage.Properties[datePropertyName] as DatePropertyValue;
+            var verifyDate = (DatePropertyItem)await _client.Pages.RetrievePagePropertyItem(new RetrievePropertyItemParameters
+            {
+                PageId = page.Id,
+                PropertyId = updatedPage.Properties[datePropertyName].Id
+            });
 
             verifyDate?.Date.Should().BeNull();