Skip to content

Commit 99bbba9

Browse files
feat(reporting): filter issues with PR or not
1 parent 18b942d commit 99bbba9

File tree

3 files changed

+22
-4
lines changed

3 files changed

+22
-4
lines changed

reporting/README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,9 @@ FLAGS
2424
-since ... since date RFC 3339 (ex: 2003-01-19T00:00:00.000Z)
2525
-tips=true generate tips
2626
-twitter-token ... twitter token
27-
```
27+
```
28+
29+
------------
30+
31+
## Example output
32+

reporting/github.go

+10
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,13 @@ func filterPullRequestByTime(pullRequests []*github.PullRequest, since time.Time
5151
}
5252
return filtered
5353
}
54+
55+
func filterIssueNotPR(issues []*github.Issue) []*github.Issue {
56+
var filtered []*github.Issue
57+
for _, issue := range issues {
58+
if issue.PullRequestLinks == nil {
59+
filtered = append(filtered, issue)
60+
}
61+
}
62+
return filtered
63+
}

reporting/reporting.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ func fetchChangelog(client *github.Client, since time.Time, outputFile *os.File)
117117
if err != nil {
118118
return err
119119
}
120+
issuesFiltered := filterIssueNotPR(issues)
120121
pullRequests, err := githubFetchPullRequests(client, &github.PullRequestListOptions{State: "closed"}, "gnolang", "gno")
121122
if err != nil {
122123
return err
@@ -126,7 +127,7 @@ func fetchChangelog(client *github.Client, since time.Time, outputFile *os.File)
126127
if err != nil {
127128
return err
128129
}
129-
err = writeChangelog(issues, pullRequestsFiltered, commits, outputFile)
130+
err = writeChangelog(issuesFiltered, pullRequestsFiltered, commits, outputFile)
130131
if err != nil {
131132
return err
132133
}
@@ -141,6 +142,7 @@ func fetchBacklog(client *github.Client, since time.Time, outputFile *os.File) e
141142
if err != nil {
142143
return err
143144
}
145+
issuesFiltered := filterIssueNotPR(issues)
144146
pullRequests, err := githubFetchPullRequests(client, &github.PullRequestListOptions{State: "open"}, "gnolang", "gno")
145147
if err != nil {
146148
return err
@@ -149,7 +151,7 @@ func fetchBacklog(client *github.Client, since time.Time, outputFile *os.File) e
149151
if err != nil {
150152
return err
151153
}
152-
err = writeBacklog(issues, pullRequestsFiltered, outputFile)
154+
err = writeBacklog(issuesFiltered, pullRequestsFiltered, outputFile)
153155
if err != nil {
154156
return err
155157
}
@@ -164,6 +166,7 @@ func fetchCuration(client *github.Client, since time.Time, outputFile *os.File)
164166
if err != nil {
165167
return err
166168
}
169+
issuesFiltered := filterIssueNotPR(issues)
167170
pullRequests, err := githubFetchPullRequests(client, &github.PullRequestListOptions{State: "all"}, "gnolang", "awesome-gno")
168171
if err != nil {
169172
return err
@@ -173,7 +176,7 @@ func fetchCuration(client *github.Client, since time.Time, outputFile *os.File)
173176
if err != nil {
174177
return err
175178
}
176-
err = writeCuration(issues, pullRequestsFiltered, commits, outputFile)
179+
err = writeCuration(issuesFiltered, pullRequestsFiltered, commits, outputFile)
177180
if err != nil {
178181
return err
179182
}

0 commit comments

Comments
 (0)