From 73dbc1e5cbce860ef3e3ab00d18cb118be6db713 Mon Sep 17 00:00:00 2001
From: Santo Cariotti <santo@dcariotti.me>
Date: Sun, 8 Sep 2024 15:45:10 +0200
Subject: Filter notifications by optional id and optional seen

---
 src/graphql/query.rs              |  5 +++--
 src/graphql/types/notification.rs | 36 +++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/graphql/query.rs b/src/graphql/query.rs
index e52bd2a..c39d19a 100644
--- a/src/graphql/query.rs
+++ b/src/graphql/query.rs
@@ -118,11 +118,12 @@ impl Query {
     async fn notifications<'ctx>(
         &self,
         ctx: &Context<'ctx>,
-        #[graphql(desc = "Show only seen or not notifications")] seen: bool,
+        #[graphql(desc = "Show only seen or not notifications")] seen: Option<bool>,
+        #[graphql(desc = "Filter by ID")] id: Option<i32>,
         #[graphql(desc = "Filter by alert ID")] alert_id: Option<i32>,
         #[graphql(desc = "Limit results")] limit: Option<i64>,
         #[graphql(desc = "Offset results")] offset: Option<i64>,
     ) -> Result<Option<Vec<notification::Notification>>, String> {
-        notification::query::get_notifications(ctx, seen, alert_id, limit, offset).await
+        notification::query::get_notifications(ctx, seen, id, alert_id, limit, offset).await
     }
 }
diff --git a/src/graphql/types/notification.rs b/src/graphql/types/notification.rs
index 0773876..cbb6832 100644
--- a/src/graphql/types/notification.rs
+++ b/src/graphql/types/notification.rs
@@ -52,7 +52,10 @@ pub mod query {
         ctx: &Context<'ctx>,
 
         // Filter for `seen` field
-        seen: bool,
+        seen: Option<bool>,
+
+        // Optional filter by id
+        id: Option<i32>,
 
         // Optional filter by alert id
         alert_id: Option<i32>,
@@ -108,32 +111,43 @@ pub mod query {
                         JOIN alerts a ON n.alert_id = a.id
                         JOIN positions p ON n.position_id = p.id".to_string();
 
+                let base_query = match id {
+                    Some(idn) => format!("{} WHERE n.id = {}", base_query, idn),
+                    None => format!("{} WHERE 1=1", base_query),
+                };
+
+                let base_query = match seen {
+                    Some(seen_status) if seen_status => format!("{} AND seen = 't'", base_query),
+                    Some(_) => format!("{} AND seen = 'f'", base_query),
+                    None => base_query,
+                };
+
                 let rows = match alert_id {
-                Some(id) if claim_user.is_admin =>
+                Some(ida) if claim_user.is_admin =>
                         client
                         .query(&format!(
-                            "{base_query} WHERE seen = $1 AND n.alert_id = $2 ORDER BY n.id DESC LIMIT $3 OFFSET $4",
-                        ), &[&seen, &id, &limit, &offset])
+                            "{base_query} AND n.alert_id = $1 ORDER BY n.id DESC LIMIT $2 OFFSET $3",
+                        ), &[&ida, &limit, &offset])
                         .await
                         .unwrap(),
-                Some (id) =>
+                Some (ida) =>
                     client
                     .query(&format!(
-                        "{base_query} WHERE seen = $1 AND p.user_id = $2 AND n.alert_id = $3 ORDER BY n.id DESC LIMIT $4 OFFSET $5",
-                    ), &[&seen, &claim_user.id, &id, &limit, &offset])
+                        "{base_query} AND p.user_id = $1 AND n.alert_id = $2 ORDER BY n.id DESC LIMIT $3 OFFSET $4",
+                    ), &[&claim_user.id, &ida, &limit, &offset])
                     .await
                     .unwrap(),
                 None if claim_user.is_admin => client
                     .query(
-                        &format!("{base_query} WHERE seen = $1 ORDER BY n.id DESC LIMIT $2 OFFSET $3"),
-                        &[&seen, &limit, &offset],
+                        &format!("{base_query} ORDER BY n.id DESC LIMIT $1 OFFSET $2"),
+                        &[&limit, &offset],
                     )
                     .await
                     .unwrap(),
                 None =>
                     client.query(
-                        &format!("{base_query} WHERE seen = $1 AND p.user_id = $2 ORDER BY n.id DESC LIMIT $3 OFFSET $4"),
-                        &[&seen, &claim_user.id, &limit, &offset],
+                        &format!("{base_query} AND p.user_id = $1 ORDER BY n.id DESC LIMIT $2 OFFSET $3"),
+                        &[&claim_user.id, &limit, &offset],
                     )
                     .await
                     .unwrap(),
-- 
cgit v1.2.3-18-g5258