WIP on integrate gitea

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

@@ -0,0 +1,4 @@
+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

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

.changes/v0.2.0.md

@@ -1,5 +0,0 @@
-## 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

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

.changes/v0.4.0.md

@@ -1,3 +0,0 @@
-## 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"

.gitea/workflows/release/build-and-release.yaml

@@ -20,14 +20,17 @@ jobs:
         id: read_release
         with:
           path: .changes/${{ github.ref_name }}.md
-      - name: Release
+      - name: Setup go for using go gitea actions
-        uses: https://github.com/akkuman/gitea-release-action@v1
+        uses: https://github.com/actions/setup-go@v4
-        #env:
+        with:
-        #  NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18
+          go-version: '>=1.20.1'
+      - name: Use Go Action to release
+        id: use-go-action
+        uses: https://gitea.com/actions/release-action@main
         with:
           files: |-
             target/release/cl-cli
             config.toml.dist
-          md5sum: true
+          api_key: '${{secrets.RELEASE_TOKEN}}'
-          sha256sum: true
+          body: |
-          body_path: .changes/${{ github.ref_name }}.md
+            ${{ steps.read_release.outputs.content }}

.gitea/workflows/release/check.yaml

@@ -1,25 +0,0 @@
-name: Check go code
-
-on:
-  push:
-    branches:
-      - '**'
-  pull_request:
-    branches:
-      - '**'
-  pull_request_target:
-    branches:
-      - '**'
-
-jobs:
-  build-and-release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: https://github.com/actions/checkout@v4
-      - name: Install rust toolchain
-        uses: https://github.com/dtolnay/rust-toolchain@stable
-      - name: Build binaries
-        run: cargo build
-      - name: Run tests
-        run: cargo test

CHANGELOG.md

@@ -6,20 +6,6 @@ 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.toml

@@ -7,12 +7,11 @@ edition = "2021"
 
 [dependencies]
 clap = { version = "4.1.13", features = ["derive"] }
-gitlab = "0.1804.0"
+gitlab = "0.1607.0"
-reqwest = "0.12.24"
+reqwest = "0.11.23"
-serde = { version = "1.0.228", features = ["derive"] }
+serde = { version = "1.0.158", features = ["derive"] }
-toml = "0.9.8"
+toml = "0.7.3"
-url = "2.5.7"
+url = "2.3.1"
 tokio = { version = "1.0.0", features = ["rt", "rt-multi-thread", "macros"] }
-simple-home-dir = "0.5.2"
+simple-home-dir = "0.2.1"
-log = "0.4.28"
+log = "0.4.17"
-open = "5.3.2"

config.toml.dist

