-
-
Notifications
You must be signed in to change notification settings - Fork 271
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add associated pull requests and commit compare functionality (#413)
* add InProgress variant to WorkflowRunEventAction * added types and handler for comparing commits * wip * fix type based on test get request * wip * add associated pull requests endpoint * implement paging * wip * remove pagination of compare commit * remove commented code * wip * fix page type * make unit tests async
- Loading branch information
1 parent
7590176
commit 6e91b68
Showing
5 changed files
with
305 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
use super::*; | ||
|
||
/// helper to let users know they can pass a branch name or a commit sha | ||
#[derive(Clone, Debug, serde::Serialize)] | ||
#[serde(untagged)] | ||
pub enum PullRequestTarget { | ||
Branch(String), | ||
Sha(String), | ||
} | ||
|
||
impl ToString for PullRequestTarget { | ||
fn to_string(&self) -> String { | ||
match self { | ||
Self::Branch(branch) => branch.to_string(), | ||
Self::Sha(commit) => commit.to_string(), | ||
} | ||
} | ||
} | ||
|
||
#[derive(serde::Serialize)] | ||
pub struct AssociatedPullRequestsBuilder<'octo, 'r> { | ||
#[serde(skip)] | ||
handler: &'r super::CommitHandler<'octo>, | ||
target: PullRequestTarget, | ||
#[serde(skip_serializing_if = "Option::is_none")] | ||
per_page: Option<u8>, | ||
#[serde(skip_serializing_if = "Option::is_none")] | ||
page: Option<u32>, | ||
} | ||
|
||
impl<'octo, 'r> AssociatedPullRequestsBuilder<'octo, 'r> { | ||
/// Sha will return all closed pull requests for the given commit sha. | ||
/// | ||
/// Pass a Branch to return all open pull requests against that branch. | ||
pub(crate) fn new(handler: &'r super::CommitHandler<'octo>, target: PullRequestTarget) -> Self { | ||
Self { | ||
handler, | ||
target, | ||
page: None, | ||
per_page: None, | ||
} | ||
} | ||
|
||
/// Results per page (max 100). | ||
pub fn per_page(mut self, per_page: impl Into<u8>) -> Self { | ||
self.per_page = Some(per_page.into()); | ||
self | ||
} | ||
|
||
/// Page number of the results to fetch. | ||
pub fn page(mut self, page: impl Into<u32>) -> Self { | ||
self.page = Some(page.into()); | ||
self | ||
} | ||
|
||
/// Sends the actual request. | ||
pub async fn send(self) -> crate::Result<crate::Page<models::pulls::PullRequest>> { | ||
let route = format!( | ||
"/repos/{owner}/{repo}/commits/{target}/pulls", | ||
owner = self.handler.owner, | ||
repo = self.handler.repo, | ||
target = self.target.to_string(), | ||
); | ||
|
||
self.handler.crab.get(route, Some(&self)).await | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
|
||
#[tokio::test] | ||
async fn associated_pull_requests_serializes_correctly() { | ||
use super::PullRequestTarget; | ||
|
||
let octocrab = crate::Octocrab::default(); | ||
let handler = octocrab.commits("owner", "repo"); | ||
let associated_prs = | ||
handler.associated_pull_requests(PullRequestTarget::Sha("commit_sha".to_string())); | ||
|
||
assert_eq!( | ||
serde_json::to_value(associated_prs).unwrap(), | ||
serde_json::json!({ | ||
"target": "commit_sha" | ||
}) | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
use super::*; | ||
|
||
#[derive(serde::Serialize)] | ||
pub struct CompareCommitsBuilder<'octo, 'r> { | ||
#[serde(skip)] | ||
handler: &'r super::CommitHandler<'octo>, | ||
base: String, | ||
head: String, | ||
#[serde(skip_serializing_if = "Option::is_none")] | ||
per_page: Option<u8>, | ||
#[serde(skip_serializing_if = "Option::is_none")] | ||
page: Option<u32>, | ||
} | ||
|
||
impl<'octo, 'r> CompareCommitsBuilder<'octo, 'r> { | ||
pub(crate) fn new( | ||
handler: &'r super::CommitHandler<'octo>, | ||
base: String, | ||
head: String, | ||
) -> Self { | ||
Self { | ||
handler, | ||
base, | ||
head, | ||
page: None, | ||
per_page: None, | ||
} | ||
} | ||
|
||
/// Results per page (max 100). | ||
pub fn per_page(mut self, per_page: impl Into<u8>) -> Self { | ||
self.per_page = Some(per_page.into()); | ||
self | ||
} | ||
|
||
/// Page number of the results to fetch. | ||
pub fn page(mut self, page: impl Into<u32>) -> Self { | ||
self.page = Some(page.into()); | ||
self | ||
} | ||
|
||
/// Sends the actual request. | ||
pub async fn send(self) -> crate::Result<models::commits::CommitComparison> { | ||
let route = format!( | ||
"/repos/{owner}/{repo}/compare/{base}...{head}", | ||
owner = self.handler.owner, | ||
repo = self.handler.repo, | ||
base = self.base, | ||
head = self.head, | ||
); | ||
|
||
self.handler.crab.get(route, Some(&self)).await | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
|
||
#[tokio::test] | ||
async fn compare_commits_serializes_correctly() { | ||
let octocrab = crate::Octocrab::default(); | ||
let handler = octocrab.commits("owner", "repo"); | ||
let comparison = handler.compare("base", "head"); | ||
|
||
assert_eq!( | ||
serde_json::to_value(comparison).unwrap(), | ||
serde_json::json!({ | ||
"base": "base", | ||
"head": "head", | ||
}) | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters