Merge pull request #203 from garethjevans/count-comment

feat: show the number of comments against an issue/pr
plumming · Jan 29, 2022 · 9ac1b2c · 9ac1b2c
2 parents 5e925e7 + dc3d373
commit 9ac1b2c
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 55 deletions.
diff --git a/pkg/cmd/common_cmd_test.go b/pkg/cmd/common_cmd_test.go
@@ -24,6 +24,9 @@ func TestCommonCmd_Filter_AllData(t *testing.T) {
       "login": "author1"
     },
     "closed": false,
+    "comments": {
+      "totalCount": 0
+    },
     "commits": {
       "nodes": null
     },
@@ -45,6 +48,9 @@ func TestCommonCmd_Filter_AllData(t *testing.T) {
       "login": "author2"
     },
     "closed": false,
+    "comments": {
+      "totalCount": 0
+    },
     "commits": {
       "nodes": null
     },
@@ -66,6 +72,9 @@ func TestCommonCmd_Filter_AllData(t *testing.T) {
       "login": "author3"
     },
     "closed": false,
+    "comments": {
+      "totalCount": 0
+    },
     "commits": {
       "nodes": null
     },
@@ -102,6 +111,9 @@ func TestCommonCmd_Filter_FilterOnAuthor(t *testing.T) {
       "login": "author1"
     },
     "closed": false,
+    "comments": {
+      "totalCount": 0
+    },
     "commits": {
       "nodes": null
     },

diff --git a/pkg/cmd/getcmd/get_issues.go b/pkg/cmd/getcmd/get_issues.go
@@ -115,20 +115,22 @@ func (c *GetIssuesCmd) Run() error {
 			"Title",
 			"Age",
 			"Labels",
+			"Comments",
 		)
 	}
 
-	for _, pr := range d.Issues {
-		if pullURL != pr.IssueString() {
-			table.AddRow(fmt.Sprintf("# %s", util.ColorAnswer(pr.IssueString())))
-			pullURL = pr.IssueString()
+	for _, issue := range d.Issues {
+		if pullURL != issue.IssueString() {
+			table.AddRow(fmt.Sprintf("# %s", util.ColorAnswer(issue.IssueString())))
+			pullURL = issue.IssueString()
 		}
 		table.AddRow(
-			util.ColorInfo(fmt.Sprintf("#%d", pr.Number)),
-			pr.Author.Login,
-			pr.ColoredTitle(),
-			util.SafeTime(&pr.CreatedAt),
-			pr.LabelsString(),
+			util.ColorInfo(fmt.Sprintf("#%d", issue.Number)),
+			issue.Author.Login,
+			issue.ColoredTitle(),
+			util.SafeTime(&issue.CreatedAt),
+			issue.LabelsString(),
+			util.SafeIfAboveZero(issue.Comments.TotalCount),
 		)
 	}
 

diff --git a/pkg/cmd/getcmd/get_prs.go b/pkg/cmd/getcmd/get_prs.go
@@ -117,6 +117,7 @@ func (c *GetPrsCmd) Run() error {
 			"Review",
 			"Labels",
 			"Mergeable",
+			"Comments",
 		)
 	}
 
@@ -133,6 +134,7 @@ func (c *GetPrsCmd) Run() error {
 			pr.ColoredReviewDecision(),
 			pr.LabelsString(),
 			pr.MergeableString(),
+			util.SafeIfAboveZero(pr.Comments.TotalCount),
 		)
 	}
 

