spaces

Author: ahndmal

Cargo.toml

@@ -2,6 +2,7 @@
 name = "rust-atlas-rest"
 version = "0.1.0"
 edition = "2021"
+authors = ["Andrii Maliuta"]
 
 [workspace]
 #members=[

src/main.rs

@@ -11,7 +11,7 @@ use serde_json::{json, Value};
 use tokio::time::Instant;
 use crate::model::models::{Ancestor, CreatePage, CreatePageSpace, PageBody, Storage};
 use crate::pages::page_service::{create_page, get_children, get_descendants, get_page};
-use crate::spaces::spaces::{get_space, get_spaces};
+use crate::spaces::spaces::{SpaceService};
 
 
 #[tokio::main]
@@ -20,22 +20,23 @@ async fn main() -> Result<(), Error> {
     println!("{}", "[ *** ] Starting");
 
     // data
-    let token = base64::encode(b"admin:admin");
+    let token = base64::engine::encode(b"admin:admin");
     let conf_url = "http://localhost:8110";
 
-    // get page
+    // =============== get page
     // let pages = get_descendants(conf_url, token, "1213317".to_string()).await;
     // pages.results.iter().for_each(|p| println!("{:?}", p.title));
 
-    // get space
+    // =============== get space
     // let space = get_space(conf_url, token, "dev16".to_string()).await;
     // println!("{:?}", space);
 
-    // get spaces
-    let spaces = get_spaces(conf_url, token).await;
-    println!("{:?}", spaces.len());
+    // =============== get spaces
+    let mut space_service = SpaceService { spaces: vec![] };
+    let vec1 = space_service.get_spaces(conf_url, token).await;
+    println!("{:?}", vec1);
 
-    // CREATE PAGE
+    // =============== CREATE PAGE
     // let space_key = "dev16";
     // let parent = 1213317;
     //

src/spaces.rs

@@ -6,11 +6,10 @@ pub mod spaces {
 
     pub struct SpaceService {
         pub spaces: Vec<SpaceResult>
-
     }
 
     impl SpaceService {
-        pub async fn get_spaces(url: &str, token: String) -> Vec<SpaceResult> {
+        pub async fn get_spaces(&self, url: &str, token: String) -> Vec<SpaceResult> {
             let request_url = format!("{url}/rest/api/space/");
             let client = reqwest::Client::new();
             let resp: Response = client.get(&request_url)
@@ -20,9 +19,9 @@ pub mod spaces {
             let body = resp.text().await.unwrap();
 
             let spaces_init: Spaces = serde_json::from_str(body.as_str()).unwrap();
-            spaces_init.results.iter().for_each(|s| spaces.push(s));
+            // spaces_init.results.iter().for_each(|s| self.spaces.push(s));
 
-            return spaces;
+            return spaces_init.results;
         }
 
         pub async fn get_space(url: &str, token: String, key: String) -> Space {