fix: multiple tag params

Author: la3rence

api/index.go

@@ -126,43 +126,25 @@ func approvePullRequest(client *github.Client, event github.IssueCommentEvent) {
 }
 
 func addLabelsToIssue(commentBody string, githubClient *github.Client, issueCommentEvent github.IssueCommentEvent) {
-	wordArray := strings.Fields(commentBody)
-	labelIndex := utils.StringIndexOf(wordArray, Label)
-	for i := 0; i < len(labelIndex); i++ {
-		param, err := utils.GetTagNextOneParam(commentBody, Label)
-		if err == nil {
-			labels := []string{param}
-			issue, response, githubErr := githubClient.Issues.AddLabelsToIssue(ctx, *issueCommentEvent.GetRepo().Owner.Login,
-				*issueCommentEvent.GetRepo().Name,
-				*issueCommentEvent.GetIssue().Number, labels)
-			if githubErr != nil {
-				log.Print(githubErr)
-			}
-			log.Println(response, issue)
-		} else {
-			log.Println(err)
-		}
-	}
+	params := utils.GetTagNextAllParams(commentBody, Label)
+	issue, response, githubErr := githubClient.Issues.AddLabelsToIssue(ctx, *issueCommentEvent.GetRepo().Owner.Login,
+		*issueCommentEvent.GetRepo().Name,
+		*issueCommentEvent.GetIssue().Number, params)
+	log.Println(response, issue, githubErr)
 }
 
 func removeLabelFromIssue(commentBody string, githubClient *github.Client, issueCommentEvent github.IssueCommentEvent) {
-	wordArray := strings.Fields(commentBody)
-	unLabelIndex := utils.StringIndexOf(wordArray, UnLabel)
-	for i := 0; i < len(unLabelIndex); i++ {
-		param, err := utils.GetTagNextOneParam(commentBody, UnLabel)
-		if err == nil {
-			response, githubErr := githubClient.Issues.RemoveLabelForIssue(ctx,
-				*issueCommentEvent.GetRepo().Owner.Login,
-				*issueCommentEvent.GetRepo().Name,
-				*issueCommentEvent.GetIssue().Number,
-				param)
-			if githubErr != nil {
-				log.Print(githubErr)
-			}
-			log.Println(response)
-		} else {
-			log.Println(err)
+	params := utils.GetTagNextAllParams(commentBody, UnLabel)
+	for _, param := range params {
+		response, githubErr := githubClient.Issues.RemoveLabelForIssue(ctx,
+			*issueCommentEvent.GetRepo().Owner.Login,
+			*issueCommentEvent.GetRepo().Name,
+			*issueCommentEvent.GetIssue().Number,
+			param)
+		if githubErr != nil {
+			log.Print(githubErr)
 		}
+		log.Println(response)
 	}
 }
 

go.mod

@@ -4,9 +4,9 @@ go 1.15
 
 require (
 	github.com/golang/protobuf v1.4.3 // indirect
-	github.com/google/go-github v17.0.0+incompatible // indirect
+	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-querystring v1.0.0 // indirect
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
-	golang.org/x/oauth2 v0.0.0-20210113205817-d3ed898aa8a3 // indirect
+	golang.org/x/oauth2 v0.0.0-20210113205817-d3ed898aa8a3
 	google.golang.org/appengine v1.6.7 // indirect
 )

utils/stringutils.go

@@ -2,7 +2,6 @@ package utils
 
 import (
 	"fmt"
-	"strconv"
 	"strings"
 )
 
@@ -22,16 +21,6 @@ func StringIndexOf(originalArray []string, wordToFind interface{}) []int {
 	return indexArray
 }
 
-func StringToInt32(numberString string) (int32, error) {
-	parseNumber, err := strconv.ParseInt(numberString, 10, 32)
-	if err == nil {
-		return int32(parseNumber), nil
-	} else {
-		return 0, err
-	}
-}
-
-// 封装：获取 /tag 后一位字符串
 func GetTagNextOneParam(originalMessage string, tagName string) (nextString string, err error) {
 	wordArray := strings.Fields(originalMessage)
 	indexes := StringIndexOf(wordArray, tagName)
@@ -41,3 +30,15 @@ func GetTagNextOneParam(originalMessage string, tagName string) (nextString stri
 	}
 	return nextString, fmt.Errorf("param of %s required", tagName)
 }
+
+func GetTagNextAllParams(originalMessage string, tagName string) (params []string) {
+	wordArray := strings.Fields(originalMessage)
+	tagIndexes := StringIndexOf(wordArray, tagName)
+	for _, v := range tagIndexes {
+		if v+1 < len(wordArray) {
+			param := wordArray[v+1]
+			params = append(params, param)
+		}
+	}
+	return
+}

utils/stringutils_test.go

@@ -12,22 +12,6 @@ var (
 	tagParam        = "object"
 )
 
-func TestStringToInt32(t *testing.T) {
-
-	t.Run("NormalNumber", func(t *testing.T) {
-		normalNumber := "1"
-		if resultInt, err := StringToInt32(normalNumber); resultInt != 1 && err == nil {
-			t.Errorf("The String %s expected be int32 %s, but %d got", normalNumber, normalNumber, resultInt)
-		}
-	})
-
-	t.Run("UnexpectedString", func(t *testing.T) {
-		if _, err := StringToInt32("not a number"); err == nil {
-			t.Errorf("The String must be the number string, otherwise the error wouldn't be nil")
-		}
-	})
-}
-
 func TestStringIndexOf(t *testing.T) {
 	// the string word must exists in the array.
 	indexes := StringIndexOf([]string{"x", tagName, "y"}, tagName)
@@ -70,3 +54,41 @@ func TestGetTagNextOneParam(t *testing.T) {
 		t.Errorf(err.Error())
 	}
 }
+
+func stringSliceEqual(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	if (a == nil) != (b == nil) {
+		return false
+	}
+	for i, v := range a {
+		if v != b[i] {
+			return false
+		}
+	}
+	return true
+}
+
+func TestGetTagNextAllParams(t *testing.T) {
+	// use table-driven tests
+	cases := []struct {
+		Name          string
+		Message       string
+		ExpectedLabel []string
+	}{
+		{"single tag with param", "/tag a", []string{"a"}},
+		{"two same tags with different params", "/tag a /tag b", []string{"a", "b"}},
+		{"two same tags but one lack of param", "/tag a /tag", []string{"a"}},
+		{"two different tags", "/tag a /untag b", []string{"a"}},
+	}
+
+	for _, c := range cases {
+		t.Run(c.Name, func(t *testing.T) {
+			params := GetTagNextAllParams(c.Message, tagName)
+			if !stringSliceEqual(params, c.ExpectedLabel) {
+				t.Errorf("The param after the tag expected to be %s, but %s got", c.ExpectedLabel, params)
+			}
+		})
+	}
+}