diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib.rs | 43 | ||||
| -rw-r--r-- | src/models.rs | 163 |
2 files changed, 199 insertions, 7 deletions
@@ -1,11 +1,11 @@ use crate::models::search::{DatabaseQuery, SearchRequest}; -use crate::models::{Database, DatabaseId, ListResponse, Object, Page}; +use crate::models::{Database, DatabaseId, ListResponse, Object, Page, Block, BlockId}; use reqwest::header::{HeaderMap, HeaderValue}; use reqwest::{header, Client, ClientBuilder, RequestBuilder}; use serde::de::DeserializeOwned; use snafu::{ResultExt, Snafu}; -mod models; +pub mod models; const NOTION_API_VERSION: &str = "2021-05-13"; @@ -127,6 +127,18 @@ impl NotionApi { ) .await?) } + + pub async fn get_block_children<T: Identifiable<Type = BlockId>>( + &self, + block_id: T + ) -> Result<ListResponse<Block>, NotionApiClientError> { + Ok(NotionApi::make_json_request( + self.client.get(&format!( + "https://api.notion.com/v1/blocks/{block_id}/children", + block_id = block_id.id() + )) + ).await?) + } } #[cfg(test)] @@ -135,8 +147,8 @@ mod tests { use crate::models::search::{ DatabaseQuery, FilterCondition, FilterProperty, FilterValue, NotionSearch, TextCondition, }; - use crate::models::Object; - use crate::NotionApi; + use crate::models::{Object, BlockId}; + use crate::{NotionApi, Identifiable}; fn test_token() -> String { let token = { @@ -227,6 +239,29 @@ mod tests { } #[tokio::test] + async fn get_block_children() -> Result<(), Box<dyn std::error::Error>> { + let api = test_client(); + + let search_response = api + .search(NotionSearch::Filter { + value: FilterValue::Page, + property: FilterProperty::Object, + }) + .await?; + + println!("{:?}", search_response.results.len()); + + for object in search_response.results { + let _block = match object { + Object::Page { page } => api.get_block_children(BlockId::from(page.id())).await.unwrap(), + _ => panic!("Should not have received anything but pages!") + }; + } + + Ok(()) + } + + #[tokio::test] async fn query_database() -> Result<(), Box<dyn std::error::Error>> { let api = test_client(); diff --git a/src/models.rs b/src/models.rs index f0909d9..9f2cd14 100644 --- a/src/models.rs +++ b/src/models.rs @@ -136,12 +136,142 @@ pub struct Page { } #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)] -pub struct Block {} +#[serde(rename_all = "snake_case")] +pub enum BlockType { + Paragraph, + Heading1, + Heading2, + Heading3, + BulletedListItem, + NumberedListItem, + ToDo, + Toggle, + ChildPage, + Unsupported +} -#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)] +pub struct BlockCommon { + id: BlockId, + created_time: DateTime<Utc>, + last_edited_time: DateTime<Utc>, + has_children: bool, +} + +#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)] +pub struct TextAndChildren { + text: Vec<RichText>, + children: Option<Vec<Block>>, +} + +#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)] +pub struct Text { + text: Vec<RichText>, +} + +#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)] +pub struct ToDoFields { + text: Vec<RichText>, + checked: bool, + children: Option<Vec<Block>>, +} + +#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)] +pub struct ChildPageFields { + title: String, +} + +#[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, + }, + 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, + }, + ChildPage { + #[serde(flatten)] + common: BlockCommon, + child_page: ChildPageFields, + }, + Unsupported {} +} + +impl Identifiable for Block { + type Type = BlockId; + + fn id(&self) -> &Self::Type { + match self { + Block::Paragraph { common, paragraph: _ } => &common.id, + Block::Heading1 { common, heading_1: _} => &common.id, + Block::Heading2 { common, heading_2: _} => &common.id, + Block::Heading3 { common, heading_3: _} => &common.id, + Block::BulletedListItem { common, bulleted_list_item: _} => &common.id, + Block::NumberedListItem { common, numbered_list_item: _} => &common.id, + Block::ToDo { common, to_do: _ } => &common.id, + Block::Toggle { common, toggle: _} => &common.id, + Block::ChildPage { common, child_page: _} => &common.id, + Block::Unsupported {} => { panic!("Trying to reference identifier for unsupported block!") } + } + + } +} + +impl Identifiable for Page { + type Type = PageId; + + fn id(&self) -> &Self::Type { + &self.id + } +} + +#[derive(Eq, Serialize, Deserialize, Clone, Debug, PartialEq)] #[serde(tag = "object")] #[serde(rename_all = "snake_case")] pub enum Object { + Block { + #[serde(flatten)] + block: Block + }, Database { #[serde(flatten)] database: Database, @@ -158,7 +288,34 @@ pub enum Object { #[serde(flatten)] user: User, }, - Block {}, +} + +#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Hash, Clone)] +#[serde(transparent)] +pub struct BlockId(String); + +impl BlockId { + pub fn id(&self) -> &str { + &self.0 + } + + pub fn from(page_id: &PageId) -> Self { + BlockId(page_id.clone().0) + } +} + +impl Identifiable for BlockId { + type Type = BlockId; + + fn id(&self) -> &Self::Type { + self + } +} + +impl Display for BlockId { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + self.0.fmt(f) + } } impl Object { |