feat(reporting): add reporting PR/issues in backlog & changelog

Author: MikaelVallenet

reporting/output.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"github.com/fbiville/markdown-table-formatter/pkg/markdown"
@@ -10,15 +9,6 @@ import (
 	"strings"
 )
 
-func jsonFormat(data string) string {
-	var out bytes.Buffer
-	err := json.Indent(&out, []byte(data), "", "\t")
-	if err != nil {
-		return data
-	}
-	return out.String()
-}
-
 func createOutputFile() (*os.File, error) {
 	if _, err := os.Stat(opts.outputPath); os.IsNotExist(err) {
 		err = os.MkdirAll(opts.outputPath, os.ModePerm)
@@ -33,7 +23,8 @@ func createOutputFile() (*os.File, error) {
 	return outputFile, nil
 }
 
-func writeChangelog(issues []*github.Issue, outputFile *os.File) error {
+// TODO: Refacto table creation ~Don't repeat yourself
+func writeChangelog(issues []*github.Issue, pullRequests []*github.PullRequest, commits []*github.RepositoryCommit, outputFile *os.File) error {
 	var issuesTable [][]string
 	for _, issue := range issues {
 		issuesTable = append(issuesTable, []string{issue.GetTitle(), issue.GetURL(), issue.GetUser().GetLogin()})
@@ -47,14 +38,29 @@ func writeChangelog(issues []*github.Issue, outputFile *os.File) error {
 	}
 	result := fmt.Sprintf("# Changelog ⚙️\n\nThere is **%d new closed issues** in gnolang/gno since %s\n\n%s", len(issues), opts.since, markdownTable)
 
+	var pullRequestRows [][]string
+	for _, pr := range pullRequests {
+		pullRequestRows = append(pullRequestRows, []string{pr.GetTitle(), pr.GetURL(), pr.GetUser().GetLogin()})
+	}
+	pullRequestsTable, err := markdown.NewTableFormatterBuilder().
+		Build("Title", "Link to PR", "Author").
+		Format(pullRequestRows)
+	if err != nil {
+		return err
+	}
+	result += fmt.Sprintf("\n\n## New PR\nThere is **%d new closed PR** in gnolang/awesome-gno since %s\n\n%s", len(pullRequests), opts.since, pullRequestsTable)
+
+	result += fmt.Sprintf("\n\n## New commits\nThere is **%d new commits** in gnolang/awesome-gno since %s\n\n", len(commits), opts.since)
+
 	_, err = outputFile.WriteString(result)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func writeBacklog(issues []*github.Issue, outputFile *os.File) error {
+// TODO: Refacto table creation ~Don't repeat yourself
+func writeBacklog(issues []*github.Issue, pullRequests []*github.PullRequest, outputFile *os.File) error {
 	var issuesTable [][]string
 	for _, issue := range issues {
 		issuesTable = append(issuesTable, []string{issue.GetTitle(), issue.GetURL(), issue.GetUser().GetLogin()})
@@ -68,13 +74,26 @@ func writeBacklog(issues []*github.Issue, outputFile *os.File) error {
 	}
 	result := fmt.Sprintf("# Backlog 💡\n\nThere is **%d new open issues** in gnolang/gno since %s\n\n%s", len(issues), opts.since, markdownTable)
 
+	var pullRequestRows [][]string
+	for _, pr := range pullRequests {
+		pullRequestRows = append(pullRequestRows, []string{pr.GetTitle(), pr.GetURL(), pr.GetUser().GetLogin()})
+	}
+	pullRequestsTable, err := markdown.NewTableFormatterBuilder().
+		Build("Title", "Link to PR", "Author").
+		Format(pullRequestRows)
+	if err != nil {
+		return err
+	}
+	result += fmt.Sprintf("\n\n## New PR\nThere is **%d new open PR** in gnolang/gno since %s\n\n%s", len(pullRequests), opts.since, pullRequestsTable)
+
 	_, err = outputFile.WriteString(result)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
+// TODO: Refacto table creation ~Don't repeat yourself
 func writeCuration(issues []*github.Issue, pullRequests []*github.PullRequest, commits []*github.RepositoryCommit, outputFile *os.File) error {
 	// Format at Markdown format
 	var issuesRows [][]string
@@ -87,7 +106,7 @@ func writeCuration(issues []*github.Issue, pullRequests []*github.PullRequest, c
 	if err != nil {
 		return err
 	}
-	result := fmt.Sprintf("# Curation 📚\n\n## New issues\nThere is **%d new issues** in gnolang/awesome-gno since %s\n\n%s", len(issues), opts.since, issuesTable)
+	result := fmt.Sprintf("# Curation 📚\n\n## New issues\nThere is **%d updated issues** in gnolang/awesome-gno since %s\n\n%s", len(issues), opts.since, issuesTable)
 
 	var pullRequestRows [][]string
 	for _, pr := range pullRequests {
@@ -99,7 +118,7 @@ func writeCuration(issues []*github.Issue, pullRequests []*github.PullRequest, c
 	if err != nil {
 		return err
 	}
-	result += fmt.Sprintf("\n\n## New PR\nThere is **%d new PR** in gnolang/awesome-gno since %s\n\n%s", len(pullRequests), opts.since, pullRequestsTable)
+	result += fmt.Sprintf("\n\n## New PR\nThere is **%d updated PR** in gnolang/awesome-gno since %s\n\n%s", len(pullRequests), opts.since, pullRequestsTable)
 
 	result += fmt.Sprintf("\n\n## New commits\nThere is **%d new commits** in gnolang/awesome-gno since %s\n\n", len(commits), opts.since)
 
@@ -110,6 +129,7 @@ func writeCuration(issues []*github.Issue, pullRequests []*github.PullRequest, c
 	return nil
 }
 
+// TODO: Refacto table creation ~Don't repeat yourself
 func writeTips(data string, outputFile *os.File) error {
 	// Format at Markdown format
 	var rows [][]string

reporting/reporting.go

@@ -52,7 +52,7 @@ func runMain(args []string) error {
 		globalFlags.BoolVar(&opts.backlog, "backlog", opts.backlog, "generate backlog")
 		globalFlags.BoolVar(&opts.curation, "curation", opts.curation, "generate curation")
 		globalFlags.BoolVar(&opts.tips, "tips", opts.tips, "generate tips")
-		globalFlags.StringVar(&opts.since, "since", opts.since, "since date RFC 3339 (ex: 2003-01-19T00:00:00Z)")
+		globalFlags.StringVar(&opts.since, "since", opts.since, "since date RFC 3339 (ex: 2003-01-19T00:00:00.000Z)")
 		globalFlags.StringVar(&opts.twitterToken, "twitter-token", opts.twitterToken, "twitter token")
 		globalFlags.StringVar(&opts.githubToken, "github-token", opts.githubToken, "github token")
 		globalFlags.BoolVar(&opts.help, "help", false, "show help")
@@ -117,39 +117,54 @@ func fetchChangelog(client *github.Client, since time.Time, outputFile *os.File)
 	if err != nil {
 		return err
 	}
-	err = writeChangelog(issues, outputFile)
+	pullRequests, err := githubFetchPullRequests(client, &github.PullRequestListOptions{State: "closed"}, "gnolang", "gno")
+	if err != nil {
+		return err
+	}
+	pullRequestsFiltered := filterPullRequestByTime(pullRequests, since)
+	commits, err := githubFetchCommits(client, &github.CommitsListOptions{Since: since}, "gnolang", "gno")
+	if err != nil {
+		return err
+	}
+	err = writeChangelog(issues, pullRequestsFiltered, commits, outputFile)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-// TODO: Fetch backlog from github issues & PRS ...
 func fetchBacklog(client *github.Client, since time.Time, outputFile *os.File) error {
-	if !opts.curation {
+	if !opts.backlog {
 		return nil
 	}
 	issues, err := githubFetchIssues(client, &github.IssueListByRepoOptions{State: "open", Since: since}, "gnolang", "gno")
 	if err != nil {
 		return err
 	}
-	err = writeBacklog(issues, outputFile)
+	pullRequests, err := githubFetchPullRequests(client, &github.PullRequestListOptions{State: "open"}, "gnolang", "gno")
+	if err != nil {
+		return err
+	}
+	pullRequestsFiltered := filterPullRequestByTime(pullRequests, since)
+	if err != nil {
+		return err
+	}
+	err = writeBacklog(issues, pullRequestsFiltered, outputFile)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-// TODO: Fetch curation from github commits & issues & PRS in `awesome-gno` repo
 func fetchCuration(client *github.Client, since time.Time, outputFile *os.File) error {
 	if !opts.curation {
 		return nil
 	}
-	issues, err := githubFetchIssues(client, &github.IssueListByRepoOptions{State: "open", Since: since}, "gnolang", "awesome-gno")
+	issues, err := githubFetchIssues(client, &github.IssueListByRepoOptions{State: "all", Since: since}, "gnolang", "awesome-gno")
 	if err != nil {
 		return err
 	}
-	pullRequests, err := githubFetchPullRequests(client, &github.PullRequestListOptions{State: "closed"}, "gnolang", "awesome-gno")
+	pullRequests, err := githubFetchPullRequests(client, &github.PullRequestListOptions{State: "all"}, "gnolang", "awesome-gno")
 	if err != nil {
 		return err
 	}