fix: first attempt at making review plugin time bound. Needs to be tested

Signed-off-by: Nina 'Nino' Agrawal <ninaagrawal@mitre.org>

Author: ninaagrawal

plugins/github/Cargo.toml

@@ -13,6 +13,7 @@ graphql_client = "0.14.0"
 hipcheck-sdk = { version = "0.5.0", path = "../../sdk/rust", features = [
     "macros",
 ] }
+chrono = "0.4.40"
 tracing = "0.1"
 # Exactly matching the version of rustls used by ureq
 # Get rid of default features since we don't use the AWS backed crypto

plugins/github/src/gh_query.graphql

@@ -12,7 +12,8 @@ query Reviews($owner:String!, $repo:String!, $cursor:String) {
                     nodes {
                         databaseId
                     }
-                }
+                },
+                mergedAt
             }
         }
     }

plugins/github/src/gh_schema.graphql

@@ -94,6 +94,12 @@ type PullRequest {
   number: Int!
 
   url: URI!
+  
+  """
+  Identifies the date the pull request was merged
+  """
+  mergedAt: String!
+  
   """
   A list of reviews associated with the pull request.
   """

plugins/github/src/graphql.rs

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
+use chrono::prelude::*;
 use std::convert::TryInto;
 
 use self::reviews::{ResponseData, ReviewsRepositoryPullRequestsNodes as RawPull, Variables};
@@ -152,6 +153,14 @@ fn process_pr(pr: RawPull) -> GitHubPullRequest {
 	}
 	.try_into()
 	.unwrap();
-
-	GitHubPullRequest { number, reviews }
+	let date_merged: DateTime<Utc> = pr
+		.merged_at
+		.parse::<DateTime<Utc>>()
+		.expect("Error, could not get timestamp");
+
+	GitHubPullRequest {
+		number,
+		reviews,
+		date_merged,
+	}
 }

plugins/github/src/main.rs

@@ -5,8 +5,8 @@ mod data;
 mod graphql;
 mod types;
 mod util;
-
 use crate::data::GitHub;
