fix: parse contributor struct

Author: SergioRibera

src/pages/contributors.rs

@@ -5,16 +5,17 @@ use leptos::{
 use serde::{Deserialize, Serialize};
 
 use crate::components::ContributorCard;
+use crate::{error, log};
 
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Contributor {
     login: String,
     avatar_url: String,
     html_url: String,
     bio: Option<String>,
     twitter_username: Option<String>,
     location: Option<String>,
-    contributions: i32,
+    contributions: Option<i32>,
 }
 
 async fn fetch_contributors() -> Result<Vec<Contributor>> {
@@ -26,28 +27,30 @@ async fn fetch_contributors() -> Result<Vec<Contributor>> {
     .json::<Vec<Contributor>>()
     .await?;
 
-    let response = join_all(
-        response
-            .into_iter()
-            .map(|contributor| fetch_contributor_info(contributor.login)),
-    )
-    .await;
-
-    let response = response
-        .into_iter()
-        .filter_map(std::result::Result::ok)
+    let response = join_all(response.iter().map(|c| fetch_contributor_info(c)))
+        .await
+        .iter()
+        .flat_map(|c| c.clone().ok())
         .collect::<Vec<Contributor>>();
 
     Ok(response)
 }
 
-async fn fetch_contributor_info(username: String) -> Result<Contributor> {
-    let response = reqwasm::http::Request::get(&format!("https://api.github.com/users/{username}"))
-        .send()
-        .await?
-        .json::<Contributor>()
-        .await?;
-    Ok(response)
+async fn fetch_contributor_info(contributor: &Contributor) -> Result<Contributor> {
+    Ok(reqwasm::http::Request::get(&format!(
+        "https://api.github.com/users/{}",
+        contributor.login
+    ))
+    .send()
+    .await?
+    .json::<Contributor>()
+    .await
+    .inspect(|c| log!("{c:?} - {contributor:?}"))
+    .inspect_err(|e| error!("Error: {e:?}"))
+    .map(|c| Contributor {
+        contributions: contributor.contributions,
+        ..c
+    })?)
 }
 
 #[island]
@@ -62,14 +65,13 @@ pub fn Contributors() -> impl IntoView {
                 brand_src=item.avatar_url.clone()
                 twitter=item.twitter_username.clone()
                 location=item.location.clone()
-                contributions=item.contributions
+                contributions=item.contributions.unwrap_or(1)
             />
         }
     };
 
     let contributors_view = move || {
-        let mut contributors = contributors_results.get()?.ok()?;
-        contributors.sort_by_key(|a| a.contributions);
+        let contributors = contributors_results.get()?.ok()?;
         let result = contributors
             .iter()
             .map(contributorMapper)