fix: fixed client query

ActivityWatch · Apr 5, 2024 · ae603a2 · ae603a2
1 parent 9416fe0
commit ae603a2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aw-client-rust/src/lib.rs b/aw-client-rust/src/lib.rs
@@ -115,7 +115,7 @@ impl AwClient {
         self.client
             .post(url)
             .json(&json!({
-                "query": query,
+                "query": query.split('\n').collect::<Vec<&str>>(),
                 "timeperiods": timeperiods_str,
             }))
             .send()

diff --git a/aw-client-rust/tests/test.rs b/aw-client-rust/tests/test.rs
@@ -110,6 +110,22 @@ mod test {
         println!("Events: {events:?}");
         assert!(events[0].duration == Duration::seconds(1));
 
+        // Query
+        let query = format!(
+            "events = query_bucket(\"{}\");
+RETURN = events;",
+            bucket.id
+        );
+        let start: DateTime<Utc> = DateTime::parse_from_rfc3339("1996-12-19T00:00:00-08:00")
+            .unwrap()
+            .into();
+        let end: DateTime<Utc> = DateTime::parse_from_rfc3339("2020-12-19T00:00:00-08:00")
+            .unwrap()
+            .into();
+        let timeperiods = (start, end);
+        let query_result = client.query(&query, vec![timeperiods]).unwrap();
+        println!("Query result: {query_result:?}");
+
         client
             .delete_event(&bucketname, events[0].id.unwrap())
             .unwrap();