@@ -1,11 +1,6 @@
-[[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,24 +1,22 @@
+use url::Url;
 use crate::config::Config;
 use crate::error::GeneralError;
 use crate::gitea::issue::Issue;
-use url::Url;
+use crate::openproject::client::Client;
+use crate::openproject::root::RootClient;
+use crate::openproject::user::GetMe;
 
 pub(crate) async fn debug(config: Config) -> Result<(), GeneralError> {
     println!("test");
 
+
     let gitea_client = crate::gitea::client::Client::from_config(config.gitea.first().unwrap());
-    let issue: Issue = gitea_client
+    let issue: Issue = gitea_client.get(Url::parse("https://gitea.champs-libres.be/api/v1/repos/julienfastre/test/issues/6").unwrap()).await?;
-        .get(
-            Url::parse("https://gitea.champs-libres.be/api/v1/repos/julienfastre/test/issues/6")
-                .unwrap(),
-        )
-        .await?;
 
     println!("issue: {:?}", issue);
 
-    Ok(())
+    return Ok(());
 
-    /*
     let open_project_client = Client::from_config(&config.openproject);
     println!("base_url: {}", open_project_client.base_url);
     println!("base_url: will get root");
@@ -28,6 +26,4 @@ pub(crate) async fn debug(config: Config) -> Result<(), GeneralError> {
     println!("me: {:?}", u);
 
     Ok(())
-
-     */
 }

src/error.rs

@@ -7,7 +7,7 @@ pub struct GeneralError {
 }
 
 impl From<InvalidHeaderValue> for GeneralError {
-    fn from(_value: InvalidHeaderValue) -> Self {
+    fn from(value: InvalidHeaderValue) -> Self {
         GeneralError {
             description: "Unable to convert the token into header value".to_string(),
         }

src/gitea/action.rs

@@ -1,82 +0,0 @@
-use crate::cli::Issue2Work;
-use crate::config::Config;
-use crate::error::GeneralError;
-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::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 work_package = create_work_package_from_issue(
-            &issue,
-            match args.assign_to_me {
-                true => {
-                    let u = open_project_client.me().await?;
-                    Some(u)
-                }
-                false => None,
-            },
-        );
-
-        let work_package = open_project_client
-            .create_work_package(&work_package, &args.project_id)
-            .await?;
-
-        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(())
-    }
-
-    fn supports(&self, url: &Url, config: &Config, _args: &Issue2Work) -> bool {
-        has_client_for_url(&url, &config)
-    }
-}
-
-fn create_work_package_from_issue(issue: &Issue, assignee: Option<User>) -> WorkPackageWriter {
-    WorkPackageWriter {
-        subject: format!(
-            "{} ({}/{})",
-            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(),
-    }
-}

src/gitea/client.rs

@@ -1,62 +1,32 @@
-use crate::config::{Config, GiteaConfig};
 use crate::error::GeneralError;
-use reqwest::header::{HeaderMap, ACCEPT, AUTHORIZATION};
+use reqwest::header::{HeaderMap, AUTHORIZATION, ACCEPT};
 use reqwest::{ClientBuilder, StatusCode};
 use serde::de::DeserializeOwned;
-use serde::Serialize;
 use url::Url;
+use crate::config::GiteaConfig;
 
 #[derive(Debug)]
 pub struct Client {
     token: String,
-    // base_uri: String,
+    base_uri: String,
-}
-
-fn is_client_for_url(url: &Url, config: &GiteaConfig) -> bool {
-    if url.domain() == Some(config.domain.as_str()) {
-        return true;
-    }
-    false
-}
-
-pub(crate) fn has_client_for_url(url: &Url, config: &Config) -> bool {
-    for c in &config.gitea {
-        if is_client_for_url(url, c) {
-            return true;
-        }
-    }
-
-    false
-}
-
-#[allow(dead_code)]
-fn client_for_url(url: &Url, config: &Config) -> Result<Client, GeneralError> {
-    for c in &config.gitea {
-        if is_client_for_url(url, c) {
-            return Ok(Client::from_config(&c));
-        }
-    }
-
-    Err(GeneralError {
-        description: format!("No gitea client found for url {}", url),
-    })
 }
 
 impl Client {
+
     pub fn from_config(config: &GiteaConfig) -> Self {
         Self::new(&config.token, &config.domain)
     }
 
-    pub fn new(token: &String, _domain: &String) -> Self {
+    pub fn new(token: &String, domain: &String) -> Self {
         Client {
             token: token.clone(),
-            // base_uri: format!("https://{}", domain.clone()),
+            base_uri: format!("https://{}", domain.clone()),
         }
     }
 
     pub async fn get<T: DeserializeOwned>(&self, url: Url) -> Result<T, GeneralError> {
         let mut headers = HeaderMap::new();
-        headers.append(AUTHORIZATION, format!("token {}", self.token).parse()?);
+        headers.append(AUTHORIZATION, self.token.parse()?);
         headers.append(ACCEPT, "application/json".parse()?);
 
         let client = ClientBuilder::new()
@@ -70,7 +40,7 @@ impl Client {
             StatusCode::OK => {
                 let result: T = response.json().await?;
 
-                Ok(result)
+                return Ok(result);
             }
             _ => Err(GeneralError {
                 description: format!(
@@ -81,64 +51,4 @@ 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)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_is_client_for_url() {
-        let config = GiteaConfig {
-            domain: "gitea.champs-libres.be".into(),
-            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
-        );
-    }
 }

src/gitea/issue.rs

@@ -1,64 +1,22 @@
-use crate::error::GeneralError;
+use crate::gitea::client::Client;
+use serde::Deserialize;
 use crate::gitea::repository::Repository;
-use serde::{Deserialize, Serialize};
-use url::Url;
 
 #[derive(Debug, Deserialize)]
 pub struct Issue {
-    // pub id: u64,
+    id: u64,
-    pub number: u64,
+    number: u64,
-    pub title: String,
+    title: String,
-    pub body: String,
+    body: String,
-    pub repository: Repository,
+    repository: Repository
-    pub html_url: String,
 }
 
-#[derive(Debug, Serialize)]
+pub trait IssueClient {
-pub struct IssueWriteSetBody {
+    fn get_issue(owner_or_organisation: &String, repo: &String, number: &u64) -> Option<Issue>;
-    pub body: String,
 }
 
-pub fn issue_html_url_to_api(url: &Url) -> Result<Url, GeneralError> {
+impl IssueClient for Client {
-    let mut parts = url.path_segments().unwrap();
+    fn get_issue(owner_or_organisation: &String, repo: &String, number: &u64) -> Option<Issue> {
-    let domain = parts.next().unwrap();
+        todo!()
-    let repo = parts.next().unwrap();
-    let issue = parts.next().unwrap();
-    let iid = parts.next().unwrap();
-
-    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();
-
-    Ok(url)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_issue_html_url_to_api() {
-        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"
-        );
     }
 }

src/gitea/mod.rs

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

src/gitea/repository.rs

@@ -2,8 +2,8 @@ use serde::Deserialize;
 
 #[derive(Debug, Deserialize)]
 pub struct Repository {
-    // id: u64,
+    id: u64,
-    // name: String,
+    name: String,
-    // owner: String,
+    owner: String,
-    pub full_name: String,
+    full_name: String,
 }

src/gitlab/action.rs

@@ -1,138 +0,0 @@
-use crate::cli::Issue2Work;
-use crate::config::Config;
-use crate::error::GeneralError;
-use crate::gitlab::client::{client_for_url, has_client_for_url};
-use crate::gitlab::issue::{Issue, IssueBundle, Project};
-use crate::openproject::client::Client;
-use crate::openproject::user::{GetMe, User};
-use crate::openproject::work::WorkPackageWriterAssignee;
-use crate::planning::Issue2WorkActionTrait;
-use gitlab::api::{issues, projects, AsyncQuery};
-use url::Url;
-
-#[derive(Debug)]
-struct IssueInfo {
-    project: String,
-    iid: u64,
-}
-
-/// details on how to create a work package from various informations
-#[derive(Debug)]
-struct Issue2WorkPackageDTO {
-    pub issue: IssueBundle,
-    pub assign_to: Option<User>,
-}
-
-pub(crate) struct GitlabAction {}
-
-impl Issue2WorkActionTrait for GitlabAction {
-    async fn run(&self, url: &Url, config: &Config, args: &Issue2Work) -> Result<(), GeneralError> {
-        let client = client_for_url(&url, &config).await?;
-        let data = extract_issue_info(&url).unwrap();
-
-        let endpoint = issues::ProjectIssues::builder()
-            .iid(data.iid)
-            .project(String::from(data.project))
-            .build()
-            .unwrap();
-
-        let issues: Vec<Issue> = endpoint.query_async(&client).await.unwrap();
-        let issue = issues.first().unwrap();
-
-        let project_endpoint = projects::Project::builder()
-            .project(issue.project_id)
-            .build()
-            .unwrap();
-
-        let project: Project = project_endpoint.query_async(&client).await.unwrap();
-
-        let issue_bundle = IssueBundle::new(&issue, &project);
-
-        let open_project_client = Client::from_config(&config.openproject);
-
-        let dto = Issue2WorkPackageDTO {
-            issue: issue_bundle,
-            assign_to: match args.assign_to_me {
-                true => {
-                    let u = open_project_client.me().await?;
-                    Some(u)
-                }
-                false => None,
-            },
-        };
-
-        let work_package = open_project_client
-            .create_work_package(&(&dto).into(), &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
-        );
-
-        Ok(())
-    }
-
-    fn supports(&self, url: &Url, config: &Config, _args: &Issue2Work) -> bool {
-        has_client_for_url(&url, &config)
-    }
-}
-
-fn extract_issue_info(url: &Url) -> Option<IssueInfo> {
-    let parts = url
-        .path_segments()
-        .expect("Could not parse path segment of given url");
-    let mut project_url: Vec<String> = Vec::with_capacity(3);
-    let mut iid: Option<String> = None;
-
-    let mut project_found = false;
-
-    for el in parts {
-        if el == "-" {
-            project_found = true;
-            continue;
-        }
-        if el == "issues" {
-            continue;
-        }
-        if !project_found {
-            project_url.push(String::from(el));
-        } else {
-            // must be the id
-            iid = Some(String::from(el));
-            break;
-        }
-    }
-
-    Some(IssueInfo {
-        project: project_url.join("/"),
-        iid: iid
-            .expect("iid of the issue not found")
-            .parse()
-            .expect("could not transform issue id to u64"),
-    })
-}
-
-impl From<&Issue2WorkPackageDTO> for crate::openproject::work::WorkPackageWriter {
-    fn from(value: &Issue2WorkPackageDTO) -> Self {
-        crate::openproject::work::WorkPackageWriter {
-            subject: format!(
-                "{} ({}/{})",
-                value.issue.issue.title,
-                value.issue.project.name_with_namespace,
-                value.issue.issue.iid
-            ),
-            work_type: "TASK".into(),
-            description: crate::openproject::work::DescriptionWriter {
-                format: "markdown".into(),
-                raw: format!("From gitlab: {}", value.issue.issue.web_url),
-            },
-            assignee: WorkPackageWriterAssignee {
-                href: match &value.assign_to {
-                    None => None,
-                    Some(w) => Some(w.clone().d_links.d_self.href),
-                },
-            },
-        }
-    }
-}

src/gitlab/client.rs

@@ -1,44 +1,35 @@
-use crate::config::{Config, GitlabConfig};
+use crate::config::Config;
 use crate::error::GeneralError;
-use gitlab::{AsyncGitlab, GitlabBuilder};
+use gitlab::AsyncGitlab;
+use gitlab::GitlabBuilder;
 use url::Url;
 
-fn is_client_for_url(url: &Url, config: &GitlabConfig) -> bool {
+pub trait ClientProviderTrait {
-    if url.domain() == Some(config.domain.as_str()) {
+    async fn client_for_url(url: &Url, config: &Config) -> Result<AsyncGitlab, GeneralError>;
-        return true;
-    }
-
-    false
 }
 
-pub async fn client_for_url(url: &Url, config: &Config) -> Result<AsyncGitlab, GeneralError> {
+pub struct ClientProvider {}
-    for c in &config.gitlab {
-        if is_client_for_url(url, c) {
-            let client = GitlabBuilder::new("gitlab.com", c.token.clone())
-                .build_async()
-                .await;
 
-            return match client {
+impl ClientProviderTrait for ClientProvider {
-                Ok(new_client) => Ok(new_client),
+    async fn client_for_url(url: &Url, config: &Config) -> Result<AsyncGitlab, GeneralError> {
-                Err(e) => {
+        for c in &config.gitlab {
-                    let new_error = e.into();
+            if url.domain() == Some(c.domain.as_str()) {
-                    Err(new_error)
+                let client = GitlabBuilder::new("gitlab.com", c.token.clone())
-                }
+                    .build_async()
-            };
+                    .await;
+
+                return match client {
+                    Ok(new_client) => Ok(new_client),
+                    Err(e) => {
+                        let new_error = e.into();
+                        Err(new_error)
+                    }
+                };
+            }
         }
+
+        Err(GeneralError {
+            description: format!("No client available for this domain: {:?}", url.domain()),
+        })
     }
-
-    Err(GeneralError {
-        description: format!("No client available for this domain: {:?}", url.domain()),
-    })
-}
-
-pub fn has_client_for_url(url: &Url, config: &Config) -> bool {
-    for c in &config.gitlab {
-        if is_client_for_url(url, c) {
-            return true;
-        }
-    }
-
-    false
 }

src/gitlab/issue.rs

@@ -1,17 +1,5 @@
-use serde::Deserialize;
+use gitlab::Issue;
-
+use gitlab::Project;
-#[derive(Clone, Debug, Deserialize)]
-pub struct Issue {
-    pub iid: u64,
-    pub title: String,
-    pub web_url: String,
-    pub project_id: u64,
-}
-
-#[derive(Clone, Debug, Deserialize)]
-pub struct Project {
-    pub name_with_namespace: String,
-}
 
 /// A struct which contains Issue and Project
 #[derive(Debug)]

src/gitlab/mod.rs

@@ -1,4 +1,3 @@
-pub mod action;
 pub mod client;
 pub mod issue;
 

src/openproject/hal.rs

@@ -1,13 +1,13 @@
 use serde::Deserialize;
 
-// #[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
-// pub struct HalEntity {
+pub struct HalEntity {
-//     // #[serde(rename = "_type")]
+    #[serde(rename = "_type")]
-//     // pub d_type: String,
+    pub d_type: String,
-// }
+}
 
 #[derive(Deserialize, Debug, Clone)]
 pub struct Link {
     pub href: String,
-    // pub title: Option<String>,
+    pub title: Option<String>,
 }

src/openproject/root.rs

@@ -1,11 +1,11 @@
 use crate::openproject::client::{handle_response_status, Client, OpenProjectError};
-// use crate::openproject::hal::HalEntity;
+use crate::openproject::hal::HalEntity;
 use serde::Deserialize;
 
 #[derive(Deserialize, Debug)]
 pub struct User {
     pub href: String,
-    // pub title: String,
+    pub title: String,
 }
 #[derive(Deserialize, Debug)]
 pub struct Links {
@@ -13,12 +13,12 @@ pub struct Links {
 }
 #[derive(Deserialize, Debug)]
 pub struct Root {
-    // #[serde(rename = "instanceName")]
+    #[serde(rename = "instanceName")]
-    // pub instance_name: String,
+    pub instance_name: String,
     #[serde(rename = "_links")]
     pub links: Links,
-    // #[serde(flatten)]
+    #[serde(flatten)]
-    // pub hal_entity: HalEntity,
+    pub hal_entity: HalEntity,
 }
 
 pub trait RootClient {

src/openproject/user.rs

@@ -10,10 +10,10 @@ pub struct UserLink {
 }
 #[derive(Deserialize, Debug, Clone)]
 pub struct User {
-    // #[serde(rename = "_type")]
+    #[serde(rename = "_type")]
-    // pub d_type: String,
+    pub d_type: String,
-    // pub id: u64,
+    pub id: u64,
-    // pub name: String,
+    pub name: String,
     #[serde(rename = "_links")]
     pub d_links: UserLink,
 }

src/openproject/work.rs

@@ -1,4 +1,3 @@
-use crate::openproject::user::User;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Debug)]
@@ -25,14 +24,3 @@ pub struct WorkPackage {
     pub id: u64,
     pub subject: String,
 }
-
-impl From<Option<User>> for WorkPackageWriterAssignee {
-    fn from(value: Option<User>) -> Self {
-        WorkPackageWriterAssignee {
-            href: match value {
-                None => None,
-                Some(w) => Some(w.clone().d_links.d_self.href),
-            },
-        }
-    }
-}

src/planning/issue2work.rs

@@ -1,30 +1,132 @@
 use crate::cli::Issue2Work;
 use crate::config::Config;
 use crate::error::GeneralError;
-use crate::gitea::action::GiteaAction;
+use crate::gitlab::client::{ClientProvider, ClientProviderTrait};
-use crate::gitlab::action::GitlabAction;
+use crate::gitlab::issue::IssueBundle;
-use crate::planning::Issue2WorkActionTrait;
+use crate::openproject::client::Client;
+use crate::openproject::user::{GetMe, User};
+use crate::openproject::work::WorkPackageWriterAssignee;
+use gitlab::api::{issues, projects, AsyncQuery};
+use gitlab::{Issue, Project};
 use url::Url;
 
-struct App {
+#[derive(Debug)]
-    gitlab_issue2work_action: GitlabAction,
+struct IssueInfo {
-    gitea_issue2work_action: GiteaAction,
+    project: String,
+    iid: u64,
+}
+
+/// details on how to create a work package from various informations
+#[derive(Debug)]
+struct Issue2WorkPackageDTO {
+    pub issue: IssueBundle,
+    pub assign_to: Option<User>,
+}
+
+impl From<&Issue2WorkPackageDTO> for crate::openproject::work::WorkPackageWriter {
+    fn from(value: &Issue2WorkPackageDTO) -> Self {
+        crate::openproject::work::WorkPackageWriter {
+            subject: format!(
+                "{} ({}/{})",
+                value.issue.issue.title,
+                value.issue.project.name_with_namespace,
+                value.issue.issue.iid
+            ),
+            work_type: "TASK".into(),
+            description: crate::openproject::work::DescriptionWriter {
+                format: "markdown".into(),
+                raw: format!("From gitlab: {}", value.issue.issue.web_url),
+            },
+            assignee: WorkPackageWriterAssignee {
+                href: match &value.assign_to {
+                    None => None,
+                    Some(w) => Some(w.clone().d_links.d_self.href),
+                },
+            },
+        }
+    }
 }
 
 pub(crate) async fn issue2work(config: Config, args: &Issue2Work) -> Result<(), GeneralError> {
     let url = Url::parse(&*args.issue_url).expect("issue_url is not valid");
-    let app = App {
+    let data = extract_issue_info(&url).unwrap();
-        gitlab_issue2work_action: GitlabAction {},
+
-        gitea_issue2work_action: GiteaAction {},
+    let client = ClientProvider::client_for_url(&url, &config).await?;
+
+    let endpoint = issues::ProjectIssues::builder()
+        .iid(data.iid)
+        .project(String::from(data.project))
+        .build()
+        .unwrap();
+
+    let issues: Vec<Issue> = endpoint.query_async(&client).await.unwrap();
+    let issue = issues.first().unwrap();
+
+    let project_endpoint = projects::Project::builder()
+        .project(issue.project_id.value())
+        .build()
+        .unwrap();
+
+    let project: Project = project_endpoint.query_async(&client).await.unwrap();
+
+    let issue_bundle = IssueBundle::new(&issue, &project);
+
+    let open_project_client = Client::from_config(&config.openproject);
+
+    let dto = Issue2WorkPackageDTO {
+        issue: issue_bundle,
+        assign_to: match args.assign_to_me {
+            true => {
+                let u = open_project_client.me().await?;
+                Some(u)
+            }
+            false => None,
+        },
     };
 
-    if app.gitlab_issue2work_action.supports(&url, &config, args) {
+    let work_package = open_project_client
-        app.gitlab_issue2work_action.run(&url, &config, args).await
+        .create_work_package(&(&dto).into(), &args.project_id)
-    } else if app.gitea_issue2work_action.supports(&url, &config, args) {
+        .await?;
-        app.gitea_issue2work_action.run(&url, &config, args).await
+
-    } else {
+    println!(
-        Err(GeneralError {
+        "new work package created: {:?}, edit at {}/projects/{}/work_packages/{}",
-            description: format!("This action is not supported for this url: {}", url),
+        work_package.subject, config.openproject.base_url, args.project_id, work_package.id
-        })
+    );
-    }
+
+    Ok(())
+}
+
+fn extract_issue_info(url: &Url) -> Option<IssueInfo> {
+    let parts = url
+        .path_segments()
+        .expect("Could not parse path segment of given url");
+    let mut project_url: Vec<String> = Vec::with_capacity(3);
+    let mut iid: Option<String> = None;
+
+    let mut project_found = false;
+
+    for el in parts {
+        if el == "-" {
+            project_found = true;
+            continue;
+        }
+        if el == "issues" {
+            continue;
+        }
+        if !project_found {
+            project_url.push(String::from(el));
+        } else {
+            // must be the id
+            iid = Some(String::from(el));
+            break;
+        }
+    }
+
+    Some(IssueInfo {
+        project: project_url.join("/"),
+        iid: iid
+            .expect("iid of the issue not found")
+            .parse()
+            .expect("could not transform issue id to u64"),
+    })
 }

src/planning/mod.rs

@@ -1,13 +1 @@
-use crate::cli::Issue2Work;
-use crate::config::Config;
-use crate::error::GeneralError;
-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>;
-
-    fn supports(&self, url: &Url, config: &Config, args: &Issue2Work) -> bool;
-}

src/planning/utils.rs

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