Compare commits
3 Commits
c5f4f9fcf9
...
442b5d25b4
| Author | SHA1 | Date | |
|---|---|---|---|
|
442b5d25b4
|
|||
|
4763d48290
|
|||
|
1af6596b51
|
3
.changes/v0.4.0.md
Normal file
3
.changes/v0.4.0.md
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
## v0.4.0 - 2025-10-24
|
||||||
|
### Added
|
||||||
|
* [planning - i2work] Met à jour le body du ticket gitea avec un lien vers le work package, dans une section "related issues"
|
||||||
@@ -6,6 +6,14 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
|
|||||||
and is generated by [Changie](https://github.com/miniscruff/changie).
|
and is generated by [Changie](https://github.com/miniscruff/changie).
|
||||||
|
|
||||||
|
|
||||||
|
## v0.4.0 - 2025-10-24
|
||||||
|
### Added
|
||||||
|
* [planning - i2work] Met à jour le body du ticket gitea avec un lien vers le work package, dans une section "related issues"
|
||||||
|
|
||||||
|
## v0.3.0 - 2024-11-17
|
||||||
|
### Added
|
||||||
|
* Open the newly create work package after the wp has been created
|
||||||
|
|
||||||
## v0.2.0 - 2024-11-14
|
## v0.2.0 - 2024-11-14
|
||||||
### Added
|
### Added
|
||||||
* Add an option `--assign-to-me` to automatically assign the openproject's user to the newly created work package
|
* Add an option `--assign-to-me` to automatically assign the openproject's user to the newly created work package
|
||||||
|
|||||||
@@ -2,9 +2,10 @@ use crate::cli::Issue2Work;
|
|||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::error::GeneralError;
|
use crate::error::GeneralError;
|
||||||
use crate::gitea::client::has_client_for_url;
|
use crate::gitea::client::has_client_for_url;
|
||||||
use crate::gitea::issue::{issue_html_url_to_api, Issue};
|
use crate::gitea::issue::{issue_html_url_to_api, Issue, IssueWriteSetBody};
|
||||||
use crate::openproject::user::{GetMe, User};
|
use crate::openproject::user::{GetMe, User};
|
||||||
use crate::openproject::work::WorkPackageWriter;
|
use crate::openproject::work::WorkPackageWriter;
|
||||||
|
use crate::planning::utils::{append_related_issues, IssueRelated};
|
||||||
use crate::planning::Issue2WorkActionTrait;
|
use crate::planning::Issue2WorkActionTrait;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
@@ -32,17 +33,28 @@ impl Issue2WorkActionTrait for GiteaAction {
|
|||||||
.create_work_package(&work_package, &args.project_id)
|
.create_work_package(&work_package, &args.project_id)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let url = format!(
|
let url_wp = format!(
|
||||||
"{}/projects/{}/work_packages/{}",
|
"{}/projects/{}/work_packages/{}",
|
||||||
config.openproject.base_url, args.project_id, work_package.id
|
config.openproject.base_url, args.project_id, work_package.id
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let content = append_related_issues(
|
||||||
|
&IssueRelated::OpenProjectIssue(url_wp.to_string()),
|
||||||
|
&issue.body,
|
||||||
|
);
|
||||||
|
let _u: Issue = gitea_client
|
||||||
|
.patch(
|
||||||
|
issue_html_url_to_api(url)?,
|
||||||
|
&IssueWriteSetBody { body: content },
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
println!(
|
println!(
|
||||||
"new work package created: {:?}, edit at {}",
|
"new work package created: {:?}, edit at {}",
|
||||||
work_package.subject, url
|
work_package.subject, url_wp
|
||||||
);
|
);
|
||||||
|
|
||||||
if let Err(e) = open::that(url) {
|
if let Err(e) = open::that(url_wp) {
|
||||||
println!("failed to open work package in browser: {}", e);
|
println!("failed to open work package in browser: {}", e);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
use crate::config::{Config, GiteaConfig};
|
use crate::config::{Config, GiteaConfig};
|
||||||
use crate::error::GeneralError;
|
use crate::error::GeneralError;
|
||||||
use reqwest::header::{HeaderMap, ACCEPT, AUTHORIZATION};
|
use reqwest::header::{HeaderMap, ACCEPT, AUTHORIZATION};
|
||||||
use reqwest::{ClientBuilder, StatusCode};
|
use reqwest::{Body, ClientBuilder, StatusCode};
|
||||||
use serde::de::DeserializeOwned;
|
use serde::de::DeserializeOwned;
|
||||||
|
use serde::Serialize;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
@@ -79,6 +80,38 @@ impl Client {
|
|||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn patch<T: DeserializeOwned, B: Serialize>(
|
||||||
|
&self,
|
||||||
|
url: Url,
|
||||||
|
body: &B,
|
||||||
|
) -> Result<T, GeneralError> {
|
||||||
|
let mut headers = HeaderMap::new();
|
||||||
|
headers.append(AUTHORIZATION, format!("token {}", self.token).parse()?);
|
||||||
|
headers.append(ACCEPT, "application/json".parse()?);
|
||||||
|
|
||||||
|
let client = ClientBuilder::new()
|
||||||
|
.default_headers(headers)
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let response = client.patch(url.clone()).json(body).send().await?;
|
||||||
|
|
||||||
|
match response.status() {
|
||||||
|
StatusCode::OK | StatusCode::CREATED => {
|
||||||
|
let result: T = response.json().await?;
|
||||||
|
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
_ => Err(GeneralError {
|
||||||
|
description: format!(
|
||||||
|
"Could not call PATCH on {:?}, error code {}",
|
||||||
|
url,
|
||||||
|
response.status()
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
use crate::error::GeneralError;
|
use crate::error::GeneralError;
|
||||||
use crate::gitea::client::Client;
|
use crate::gitea::client::Client;
|
||||||
use crate::gitea::repository::Repository;
|
use crate::gitea::repository::Repository;
|
||||||
use serde::Deserialize;
|
use reqwest::Body;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
@@ -14,6 +15,11 @@ pub struct Issue {
|
|||||||
pub html_url: String,
|
pub html_url: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize)]
|
||||||
|
pub struct IssueWriteSetBody {
|
||||||
|
pub body: String,
|
||||||
|
}
|
||||||
|
|
||||||
pub trait IssueClient {
|
pub trait IssueClient {
|
||||||
fn get_issue(owner_or_organisation: &String, repo: &String, number: &u64) -> Option<Issue>;
|
fn get_issue(owner_or_organisation: &String, repo: &String, number: &u64) -> Option<Issue>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ use crate::error::GeneralError;
|
|||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
pub(crate) mod issue2work;
|
pub(crate) mod issue2work;
|
||||||
|
pub mod utils;
|
||||||
|
|
||||||
pub trait Issue2WorkActionTrait {
|
pub trait Issue2WorkActionTrait {
|
||||||
async fn run(&self, url: &Url, config: &Config, args: &Issue2Work) -> Result<(), GeneralError>;
|
async fn run(&self, url: &Url, config: &Config, args: &Issue2Work) -> Result<(), GeneralError>;
|
||||||
|
|||||||
180
src/planning/utils.rs
Normal file
180
src/planning/utils.rs
Normal file
@@ -0,0 +1,180 @@
|
|||||||
|
pub enum IssueRelated {
|
||||||
|
OpenProjectIssue(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn append_related_issues(issue: &IssueRelated, content: &String) -> String {
|
||||||
|
let mut splitted = content.lines();
|
||||||
|
let mut new_content: Vec<String> = Vec::new();
|
||||||
|
|
||||||
|
let mut found = false;
|
||||||
|
let mut iteration_started = false;
|
||||||
|
while let Some(line) = splitted.next() {
|
||||||
|
if line.contains("## Related issues") {
|
||||||
|
found = true;
|
||||||
|
new_content.push(line.parse().unwrap());
|
||||||
|
// we go to the end of the section
|
||||||
|
while let Some(line) = splitted.next() {
|
||||||
|
if line.starts_with("-") || line.starts_with("*") {
|
||||||
|
iteration_started = true;
|
||||||
|
new_content.push(line.parse().unwrap());
|
||||||
|
} else if (line.trim().is_empty()) && iteration_started {
|
||||||
|
new_content.append(&mut add_related_issues_section(issue));
|
||||||
|
iteration_started = false;
|
||||||
|
found = true;
|
||||||
|
new_content.push(line.parse().unwrap());
|
||||||
|
break;
|
||||||
|
} else if line.starts_with("#") {
|
||||||
|
new_content.push("new title found".to_string());
|
||||||
|
found = true;
|
||||||
|
new_content.append(&mut add_related_issues_section(issue));
|
||||||
|
new_content.push("".to_string());
|
||||||
|
new_content.push(line.parse().unwrap());
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
new_content.push(line.parse().unwrap());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
new_content.push(line.parse().unwrap());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found || iteration_started {
|
||||||
|
if !found {
|
||||||
|
new_content.append(&mut add_related_issues_title());
|
||||||
|
}
|
||||||
|
new_content.append(&mut add_related_issues_section(issue));
|
||||||
|
}
|
||||||
|
|
||||||
|
new_content.join(&"\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn add_related_issues_title() -> Vec<String> {
|
||||||
|
let mut previous: Vec<String> = Vec::new();
|
||||||
|
previous.push("".to_string());
|
||||||
|
previous.push("## Related issues".to_string());
|
||||||
|
previous.push("".to_string());
|
||||||
|
previous
|
||||||
|
}
|
||||||
|
|
||||||
|
fn add_related_issues_section(issue: &IssueRelated) -> Vec<String> {
|
||||||
|
let mut previous: Vec<String> = Vec::new();
|
||||||
|
previous.push(convert_issue_link_items(issue));
|
||||||
|
|
||||||
|
previous
|
||||||
|
}
|
||||||
|
|
||||||
|
fn convert_issue_link_items(issue: &IssueRelated) -> String {
|
||||||
|
match issue {
|
||||||
|
IssueRelated::OpenProjectIssue(issue_url) => format!("- [{}]({})", issue_url, issue_url),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use crate::planning::utils::{append_related_issues, IssueRelated};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_append_related_issues_content_empty() {
|
||||||
|
let issue = IssueRelated::OpenProjectIssue("https://example/wp/1".to_string());
|
||||||
|
assert_eq!(
|
||||||
|
r#"
|
||||||
|
## Related issues
|
||||||
|
|
||||||
|
- [https://example/wp/1](https://example/wp/1)"#,
|
||||||
|
append_related_issues(&issue, &("".to_string()))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_append_related_issues_content_not_empty() {
|
||||||
|
let issue = IssueRelated::OpenProjectIssue("https://example/wp/1".to_string());
|
||||||
|
assert_eq!(
|
||||||
|
r#"Something happens.
|
||||||
|
|
||||||
|
## Some title
|
||||||
|
|
||||||
|
Some content
|
||||||
|
|
||||||
|
## Related issues
|
||||||
|
|
||||||
|
- [https://example/wp/1](https://example/wp/1)"#,
|
||||||
|
append_related_issues(
|
||||||
|
&issue,
|
||||||
|
&"Something happens.\n\
|
||||||
|
\n\
|
||||||
|
## Some title\n\
|
||||||
|
\n\
|
||||||
|
Some content"
|
||||||
|
.to_string()
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_append_related_issues_existing_section_related_issues() {
|
||||||
|
let issue = IssueRelated::OpenProjectIssue("https://example/wp/1".to_string());
|
||||||
|
assert_eq!(
|
||||||
|
r#"Something happens.
|
||||||
|
|
||||||
|
## Some title
|
||||||
|
|
||||||
|
Some content
|
||||||
|
|
||||||
|
## Related issues
|
||||||
|
|
||||||
|
- [https://example/wp/2](https://example/wp/2)
|
||||||
|
- [https://example/wp/1](https://example/wp/1)"#,
|
||||||
|
append_related_issues(
|
||||||
|
&issue,
|
||||||
|
&r#"Something happens.
|
||||||
|
|
||||||
|
## Some title
|
||||||
|
|
||||||
|
Some content
|
||||||
|
|
||||||
|
## Related issues
|
||||||
|
|
||||||
|
- [https://example/wp/2](https://example/wp/2)"#
|
||||||
|
.to_string()
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_append_related_issues_existing_section_related_issues_not_last() {
|
||||||
|
let issue = IssueRelated::OpenProjectIssue("https://example/wp/1".to_string());
|
||||||
|
assert_eq!(
|
||||||
|
r#"Something happens.
|
||||||
|
|
||||||
|
## Some title
|
||||||
|
|
||||||
|
Some content
|
||||||
|
|
||||||
|
## Related issues
|
||||||
|
|
||||||
|
- [https://example/wp/2](https://example/wp/2)
|
||||||
|
- [https://example/wp/1](https://example/wp/1)
|
||||||
|
|
||||||
|
## Other content
|
||||||
|
|
||||||
|
Some other content"#,
|
||||||
|
append_related_issues(
|
||||||
|
&issue,
|
||||||
|
&r#"Something happens.
|
||||||
|
|
||||||
|
## Some title
|
||||||
|
|
||||||
|
Some content
|
||||||
|
|
||||||
|
## Related issues
|
||||||
|
|
||||||
|
- [https://example/wp/2](https://example/wp/2)
|
||||||
|
|
||||||
|
## Other content
|
||||||
|
|
||||||
|
Some other content"#
|
||||||
|
.to_string()
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user