jira linkifying works now

rickschubert · Jun 17, 2020 · c70e2d0 · c70e2d0
1 parent 9d79e4f
commit c70e2d0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 15 deletions.
diff --git a/jira/jira.go b/jira/jira.go
@@ -113,14 +113,38 @@ func splitPlainTextDescriptionIntoJiraApiObjects(plainTextDescription string) []
 	}
 }
 
-func linkifyContentBlock(content content) content {
+func linkifyContentBlock(cont content) content {
 	var newParagraphContents []paragraphContent
-	for _, paragraph := range content.Content {
-		if len(linksInParagraph) > 0 {
-
-		} else {
-			newParagraphContents = append(newParagraphContents, paragraph)
+	for _, paragraph := range cont.Content {
+		linksInParagraph := utils.SplitTextOnLinks(paragraph.Text)
+		// if len(linksInParagraph) > 0 {
+		for _, text := range linksInParagraph {
+			if text.IsLink {
+				newParagraphContents = append(newParagraphContents, paragraphContent{
+					Type: "text",
+					Text: text.Text,
+					Marks: []mark{
+						{
+							Type: "link",
+							Attrs: Attr{
+								Href: text.Text,
+							},
+						},
+					},
+				})
+			} else {
+				newParagraphContents = append(newParagraphContents, paragraphContent{
+					Type: "text",
+					Text: text.Text,
+				})
+			}
 		}
+		// } else {
+		// }
+	}
+	return content{
+		Type:    "paragraph",
+		Content: newParagraphContents,
 	}
 }
 

diff --git a/utils/SplitTextOnLinks.go b/utils/SplitTextOnLinks.go
@@ -7,7 +7,7 @@ import (
 )
 
 type textChunk struct {
-	isLink bool
+	IsLink bool
 	Text   string
 }
 
@@ -54,13 +54,13 @@ func SplitTextOnLinks(text string) []textChunk {
 			isPlaceholder, _ := regexp.Match(placeholderMarker, []byte(chunk))
 			if isPlaceholder {
 				chunkObjects = append(chunkObjects, textChunk{
-					isLink: true,
+					IsLink: true,
 					Text:   linksInText[amountOfLinks],
 				})
 				amountOfLinks++
 			} else {
 				chunkObjects = append(chunkObjects, textChunk{
-					isLink: false,
+					IsLink: false,
 					Text:   chunk,
 				})
 			}

diff --git a/utils/SplitTextOnLinks_test.go b/utils/SplitTextOnLinks_test.go
@@ -10,27 +10,27 @@ func TestSplitTextOnLinks(t *testing.T) {
 	input := "See failure on Jenkins: https://jenkins.tray.io/job/qa-api-utils-tests/6548/allure/#suites/7deabbaf120515942d030aa4a12b42ab/8caffa3c0bf480ed/ and there you https://jenkins.tray.io/job/qa-api-utied/ go https://jenkins.tray.io/"
 	expectedOutput := []textChunk{
 		{
-			isLink: false,
+			IsLink: false,
 			Text:   "See failure on Jenkins: ",
 		},
 		{
-			isLink: true,
+			IsLink: true,
 			Text:   "https://jenkins.tray.io/job/qa-api-utils-tests/6548/allure/#suites/7deabbaf120515942d030aa4a12b42ab/8caffa3c0bf480ed/",
 		},
 		{
-			isLink: false,
+			IsLink: false,
 			Text:   " and there you ",
 		},
 		{
-			isLink: true,
+			IsLink: true,
 			Text:   "https://jenkins.tray.io/job/qa-api-utied/",
 		},
 		{
-			isLink: false,
+			IsLink: false,
 			Text:   " go ",
 		},
 		{
-			isLink: true,
+			IsLink: true,
 			Text:   "https://jenkins.tray.io/",
 		},
 	}