Release v0.4.0

Extend Gitea client with a `patch` method for executing PATCH requests. Introduce `IssueWriteSetBody` struct for serializing issue update payloads. Update Gitea action to append related issues and send PATCH requests to update issue descriptions.

.changes/unreleased/Added-20240317-213542.yaml

@@ -1,4 +0,0 @@
-kind: Added
-body: Add an option `--assign-to-me` to automatically assign the openproject's user
-  to the newly created work package
-time: 2024-03-17T21:35:42.724855046+01:00

.changes/unreleased/Added-20240317-213556.yaml

@@ -1,3 +0,0 @@
-kind: Added
-body: Allow to configure multiple gitlab instances
-time: 2024-03-17T21:35:56.447907065+01:00

.changes/v0.2.0.md

@@ -0,0 +1,5 @@
+## v0.2.0 - 2024-11-14
+### Added
+* Add an option `--assign-to-me` to automatically assign the openproject's user to the newly created work package
+* Allow to configure multiple gitlab instances
+* Create work pakcage from gitea

.changes/v0.3.0.md

@@ -0,0 +1,3 @@
+## v0.3.0 - 2024-11-17
+### Added
+* Open the newly create work package after the wp has been created

.changes/v0.4.0.md

@@ -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"

CHANGELOG.md

@@ -6,6 +6,20 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 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
+### Added
+* Add an option `--assign-to-me` to automatically assign the openproject's user to the newly created work package
+* Allow to configure multiple gitlab instances
+* Create work pakcage from gitea
+
 ## v0.1.0 - 2024-01-08
 ### Added
 * Initiate changie versioning

Cargo.lock

