Add new CreateBlock children to page creation (#49)

* extract block to mod

* add CreateBlock struct, implement Into<CreateBlock> for Block, and add children to PageCreateRequest

* move tests into block mod and fix up use

1 files changed, 7 insertions, 456 deletions

diff --git a/src/models/mod.rs b/src/models/mod.rs
index 3c9d12b..795accd 100644
--- a/src/models/mod.rs
+++ b/src/models/mod.rs
@@ -1,3 +1,4 @@
+pub mod block;
 pub mod error;
 pub mod paging;
 pub mod properties;
@@ -8,15 +9,16 @@ pub mod text;
 pub mod users;
 
 use crate::models::properties::{PropertyConfiguration, PropertyValue};
-use crate::models::text::{RichText, TextColor};
+use crate::models::text::RichText;
 use crate::Error;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
-use crate::ids::{AsIdentifier, BlockId, DatabaseId, PageId};
+use crate::ids::{AsIdentifier, DatabaseId, PageId};
+use crate::models::block::{Block, CreateBlock};
 use crate::models::error::ErrorResponse;
 use crate::models::paging::PagingCursor;
-use crate::models::users::{User, UserCommon};
+use crate::models::users::User;
 pub use chrono::{DateTime, Utc};
 pub use serde_json::value::Number;
 
@@ -184,6 +186,8 @@ impl Properties {
 pub struct PageCreateRequest {
     pub parent: Parent,
     pub properties: Properties,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub children: Option<Vec<CreateBlock>>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
@@ -205,459 +209,6 @@ impl Page {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct BlockCommon {
-    pub id: BlockId,
-    pub created_time: DateTime<Utc>,
-    pub last_edited_time: DateTime<Utc>,
-    pub has_children: bool,
-    pub created_by: UserCommon,
-    pub last_edited_by: UserCommon,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct TextAndChildren {
-    pub rich_text: Vec<RichText>,
-    pub children: Option<Vec<Block>>,
-    pub color: TextColor,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct Text {
-    pub rich_text: Vec<RichText>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct InternalFileObject {
-    url: String,
-    expiry_time: DateTime<Utc>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct ExternalFileObject {
-    url: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(tag = "type")]
-#[serde(rename_all = "snake_case")]
-pub enum FileOrEmojiObject {
-    Emoji { emoji: String },
-    File { file: InternalFileObject },
-    External { external: ExternalFileObject },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(tag = "type")]
-#[serde(rename_all = "snake_case")]
-pub enum FileObject {
-    File { file: InternalFileObject },
-    External { external: ExternalFileObject },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct Callout {
-    pub rich_text: Vec<RichText>,
-    pub icon: FileOrEmojiObject,
-    pub color: TextColor,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct ToDoFields {
-    pub rich_text: Vec<RichText>,
-    pub checked: bool,
-    pub children: Option<Vec<Block>>,
-    pub color: TextColor,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct ChildPageFields {
-    pub title: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct ChildDatabaseFields {
-    pub title: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct EmbedFields {
-    pub url: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct BookmarkFields {
-    pub url: String,
-    pub caption: Vec<RichText>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(rename_all = "lowercase")]
-pub enum CodeLanguage {
-    Abap,
-    Arduino,
-    Bash,
-    Basic,
-    C,
-    Clojure,
-    Coffeescript,
-    #[serde(rename = "c++")]
-    CPlusPlus,
-    #[serde(rename = "c#")]
-    CSharp,
-    Css,
-    Dart,
-    Diff,
-    Docker,
-    Elixir,
-    Elm,
-    Erlang,
-    Flow,
-    Fortran,
-    #[serde(rename = "f#")]
-    FSharp,
-    Gherkin,
-    Glsl,
-    Go,
-    Graphql,
-    Groovy,
-    Haskell,
-    Html,
-    Java,
-    Javascript,
-    Json,
-    Julia,
-    Kotlin,
-    Latex,
-    Less,
-    Lisp,
-    Livescript,
-    Lua,
-    Makefile,
-    Markdown,
-    Markup,
-    Matlab,
-    Mermaid,
-    Nix,
-    #[serde(rename = "objective-c")]
-    ObjectiveC,
-    Ocaml,
-    Pascal,
-    Perl,
-    Php,
-    #[serde(rename = "plain text")]
-    PlainText,
-    Powershell,
-    Prolog,
-    Protobuf,
-    Python,
-    R,
-    Reason,
-    Ruby,
-    Rust,
-    Sass,
-    Scala,
-    Scheme,
-    Scss,
-    Shell,
-    Sql,
-    Swift,
-    Typescript,
-    #[serde(rename = "vb.net")]
-    VbNet,
-    Verilog,
-    Vhdl,
-    #[serde(rename = "visual basic")]
-    VisualBasic,
-    Webassembly,
-    Xml,
-    Yaml,
-    #[serde(rename = "java/c/c++/c#")]
-    JavaCAndCPlusPlusAndCSharp,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct CodeFields {
-    pub rich_text: Vec<RichText>,
-    pub caption: Vec<RichText>,
-    pub language: CodeLanguage,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct Equation {
-    pub expression: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct TableOfContents {
-    pub color: TextColor,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct ColumnListFields {
-    pub children: Vec<Block>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct ColumnFields {
-    pub children: Vec<Block>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct LinkPreviewFields {
-    pub url: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct TemplateFields {
-    pub rich_text: Vec<RichText>,
-    pub children: Vec<Block>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(tag = "type")]
-#[serde(rename_all = "snake_case")]
-pub enum LinkToPageFields {
-    PageId { page_id: PageId },
-    DatabaseId { database_id: DatabaseId },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct SyncedFromObject {
-    pub block_id: BlockId,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct SyncedBlockFields {
-    pub synced_from: Option<SyncedFromObject>,
-    pub children: Vec<Block>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct TableFields {
-    pub table_width: u64,
-    pub has_column_header: bool,
-    pub has_row_header: bool,
-    pub children: Vec<Block>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct TableRowFields {
-    pub cells: Vec<RichText>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(tag = "type")]
-#[serde(rename_all = "snake_case")]
-pub enum Block {
-    Paragraph {
-        #[serde(flatten)]
-        common: BlockCommon,
-        paragraph: TextAndChildren,
-    },
-    #[serde(rename = "heading_1")]
-    Heading1 {
-        #[serde(flatten)]
-        common: BlockCommon,
-        heading_1: Text,
-    },
-    #[serde(rename = "heading_2")]
-    Heading2 {
-        #[serde(flatten)]
-        common: BlockCommon,
-        heading_2: Text,
-    },
-    #[serde(rename = "heading_3")]
-    Heading3 {
-        #[serde(flatten)]
-        common: BlockCommon,
-        heading_3: Text,
-    },
-    Callout {
-        #[serde(flatten)]
-        common: BlockCommon,
-        callout: Callout,
-    },
-    Quote {
-        #[serde(flatten)]
-        common: BlockCommon,
-        quote: TextAndChildren,
-    },
-    BulletedListItem {
-        #[serde(flatten)]
-        common: BlockCommon,
-        bulleted_list_item: TextAndChildren,
-    },
-    NumberedListItem {
-        #[serde(flatten)]
-        common: BlockCommon,
-        numbered_list_item: TextAndChildren,
-    },
-    ToDo {
-        #[serde(flatten)]
-        common: BlockCommon,
-        to_do: ToDoFields,
-    },
-    Toggle {
-        #[serde(flatten)]
-        common: BlockCommon,
-        toggle: TextAndChildren,
-    },
-    Code {
-        #[serde(flatten)]
-        common: BlockCommon,
-        code: CodeFields,
-    },
-    ChildPage {
-        #[serde(flatten)]
-        common: BlockCommon,
-        child_page: ChildPageFields,
-    },
-    ChildDatabase {
-        #[serde(flatten)]
-        common: BlockCommon,
-        child_page: ChildDatabaseFields,
-    },
-    Embed {
-        #[serde(flatten)]
-        common: BlockCommon,
-        embed: EmbedFields,
-    },
-    Image {
-        #[serde(flatten)]
-        common: BlockCommon,
-        image: FileObject,
-    },
-    Video {
-        #[serde(flatten)]
-        common: BlockCommon,
-        video: FileObject,
-    },
-    File {
-        #[serde(flatten)]
-        common: BlockCommon,
-        file: FileObject,
-        caption: Text,
-    },
-    Pdf {
-        #[serde(flatten)]
-        common: BlockCommon,
-        pdf: FileObject,
-    },
-    Bookmark {
-        #[serde(flatten)]
-        common: BlockCommon,
-        bookmark: BookmarkFields,
-    },
-    Equation {
-        #[serde(flatten)]
-        common: BlockCommon,
-        equation: Equation,
-    },
-    Divider {
-        #[serde(flatten)]
-        common: BlockCommon,
-    },
-    TableOfContents {
-        #[serde(flatten)]
-        common: BlockCommon,
-        table_of_contents: TableOfContents,
-    },
-    Breadcrumb {
-        #[serde(flatten)]
-        common: BlockCommon,
-    },
-    ColumnList {
-        #[serde(flatten)]
-        common: BlockCommon,
-        column_list: ColumnListFields,
-    },
-    Column {
-        #[serde(flatten)]
-        common: BlockCommon,
-        column: ColumnFields,
-    },
-    LinkPreview {
-        #[serde(flatten)]
-        common: BlockCommon,
-        link_preview: LinkPreviewFields,
-    },
-    Template {
-        #[serde(flatten)]
-        common: BlockCommon,
-        template: TemplateFields,
-    },
-    LinkToPage {
-        #[serde(flatten)]
-        common: BlockCommon,
-        link_to_page: LinkToPageFields,
-    },
-    Table {
-        #[serde(flatten)]
-        common: BlockCommon,
-        table: TableFields,
-    },
-    SyncedBlock {
-        #[serde(flatten)]
-        common: BlockCommon,
-        synced_block: SyncedBlockFields,
-    },
-    TableRow {
-        #[serde(flatten)]
-        common: BlockCommon,
-        table_row: TableRowFields,
-    },
-    Unsupported {
-        #[serde(flatten)]
-        common: BlockCommon,
-    },
-    #[serde(other)]
-    Unknown,
-}
-
-impl AsIdentifier<BlockId> for Block {
-    fn as_id(&self) -> &BlockId {
-        use Block::*;
-        match self {
-            Paragraph { common, .. }
-            | Heading1 { common, .. }
-            | Heading2 { common, .. }
-            | Heading3 { common, .. }
-            | Callout { common, .. }
-            | Quote { common, .. }
-            | BulletedListItem { common, .. }
-            | NumberedListItem { common, .. }
-            | ToDo { common, .. }
-            | Toggle { common, .. }
-            | Code { common, .. }
-            | ChildPage { common, .. }
-            | ChildDatabase { common, .. }
-            | Embed { common, .. }
-            | Image { common, .. }
-            | Video { common, .. }
-            | File { common, .. }
-            | Pdf { common, .. }
-            | Bookmark { common, .. }
-            | Equation { common, .. }
-            | Divider { common, .. }
-            | TableOfContents { common, .. }
-            | Breadcrumb { common, .. }
-            | ColumnList { common, .. }
-            | Column { common, .. }
-            | LinkPreview { common, .. }
-            | Template { common, .. }
-            | LinkToPage { common, .. }
-            | SyncedBlock { common, .. }
-            | Table { common, .. }
-            | TableRow { common, .. }
-            | Unsupported { common, .. } => &common.id,
-            Unknown => {
-                panic!("Trying to reference identifier for unknown block!")
-            }
-        }
-    }
-}
-
 impl AsIdentifier<PageId> for Page {
     fn as_id(&self) -> &PageId {
         &self.id