Add feature for replies

Author: SvenLie

.gitignore

@@ -1,3 +1,3 @@
 .idea
-service/structure.json
+service/*.json
 .env

README.md

@@ -1,4 +1,10 @@
 # imap2jira
-This tool reads a mailbox and search for unseen mails. These mails are converted into JIRA tickets. You have to customize structure.json for your workflow.
+This tool reads a mailbox and search for unseen mails. These mails are converted into JIRA tickets. You have to customize structure_new_issue.json and structure_add_comment.json for your workflow.
 
-You can run this tool with docker (image and docker-compose are provided in this project)
+You can run this tool with docker (image and docker-compose are provided in this project)
+
+### Mail without [Issue-1] in subject
+A new issue is generated for this mail. You want to set the issue number into the subject of your answer in format `[ISSUENUMBER]` 
+
+### Mail with [Issue-1] in subject
+If this issue exists a comment will added to this issue

docker-compose.yml

@@ -12,4 +12,5 @@ services:
       - .env
     volumes:
       - ./service:/go/src/app
-      - ./structure.json:/go/src/app/structure.json
+      - ./structure_new_issue.json:/go/src/app/structure_new_issue.json
+      - ./structure_add_comment.json:/go/src/app/structure_add_comment.json

service/cmd/server/main.go

@@ -6,7 +6,6 @@ import (
 	"github.com/emersion/go-imap"
 	"github.com/emersion/go-imap/client"
 	"github.com/emersion/go-message/mail"
-	strip "github.com/grokify/html-strip-tags-go"
 	"github.com/microcosm-cc/bluemonday"
 	"github.com/robfig/cron/v3"
 	"io"
@@ -15,6 +14,7 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"regexp"
 	"strings"
 )
 
@@ -31,6 +31,76 @@ func main() {
 
 }
 
+func printErrorFromApi(resp *http.Response) {
+	bodyBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.Fatal(err)
+	}
+	bodyString := string(bodyBytes)
+	err = errors.New(bodyString)
+	log.Print(err)
+}
+
+func getMailBody(p *mail.Part) string {
+	sanitizePolicy := bluemonday.UGCPolicy()
+	body, _ := ioutil.ReadAll(p.Body)
+	plainTextBody := strings.Replace(string(body), "\n", "\\n", -1)
+	plainTextBody = strings.Replace(plainTextBody, "\r", "\\r", -1)
+	return sanitizePolicy.Sanitize(plainTextBody)
+}
+
+func makePostRequest(endpoint string, body string) *http.Response {
+	jiraUrl := os.Getenv("JIRA_URL")
+	jiraUser := os.Getenv("JIRA_USER")
+	jiraPassword := os.Getenv("JIRA_PASSWORD")
+
+	clt := &http.Client{}
+	req, err := http.NewRequest("POST", jiraUrl+endpoint, strings.NewReader(body))
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(jiraUser+":"+jiraPassword)))
+	resp, err := clt.Do(req)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer resp.Body.Close()
+
+	return resp
+}
+
+func makeGetRequest(endpoint string) *http.Response {
+	jiraUrl := os.Getenv("JIRA_URL")
+	jiraUser := os.Getenv("JIRA_USER")
+	jiraPassword := os.Getenv("JIRA_PASSWORD")
+
+	clt := &http.Client{}
+	req, err := http.NewRequest("GET", jiraUrl+endpoint, strings.NewReader(""))
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(jiraUser+":"+jiraPassword)))
+	resp, err := clt.Do(req)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer resp.Body.Close()
+
+	return resp
+}
+
+func setMailAsUnseen(c *client.Client, currentMail uint32) {
+	seqSet := new(imap.SeqSet)
+	seqSet.AddRange(currentMail, currentMail)
+
+	if err := c.Store(seqSet, imap.RemoveFlags, []interface{}{imap.SeenFlag}, nil); err != nil {
+		log.Println("IMAP Message Flag Update Failed")
+		log.Println(err)
+		os.Exit(1)
+	}
+
+	if err := c.Expunge(nil); err != nil {
+		log.Println("IMAP Message mark as unseen Failed")
+		os.Exit(1)
+	}
+}
+
 func run() {
 
 	// ============================================================
@@ -42,10 +112,6 @@ func run() {
 	imapUser := os.Getenv("IMAP_USER")
 	imapPassword := os.Getenv("IMAP_PASSWORD")
 
-	jiraUrl := os.Getenv("JIRA_URL")
-	jiraUser := os.Getenv("JIRA_USER")
-	jiraPassword := os.Getenv("JIRA_PASSWORD")
-
 	// Connect to server
 	c, err := client.DialTLS(imapServer+":"+imapServerPort, nil)
 	if err != nil {
@@ -63,7 +129,7 @@ func run() {
 	log.Println("Logged in")
 
 	// Select INBOX
-	mbox, err := c.Select("INBOX", false)
+	_, err = c.Select("INBOX", false)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -81,19 +147,34 @@ func run() {
 
 	var section imap.BodySectionName
 	items := []imap.FetchItem{section.FetchItem(), imap.FetchEnvelope}
-	sanitizePolicy := bluemonday.UGCPolicy()
 
-	messages := make(chan *imap.Message, 1)
-	_ = c.Fetch(messageSet, items, messages)
+	messages := make(chan *imap.Message, len(uids))
+	err = c.Fetch(messageSet, items, messages)
+
+	currentMessage := -1
 
 	for message := range messages {
+		currentMessage = currentMessage + 1
+		currentUid := uids[currentMessage]
+
 		r := message.GetBody(&section)
+		subject := message.Envelope.Subject
+
+		isMessageWithIssueNumber, _ := regexp.MatchString("^.*\\[.*-\\d+]$", subject)
 
 		mr, err := mail.CreateReader(r)
 		if err != nil {
 			log.Fatal(err)
 		}
 
+		header := mr.Header
+		senderArray, err := header.AddressList("From")
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		sender := senderArray[0]
+
 		for {
 			p, err := mr.NextPart()
 			if err == io.EOF {
@@ -104,61 +185,55 @@ func run() {
 
 			switch p.Header.(type) {
 			case *mail.InlineHeader:
-				// This is the message's text (can be plain-text or HTML)
-				body, _ := ioutil.ReadAll(p.Body)
-				plainTextBody := strip.StripTags(string(body))
-				plainTextBody = strings.Replace(plainTextBody, "\n", "\\n", -1)
-				plainTextBody = strings.Replace(plainTextBody, "\r", "\\r", -1)
-				sanitizedBody := sanitizePolicy.Sanitize(plainTextBody)
-
-				content, err := ioutil.ReadFile("structure.json")
-				if err != nil {
-					log.Fatal(err)
-				}
-
-				// Convert []byte to string and print to screen
-				jsonString := string(content)
-				jsonString = strings.Replace(jsonString, "%SUMMARY%", message.Envelope.Subject, 1)
-				jsonString = strings.Replace(jsonString, "%DESCRIPTION%", strings.TrimSpace(sanitizedBody), 1)
-
-				log.Println(jsonString)
-
-				clt := &http.Client{}
-
-				req, err := http.NewRequest("POST", jiraUrl+"/rest/api/latest/issue", strings.NewReader(jsonString))
-				req.Header.Add("Content-Type", "application/json")
-				req.Header.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(jiraUser+":"+jiraPassword)))
-				resp, err := clt.Do(req)
-				if err != nil {
-					log.Fatal(err)
-				}
-				defer resp.Body.Close()
+				sanitizedBody := getMailBody(p)
 
-				if resp.StatusCode != 201 {
-					bodyBytes, err := ioutil.ReadAll(resp.Body)
+				if isMessageWithIssueNumber {
+					content, err := ioutil.ReadFile("structure_add_comment.json")
 					if err != nil {
 						log.Fatal(err)
 					}
-					bodyString := string(bodyBytes)
-					err = errors.New(bodyString)
-					log.Print(err)
-				} else {
-					delSeqset := new(imap.SeqSet)
-					delSeqset.AddRange(mbox.Messages, mbox.Messages)
-
-					flags := []interface{}{imap.SeenFlag}
-					if err := c.Store(delSeqset, imap.FormatFlagsOp(imap.AddFlags, true), flags, nil); err != nil {
-						log.Println("IMAP Message Flag Update Failed")
-						log.Println(err)
-						os.Exit(1)
+					// Convert []byte to string and print to screen
+					jsonString := string(content)
+					jsonString = strings.Replace(jsonString, "%SUMMARY%", subject+" ("+sender.Name+" <"+sender.Address+">)", 1)
+					jsonString = strings.Replace(jsonString, "%DESCRIPTION%", strings.TrimSpace(sanitizedBody), 1)
+
+					issueNumber := subject[strings.LastIndex(subject, "[")+1 : strings.LastIndex(subject, "]")]
+
+					resp := makeGetRequest("/rest/api/3/issue/" + issueNumber)
+
+					if resp.StatusCode != 200 {
+						setMailAsUnseen(c, currentUid)
+						printErrorFromApi(resp)
+					} else {
+						resp := makePostRequest("/rest/api/3/issue/"+issueNumber+"/comment", jsonString)
+
+						if resp.StatusCode != 201 {
+							setMailAsUnseen(c, currentUid)
+							printErrorFromApi(resp)
+						} else {
+							log.Println("Success add comment")
+						}
 					}
 
-					if err := c.Expunge(nil); err != nil {
-						log.Println("IMAP Message mark as Seen Failed")
-						os.Exit(1)
+				} else {
+					content, err := ioutil.ReadFile("structure_new_issue.json")
+					if err != nil {
+						log.Fatal(err)
 					}
 
-					log.Println("Success")
+					// Convert []byte to string and print to screen
+					jsonString := string(content)
+					jsonString = strings.Replace(jsonString, "%SUMMARY%", subject, 1)
+					jsonString = strings.Replace(jsonString, "%DESCRIPTION%", strings.TrimSpace(sanitizedBody), 1)
+
+					resp := makePostRequest("/rest/api/3/issue", jsonString)
+
+					if resp.StatusCode != 201 {
+						setMailAsUnseen(c, currentUid)
+						printErrorFromApi(resp)
+					} else {
+						log.Println("Success add issue")
+					}
 				}
 			}
 			break

structure.json

@@ -0,0 +1 @@
+{"body":{"type":"doc","version":1,"content":[{"type":"paragraph","content":[{"text":"%SUMMARY%","type":"text","marks":[{"type":"strong"}]}]},{"type":"paragraph","content":[{"text":"%DESCRIPTION%","type":"text"}]}]}}

structure_add_comment.json

@@ -0,0 +1 @@
+{"fields":{"project":{"key":"TES"},"summary":"%SUMMARY%","description":{"type":"doc","version":1,"content":[{"type":"paragraph","content":[{"text":"%DESCRIPTION%","type":"text"}]}]},"issuetype":{"name":"Task"}}}