allow multiple instances of gitlab to be configured

src/openproject/client.rs

@@ -3,22 +3,23 @@ use crate::error::GeneralError;
 use crate::openproject::work::{WorkPackage, WorkPackageWriter};
 use reqwest::Response;
 use serde::Deserialize;
+use std::error::Error;
 
 #[derive(Deserialize, Debug)]
-pub(crate) struct Error {
+pub(crate) struct OpenProjectError {
     pub(crate) description: String,
 }
 
-impl From<reqwest::Error> for Error {
+impl From<reqwest::Error> for OpenProjectError {
     fn from(value: reqwest::Error) -> Self {
-        Error {
+        OpenProjectError {
             description: format!("Error while connecting to openproject instance: {}", value),
         }
     }
 }
 
-impl From<Error> for GeneralError {
-    fn from(value: Error) -> GeneralError {
+impl From<OpenProjectError> for GeneralError {
+    fn from(value: OpenProjectError) -> GeneralError {
         GeneralError {
             description: value.description,
         }
@@ -33,7 +34,7 @@ pub(crate) struct Client {
 pub async fn handle_response_status<T: for<'de> serde::Deserialize<'de>>(
     response: Response,
     error_message: &str,
-) -> Result<T, Error> {
+) -> Result<T, OpenProjectError> {
     if !response.status().is_success() {
         let status = response.status().to_string().clone();
         let content = response
@@ -42,7 +43,7 @@ pub async fn handle_response_status<T: for<'de> serde::Deserialize<'de>>(
             .unwrap_or_else(|_| "Impossible to decode".into())
             .clone();
 
-        return Err(Error {
+        return Err(OpenProjectError {
             description: format!(
                 "{}, status: {}, content: {}",
                 error_message, status, content
@@ -50,9 +51,18 @@ pub async fn handle_response_status<T: for<'de> serde::Deserialize<'de>>(
         });
     }
 
-    let t = response.json().await?;
+    let t = response.json::<T>().await;
 
-    Ok(t)
+    match t {
+        Ok(t) => Ok(t),
+        Err(e) => Err(OpenProjectError {
+            description: format!(
+                "Error while decoding json: {}, source: {:?}",
+                e.to_string(),
+                e.source()
+            ),
+        }),
+    }
 }
 
 impl Client {
@@ -67,21 +77,22 @@ impl Client {
         &self,
         work_package: &WorkPackageWriter,
         project_id: &String,
-    ) -> Result<WorkPackage, Error> {
+    ) -> Result<WorkPackage, OpenProjectError> {
         let client = reqwest::Client::new();
 
-        let work_package: WorkPackage = client
+        let response = client
             .post(format!(
                 "{}/api/v3/projects/{}/work_packages",
                 self.base_url, project_id
             ))
             .basic_auth("apikey", Some(&self.token))
-            .json(&work_package)
+            .json(work_package)
             .send()
-            .await?
-            .json()
             .await?;
 
+        let work_package =
+            handle_response_status(response, "error while retrieving work package").await?;
+
         Ok(work_package)
     }
 }

src/openproject/root.rs

@@ -1,4 +1,4 @@
-use crate::openproject::client::{handle_response_status, Client, Error};
+use crate::openproject::client::{handle_response_status, Client, OpenProjectError};
 use crate::openproject::hal::HalEntity;
 use serde::Deserialize;
 
@@ -22,11 +22,11 @@ pub struct Root {
 }
 
 pub trait RootClient {
-    async fn root(&self) -> Result<Root, Error>;
+    async fn root(&self) -> Result<Root, OpenProjectError>;
 }
 
 impl RootClient for Client {
-    async fn root(&self) -> Result<Root, Error> {
+    async fn root(&self) -> Result<Root, OpenProjectError> {
         let client = reqwest::Client::new();
 
         let response = client

src/openproject/user.rs

@@ -1,4 +1,4 @@
-use crate::openproject::client::{handle_response_status, Client, Error};
+use crate::openproject::client::{handle_response_status, Client, OpenProjectError};
 use crate::openproject::hal::Link;
 use crate::openproject::root::RootClient;
 use serde::Deserialize;
@@ -19,11 +19,11 @@ pub struct User {
 }
 
 pub trait GetMe {
-    async fn me(&self) -> Result<User, Error>;
+    async fn me(&self) -> Result<User, OpenProjectError>;
 }
 
 impl GetMe for Client {
-    async fn me(&self) -> Result<User, Error> {
+    async fn me(&self) -> Result<User, OpenProjectError> {
         let r = self.root().await?;
         let client = reqwest::Client::new();
 

src/openproject/work.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Debug)]
 pub struct WorkPackageWriterAssignee {
-    pub(crate) href: String,
+    pub(crate) href: Option<String>,
 }
 #[derive(Serialize, Debug)]
 pub struct WorkPackageWriter {
@@ -10,7 +10,7 @@ pub struct WorkPackageWriter {
     #[serde(alias = "type")]
     pub(crate) work_type: String,
     pub(crate) description: DescriptionWriter,
-    pub assignee: Option<WorkPackageWriterAssignee>,
+    pub assignee: WorkPackageWriterAssignee,
 }
 
 #[derive(Serialize, Debug)]