add warning emoji for changelog lineitem

HandOfGod94 · Jun 26, 2023 · 269dba9 · 269dba9
1 parent 937e2d8
commit 269dba9
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/pkg/jira_changelog/changelog.go b/pkg/jira_changelog/changelog.go
@@ -15,7 +15,7 @@ import (
 var changeLogTmpl embed.FS
 
 type Changelog struct {
-	DoneChanges map[string][]jira.Issue
+	Changes map[string][]jira.Issue
 }
 
 func (c *Changelog) Render(w io.Writer) {

diff --git a/pkg/jira_changelog/changelog_test.go b/pkg/jira_changelog/changelog_test.go
@@ -18,10 +18,10 @@ func TestRender(t *testing.T) {
 		{
 			desc: "when there are `done` issues",
 			changelog: jira_changelog.Changelog{
-				DoneChanges: map[string][]jira.Issue{
+				Changes: map[string][]jira.Issue{
 					"TestEpic": {
-						jira.NewIssue("TEST-1", "foobar is new"),
-						jira.NewIssue("TEST-2", "fizzbuzz is something else"),
+						jira.NewIssue("TEST-1", "foobar is new", "done"),
+						jira.NewIssue("TEST-2", "fizzbuzz is something else", "done"),
 					},
 				},
 			},
@@ -30,14 +30,27 @@ func TestRender(t *testing.T) {
 ### TestEpic
 - [TEST-1] foobar is new
 - [TEST-2] fizzbuzz is something else
+`,
+		},
+		{
+			desc: "when there are `wip` issues",
+			changelog: jira_changelog.Changelog{
+				Changes: map[string][]jira.Issue{
+					"TestEpic": {
+						jira.NewIssue("TEST-1", "foobar is new", "done"),
+						jira.NewIssue("TEST-2", "fizzbuzz is something else", "in progress"),
+						jira.NewIssue("TEST-3", "fizzbuzz is something else", "done"),
+					},
+				},
+			},
+			want: `## What has changed?
 
-## :warning: WIP
-### These cards are still in "done" state. Be careful while examining it
+### TestEpic
+- [TEST-1] foobar is new
+- :warning: [TEST-2] fizzbuzz is something else
+- [TEST-3] fizzbuzz is something else
 `,
 		},
-		// {
-		// 	desc: "when there are `wip` issues",
-		// },
 	}
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {

diff --git a/pkg/jira_changelog/generator.go b/pkg/jira_changelog/generator.go
@@ -41,7 +41,7 @@ func (c Generator) Generate() *Changelog {
 
 	issuesByEpic := lo.GroupBy(issues, func(issue jira.Issue) string { return issue.Epic() })
 	slog.Debug("Issues grouped by epic", "issues", issuesByEpic)
-	return &Changelog{DoneChanges: issuesByEpic}
+	return &Changelog{Changes: issuesByEpic}
 }
 
 func NewGenerator(jiraConfig jira.Config, fromRef, toRef string) *Generator {

diff --git a/pkg/jira_changelog/jira/types.go b/pkg/jira_changelog/jira/types.go
@@ -31,10 +31,11 @@ type Issue struct {
 	} `json:"fields"`
 }
 
-func NewIssue(key, summary string) Issue {
+func NewIssue(key, summary string, status string) Issue {
 	issues := &Issue{}
 	issues.Key = key
 	issues.Fields.Summary = summary
+	issues.Fields.Status.StatusCategory.Key = status
 	return *issues
 }
 

diff --git a/pkg/jira_changelog/templates/changelog.tmpl b/pkg/jira_changelog/templates/changelog.tmpl
@@ -1,10 +1,11 @@
 ## What has changed?
-{{ range $epic, $changes := .DoneChanges }}
+{{ range $epic, $changes := .Changes }}
 ### {{$epic}}
     {{- range $index, $change := $changes }}
+{{- if $change.IsWip }}
+- :warning: [{{$change.Key}}] {{$change.Fields.Summary -}}
+{{- else }}
 - [{{$change.Key}}] {{$change.Fields.Summary -}}
+{{- end -}}
     {{ end -}}
 {{ end }}
-
-## :warning: WIP
-### These cards are still in "done" state. Be careful while examining it