spaces

Author: ahndmal

src/main.rs

@@ -29,6 +29,7 @@ async fn main() -> Result<(), Error> {
 
     // get space
     let space = get_space(conf_url, token, "dev16".to_string()).await;
+    println!("{:?}", space);
 
     // CREATE PAGE
     // let space_key = "dev16";

src/model.rs

@@ -1,4 +1,4 @@
-mod space;
+pub(crate) mod space;
 
 pub mod models {
     use serde_json::{json, Value};
@@ -11,12 +11,6 @@ pub mod models {
         pub position: Option<T>,
     }
 
-    // impl Extentions {
-    //     pub fn is_empty(option: Option<Extentions>) -> bool {
-    //         if option == None { true} else { false }
-    //     }
-    // }
-
     #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
     #[allow(non_snake_case)]
     pub struct Content {

src/model/space.rs

@@ -1,32 +1,47 @@
-use serde::{Deserialize, Serialize};
-use crate::model::models::{Links};
+pub mod space {
+    use serde::{Deserialize, Serialize};
 
-#[derive(Deserialize, Serialize, Debug)]
-pub struct Space {
-    id: i16,
-    key: String,
-    name: String,
-    #[serde(rename(serialize = "type"))]
-    #[serde(rename(deserialize = "type"))]
-    ttype: String,
-    _links: Links,
-    _expandable: SpaceExpandable
-}
+    #[derive(Deserialize, Serialize, Debug)]
+    pub struct Space {
+        pub id: i64,
+        pub key: String,
+        pub name: String,
+        #[serde(rename(serialize = "type"))]
+        #[serde(rename(deserialize = "type"))]
+        pub ttype: String,
+        pub _links: SpaceLinks,
+        pub _expandable: SpaceExpandable
+    }
 
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[allow(non_snake_case)]
-pub struct SpaceExpandable {
-    pub metadata: String,
-    pub icon: String,
-    pub description: String,
-    #[serde(rename(serialize = "retentionPolicy"))]
-    #[serde(rename(deserialize = "retentionPolicy"))]
-    pub retention_policy: String,
-    pub homepage: String,
-}
+    #[derive(Deserialize, Serialize, Debug)]
+    pub struct SpaceLinks {
+        pub webui: String,
+        pub collection: String,
+        pub base: String,
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub context: String,
+        #[serde(rename(serialize = "self"))]
+        #[serde(rename(deserialize = "self"))]
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub sself: String,
+    }
 
-#[derive(Deserialize, Serialize, Debug)]
-pub struct CreateSpace {
-    key: String,
-    name: String,
-}
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+    #[allow(non_snake_case)]
+    pub struct SpaceExpandable {
+        pub metadata: String,
+        pub icon: String,
+        pub description: String,
+        #[serde(rename(serialize = "retentionPolicy"))]
+        #[serde(rename(deserialize = "retentionPolicy"))]
+        pub retention_policy: String,
+        pub homepage: String,
+    }
+
+    #[derive(Deserialize, Serialize, Debug)]
+    pub struct CreateSpace {
+        pub key: String,
+        pub name: String,
+    }
+
+}

src/spaces.rs

@@ -1,7 +1,7 @@
 pub mod spaces {
-
     use reqwest::Response;
     use crate::model::models::{Content, CreatePage, ContentResponse, SearchResults};
+    use crate::model::space::space::{Space, CreateSpace};
 
     pub async fn get_space(url: &str, token: String, key: String) -> Space {
         let request_url = format!("{url}/rest/api/space/{key}");
@@ -14,7 +14,7 @@ pub mod spaces {
         return serde_json::from_str(body.as_str()).unwrap();
     }
 
-    pub async fn create_space(conf_url: &str, token: &str, page: CreateSpace) -> String {
+    pub async fn create_space(conf_url: &str, token: &str, page: CreateSpace) -> Space {
         let request_url = format!("{conf_url}/rest/api/content/");
         let client = reqwest::Client::new();
         let res = client.post(&request_url)
@@ -24,6 +24,6 @@ pub mod spaces {
             .send()
             .await.unwrap();
         let created: String = res.text().await.unwrap();
-        return created;
+        return serde_json::from_str(created.as_str()).unwrap();
     }
 }