@@ -111,6 +111,7 @@ dependencies = [
  "clap",
  "gitlab",
  "log",
+ "open",
  "reqwest",
  "serde",
  "simple-home-dir",
@@ -738,6 +739,15 @@ version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
 
+[[package]]
+name = "is-docker"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
+dependencies = [
+ "once_cell",
+]
+
 [[package]]
 name = "is-terminal"
 version = "0.4.5"
@@ -750,6 +760,16 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "is-wsl"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
+dependencies = [
+ "is-docker",
+ "once_cell",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -909,6 +929,17 @@ version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
+[[package]]
+name = "open"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ecd52f0b8d15c40ce4820aa251ed5de032e5d91fab27f7db2f40d42a8bdf69c"
+dependencies = [
+ "is-wsl",
+ "libc",
+ "pathdiff",
+]
+
 [[package]]
 name = "openssl"
 version = "0.10.62"
@@ -959,6 +990,12 @@ version = "6.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
 
+[[package]]
+name = "pathdiff"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
+
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"

Cargo.toml

@@ -15,3 +15,4 @@ url = "2.3.1"
 tokio = { version = "1.0.0", features = ["rt", "rt-multi-thread", "macros"] }
 simple-home-dir = "0.2.1"
 log = "0.4.17"
+open = "5.3.1"

config.toml.dist

@@ -1,6 +1,11 @@
-[gitlab]
+[[gitlab]]
 # generate from https://gitlab.com/-/user_settings/personal_access_tokens
 token = "glpat-example"
+domain = "gitlab.com"
+
+[[gitea]]
+token = "abcdexempletoken"
+domain = "gitea.champs-libres.be"
 
 [openproject]
 # generate api token from https://champs-libres.openproject.com/my/access_token

src/debug.rs

@@ -1,9 +1,6 @@
 use crate::config::Config;
 use crate::error::GeneralError;
 use crate::gitea::issue::Issue;
-use crate::openproject::client::Client;
-use crate::openproject::root::RootClient;
-use crate::openproject::user::GetMe;
 use url::Url;
 
 pub(crate) async fn debug(config: Config) -> Result<(), GeneralError> {
@@ -19,8 +16,9 @@ pub(crate) async fn debug(config: Config) -> Result<(), GeneralError> {
 
     println!("issue: {:?}", issue);
 
-    return Ok(());
+    Ok(())
 
+    /*
     let open_project_client = Client::from_config(&config.openproject);
     println!("base_url: {}", open_project_client.base_url);
     println!("base_url: will get root");
@@ -30,4 +28,6 @@ pub(crate) async fn debug(config: Config) -> Result<(), GeneralError> {
     println!("me: {:?}", u);
 
     Ok(())
+
+     */
 }

src/gitea/action.rs

@@ -1,22 +1,22 @@
-use url::Url;
 use crate::cli::Issue2Work;
 use crate::config::Config;
 use crate::error::GeneralError;
-use crate::gitea::issue::{issue_html_url_to_api, Issue};
 use crate::gitea::client::has_client_for_url;
+use crate::gitea::issue::{issue_html_url_to_api, Issue, IssueWriteSetBody};
 use crate::openproject::user::{GetMe, User};
-use crate::openproject::work::{WorkPackage, WorkPackageWriter, WorkPackageWriterAssignee};
+use crate::openproject::work::WorkPackageWriter;
+use crate::planning::utils::{append_related_issues, IssueRelated};
 use crate::planning::Issue2WorkActionTrait;
+use url::Url;
 
 pub(crate) struct GiteaAction {}
 
 impl Issue2WorkActionTrait for GiteaAction {
     async fn run(&self, url: &Url, config: &Config, args: &Issue2Work) -> Result<(), GeneralError> {
         let gitea_client = crate::gitea::client::Client::from_config(config.gitea.first().unwrap());
-        let issue: Issue = gitea_client
-            .get(issue_html_url_to_api(url)?)
-            .await?;
-        let open_project_client = crate::openproject::client::Client::from_config(&config.openproject);
+        let issue: Issue = gitea_client.get(issue_html_url_to_api(url)?).await?;
+        let open_project_client =
+            crate::openproject::client::Client::from_config(&config.openproject);
 
         let work_package = create_work_package_from_issue(
             &issue,
@@ -26,18 +26,38 @@ impl Issue2WorkActionTrait for GiteaAction {
                     Some(u)
                 }
                 false => None,
-            }
+            },
         );
 
         let work_package = open_project_client
             .create_work_package(&work_package, &args.project_id)
             .await?;
 
-        println!(
-            "new work package created: {:?}, edit at {}/projects/{}/work_packages/{}",
-            work_package.subject, config.openproject.base_url, args.project_id, work_package.id
+        let url_wp = format!(
+            "{}/projects/{}/work_packages/{}",
+            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!(
+            "new work package created: {:?}, edit at {}",
+            work_package.subject, url_wp
+        );
+
+        if let Err(e) = open::that(url_wp) {
+            println!("failed to open work package in browser: {}", e);
+        };
+
         Ok(())
     }
 
@@ -49,15 +69,14 @@ impl Issue2WorkActionTrait for GiteaAction {
 fn create_work_package_from_issue(issue: &Issue, assignee: Option<User>) -> WorkPackageWriter {
     WorkPackageWriter {
         subject: format!(
-            "{} ({})",
-            issue.title,
-            issue.repository.full_name
+            "{} ({}/{})",
+            issue.title, issue.repository.full_name, issue.number
         ),
         work_type: "TASK".into(),
         description: crate::openproject::work::DescriptionWriter {
             format: "markdown".into(),
             raw: format!("From Gitea issue: {} \n\n{}", issue.html_url, issue.body),
         },
-        assignee: assignee.into()
+        assignee: assignee.into(),
     }
-}
+}

src/gitea/client.rs

@@ -1,8 +1,9 @@
-use crate::config::{Config, GiteaConfig, GitlabConfig};
+use crate::config::{Config, GiteaConfig};
 use crate::error::GeneralError;
 use reqwest::header::{HeaderMap, ACCEPT, AUTHORIZATION};
-use reqwest::{ClientBuilder, StatusCode};
+use reqwest::{Body, ClientBuilder, StatusCode};
 use serde::de::DeserializeOwned;
+use serde::Serialize;
 use url::Url;
 
 #[derive(Debug)]
@@ -54,7 +55,7 @@ impl Client {
 
     pub async fn get<T: DeserializeOwned>(&self, url: Url) -> Result<T, GeneralError> {
         let mut headers = HeaderMap::new();
-        headers.append(AUTHORIZATION, self.token.parse()?);
+        headers.append(AUTHORIZATION, format!("token {}", self.token).parse()?);
         headers.append(ACCEPT, "application/json".parse()?);
 
         let client = ClientBuilder::new()
@@ -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)]
@@ -92,7 +125,19 @@ mod test {
             token: "<PASSWORD>".into(),
         };
 
-        assert_eq!(is_client_for_url(&Url::parse("https://gitea.champs-libres.be/something/somewhere").unwrap(), &config), true);
-        assert_eq!(is_client_for_url(&Url::parse("https://somewhere.else/something/somewhere").unwrap(), &config), false);
+        assert_eq!(
+            is_client_for_url(
+                &Url::parse("https://gitea.champs-libres.be/something/somewhere").unwrap(),
+                &config
+            ),
+            true
+        );
+        assert_eq!(
+            is_client_for_url(
+                &Url::parse("https://somewhere.else/something/somewhere").unwrap(),
+                &config
+            ),
+            false
+        );
     }
 }

src/gitea/issue.rs

@@ -1,19 +1,25 @@
+use crate::error::GeneralError;
 use crate::gitea::client::Client;
 use crate::gitea::repository::Repository;
-use serde::Deserialize;
+use reqwest::Body;
+use serde::{Deserialize, Serialize};
 use url::Url;
-use crate::error::GeneralError;
 
 #[derive(Debug, Deserialize)]
 pub struct Issue {
     pub id: u64,
-    number: u64,
+    pub number: u64,
     pub title: String,
     pub body: String,
     pub repository: Repository,
     pub html_url: String,
 }
 
+#[derive(Debug, Serialize)]
+pub struct IssueWriteSetBody {
+    pub body: String,
+}
+
 pub trait IssueClient {
     fn get_issue(owner_or_organisation: &String, repo: &String, number: &u64) -> Option<Issue>;
 }
@@ -31,13 +37,24 @@ pub fn issue_html_url_to_api(url: &Url) -> Result<Url, GeneralError> {
     let issue = parts.next().unwrap();
     let iid = parts.next().unwrap();
 
-    if (!issue.eq("issues")) {
+    if !issue.eq("issues") {
         return Err(GeneralError {
             description: format!("Issue url is not valid: {}", url),
         });
     }
 
-    let url = Url::parse(format!("{}://{}/api/v1/repos/{}/{}/issues/{}", url.scheme(), url.host().unwrap(), domain, repo, iid).as_str()).unwrap();
+    let url = Url::parse(
+        format!(
+            "{}://{}/api/v1/repos/{}/{}/issues/{}",
+            url.scheme(),
+            url.host().unwrap(),
+            domain,
+            repo,
+            iid
+        )
+        .as_str(),
+    )
+    .unwrap();
 
     Ok(url)
 }
@@ -51,6 +68,9 @@ mod tests {
         let url = Url::parse("https://gitea.champs-libres.be/champs-libres/test/issues/1").unwrap();
         let result = issue_html_url_to_api(&url).unwrap();
 
-        assert_eq!(result.as_str(), "https://gitea.champs-libres.be/api/v1/repos/champs-libres/test/issues/1");
+        assert_eq!(
+            result.as_str(),
+            "https://gitea.champs-libres.be/api/v1/repos/champs-libres/test/issues/1"
+        );
     }
 }

src/gitea/mod.rs

@@ -1,4 +1,4 @@
+pub(crate) mod action;
 pub mod client;
 pub mod issue;
 pub mod repository;
-pub(crate) mod action;

src/openproject/work.rs

@@ -1,5 +1,5 @@
-use serde::{Deserialize, Serialize};
 use crate::openproject::user::User;
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Debug)]
 pub struct WorkPackageWriterAssignee {

src/planning/mod.rs

@@ -1,11 +1,10 @@
 use crate::cli::Issue2Work;
 use crate::config::Config;
 use crate::error::GeneralError;
-use crate::gitlab::client::ClientProvider;
-use gitlab::{AsyncGitlab, GitlabBuilder};
 use url::Url;
 
 pub(crate) mod issue2work;
+pub mod utils;
 
 pub trait Issue2WorkActionTrait {
     async fn run(&self, url: &Url, config: &Config, args: &Issue2Work) -> Result<(), GeneralError>;

src/planning/utils.rs

@@ -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()
+            ),
+        );
+    }
+}