Add file metadata to file DB page prop

block.go

@@ -91,22 +91,6 @@ type FileBlock struct {
 	Caption  []RichText    `json:"caption,omitempty"`
 }
 
-type FileFile struct {
-	URL        string   `json:"url"`
-	ExpiryTime DateTime `json:"expiry_time"`
-}
-
-type FileExternal struct {
-	URL string `json:"url"`
-}
-
-type FileType string
-
-const (
-	FileTypeFile     FileType = "file"
-	FileTypeExternal FileType = "external"
-)
-
 type Bookmark struct {
 	URL     string     `json:"url"`
 	Caption []RichText `json:"caption,omitempty"`

client_test.go

@@ -980,8 +980,8 @@ func TestCreateDatabase(t *testing.T) {
 					Emoji: notion.StringPtr("✌️"),
 				},
 				Cover: &notion.Cover{
-					Type: notion.CoverTypeExternal,
+					Type: notion.FileTypeExternal,
-					External: &notion.CoverExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/image.png",
 					},
 				},
@@ -1098,8 +1098,8 @@ func TestCreateDatabase(t *testing.T) {
 					Emoji: notion.StringPtr("✌️"),
 				},
 				Cover: &notion.Cover{
-					Type: notion.CoverTypeExternal,
+					Type: notion.FileTypeExternal,
-					External: &notion.CoverExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/image.png",
 					},
 				},
@@ -1264,8 +1264,8 @@ func TestUpdateDatabase(t *testing.T) {
 					Emoji: notion.StringPtr("✌️"),
 				},
 				Cover: &notion.Cover{
-					Type: notion.CoverTypeExternal,
+					Type: notion.FileTypeExternal,
-					External: &notion.CoverExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/image.png",
 					},
 				},
@@ -1388,8 +1388,8 @@ func TestUpdateDatabase(t *testing.T) {
 					Emoji: notion.StringPtr("✌️"),
 				},
 				Cover: &notion.Cover{
-					Type: notion.CoverTypeExternal,
+					Type: notion.FileTypeExternal,
-					External: &notion.CoverExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/image.png",
 					},
 				},
@@ -1676,13 +1676,13 @@ func TestCreatePage(t *testing.T) {
 				},
 				Icon: &notion.Icon{
 					Type: notion.IconTypeExternal,
-					External: &notion.IconExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/icon.png",
 					},
 				},
 				Cover: &notion.Cover{
-					Type: notion.CoverTypeExternal,
+					Type: notion.FileTypeExternal,
-					External: &notion.CoverExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/cover.png",
 					},
 				},
@@ -1809,13 +1809,13 @@ func TestCreatePage(t *testing.T) {
 				},
 				Icon: &notion.Icon{
 					Type: notion.IconTypeExternal,
-					External: &notion.IconExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/icon.png",
 					},
 				},
 				Cover: &notion.Cover{
-					Type: notion.CoverTypeExternal,
+					Type: notion.FileTypeExternal,
-					External: &notion.CoverExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/cover.png",
 					},
 				},
@@ -2204,7 +2204,7 @@ func TestUpdatePageProps(t *testing.T) {
 			params: notion.UpdatePageParams{
 				Icon: &notion.Icon{
 					Type: notion.IconTypeExternal,
-					External: &notion.IconExternal{
+					External: &notion.FileExternal{
 						URL: "https://www.notion.so/front-static/pages/pricing/pro.png",
 					},
 				},
@@ -2276,7 +2276,7 @@ func TestUpdatePageProps(t *testing.T) {
 				},
 				Icon: &notion.Icon{
 					Type: notion.IconTypeExternal,
-					External: &notion.IconExternal{
+					External: &notion.FileExternal{
 						URL: "https://www.notion.so/front-static/pages/pricing/pro.png",
 					},
 				},
@@ -2303,8 +2303,8 @@ func TestUpdatePageProps(t *testing.T) {
 			name: "page cover, successful response",
 			params: notion.UpdatePageParams{
 				Cover: &notion.Cover{
-					Type: notion.CoverTypeExternal,
+					Type: notion.FileTypeExternal,
-					External: &notion.CoverExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/image.png",
 					},
 				},
@@ -2375,8 +2375,8 @@ func TestUpdatePageProps(t *testing.T) {
 					PageID: "b0668f48-8d66-4733-9bdb-2f82215707f7",
 				},
 				Cover: &notion.Cover{
-					Type: notion.CoverTypeExternal,
+					Type: notion.FileTypeExternal,
-					External: &notion.CoverExternal{
+					External: &notion.FileExternal{
 						URL: "https://example.com/image.png",
 					},
 				},

cover.go

@@ -2,27 +2,11 @@ package notion
 
 import "errors"
 
-type CoverType string
-
-const (
-	CoverTypeFile     CoverType = "file"
-	CoverTypeExternal CoverType = "external"
-)
-
 type Cover struct {
-	Type CoverType `json:"type"`
+	Type FileType `json:"type"`
 
-	File     *CoverFile     `json:"file,omitempty"`
+	File     *FileFile     `json:"file,omitempty"`
-	External *CoverExternal `json:"external,omitempty"`
+	External *FileExternal `json:"external,omitempty"`
-}
-
-type CoverFile struct {
-	URL        string   `json:"url"`
-	ExpiryTime DateTime `json:"expiry_time"`
-}
-
-type CoverExternal struct {
-	URL string `json:"url"`
 }
 
 func (cover Cover) Validate() error {
@@ -30,7 +14,7 @@ func (cover Cover) Validate() error {
 		return errors.New("cover type cannot be empty")
 	}
 
-	if cover.Type == CoverTypeExternal && cover.External == nil {
+	if cover.Type == FileTypeExternal && cover.External == nil {
 		return errors.New("cover external cannot be empty")
 	}
 

database.go

@@ -99,7 +99,11 @@ type People struct {
 }
 
 type File struct {
-	Name string `json:"name"`
+	Name string   `json:"name"`
+	Type FileType `json:"type"`
+
+	File     *FileFile     `json:"file,omitempty"`
+	External *FileExternal `json:"external,omitempty"`
 }
 
 type DatabaseProperty struct {

file.go

@@ -0,0 +1,17 @@
+package notion
+
+type FileFile struct {
+	URL        string   `json:"url"`
+	ExpiryTime DateTime `json:"expiry_time"`
+}
+
+type FileExternal struct {
+	URL string `json:"url"`
+}
+
+type FileType string
+
+const (
+	FileTypeFile     FileType = "file"
+	FileTypeExternal FileType = "external"
+)

icon.go

@@ -16,17 +16,8 @@ type Icon struct {
 	Type IconType `json:"type"`
 
 	Emoji    *string       `json:"emoji,omitempty"`
-	File     *IconFile     `json:"file,omitempty"`
+	File     *FileFile     `json:"file,omitempty"`
-	External *IconExternal `json:"external,omitempty"`
+	External *FileExternal `json:"external,omitempty"`
-}
-
-type IconFile struct {
-	URL        string   `json:"url"`
-	ExpiryTime DateTime `json:"expiry_time"`
-}
-
-type IconExternal struct {
-	URL string `json:"url"`
 }
 
 func (icon Icon) Validate() error {