Search by name, cost and user

1 files changed, 18 insertions, 10 deletions

diff --git a/src/queries.rs b/src/queries.rs
index df57bd8..f10c7a1 100644
--- a/src/queries.rs
+++ b/src/queries.rs
@@ -4,9 +4,11 @@ use serde::{Deserialize, Serialize};
 #[derive(Deserialize, Serialize, Clone)]
 pub struct Payments {
     pub page: Option<i64>,
-    pub search: Option<String>,
+    pub name: Option<String>,
+    pub cost: Option<String>,
     pub frequency: Option<Frequency>,
     pub highlight: Option<i64>,
+    pub user: Option<i64>,
     pub category: Option<i64>,
 }
 
@@ -18,15 +20,6 @@ pub fn payments_url(q: Payments) -> String {
         Some(p) => params.push(format!("page={}", p)),
     };
 
-    match q.search {
-        Some(s) => {
-            if !s.is_empty() {
-                params.push(format!("search={}", s));
-            }
-        }
-        _ => (),
-    };
-
     match q.frequency {
         Some(Frequency::Monthly) => {
             params.push("frequency=Monthly".to_string())
@@ -39,6 +32,21 @@ pub fn payments_url(q: Payments) -> String {
         _ => (),
     };
 
+    match q.name {
+        Some(str) => params.push(format!("name={}", str)),
+        _ => (),
+    };
+
+    match q.cost {
+        Some(n) => params.push(format!("cost={}", n)),
+        _ => (),
+    };
+
+    match q.user {
+        Some(id) => params.push(format!("user={}", id)),
+        _ => (),
+    };
+
     match q.category {
         Some(id) => params.push(format!("category={}", id)),
         _ => (),