Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable seQuestering PRs #374

Merged
merged 3 commits into from
Jul 10, 2024
Merged

Re-enable seQuestering PRs #374

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d197a1f
Turn on PR requests
BillWagner Jul 10, 2024
ce07259
Getting timeline items for a PR has issues
BillWagner Jul 10, 2024
be18448
fix test to match new behavior
BillWagner Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 33 additions & 22 deletions DotNet.DocsTools/GitHubObjects/QuestIssueOrPullRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,36 @@ public abstract record QuestIssueOrPullRequest : Issue
query FindUpdatedIssues($organization: String!, $repository: String!, $questlabels: [String!], $cursor: String) {
repository(owner: $organization, name: $repository) {
issues(
""" + EnumerationQueryBody;
""" + EnumerationQueryBody +
"""
timelineItems(last: 5) {
nodes {
... on ClosedEvent {
closer {
... on PullRequest {
url
}
}
}
}
}
}
}
}
}
""";

protected const string EnumerateQuestPullRequestQueryText = """
query FindUpdatedPullRequests($organization: String!, $repository: String!, $questlabels: [String!], $cursor: String) {
repository(owner: $organization, name: $repository) {
pullRequests(
""" + EnumerationQueryBody;
""" + EnumerationQueryBody +
"""
}
}
}
}
""";

private const string EnumerationQueryBody = """
first: 25
Expand All @@ -163,17 +186,6 @@ public abstract record QuestIssueOrPullRequest : Issue
name
}
}
timelineItems(last: 5) {
nodes {
... on ClosedEvent {
closer {
... on PullRequest {
url
}
}
}
}
}
projectItems(first: 25) {
... on ProjectV2ItemConnection {
nodes {
Expand Down Expand Up @@ -226,13 +238,9 @@ public abstract record QuestIssueOrPullRequest : Issue
bodyHTML
}
}
}
}
}
}
""";

private protected QuestIssueOrPullRequest(JsonElement issueNode, string organization, string repository) : base(issueNode)
private protected QuestIssueOrPullRequest(JsonElement issueNode, string organization, string repository, bool includeTimeLine=true) : base(issueNode)
{
var author = Actor.FromJsonElement(ResponseExtractors.GetAuthorChildElement(issueNode));
FormattedAuthorLoginName = (author is not null) ?
Expand Down Expand Up @@ -260,10 +268,13 @@ private protected QuestIssueOrPullRequest(JsonElement issueNode, string organiza
ProjectStoryPoints = [ ..points.Where(p => p is not null).ToArray()];

// check state. If re-opened, don't reference the (not correct) closing PR
ClosingPRUrl = ResponseExtractors.GetChildArrayElements(issueNode, "timelineItems", item =>
(item.TryGetProperty("closer", out JsonElement closer) && closer.ValueKind == JsonValueKind.Object) ?
ResponseExtractors.OptionalStringProperty(closer, "url")
: default).LastOrDefault(url => url is not null);
if (includeTimeLine)
{
ClosingPRUrl = ResponseExtractors.GetChildArrayElements(issueNode, "timelineItems", item =>
(item.TryGetProperty("closer", out JsonElement closer) && closer.ValueKind == JsonValueKind.Object) ?
ResponseExtractors.OptionalStringProperty(closer, "url")
: default).LastOrDefault(url => url is not null);
}

LinkText = $"""
<a href = "https://github.com/{organization}/{repository}/issues/{Number}">
Expand Down
2 changes: 1 addition & 1 deletion DotNet.DocsTools/GitHubObjects/QuestPullRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ public sealed record QuestPullRequest : QuestIssueOrPullRequest, IGitHubQueryRes
public static QuestPullRequest FromJsonElement(JsonElement issueNode, QuestIssueOrPullRequestVariables variables) =>
new(issueNode, variables.Organization, variables.Repository);

private QuestPullRequest(JsonElement issueNode, string organization, string repository) : base(issueNode, organization, repository) { }
private QuestPullRequest(JsonElement issueNode, string organization, string repository) : base(issueNode, organization, repository, false) { }
}
10 changes: 5 additions & 5 deletions actions/sequester/Quest2GitHub/QuestGitHubService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ public async Task ProcessIssues(string organization, string repository, int dura
var issueQueryEnumerable = QueryIssuesOrPullRequests<QuestIssue>();
await ProcessItems(issueQueryEnumerable);
Console.WriteLine("----- Finished processing issues. --------");
//Console.WriteLine(" ----- Regenerating bearer token ------");
Console.WriteLine(" ----- Regenerating bearer token ------");
await ghClient.RegenerateBearerToken();
//Console.WriteLine("----- Starting processing pull requests. --------");
//var prQueryEnumerable = QueryIssuesOrPullRequests<QuestPullRequest>();
//await ProcessItems(prQueryEnumerable);
//Console.WriteLine("----- Finished processing pull requests. --------");
Console.WriteLine("----- Starting processing pull requests. --------");
var prQueryEnumerable = QueryIssuesOrPullRequests<QuestPullRequest>();
await ProcessItems(prQueryEnumerable);
Console.WriteLine("----- Finished processing pull requests. --------");

async Task ProcessItems(IAsyncEnumerable<QuestIssueOrPullRequest> items)
{
Expand Down
Loading