Merge pull request #12 from ivinjabraham/develop

new and improved status update

Author: ivinjabraham

Cargo.lock

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.66"
+anyhow = "1.0.95"
 async-trait = "0.1.83"
 chrono = "0.4.38"
 chrono-tz = "0.10.0"
-poise = { git = "https://github.com/serenity-rs/poise", branch = "current" }
+poise = "0.6.1"
 reqwest = { version = "0.12.5", features = ["json"] }
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"

Cargo.toml

@@ -0,0 +1,4 @@
+1334963922205147176
+1334963925585891419
+1334963927678849145
+1334963929922670682

config.txt

@@ -16,28 +16,24 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 use serde::Deserialize;
-use std::borrow::Cow;
 
-#[derive(Deserialize)]
-pub struct Member<'a> {
-    id: Option<i32>,
-    roll_num: Option<Cow<'a, str>>,
-    name: Option<Cow<'a, str>>,
-    hostel: &'a str,
-    email: &'a str,
-    sex: &'a str,
-    year: i32,
-    mac_addr: &'a str,
-    discord_id: &'a str,
-    group_id: i32,
+#[derive(Clone, Debug, Deserialize)]
+pub struct Streak {
+    #[serde(rename = "currentStreak")]
+    pub current_streak: i32,
+    #[serde(rename = "maxStreak")]
+    pub max_streak: i32,
 }
 
-#[derive(Deserialize)]
-struct Data<'a> {
-    getMember: Vec<Member<'a>>,
-}
-
-#[derive(Deserialize)]
-struct Root<'a> {
-    data: Data<'a>,
+#[derive(Clone, Debug, Deserialize)]
+pub struct Member {
+    #[serde(rename = "memberId")]
+    pub member_id: i32,
+    pub name: String,
+    #[serde(rename = "discordId")]
+    pub discord_id: String,
+    #[serde(rename = "groupId")]
+    pub group_id: u32,
+    #[serde(default)]
+    pub streak: Vec<Streak>,
 }

src/graphql/models.rs

@@ -15,37 +15,139 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-use serde_json::Value;
+use crate::graphql::models::{Member, Streak};
+use anyhow::Context;
 
-use super::models::Member;
+pub async fn fetch_members() -> Result<Vec<Member>, anyhow::Error> {
+    let request_url = std::env::var("ROOT_URL").expect("ROOT_URL not found");
 
-const REQUEST_URL: &str = "https://root.shuttleapp.rs/";
-
-pub async fn fetch_members() -> Result<Vec<String>, reqwest::Error> {
     let client = reqwest::Client::new();
     let query = r#"
-    query {
-        getMember {
-            name,
-            groupId,
+        { 
+          members {
+            memberId
+            name
             discordId
+            groupId
+            streak {
+              currentStreak
+              maxStreak
+            }
         }
     }"#;
 
     let response = client
-        .post(REQUEST_URL)
+        .post(request_url)
         .json(&serde_json::json!({"query": query}))
         .send()
-        .await?;
+        .await
+        .context("Failed to successfully post request")?;
+
+    let response_json: serde_json::Value = response
+        .json()
+        .await
+        .context("Failed to serialize response")?;
+
+    let members = response_json
+        .get("data")
+        .and_then(|data| data.get("members"))
+        .and_then(|members| members.as_array())
+        .ok_or_else(|| anyhow::anyhow!("Malformed response: 'members' field missing or invalid"))?;
+
+    let members: Vec<Member> = serde_json::from_value(serde_json::Value::Array(members.clone()))
+        .context("Failed to parse 'members' into Vec<Member>")?;
+
+    Ok(members)
+}
+
+pub async fn increment_streak(member: &mut Member) -> anyhow::Result<()> {
+    let request_url = std::env::var("ROOT_URL").context("ROOT_URL was not found")?;
+
+    let client = reqwest::Client::new();
+    let mutation = format!(
+        r#"
+        mutation {{
+            incrementStreak(input: {{ memberId: {} }}) {{
+                currentStreak
+            }}
+        }}"#,
+        member.member_id
+    );
+    let response = client
+        .post(request_url)
+        .json(&serde_json::json!({"query": mutation}))
+        .send()
+        .await
+        .context("Root Request failed")?;
 
-    let json: Value = response.json().await?;
+    // Handle the streak vector
+    if member.streak.is_empty() {
+        // If the streak vector is empty, add a new Streak object with both values set to 1
+        member.streak.push(Streak {
+            current_streak: 1,
+            max_streak: 1,
+        });
+    } else {
+        // Otherwise, increment the current_streak for each Streak and update max_streak if necessary
+        for streak in &mut member.streak {
+            streak.current_streak += 1;
+            if streak.current_streak > streak.max_streak {
+                streak.max_streak = streak.current_streak;
+            }
+        }
+    }
+
+    Ok(())
+}
 
-    let member_names: Vec<String> = json["data"]["getMember"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .map(Member)
-        .collect();
+pub async fn reset_streak(member: &mut Member) -> anyhow::Result<()> {
+    let request_url = std::env::var("ROOT_URL").context("ROOT_URL was not found")?;
 
-    Ok(member_names)
+    let client = reqwest::Client::new();
+    let mutation = format!(
+        r#"
+        mutation {{
+            resetStreak(input: {{ memberId: {} }}) {{
+                currentStreak
+                maxStreak
+            }}
+        }}"#,
+        member.member_id
+    );
+
+    let response = client
+        .post(&request_url)
+        .json(&serde_json::json!({ "query": mutation }))
+        .send()
+        .await
+        .context("Root Request failed")?;
+
+    let response_json: serde_json::Value = response
+        .json()
+        .await
+        .context("Failed to parse response JSON")?;
+    if let Some(data) = response_json
+        .get("data")
+        .and_then(|data| data.get("resetStreak"))
+    {
+        let current_streak = data.get("currentStreak").and_then(|v| v.as_i64()).unwrap();
+
+        let max_streak = data.get("maxStreak").and_then(|v| v.as_i64()).unwrap();
+
+        // Update the member's streak vector
+        if member.streak.is_empty() {
+            // If the streak vector is empty, initialize it with the returned values
+            member.streak.push(Streak {
+                current_streak: current_streak as i32,
+                max_streak: max_streak as i32,
+            });
+        } else {
+            // Otherwise, update the first streak entry
+            for streak in &mut member.streak {
+                streak.current_streak = current_streak as i32;
+                streak.max_streak = max_streak as i32;
+            }
+        }
+    }
+    Ok(())
 }

src/graphql/queries.rs

@@ -98,9 +98,9 @@ pub fn initialize_data() -> Data {
 
     data
 }
+
 #[tokio::main]
-async fn main(
-) -> Result<(), Error> {
+async fn main() -> Result<(), Error> {
     dotenv::dotenv().ok();
     let discord_token = std::env::var("DISCORD_TOKEN").context("'DISCORD_TOKEN' was not found")?;
 

src/main.rs

@@ -50,7 +50,7 @@ impl Task for StatusUpdateCheck {
     }
 
     fn run_in(&self) -> Duration {
-        time_until(9, 0)
+        time_until(00, 40)
     }
 
     async fn run(&self, ctx: Context) {