+use chrono::prelude::*;
 use clap::Parser;
 use hipcheck_sdk::{
 	prelude::*,
@@ -54,6 +54,7 @@ static CONFIG: OnceLock<Config> = OnceLock::new();
 pub struct PullRequest {
 	pub id: u64,
 	pub reviews: u64,
+	pub date_merged: DateTime<Utc>,
 }
 
 fn get_github_agent<'a>(owner: &'a str, repo: &'a str) -> Result<GitHub<'a>> {
@@ -91,6 +92,7 @@ async fn pr_reviews(_engine: &mut PluginEngine, key: KnownRemote) -> Result<Vec<
 		.map(|pr| PullRequest {
 			id: pr.number,
 			reviews: pr.reviews,
+			date_merged: pr.date_merged,
 		})
 		.collect();
 

plugins/github/src/types.rs

@@ -1,9 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
+use chrono::{DateTime, Utc};
 use serde::Deserialize;
 
 #[derive(Debug, Deserialize)]
 pub struct GitHubPullRequest {
 	pub number: u64,
 	pub reviews: u64,
+	pub date_merged: DateTime<Utc>,
 }

plugins/review/Cargo.toml

@@ -12,6 +12,7 @@ clap = { version = "4.5.32", features = ["derive"] }
 hipcheck-sdk = { version = "0.5.0", path = "../../sdk/rust", features = [
     "macros",
 ] }
+chrono = "0.4.40"
 tracing = "0.1"
 schemars = { version = "0.8.22", features = ["url"] }
 serde = { version = "1.0.219", features = ["derive", "rc"] }

plugins/review/src/main.rs

@@ -3,6 +3,7 @@
 //! Plugin for querying what percentage of pull requests were merged without review
 
 use anyhow::Context as _;
+use chrono::prelude::*;
 use clap::Parser;
 use hipcheck_sdk::{prelude::*, types::Target, LogLevel};
 use schemars::JsonSchema;
@@ -21,6 +22,7 @@ static CONFIG: OnceLock<Config> = OnceLock::new();
 pub struct PullRequest {
 	pub id: u64,
 	pub reviews: u64,
+	pub date_merged: DateTime<Utc>,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -44,6 +46,17 @@ async fn review(engine: &mut PluginEngine, value: Target) -> Result<Vec<bool>> {
 		tracing::error!("target repository is not a GitHub repository or else is missing GitHub repo information");
 		return Err(Error::UnexpectedPluginQueryInputFormat);
 	};
+	let latest_commit_date = engine
+		.query("mitre/git/last_commit_date", value.local)
+		.await
+		.context("failed to get the last commit date from repo")?;
+
+	let latest_commit_date_as_string: String =
+		serde_json::from_value(latest_commit_date).map_err(Error::InvalidJsonInQueryOutput)?;
+
+	let latest_commit_date_as_timestamp = latest_commit_date_as_string
+		.parse::<DateTime<Utc>>()
+		.unwrap();
 
 	// Get a list of all pull requests to the repo, with their corresponding number of reviews
 	let value = engine
@@ -59,7 +72,11 @@ async fn review(engine: &mut PluginEngine, value: Target) -> Result<Vec<bool>> {
 	// Create a Vec big enough to hold every single pull request
 	let mut pull_reviews = Vec::with_capacity(pull_requests.len());
 
-	pull_reviews.extend(pull_requests.into_iter().map(|pr| pr.reviews > 0));
+	pull_reviews.extend(
+		pull_requests
+			.into_iter()
+			.map(|pr| pr.reviews > 0 && pr.date_merged <= latest_commit_date_as_timestamp),
+	);
 
 	tracing::info!("completed review query");
 	Ok(pull_reviews)
@@ -129,7 +146,6 @@ async fn main() -> Result<()> {
 #[cfg(test)]
 mod test {
 	use super::*;
-
 	use hipcheck_sdk::types::{KnownRemote, LocalGitRepo, RemoteGitRepo};
 	use std::result::Result as StdResult;
 	use url::Url;
@@ -144,15 +160,37 @@ mod test {
 	fn mock_responses() -> StdResult<MockResponses, Error> {
 		let known_remote = known_remote();
 
-		let pr1 = PullRequest { id: 1, reviews: 1 };
-		let pr2 = PullRequest { id: 2, reviews: 3 };
-		let pr3 = PullRequest { id: 3, reviews: 0 };
-		let pr4 = PullRequest { id: 4, reviews: 1 };
+		let pr1 = PullRequest {
+			id: 1,
+			reviews: 1,
+			date_merged: Utc::now(),
+		};
+		let pr2 = PullRequest {
+			id: 2,
+			reviews: 3,
+			date_merged: Utc::now(),
+		};
+		let pr3 = PullRequest {
+			id: 3,
+			reviews: 0,
+			date_merged: Utc::now(),
+		};
+		let pr4 = PullRequest {
+			id: 4,
+			reviews: 1,
+			date_merged: Utc::now(),
+		};
 		let prs = vec![pr1, pr2, pr3, pr4];
 
 		// when calling into query, the input known_remote gets passed to `pr_reviews`, lets assume it returns the vec of PullRequests `prs`
 		let mut mock_responses = MockResponses::new();
-		mock_responses.insert("mitre/github/pr_reviews", known_remote, Ok(prs))?;
+		mock_responses.insert("mitre/github/pr_reviews", &known_remote, Ok(prs))?;
+		// TODO: figure out how to call multiple mock responses since review calls both github/pr_reviews and git/last_commit_date
+		mock_responses.insert(
+			"mitre/git/last_commit_date",
+			&known_remote,
+			Ok("2023-10-01T15:30:45Z"),
+		)?;
 		Ok(mock_responses)
 	}