fix: get contributors from organization

Author: SergioRibera

src/pages/contributors.rs

@@ -1,16 +1,19 @@
-use leptos::{component, view, Fragment, IntoView};
-#[cfg(not(debug_assertions))]
-use leptos::{create_local_resource, error::Result, serde_json::json, SignalGet};
+use std::collections::HashMap;
+
+use leptos::{
+    component, create_local_resource, error::Result, island, serde_json::json, view, Fragment,
+    IntoView, SignalGet,
+};
 use serde::{Deserialize, Serialize};
 
 use crate::components::ContributorCard;
 
-#[cfg(not(debug_assertions))]
 const GRAPH_QUERY: &str = r#"
 query OrganizationContributors {
   organization(login: "RustLangES") {
     repositories(first: 100) {
       nodes {
+        name
         collaborators(first: 100) {
           nodes {
             login
@@ -19,8 +22,11 @@ query OrganizationContributors {
             bio
             twitterUsername
             location
-            contributionsCollection {
+            contributionsCollection(organizationID: "O_kgDOBHON2w") {
               totalCommitContributions
+              totalPullRequestContributions
+              totalIssueContributions
+              totalRepositoryContributions
             }
           }
         }
@@ -31,23 +37,31 @@ query OrganizationContributors {
 "#;
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct Contributor {
     login: String,
     avatar_url: String,
     url: String,
     bio: Option<String>,
     twitter_username: Option<String>,
     location: Option<String>,
-    contributions_collection: ContributionCollection,
+    contributions_collection: Option<ContributionCollection>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct ContributionCollection {
-    total_commit_contributions: u64,
+    #[serde(rename = "totalCommitContributions")]
+    commits: u64,
+    #[serde(rename = "totalPullRequestContributions")]
+    pull_request: u64,
+    #[serde(rename = "totalIssueContributions")]
+    issues: u64,
+    #[serde(rename = "totalRepositoryContributions")]
+    repository: u64,
 }
 
-#[cfg(not(debug_assertions))]
-async fn fetch_contributors() -> Result<Vec<Contributor>> {
+pub async fn fetch_contributors() -> Result<Vec<Contributor>> {
     let request_body = json!({
         "query": GRAPH_QUERY,
     });
@@ -77,84 +91,43 @@ async fn fetch_contributors() -> Result<Vec<Contributor>> {
         .as_array()
         .unwrap_or(&Vec::new())
         .iter()
-        .flat_map(|repo| repo["contributors"]["nodes"].as_array().unwrap())
-        .map(|c| leptos::serde_json::from_value::<Contributor>(c.clone()).map_err(|e| e.into()))
-        .collect::<Result<Vec<Contributor>>>()?;
-
-    res.sort_by_key(|a| a.contributions_collection.total_commit_contributions);
+        .flat_map(|repo| repo["collaborators"]["nodes"].as_array().unwrap())
+        .filter_map(|c| leptos::serde_json::from_value::<Contributor>(c.clone()).ok())
+        .fold(HashMap::new(), |prev, c| {
+            let mut prev = prev;
+            prev.entry(c.login.clone())
+                .and_modify(|o: &mut Contributor| {
+                    match (
+                        o.contributions_collection.as_mut(),
+                        c.contributions_collection.as_ref(),
+                    ) {
+                        (Some(o), Some(c)) => o.commits += c.commits,
+                        (Some(o), None) => o.commits += 1,
+                        _ => {}
+                    }
+                })
+                .or_insert(c);
+            prev
+        })
+        .into_values()
+        .collect::<Vec<_>>();
+
+    res.sort_by_key(|a| {
+        a.contributions_collection
+            .as_ref()
+            .map(|c| c.repository)
+            .unwrap_or(1)
+    });
 
-    println!("Result of Github Request: {res:#?}");
+    res.reverse();
 
     Ok(res)
 }
 
-#[cfg_attr(not(debug_assertions), component)]
-#[cfg(not(debug_assertions))]
+#[island]
 pub fn Contributors() -> impl IntoView {
-    let contributors_results = create_local_resource(move || (), |()| fetch_contributors());
-    let contributorMapper = |item: &Contributor| {
-        view! {
-            <ContributorCard
-                name=item.login.clone()
-                description=item.bio.clone()
-                link=item.url.clone()
-                brand_src=item.avatar_url.clone()
-                twitter=item.twitter_username.clone()
-                location=item.location.clone()
-                contributions=item.contributions_collection.total_commit_contributions
-            />
-        }
-    };
+    let contributors = create_local_resource(move || (), |()| fetch_contributors());
 
-    let contributors_view = move || {
-        let contributors = contributors_results.get()?.ok()?;
-        let result = contributors
-            .iter()
-            .map(contributorMapper)
-            .collect::<Fragment>();
-        Some(result.into_view())
-    };
-
-    view! {
-        <section class="bg-orange-300/30 dark:bg-transparent py-16">
-            <div class="flex flex-col gap-y-6 container mx-auto px-4">
-                <h2 class="text-3xl text-left mb-6">
-                    <span class="font-work-sans font-light">"Nuestros "</span>
-                    <span class="font-alfa-slab text-orange-500">"Colaboradores"</span>
-                </h2>
-                <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-5 gap-6">
-                    {contributors_view}
-                </div>
-            </div>
-        </section>
-    }
-}
-
-#[cfg_attr(debug_assertions, component)]
-#[cfg(debug_assertions)]
-pub fn Contributors() -> impl IntoView {
-    let contributors = [Contributor {
-        login: "Phosphorus-M".to_owned(),
-        avatar_url: "https://avatars.githubusercontent.com/u/19656993?v=4".to_owned(),
-        url: "https://github.com/Phosphorus-M".to_owned(),
-        bio: None,
-        twitter_username: Some("Phosphorus_M".to_owned()),
-        location: Some("Argentina".to_owned()),
-        contributions_collection: ContributionCollection {
-            total_commit_contributions: 499,
-        },
-    },
-    Contributor {
-        login: "SergioRibera".to_owned(),
-        avatar_url: "https://avatars.githubusercontent.com/u/56278796?u=9e3dac947b4fd3ca2f1a05024e083c64e4c69cfe&v=4".to_owned(),
-        url: "https://github.com/SergioRibera".to_owned(),
-        bio: Some("22yo Rustacean and Open Source lover\r\nI teach, Promote and Give Technical talks of rust with @RustLangES".to_owned()),
-        twitter_username: Some("sergioribera_rs".to_owned()),
-        location: Some("Santa Cruz de la Sierra, Bolivia".to_owned()),
-        contributions_collection: ContributionCollection {
-          total_commit_contributions: 2015
-        }
-    }];
     let contributorMapper = |item: &Contributor| {
         view! {
             <ContributorCard
@@ -164,21 +137,23 @@ pub fn Contributors() -> impl IntoView {
                 brand_src=item.avatar_url.clone()
                 twitter=item.twitter_username.clone()
                 location=item.location.clone()
-                contributions=item.contributions_collection.total_commit_contributions
+                contributions=item.contributions_collection.as_ref().map(|c| c.commits).unwrap_or(1)
             />
         }
     };
 
     let contributors_view = move || {
         let result = contributors
+            .get()?
+            .ok()?
             .iter()
             .map(contributorMapper)
             .collect::<Fragment>();
         Some(result.into_view())
     };
 
     view! {
-        <section class="bg-orange-300/30 dark:bg-transparent py-16">
+        <section class="bg-orange-300/30 dark:bg-transparent py-16 min-h-[80vh]">
             <div class="flex flex-col gap-y-6 container mx-auto px-4">
                 <h2 class="text-3xl text-left mb-6">
                     <span class="font-work-sans font-light">"Nuestros "</span>