Jira: create issues

ahndmal · ahndmal · commit a416adcba74f · 2023-03-23T19:58:14.000+02:00
diff --git a/src/confluence.rs b/src/confluence.rs
@@ -0,0 +1 @@
+mod conf_run;
diff --git a/src/confluence/conf_run.rs b/src/confluence/conf_run.rs
@@ -0,0 +1,48 @@
+use crate::labels::labels::LabelService;
+
+async fn run() {
+    // =============== get page
+    // let pages = get_descendants(conf_url, token, "1213317".to_string()).await;
+    // pages.results.iter().for_each(|p| println!("{:?}", p.title));
+
+    // =============== get space
+    // let space = get_space(conf_url, token, "dev16".to_string()).await;
+    // println!("{:?}", space);
+
+    // =============== get spaces
+    // let mut space_service = SpaceService { spaces: vec![] };
+    // let vec1 = space_service.get_spaces(&conf_url, &token).await;
+    // println!("{:?}", vec1);
+
+    // =============== CREATE PAGEs
+    // let space_key = "dev3";
+    // let parent = 1212664;
+    //
+    // for a in 1..20 {
+    //     let title = format!("Rust page {a}");
+    //
+    //     let req = CreatePage {
+    //         title: title.to_string(),
+    //         ctype: "page".to_string(),
+    //         space: CreatePageSpace {
+    //             key: space_key.to_string(),
+    //         },
+    //         body: PageBody {
+    //             storage: Storage {
+    //                 representation: "storage".to_string(),
+    //                 value: helpers::helpers::rand_string(30).to_string(),
+    //             },
+    //         },
+    //         ancestors: vec![Ancestor {
+    //             id: parent,
+    //         }],
+    //     };
+    //     let resp = create_page(&conf_url, &token, req).await;
+    //     println!("{:?}", resp);
+    // }
+
+    // ========= add labels
+    // let ls = LabelService{labels: vec![]};
+    // let label = String::from("bbb");
+    // ls.add_label(conf_url, token, "2523141".to_string(), vec![label]).await;
+}
diff --git a/src/jira.rs b/src/jira.rs
@@ -0,0 +1,52 @@
+pub(crate) mod jira_models;
+
+pub mod jira {
+    use reqwest::Response;
+    use crate::jira::jira_models::jira_models::CreateIssue;
+
+    pub struct JiraClient {}
+
+    pub struct IssueService();
+
+    impl IssueService {
+        pub async fn create_issue(&self, url: &str, token: String, issue: CreateIssue) -> String {
+            let req_url = format!("{url}/rest/api/2/issue");
+            let client = reqwest::Client::new();
+            let body = r#"{
+                      "fields": {
+                        "project": {
+                            "id": "10000"
+                        },
+                        "summary": "Test Rust",
+                        "issuetype": {
+                            "id": "10006"
+                        },
+                        "assignee": {
+                            "name": "admin"
+                        },
+                        "reporter": {
+                            "name": "admin"
+                        },
+                        "priority": {
+                            "id": "3"
+                        },
+                        "labels": [
+                            "a",
+                            "b"
+                        ],
+                        "description": "Test",
+                        "duedate": "2023-04-11"
+                    }
+                }
+            "#;
+            let resp: Response = client.post(&req_url)
+                .body(body)
+                .header("Authorization", format!("Basic {token}"))
+                .header("Accept", "application/json")
+                .header("Content-Type", "application/json")
+                .send().await.unwrap();
+            let body = resp.text().await.unwrap();
+            return body;
+        }
+    }
+}
diff --git a/src/jira/jira_models.rs b/src/jira/jira_models.rs
@@ -0,0 +1,32 @@
+pub mod jira_models {
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+    #[allow(non_snake_case)]
+    pub struct Issue {
+        pub id: String,
+        pub key: String,
+        pub proj_key: String,
+        pub summary: String,
+        pub description: String,
+    }
+
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+    #[allow(non_snake_case)]
+    pub struct CreateIssue {
+        #[serde(rename(serialize = "type"))]
+        #[serde(rename(deserialize = "type"))]
+        pub Type: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub fields: Option<Fields>,
+    }
+
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+    #[allow(non_snake_case)]
+    pub struct Fields {
+
+    }
+
+
+
+}
diff --git a/src/jira/models.rs b/src/jira/models.rs
diff --git a/src/labels.rs b/src/labels.rs
@@ -22,7 +22,7 @@ pub mod labels {
     }
 
     impl LabelService {
-        pub async fn add_label(url: &str, token: String, id: String, labels: Vec<String>) -> String {
+        pub async fn add_label(&self, url: &str, token: String, id: String, labels: Vec<String>) -> String {
             let mut labels_vec: Vec<AddLabel> = vec![];
             for label in labels {
                 labels_vec.push(AddLabel {
@@ -33,13 +33,13 @@ pub mod labels {
             let request_url = format!("{url}/rest/api/content/{id}/label/");
             let client = reqwest::Client::new();
             let resp: Response = client.post(&request_url)
-                .body(labels_vec)
+                .json(&labels_vec)
                 .header("Authorization", format!("Basic {token}"))
                 .header("Accept", "application/json")
                 .header("Content-Type", "application/json")
                 .send().await.unwrap();
             let body = resp.text().await.unwrap();
-            return serde_json::from_str(body.as_str()).unwrap();
+            return body;
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
@@ -3,14 +3,18 @@ mod helpers;
 mod model;
 mod spaces;
 mod labels;
+mod jira;
+mod confluence;
 
 use std::fmt::format;
 use std::future::Future;
 use std::iter::Map;
 use reqwest::{Body, Error};
 use serde_json::{json, Value};
 use tokio::time::Instant;
+use crate::labels::labels::LabelService;
 use crate::model::models::{Ancestor, CreatePage, CreatePageSpace, PageBody, Storage};
+use crate::jira::jira_models::jira_models::CreateIssue;
 use crate::pages::page_service::{create_page, get_children, get_descendants, get_page};
 use crate::spaces::spaces::{SpaceService};
 
@@ -22,50 +26,17 @@ async fn main() -> Result<(), Error> {
 
     // data
     let token = base64::encode(b"admin:admin");
-    let conf_url = "http://localhost:8110";
-
-    // =============== get page
-    // let pages = get_descendants(conf_url, token, "1213317".to_string()).await;
-    // pages.results.iter().for_each(|p| println!("{:?}", p.title));
-
-    // =============== get space
-    // let space = get_space(conf_url, token, "dev16".to_string()).await;
-    // println!("{:?}", space);
-
-    // =============== get spaces
-    let mut space_service = SpaceService { spaces: vec![] };
-    let vec1 = space_service.get_spaces(&conf_url, &token).await;
-    println!("{:?}", vec1);
-
-    // =============== CREATE PAGEs
-    // let space_key = "dev3";
-    // let parent = 1212664;
-    //
-    // for a in 1..20 {
-    //     let title = format!("Rust page {a}");
-    //
-    //     let req = CreatePage {
-    //         title: title.to_string(),
-    //         ctype: "page".to_string(),
-    //         space: CreatePageSpace {
-    //             key: space_key.to_string(),
-    //         },
-    //         body: PageBody {
-    //             storage: Storage {
-    //                 representation: "storage".to_string(),
-    //                 value: helpers::helpers::rand_string(30).to_string(),
-    //             },
-    //         },
-    //         ancestors: vec![Ancestor {
-    //             id: parent,
-    //         }],
-    //     };
-    //     let resp = create_page(&conf_url, &token, req).await;
-    //     println!("{:?}", resp);
-    // }
+    let conf_url = "http://localhost:9500";
 
+    let is = jira::jira::IssueService();
+    let result = is.create_issue(conf_url, token, CreateIssue {
+        Type: "".to_string(),
+        fields: None,
+    });
+    println!("{:?}", result.await);
 
 
+    // end
     let mut end: u128 = start.elapsed().as_millis();
     println!("{:?}", println!(">>> Action took :: {end} millis"));
 
diff --git a/src/model/space.rs b/src/model/space.rs
@@ -1,7 +1,7 @@
 pub mod space {
     use serde::{Deserialize, Serialize};
 
-    #[derive(Deserialize, Serialize, Debug)]
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
     pub struct Space {
         pub id: i64,
         pub key: String,
@@ -13,7 +13,7 @@ pub mod space {
         pub _expandable: SpaceExpandable
     }
 
-    #[derive(Deserialize, Serialize, Debug)]
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
     pub struct Spaces {
         pub results: Vec<SpaceResult>,
         pub start: i8,
@@ -22,7 +22,7 @@ pub mod space {
         pub _links: SpacesLinks,
     }
 
-    #[derive(Deserialize, Serialize, Debug)]
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
     pub struct SpaceResult {
         pub id: i64,
         pub key: String,
@@ -34,7 +34,7 @@ pub mod space {
         pub _expandable: SpaceExpandable
     }
 
-    #[derive(Deserialize, Serialize, Debug)]
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
     pub struct SpaceLinks {
         pub webui: String,
         pub collection: String,
@@ -47,7 +47,7 @@ pub mod space {
         pub sself: String,
     }
 
-    #[derive(Deserialize, Serialize, Debug)]
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
     pub struct SpaceResultLinks {
         pub webui: String,
         #[serde(rename(serialize = "self"))]
@@ -56,7 +56,7 @@ pub mod space {
         pub sself: String,
     }
 
-    #[derive(Deserialize, Serialize, Debug)]
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
     pub struct SpacesLinks {
         #[serde(rename(serialize = "self"))]
         #[serde(rename(deserialize = "self"))]
@@ -80,7 +80,7 @@ pub mod space {
         pub homepage: String,
     }
 
-    #[derive(Deserialize, Serialize, Debug)]
+    #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
     pub struct CreateSpace {
         pub key: String,
         pub name: String,

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ pub mod labels {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`impl LabelService {`
`25`		`- pub async fn add_label(url: &str, token: String, id: String, labels: Vec<String>) -> String {`
	`25`	`+ pub async fn add_label(&self, url: &str, token: String, id: String, labels: Vec<String>) -> String {`
`26`	`26`	`let mut labels_vec: Vec<AddLabel> = vec![];`
`27`	`27`	`for label in labels {`
`28`	`28`	`labels_vec.push(AddLabel {`
`@@ -33,13 +33,13 @@ pub mod labels {`
`33`	`33`	`let request_url = format!("{url}/rest/api/content/{id}/label/");`
`34`	`34`	`let client = reqwest::Client::new();`
`35`	`35`	`let resp: Response = client.post(&request_url)`
`36`		`- .body(labels_vec)`
	`36`	`+ .json(&labels_vec)`
`37`	`37`	`.header("Authorization", format!("Basic {token}"))`
`38`	`38`	`.header("Accept", "application/json")`
`39`	`39`	`.header("Content-Type", "application/json")`
`40`	`40`	`.send().await.unwrap();`
`41`	`41`	`let body = resp.text().await.unwrap();`
`42`		`- return serde_json::from_str(body.as_str()).unwrap();`
	`42`	`+ return body;`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`