WIP

A new module 'planning_load' has been added to the 'planning' directory, handling workload planning tasks. Updates have also been made to project dependencies in Cargo.lock and Cargo.toml. The added dependencies are necessary for the new functionalities in the 'planning_load' module. Also, a few adjustments were made to allow better access and error handling across packages.

Cargo.lock

@@ -64,6 +64,12 @@ version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
+[[package]]
+name = "bytecount"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -110,10 +116,12 @@ version = "0.1.0"
 dependencies = [
  "clap",
  "gitlab",
+ "iso8601",
  "log",
  "reqwest",
  "serde",
  "simple-home-dir",
+ "tabled",
  "tokio",
  "toml",
  "url",
@@ -750,6 +758,16 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "iso8601"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153"
+dependencies = [
+ "nom",
+ "serde",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -959,6 +977,17 @@ version = "6.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
 
+[[package]]
+name = "papergrid"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb"
+dependencies = [
+ "bytecount",
+ "fnv",
+ "unicode-width",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@@ -983,6 +1012,30 @@ version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.79"
@@ -1335,6 +1388,30 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "tabled"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e"
+dependencies = [
+ "papergrid",
+ "tabled_derive",
+ "unicode-width",
+]
+
+[[package]]
+name = "tabled_derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c138f99377e5d653a371cdad263615634cfc8467685dfe8e73e2b8e98f44b17"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.9.0"
@@ -1586,6 +1663,12 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
 [[package]]
 name = "void"
 version = "1.0.2"

Cargo.toml

@@ -15,3 +15,5 @@ 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"
+tabled = "0.15.0"
+iso8601 = { version = "0.6.1" , features = ["serde"]}

src/cli.rs

@@ -21,6 +21,7 @@ pub(crate) enum Commands {
 #[derive(Subcommand)]
 pub(crate) enum Planning {
     I2work(Issue2Work),
+    Load,
 }
 
 #[derive(Args, Debug)]

src/main.rs

@@ -10,6 +10,7 @@ mod error;
 mod gitlab;
 mod openproject;
 mod planning;
+mod utils;
 
 use crate::cli::Commands::{Planning, Test};
 use crate::cli::Planning::I2work;
@@ -48,6 +49,7 @@ async fn main() {
 
     let result = match cli.command {
         Some(Planning(I2work(args))) => planning::issue2work::issue2work(config, &args).await,
+        Some(Planning(cli::Planning::Load)) => planning::planning_load::planning_load(config).await,
         Some(Test) => debug::debug(config).await,
         None => Err(GeneralError {
             description: "No command launched".to_string(),

src/openproject/client.rs

@@ -6,8 +6,8 @@ use serde::Deserialize;
 use std::error::Error;
 
 #[derive(Deserialize, Debug)]
-pub(crate) struct OpenProjectError {
-    pub(crate) description: String,
+pub struct OpenProjectError {
+    pub description: String,
 }
 
 impl From<reqwest::Error> for OpenProjectError {

src/openproject/mod.rs

@@ -3,3 +3,4 @@ mod hal;
 pub(crate) mod root;
 pub(crate) mod user;
 pub(crate) mod work;
+pub(crate) mod project;

src/openproject/project.rs

@@ -0,0 +1,7 @@
+use serde::Deserialize;
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct ProjectPartial {
+    href: String,
+    pub(crate) title: String,
+}

src/openproject/user.rs

@@ -8,6 +8,27 @@ pub struct UserLink {
     #[serde(rename = "self")]
     pub d_self: Link,
 }
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct UserPartial {
+    pub href: Option<String>,
+    pub title: Option<String>,
+}
+
+impl UserPartial {
+    pub fn is_null(&self) -> bool {
+        self.href.is_none()
+    }
+}
+
+impl PartialEq<Self> for UserPartial {
+    fn eq(&self, other: &Self) -> bool {
+        self.href == other.href
+    }
+}
+
+
+
 #[derive(Deserialize, Debug, Clone)]
 pub struct User {
     #[serde(rename = "_type")]
@@ -18,6 +39,16 @@ pub struct User {
     pub d_links: UserLink,
 }
 
+impl PartialEq<Self> for User {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl Eq for User {
+
+}
+
 pub trait GetMe {
     async fn me(&self) -> Result<User, OpenProjectError>;
 }

src/openproject/work.rs

@@ -1,4 +1,16 @@
+use crate::openproject::client::{handle_response_status, Client, OpenProjectError};
+use crate::openproject::hal::Link;
+use iso8601::Duration;
 use serde::{Deserialize, Serialize};
+use crate::openproject::project::ProjectPartial;
+use crate::openproject::user::{User, UserLink, UserPartial};
+
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct BudgetPartial {
+    pub(crate) href: Option<String>,
+    pub(crate) title: Option<String>,
+}
 
 #[derive(Serialize, Debug)]
 pub struct WorkPackageWriterAssignee {
@@ -19,8 +31,129 @@ pub struct DescriptionWriter {
     pub(crate) raw: String,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug, Clone)]
+pub struct WorkPackageLinks {
+    pub(crate) assignee: Option<UserPartial>,
+    pub(crate) project: ProjectPartial,
+    pub(crate) budget: BudgetPartial,
+}
+
+#[derive(Deserialize, Debug, Clone)]
 pub struct WorkPackage {
     pub id: u64,
     pub subject: String,
+    #[serde(alias = "estimatedTime")]
+    pub estimated_time: Option<Duration>,
+    #[serde(alias = "spentTime")]
+    pub spent_time: Option<Duration>,
+    #[serde(alias = "_links")]
+    pub links: WorkPackageLinks,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct WorkPackageCollectionLinks {
+    #[serde(alias = "nextByOffset")]
+    pub next_by_offset: Option<Link>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct WorkPackagesElements {
+    pub elements: Vec<WorkPackage>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct WorkPackageCollection {
+    pub total: u64,
+    pub count: u64,
+    pub offset: u64,
+    #[serde(alias = "pageSize")]
+    pub page_size: u64,
+    #[serde(alias = "_links")]
+    pub links: WorkPackageCollectionLinks,
+    #[serde(alias = "_embedded")]
+    pub embedded: WorkPackagesElements,
+}
+
+impl WorkPackageCollection {
+    pub fn has_next(&self) -> bool {
+        self.links.next_by_offset.is_some()
+    }
+
+    pub fn is_last(&self) -> bool {
+        !self.has_next()
+    }
+}
+
+pub trait WorkPackageCollectionClient {
+    async fn work_package(&self) -> Result<Vec<WorkPackage>, OpenProjectError>;
+}
+
+trait GetWorkPackageCollectionClient {
+    async fn first_work_packages_collection(
+        &self,
+    ) -> Result<WorkPackageCollection, OpenProjectError>;
+    async fn next_work_packages_collection(
+        &self,
+        current: &WorkPackageCollection,
+    ) -> Result<WorkPackageCollection, OpenProjectError>;
+}
+
+impl GetWorkPackageCollectionClient for Client {
+    async fn first_work_packages_collection(
+        &self,
+    ) -> Result<WorkPackageCollection, OpenProjectError> {
+        let client = reqwest::Client::new();
+
+        let response = client
+            .get(format!("{}/api/v3/work_packages", self.base_url))
+            .basic_auth("apikey", Some(&self.token))
+            .send()
+            .await?;
+
+        let collection = handle_response_status(response, "could not find work packages").await?;
+
+        Ok(collection)
+    }
+
+    async fn next_work_packages_collection(
+        &self,
+        current: &WorkPackageCollection,
+    ) -> Result<WorkPackageCollection, OpenProjectError> {
+        let client = reqwest::Client::new();
+
+        let response = client
+            .get(format!(
+                "{}/{}",
+                self.base_url,
+                current.links.next_by_offset.clone().unwrap().href
+            ))
+            .basic_auth("apikey", Some(&self.token))
+           // .query(&[("filters", r##"[{"startDate":{"operator": "<=", "values": ["2024-06-30"]}, {"endDate":{"operator": ">d", "values": ["2024-06-01"]}]"##)])
+            .send()
+            .await?;
+
+        let collection = handle_response_status(response, "could not find work packages").await?;
+
+        Ok(collection)
+    }
+}
+
+impl WorkPackageCollectionClient for Client {
+    async fn work_package(&self) -> Result<Vec<WorkPackage>, OpenProjectError> {
+        let mut work_packages: Vec<WorkPackage> = vec![];
+        let mut collection = self.first_work_packages_collection().await?;
+
+        for w in collection.embedded.elements.iter_mut() {
+            work_packages.push(w.clone());
+        }
+
+        while !collection.is_last() {
+            collection = self.next_work_packages_collection(&collection).await?;
+            for w in collection.embedded.elements.iter() {
+                work_packages.push(w.clone());
+            }
+        }
+
+        Ok(work_packages)
+    }
 }

src/planning/mod.rs

@@ -1 +1,2 @@
 pub(crate) mod issue2work;
+pub(crate) mod planning_load;

src/planning/planning_load.rs

@@ -0,0 +1,142 @@
+use std::hash::Hash;
+
+use tabled::settings::Style;
+
+use crate::config::Config;
+use crate::error::GeneralError;
+use crate::openproject::client::Client;
+use crate::openproject::user::UserPartial;
+use crate::openproject::work::{WorkPackage, WorkPackageCollectionClient};
+
+pub struct PlanningLoadConfig {
+    
+}
+
+enum CellContent {
+    S(String),
+    N(f64),
+}
+
+impl From<CellContent> for String {
+    fn from(value: CellContent) -> Self {
+        match value {
+            CellContent::S(s) => s,
+            CellContent::N(n) => n.to_string()
+        }
+    }
+}
+
+struct UserList {
+    users: Vec<UserPartial>,
+}
+
+impl UserList {
+    fn from_work_packages(work_packages: &Vec<WorkPackage>) -> Self {
+        let mut users = vec![];
+        for w in work_packages {
+            if w.links.assignee.is_none() {
+                continue;
+            }
+
+            let u: &UserPartial = w.links.assignee.as_ref().unwrap();
+
+            if users.contains(u) {
+                continue;
+            }
+
+            users.push(u.clone());
+        }
+
+        users.sort_by(|a, b| a.href.partial_cmp(&b.href).unwrap());
+
+        UserList { users }
+    }
+}
+
+mod table_load {
+    use tabled::builder::Builder;
+
+    use crate::openproject::work::WorkPackage;
+    use crate::planning::planning_load::{CellContent, UserList};
+    use crate::utils::duration_to_seconds_f64;
+
+    pub struct Table {
+        work_packages: Vec<WorkPackage>,
+        user_list: UserList,
+    }
+
+    impl<'a> Table {
+        pub fn new(mut work_packages: Vec<WorkPackage>) -> Self {
+            let user_list = UserList::from_work_packages(&work_packages);
+            work_packages.sort_by(|a, b| {
+
+                if a.links.project.title != b.links.project.title {
+                    return a.links.project.title.partial_cmp(&b.links.project.title).unwrap();
+                }
+
+                if a.links.budget.href.as_ref().unwrap_or(&"".to_string()) != b.links.budget.href.as_ref().unwrap_or(&"".to_string()) {
+                    return a.links.budget.href.as_ref().unwrap_or(&"".to_string()).partial_cmp(
+                        b.links.budget.href.as_ref().unwrap_or(&"".to_string())
+                    ).unwrap();
+                }
+
+                return a.id.partial_cmp(&b.id).unwrap();
+            });
+
+            Table {work_packages, user_list}
+        }
+
+        pub fn to_rows(&self) -> tabled::Table {
+            let mut builder = Builder::default();
+            let mut header = vec![
+                "Projet".to_string(),
+                "Buddget".to_string(),
+                "Tâche".to_string()
+            ];
+            for u in &self.user_list.users {
+                header.push(u.title.as_ref().unwrap_or(&"".to_string()).clone());
+            }
+            header.push("Non assigné".to_string());
+            builder.push_record(header);
+
+            for work_package in &self.work_packages {
+                let mut row = Vec::with_capacity(3 + self.user_list.users.len() + 1);
+                row.push(CellContent::S(work_package.links.project.title.clone()));
+                row.push(CellContent::S(work_package.links.budget.title.as_ref().unwrap_or(&"".to_string()).clone()));
+                row.push(CellContent::S(format!("{} ({})", work_package.subject, work_package.id)));
+                for u in &self.user_list.users {
+                    if work_package.links.assignee.is_some() && work_package.links.assignee.as_ref().unwrap().eq(u) {
+                        row.push({
+                            match work_package.estimated_time {
+                                Some(duration) => CellContent::N(duration_to_seconds_f64(&duration)/3_600_f64),
+                                None => CellContent::S("".to_string())
+                            }
+                        });
+                    } else {
+                        row.push(CellContent::S("".to_string()));
+                    }
+                    if work_package.links.assignee.is_none() {
+                        row.push(CellContent::S("".to_string()));
+                    }
+                }
+                builder.push_record(row);
+            }
+
+            builder.build()
+        }
+    }
+}
+
+pub async fn planning_load(config: Config) -> Result<(), GeneralError> {
+    let open_project_client = Client::from_config(&config.openproject);
+    let work_packages = open_project_client.work_package().await?;
+
+
+    let table_data = table_load::Table::new(work_packages);
+    let mut table = table_data.to_rows();
+    table.with(Style::markdown());
+
+    println!("{}", table);
+
+    Ok(())
+}

src/utils.rs

@@ -0,0 +1,29 @@
+use iso8601::Duration;
+use iso8601::Duration::{Weeks, YMDHMS};
+
+pub fn duration_to_seconds_f64(duration: &Duration) -> f64 {
+    if duration.is_zero() {
+        return 0f64;
+    }
+
+    match duration {
+        Weeks(w) => f64::from(*w) * 24f64 * 7f64 * 3600f64,
+        YMDHMS{year, month, day, hour, minute, second, millisecond} =>
+            f64::from(*day) * 86400f64
+            + f64::from(*hour) * 3600f64
+            + f64::from(*minute) * 60f64
+            + f64::from(*second)
+    }
+}
+
+pub fn empty_duration() -> Duration {
+    YMDHMS {
+        year: 0,
+        month: 0,
+        day: 0,
+        hour: 0,
+        minute: 0,
+        second: 0,
+        millisecond: 0
+    }
+}