diff --git a/pkg/domain/get_issues.go b/pkg/domain/get_issues.go
@@ -30,6 +30,9 @@ var (
         repository {
           nameWithOwner
         }
+        comments {
+          totalCount
+        }
         labels(first: 10) {
           nodes {
             name

diff --git a/pkg/domain/get_prs.go b/pkg/domain/get_prs.go
@@ -37,6 +37,9 @@ var (
           }
         }
         reviewDecision
+        comments {
+          totalCount
+        }
         commits(last: 1){
           nodes{
             commit{

diff --git a/pkg/pr/common.go b/pkg/pr/common.go
@@ -0,0 +1,51 @@
+package pr
+
+type Comments struct {
+	TotalCount int `json:"totalCount"`
+}
+
+type Repository struct {
+	NameWithOwner string `json:"nameWithOwner"`
+}
+
+type Author struct {
+	Login string `json:"login"`
+}
+
+type Labels struct {
+	Nodes []Label `json:"nodes"`
+}
+
+type Label struct {
+	Name string `json:"name"`
+}
+
+type Commits struct {
+	Nodes []CommitEntry `json:"nodes"`
+}
+
+type CommitEntry struct {
+	Commit Commit `json:"commit"`
+}
+
+type Commit struct {
+	StatusCheckRollup StatusCheckRollup `json:"statusCheckRollup"`
+}
+
+type StatusCheckRollup struct {
+	State    string        `json:"state"`
+	Contexts StatusContext `json:"contexts"`
+}
+
+type StatusContext struct {
+	Nodes []Context `json:"nodes"`
+}
+
+type Context struct {
+	State       string `json:"state"`
+	Description string `json:"description"`
+	Context     string `json:"context"`
+	Conclusion  string `json:"conclusion"`
+	Name        string `json:"name"`
+	Title       string `json:"title"`
+}
diff --git a/pkg/pr/issue.go b/pkg/pr/issue.go
@@ -18,6 +18,7 @@ type Issue struct {
 	Labels     Labels     `json:"labels"`
 	Closed     bool       `json:"closed"`
 	Repository Repository `json:"repository"`
+	Comments   Comments   `json:"comments"`
 }
 
 func (p *Issue) Display() bool {

diff --git a/pkg/pr/pr.go b/pkg/pr/pr.go
@@ -20,6 +20,7 @@ type PullRequest struct {
 	Commits        Commits    `json:"commits"`
 	Closed         bool       `json:"closed"`
 	Repository     Repository `json:"repository"`
+	Comments       Comments   `json:"comments"`
 	ReviewDecision string     `json:"reviewDecision"`
 }
 
@@ -154,52 +155,6 @@ func (p *PullRequest) HasContext(name string) bool {
 	return false
 }
 
-type Repository struct {
-	NameWithOwner string `json:"nameWithOwner"`
-}
-
-type Author struct {
-	Login string `json:"login"`
-}
-
-type Labels struct {
-	Nodes []Label `json:"nodes"`
-}
-
-type Label struct {
-	Name string `json:"name"`
-}
-
-type Commits struct {
-	Nodes []CommitEntry `json:"nodes"`
-}
-
-type CommitEntry struct {
-	Commit Commit `json:"commit"`
-}
-
-type Commit struct {
-	StatusCheckRollup StatusCheckRollup `json:"statusCheckRollup"`
-}
-
-type StatusCheckRollup struct {
-	State    string        `json:"state"`
-	Contexts StatusContext `json:"contexts"`
-}
-
-type StatusContext struct {
-	Nodes []Context `json:"nodes"`
-}
-
-type Context struct {
-	State       string `json:"state"`
-	Description string `json:"description"`
-	Context     string `json:"context"`
-	Conclusion  string `json:"conclusion"`
-	Name        string `json:"name"`
-	Title       string `json:"title"`
-}
-
 func unique(stringSlice []string) []string {
 	keys := make(map[string]bool)
 	list := []string{}

diff --git a/pkg/util/format.go b/pkg/util/format.go
@@ -19,3 +19,10 @@ func SafeTime(in *time.Time) string {
 func TrimTemplate(instanceTemplate string, instanceType string) string {
 	return strings.ReplaceAll(instanceTemplate, fmt.Sprintf("%s-instance-template-", instanceType), "")
 }
+
+func SafeIfAboveZero(number int) string {
+	if number > 0 {
+		return fmt.Sprintf("%d", number)
+	}
+	return ""
+}
diff --git a/pkg/util/format_test.go b/pkg/util/format_test.go
@@ -9,3 +9,8 @@ import (
 func TestTrimTemplate(t *testing.T) {
 	assert.Equal(t, TrimTemplate("my-instance-template-1.2.3", "my"), "1.2.3")
 }
+
+func TestSafeIfAboveZero(t *testing.T) {
+	assert.Equal(t, SafeIfAboveZero(0), "")
+	assert.Equal(t, SafeIfAboveZero(1), "1")
+}