add 'start_date' and 'end_date' as configuration props in 'report.toml'

Author: chazkiker2

src/metrics/list_repos.rs

@@ -1,7 +1,7 @@
 use async_trait::async_trait;
-use chrono::Duration;
 use stable_eyre::eyre;
 use tokio::sync::mpsc::Sender;
+use toml::value::Datetime;
 
 use super::{util, Graphql, Producer};
 
@@ -10,21 +10,24 @@ pub struct ListReposForOrg {
     graphql: Graphql,
     org_name: String,
     repo_names: Vec<String>,
-    number_of_days: i64,
+    start_date: Datetime,
+    end_date: Datetime,
 }
 
 impl ListReposForOrg {
     pub fn new(
         graphql: Graphql,
         org_name: String,
         repo_names: Vec<String>,
-        number_of_days: i64,
+        start_date: Datetime,
+        end_date: Datetime,
     ) -> Self {
         ListReposForOrg {
             graphql,
             org_name,
             repo_names,
-            number_of_days,
+            start_date,
+            end_date,
         }
     }
 }
@@ -41,7 +44,8 @@ impl Producer for ListReposForOrg {
                 &mut self.graphql,
                 &self.org_name,
                 &repo,
-                Duration::days(self.number_of_days),
+                &self.start_date,
+                &self.end_date,
             )
             .await?;
             tx.send(vec![repo.to_owned(), count_prs.to_string()])

src/metrics/repo_participants.rs

@@ -1,34 +1,37 @@
 use std::collections::{HashMap, HashSet};
 
 use async_trait::async_trait;
-use chrono::{Duration, Utc};
 use fehler::throws;
 use graphql_client::GraphQLQuery;
 use stable_eyre::eyre;
 use stable_eyre::eyre::Error;
 use tokio::sync::mpsc::Sender;
+use toml::value::Datetime;
 
 use super::{Graphql, Producer};
 
 pub struct RepoParticipants {
     graphql: Graphql,
     org_name: String,
     repo_names: Vec<String>,
-    number_of_days: i64,
+    start_date: Datetime,
+    end_date: Datetime,
 }
 
 impl RepoParticipants {
     pub fn new(
         graphql: Graphql,
         org_name: String,
         repo_names: Vec<String>,
-        number_of_days: i64,
+        start_date: Datetime,
+        end_date: Datetime,
     ) -> Self {
         Self {
             graphql,
             org_name,
             repo_names,
-            number_of_days,
+            start_date,
+            end_date,
         }
     }
 }
@@ -53,7 +56,8 @@ impl Producer for RepoParticipants {
                 &mut self.graphql,
                 &self.org_name,
                 repo_name,
-                Duration::days(self.number_of_days),
+                &self.start_date,
+                &self.end_date,
             )
             .await?;
 
@@ -113,16 +117,9 @@ async fn pr_participants(
     graphql: &mut Graphql,
     org_name: &str,
     repo_name: &str,
-    time_period: Duration,
+    start_date: &Datetime,
+    end_date: &Datetime,
 ) -> Vec<(String, ParticipantCounts)> {
-    // get date string to match GitHub's PR query format for `created` field
-    // i.e., "2021-05-18UTC" turns into "2021-05-18"
-    let date_str = chrono::NaiveDate::parse_from_str(
-        &format!("{}", (Utc::now() - time_period).date())[..],
-        "%FUTC",
-    )
-    .unwrap();
-
     // Tracks, for each github login, how many PRs they participated in on this repository.
     let mut counts: HashMap<String, ParticipantCounts> = HashMap::new();
 
@@ -133,10 +130,11 @@ async fn pr_participants(
             .query(PrsAndParticipants)
             .execute(pap::Variables {
                 query_string: format!(
-                    r#"repo:{org_name}/{repo_name} is:pr created:>{date_str}"#,
+                    r#"repo:{org_name}/{repo_name} is:pr created:{start_date}..{end_date}"#,
                     org_name = org_name,
                     repo_name = repo_name,
-                    date_str = date_str,
+                    start_date = start_date,
+                    end_date = end_date,
                 ),
                 after_cursor,
             })

src/metrics/util.rs

@@ -1,8 +1,9 @@
-use super::Graphql;
-use chrono::{Duration, Utc};
 use fehler::throws;
 use graphql_client::GraphQLQuery;
 use stable_eyre::eyre::Error;
+use toml::value::Datetime;
+
+use super::Graphql;
 
 #[derive(GraphQLQuery)]
 #[graphql(
@@ -74,19 +75,12 @@ pub(super) async fn count_pull_requests(
     graphql: &mut Graphql,
     org_name: &str,
     repo_name: &str,
-    time_period: Duration,
+    start_date: &Datetime,
+    end_date: &Datetime,
 ) -> usize {
-    // get date string to match GitHub's PR query format for `created` field
-    // i.e., "2021-05-18UTC" turns into "2021-05-18"
-    let date_str = chrono::NaiveDate::parse_from_str(
-        &format!("{}", (Utc::now() - time_period).date())[..],
-        "%FUTC",
-    )
-    .unwrap();
-
     let query_string = format!(
-        r#"repo:{}/{} is:pr created:>{}"#,
-        org_name, repo_name, date_str,
+        r#"repo:{}/{} is:pr created:{}..{}"#,
+        org_name, repo_name, start_date, end_date
     );
 
     let response = graphql

src/report.rs

@@ -5,6 +5,7 @@ use std::{fs::File, path::PathBuf};
 use fehler::throws;
 use serde::Deserialize;
 use stable_eyre::eyre::{self, Error, WrapErr};
+use toml::value::Datetime;
 
 use crate::metrics::Consumer;
 use crate::metrics::{self, Graphql};
@@ -44,7 +45,8 @@ struct GithubConfig {
 
 #[derive(Deserialize, Debug)]
 struct DataSourceConfig {
-    number_of_days: i64,
+    start_date: Datetime,
+    end_date: Datetime,
 }
 
 #[derive(Deserialize, Debug)]

src/report/repo_info.rs

@@ -36,7 +36,8 @@ impl Report {
                 graphql,
                 config.github.org.clone(),
                 config.github.repos.clone(),
-                config.data_source.number_of_days,
+                config.data_source.start_date.clone(),
+                config.data_source.end_date.clone(),
             ),
         )
         .await

src/report/repo_participant.rs

@@ -46,7 +46,8 @@ impl Report {
                 graphql,
                 config.github.org.clone(),
                 config.github.repos.clone(),
-                config.data_source.number_of_days,
+                config.data_source.start_date.clone(),
+                config.data_source.end_date.clone(),
             ),
         )
         .await