refactor: don't filter on the client-side

icepuma · Feb 11, 2024 · e441980 · e441980
1 parent cdb081c
commit e441980
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 36 deletions.
diff --git a/src/client.rs b/src/client.rs
@@ -14,7 +14,6 @@ use chrono::DateTime;
 use chrono::Duration;
 use chrono::Local;
 use colored::Colorize;
-use itertools::Itertools;
 use minreq::Method;
 use minreq::Request;
 use minreq::Response;
@@ -183,22 +182,13 @@ impl TogglClient {
     include_archived: bool,
     workspace_id: u64,
   ) -> anyhow::Result<Option<Vec<Client>>> {
-    let clients = self.request(
-      debug,
-      Method::Get,
-      &format!("workspaces/{workspace_id}/clients"),
-    )?;
-
-    match clients {
-      Some(clients) if include_archived => Ok(Some(clients)),
-      Some(clients) => Ok(Some(
-        clients
-          .into_iter()
-          .filter(|client| !client.archived)
-          .collect_vec(),
-      )),
-      None => Ok(None),
-    }
+    let uri = if include_archived {
+      format!("workspaces/{workspace_id}/clients?status=both")
+    } else {
+      format!("workspaces/{workspace_id}/clients?status=active")
+    };
+
+    self.request(debug, Method::Get, &uri)
   }
 
   pub fn get_time_entries(
@@ -235,22 +225,13 @@ impl TogglClient {
     include_archived: bool,
     workspace_id: u64,
   ) -> anyhow::Result<Vec<Project>> {
-    let projects = self.request::<Vec<Project>>(
-      debug,
-      Method::Get,
-      &format!("workspaces/{workspace_id}/projects"),
-    )?;
-
-    if include_archived {
-      Ok(projects)
+    let uri = if include_archived {
+      format!("workspaces/{workspace_id}/projects")
     } else {
-      Ok(
-        projects
-          .into_iter()
-          .filter(|project| project.status != "archived")
-          .collect_vec(),
-      )
-    }
+      format!("workspaces/{workspace_id}/projects?active=true")
+    };
+
+    self.request::<Vec<Project>>(debug, Method::Get, &uri)
   }
 
   #[allow(clippy::too_many_arguments)]

diff --git a/src/client_tests.rs b/src/client_tests.rs
@@ -141,7 +141,7 @@ fn get_workspace_clients() -> anyhow::Result<()> {
   let mut server = mockito::Server::new();
 
   let mock = server
-    .mock("GET", "/workspaces/12345678/clients")
+    .mock("GET", "/workspaces/12345678/clients?status=active")
     .with_header(
       "Authorization",
       "Basic Y2I3YmY3ZWZhNmQ2NTIwNDZhYmQyZjdkODRlZTE4YzE6YXBpX3Rva2Vu",
@@ -221,7 +221,7 @@ fn get_workspace_projects() -> anyhow::Result<()> {
   let mut server = mockito::Server::new();
 
   let mock = server
-    .mock("GET", "/workspaces/12345678/projects")
+    .mock("GET", "/workspaces/12345678/projects?active=true")
     .with_header(
       "Authorization",
       "Basic Y2I3YmY3ZWZhNmQ2NTIwNDZhYmQyZjdkODRlZTE4YzE6YXBpX3Rva2Vu",

diff --git a/src/commands/time_entries_tests.rs b/src/commands/time_entries_tests.rs
@@ -189,7 +189,7 @@ fn test_create_workday_with_pause_2_hours() -> anyhow::Result<()> {
     .create();
 
   let projects_mock = server
-    .mock("GET", "/workspaces/1234567/projects")
+    .mock("GET", "/workspaces/1234567/projects?active=true")
     .with_header(
       "Authorization",
       "Basic Y2I3YmY3ZWZhNmQ2NTIwNDZhYmQyZjdkODRlZTE4YzE6YXBpX3Rva2Vu",
@@ -298,7 +298,7 @@ fn test_create_workday_with_pause_7_hours() -> anyhow::Result<()> {
     .create();
 
   let projects_mock = server
-    .mock("GET", "/workspaces/1234567/projects")
+    .mock("GET", "/workspaces/1234567/projects?active=true")
     .with_header(
       "Authorization",
       "Basic Y2I3YmY3ZWZhNmQ2NTIwNDZhYmQyZjdkODRlZTE4YzE6YXBpX3Rva2Vu",