Merge branch '2.0.0' into tech/141-add-json-property-attributes-to-all-api-response-and-request-model

Author: KoditkarVedant

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

@@ -30,5 +30,11 @@ public class Database : IObject
 
         [JsonProperty("cover")]
         public FileObject Cover { get; set; }
+
+        /// <summary>
+        /// The URL of the Notion database.
+        /// </summary>
+        [JsonProperty("url")]
+        public string Url { get; set; }
     }
 }

Src/Notion.Client/Models/ExternalFile.cs …otion.Client/Models/File/ExternalFile.csSrc/Notion.Client/Models/ExternalFile.cs renamed to Src/Notion.Client/Models/File/ExternalFile.cs Src/Notion.Client/Models/ExternalFile.cs renamed to Src/Notion.Client/Models/File/ExternalFile.cs

@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class ExternalFileWithName : FileObjectWithName
+    {
+        public override string Type => "external";
+
+        [JsonProperty("external")]
+        public Info External { get; set; }
+
+        public class Info
+        {
+            [JsonProperty("url")]
+            public string Url { get; set; }
+        }
+    }
+}

Src/Notion.Client/Models/File/ExternalFileWithName.cs

@@ -0,0 +1,17 @@
+using JsonSubTypes;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    [JsonConverter(typeof(JsonSubtypes), "type")]
+    [JsonSubtypes.KnownSubType(typeof(UploadedFileWithName), "file")]
+    [JsonSubtypes.KnownSubType(typeof(ExternalFileWithName), "external")]
+    public abstract class FileObjectWithName
+    {
+        [JsonProperty("type")]
+        public virtual string Type { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+    }
+}

Src/Notion.Client/Models/FileObject.cs …/Notion.Client/Models/File/FileObject.csSrc/Notion.Client/Models/FileObject.cs renamed to Src/Notion.Client/Models/File/FileObject.cs Src/Notion.Client/Models/FileObject.cs renamed to Src/Notion.Client/Models/File/FileObject.cs

@@ -0,0 +1,22 @@
+using System;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class UploadedFileWithName : FileObjectWithName
+    {
+        public override string Type => "file";
+
+        [JsonProperty("file")]
+        public Info File { get; set; }
+
+        public class Info
+        {
+            [JsonProperty("url")]
+            public string Url { get; set; }
+
+            [JsonProperty("expiry_time")]
+            public DateTime ExpiryTime { get; set; }
+        }
+    }
+}

Src/Notion.Client/Models/File/FileObjectWithName.cs

@@ -14,11 +14,6 @@ public class FilesPropertyValue : PropertyValue
         /// Array of File Object with name.
         /// </summary>
         [JsonProperty("files")]
-        public List<FileValue> Files { get; set; }
-    }
-
-    public class FileValue
-    {
-        public string Name { get; set; }
+        public List<FileObjectWithName> Files { get; set; }
     }
 }