Merge pull request #291 from mergestat/issue-pr-labels

Add `labels` column to `github_repo_issues` and `github_repo_prs` tables
mergestat · Jun 20, 2022 · 4e3d16a · 4e3d16a
2 parents 8737396 + 1b0783b
commit 4e3d16a
Show file tree

Hide file tree

Showing 6 changed files with 179 additions and 121 deletions.
diff --git a/extensions/internal/github/fixtures/TestRepoIssues.yaml b/extensions/internal/github/fixtures/TestRepoIssues.yaml
diff --git a/extensions/internal/github/fixtures/TestRepoPRs.yaml b/extensions/internal/github/fixtures/TestRepoPRs.yaml
diff --git a/extensions/internal/github/repo_issues.go b/extensions/internal/github/repo_issues.go
@@ -2,6 +2,7 @@ package github
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"time"
@@ -33,7 +34,10 @@ type issue struct {
 	IsReadByViewer      bool
 	Labels              struct {
 		TotalCount int
-	}
+		Nodes      []struct {
+			Name string
+		}
+	} `graphql:"labels(first: 15)"`
 	LastEditedAt githubv4.DateTime
 	Locked       bool
 	Milestone    struct {
@@ -157,6 +161,18 @@ func (i *iterIssues) Column(ctx vtab.Context, c int) error {
 		ctx.ResultInt(t1f0(current.Node.IncludesCreatedEdit))
 	case "label_count":
 		ctx.ResultInt(current.Node.Labels.TotalCount)
+	case "labels":
+		labels := make([]string, len(current.Node.Labels.Nodes))
+		for l, label := range current.Node.Labels.Nodes {
+			labels[l] = label.Name
+		}
+		js, err := json.Marshal(labels)
+		if err != nil {
+			i.logger().Err(err).Msgf("could not marshal issue labels")
+			ctx.ResultNull()
+		} else {
+			ctx.ResultText(string(js))
+		}
 	case "last_edited_at":
 		t := current.Node.LastEditedAt
 		if t.IsZero() {
@@ -255,6 +271,7 @@ var issuesCols = []vtab.Column{
 	{Name: "editor_login", Type: "TEXT"},
 	{Name: "includes_created_edit", Type: "BOOLEAN"},
 	{Name: "label_count", Type: "INT"},
+	{Name: "labels", Type: "JSON"},
 	{Name: "last_edited_at", Type: "DATETIME"},
 	{Name: "locked", Type: "BOOLEAN"},
 	{Name: "milestone_count", Type: "INT"},

diff --git a/extensions/internal/github/repo_issues_test.go b/extensions/internal/github/repo_issues_test.go
@@ -23,8 +23,8 @@ func TestRepoIssues(t *testing.T) {
 		t.Fatalf("failed to retrieve row contents: %v", err.Error())
 	}
 
-	if colCount != 22 {
-		t.Fatalf("expected 22 columns, got: %d", colCount)
+	if colCount != 23 {
+		t.Fatalf("expected 23 columns, got: %d", colCount)
 	}
 
 	if len(content) != 10 {

diff --git a/extensions/internal/github/repo_prs.go b/extensions/internal/github/repo_prs.go
@@ -2,6 +2,7 @@ package github
 
 import (
 	"context"
+	"encoding/json"
 	"io"
 	"time"
 
@@ -54,7 +55,10 @@ type pullRequest struct {
 	IsDraft           bool
 	Labels            struct {
 		TotalCount int
-	}
+		Nodes      []struct {
+			Name string
+		}
+	} `graphql:"labels(first: 15)"`
 	LastEditedAt        githubv4.DateTime
 	Locked              bool
 	MaintainerCanModify bool
@@ -205,6 +209,18 @@ func (i *iterPRs) Column(ctx vtab.Context, c int) error {
 		ctx.ResultInt(t1f0(current.IsDraft))
 	case "label_count":
 		ctx.ResultInt(current.Labels.TotalCount)
+	case "labels":
+		labels := make([]string, len(current.Labels.Nodes))
+		for l, label := range current.Labels.Nodes {
+			labels[l] = label.Name
+		}
+		js, err := json.Marshal(labels)
+		if err != nil {
+			i.logger().Err(err).Msgf("could not marshal PR labels")
+			ctx.ResultNull()
+		} else {
+			ctx.ResultText(string(js))
+		}
 	case "last_edited_at":
 		t := current.LastEditedAt
 		if t.IsZero() {
@@ -335,6 +351,7 @@ var prCols = []vtab.Column{
 	{Name: "head_repository_name", Type: "TEXT"},
 	{Name: "is_draft", Type: "BOOLEAN"},
 	{Name: "label_count", Type: "INT"},
+	{Name: "labels", Type: "JSON"},
 	{Name: "last_edited_at", Type: "DATETIME"},
 	{Name: "locked", Type: "BOOLEAN"},
 	{Name: "maintainer_can_modify", Type: "BOOLEAN"},

diff --git a/extensions/internal/github/repo_prs_test.go b/extensions/internal/github/repo_prs_test.go
@@ -23,8 +23,8 @@ func TestRepoPRs(t *testing.T) {
 		t.Fatalf("failed to retrieve row contents: %v", err.Error())
 	}
 
-	if colCount != 39 {
-		t.Fatalf("expected 39 columns, got: %d", colCount)
+	if colCount != 40 {
+		t.Fatalf("expected 40 columns, got: %d", colCount)
 	}
 
 	if len(content) != 10 {