refactor status update task

Signed-off-by: Ivin Joel Abraham <ivinjabraham@gmail.com>

Author: ivinjabraham

src/graphql/models.rs

@@ -17,6 +17,16 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 use serde::Deserialize;
 
+#[derive(Clone, Debug, Deserialize)]
+pub struct StreakWithMemberId {
+    #[serde(rename = "memberId")]
+    pub member_id: i32,
+    #[serde(rename = "currentStreak")]
+    pub current_streak: i32,
+    #[serde(rename = "maxStreak")]
+    pub max_streak: i32,
+}
+
 #[derive(Clone, Debug, Deserialize)]
 pub struct Streak {
     #[serde(rename = "currentStreak")]
@@ -32,6 +42,8 @@ pub struct Member {
     pub name: String,
     #[serde(rename = "discordId")]
     pub discord_id: String,
+    #[serde(rename = "groupId")]
+    pub group_id: i32,
     #[serde(default)]
     pub streak: Vec<Streak>, // Note that Root will NOT have multiple Streak elements but it may be an empty list which is why we use a vector here
 }

src/graphql/queries.rs

@@ -20,6 +20,8 @@ use tracing::debug;
 
 use crate::graphql::models::{Member, Streak};
 
+use super::models::StreakWithMemberId;
+
 pub async fn fetch_members() -> anyhow::Result<Vec<Member>> {
     let request_url = std::env::var("ROOT_URL").context("ROOT_URL not found in ENV")?;
 
@@ -30,6 +32,7 @@ pub async fn fetch_members() -> anyhow::Result<Vec<Member>> {
             memberId
             name
             discordId
+            groupId
             streak {
               currentStreak
               maxStreak
@@ -114,22 +117,33 @@ pub async fn increment_streak(member: &mut Member) -> anyhow::Result<()> {
         .get("data")
         .and_then(|data| data.get("incrementStreak"))
     {
-        let current_streak = data.get("currentStreak").and_then(|v| v.as_i64()).ok_or_else(|| anyhow!("current_streak was parsed as None"))? as i32;
-        let max_streak = data.get("maxStreak").and_then(|v| v.as_i64()).ok_or_else(|| anyhow!("max_streak was parsed as None"))? as i32;
+        let current_streak =
+            data.get("currentStreak")
+                .and_then(|v| v.as_i64())
+                .ok_or_else(|| anyhow!("current_streak was parsed as None"))? as i32;
+        let max_streak =
+            data.get("maxStreak")
+                .and_then(|v| v.as_i64())
+                .ok_or_else(|| anyhow!("max_streak was parsed as None"))? as i32;
 
         if member.streak.is_empty() {
-            member.streak.push(Streak { current_streak, max_streak });
+            member.streak.push(Streak {
+                current_streak,
+                max_streak,
+            });
         } else {
             for streak in &mut member.streak {
                 streak.current_streak = current_streak;
                 streak.max_streak = max_streak;
             }
         }
     } else {
-        return Err(anyhow!("Failed to access data from response: {}", response_json));
+        return Err(anyhow!(
+            "Failed to access data from response: {}",
+            response_json
+        ));
     }
 
-
     Ok(())
 }
 
@@ -199,3 +213,47 @@ pub async fn reset_streak(member: &mut Member) -> anyhow::Result<()> {
 
     Ok(())
 }
+
+pub async fn fetch_streaks() -> anyhow::Result<Vec<StreakWithMemberId>> {
+    let request_url = std::env::var("ROOT_URL").context("ROOT_URL not found in ENV")?;
+
+    let client = reqwest::Client::new();
+    let query = r#"
+        {
+          streaks {
+            memberId
+            currentStreak
+            maxStreak
+          }
+        }
+    "#;
+
+    debug!("Sending query {}", query);
+    let response = client
+        .post(request_url)
+        .json(&serde_json::json!({"query": query}))
+        .send()
+        .await
+        .context("Failed to successfully post request")?;
+
+    if !response.status().is_success() {
+        return Err(anyhow!(
+            "Server responded with an error: {:?}",
+            response.status()
+        ));
+    }
+
+    let response_json: serde_json::Value = response
+        .json()
+        .await
+        .context("Failed to serialize response")?;
+
+    debug!("Response: {}", response_json);
+    let streaks = response_json
+        .get("data")
+        .and_then(|data| data.get("streaks"))
+        .and_then(|streaks| serde_json::from_value::<Vec<StreakWithMemberId>>(streaks.clone()).ok())
+        .context("Failed to parse streaks data")?;
+
+    Ok(streaks)
+}