fix: pullrequest nil in issue comment (#5)

Author: diegolnasc

pkg/github/controller.go

@@ -39,6 +39,14 @@ func (w *Worker) AddLabels(owner string, repo string, number int, labels []strin
 	return resp, err
 }
 
+func (w *Worker) GetCheckRun(owner string, repo string, checkrunId int64) (*v41.CheckRun, error) {
+	resp, _, err := w.Client.Checks.GetCheckRun(context.TODO(), owner, repo, checkrunId)
+	if err != nil {
+		log.Printf("error creating checkrun: %v\n", err)
+	}
+	return resp, err
+}
+
 func (w *Worker) CreateCheckRun(owner string, repo string, checkrun v41.CreateCheckRunOptions) (*v41.CheckRun, error) {
 	resp, _, err := w.Client.Checks.CreateCheckRun(context.TODO(), owner, repo, checkrun)
 	if err != nil {

pkg/github/issue.go

@@ -3,6 +3,7 @@ package github
 import (
 	"fmt"
 	"log"
+	"strconv"
 	"strings"
 
 	ghwebhooks "github.com/go-playground/webhooks/v6/github"
@@ -15,24 +16,31 @@ func (w *Worker) processIssueComment(owner *string, pullRequest *v41.PullRequest
 }
 
 func (w *Worker) approve(owner *string, pullRequest *v41.PullRequest, p *ghwebhooks.IssueCommentPayload) {
-	if strings.EqualFold(p.Comment.Body, w.Config.Layout.PullRequest.ApproveCommand) {
-		message := fmt.Sprintf("[%s] Looks Good To Me!", p.Issue.User.Login)
-		_, err := w.PullRequestCreateReview(*owner, p.Repository.Name, *pullRequest.Number, v41.PullRequestReviewRequest{
-			Body:  &message,
-			Event: v41.String("APPROVE"),
-		})
-		if err != nil {
-			log.Printf("error creview: %v\n", err)
+	if pullRequest != nil {
+		if strings.EqualFold(p.Comment.Body, w.Config.Layout.PullRequest.ApproveCommand) {
+			message := fmt.Sprintf("[%s] Looks Good To Me!", p.Issue.User.Login)
+			_, err := w.PullRequestCreateReview(*owner, p.Repository.Name, *pullRequest.Number, v41.PullRequestReviewRequest{
+				Body:  &message,
+				Event: v41.String("APPROVE"),
+			})
+			if err != nil {
+				log.Printf("error creview: %v\n", err)
+			}
 		}
 	}
 }
 
 func (w *Worker) reRunLaboratoryTest(owner *string, pullRequest *v41.PullRequest, p *ghwebhooks.IssueCommentPayload) {
-	if strings.EqualFold(p.Comment.Body, w.Config.Layout.PullRequest.ReRunTestSuiteCommand) {
-		w.CreateCheckRun(*owner, p.Repository.Name, v41.CreateCheckRunOptions{
-			Name:    "Laboratory test",
-			Status:  v41.String("in_progress"),
-			HeadSHA: *pullRequest.Head.SHA,
-		})
+	if pullRequest != nil {
+		if strings.EqualFold(p.Comment.Body, w.Config.Layout.PullRequest.ReRunTestSuiteCommand) {
+			pullRequestNumber := strconv.Itoa(int(*pullRequest.Number))
+			w.CreateCheckRun(*owner, p.Repository.Name, v41.CreateCheckRunOptions{
+				Name:       "Laboratory test",
+				Status:     v41.String("in_progress"),
+				HeadSHA:    *pullRequest.Head.SHA,
+				DetailsURL: pullRequest.HTMLURL,
+				ExternalID: &pullRequestNumber,
+			})
+		}
 	}
 }

pkg/github/pull_request.go

@@ -1,16 +1,21 @@
 package github
 
 import (
+	"strconv"
+
 	ghwebhooks "github.com/go-playground/webhooks/v6/github"
 	v41 "github.com/google/go-github/v41/github"
 )
 
 func (w *Worker) processPullRequest(owner *string, p *ghwebhooks.PullRequestPayload) {
 	if p.Action == "opened" || p.Action == "reopened" || p.Action == "edited" {
+		pullRequestNumber := strconv.Itoa(int(p.PullRequest.Number))
 		w.CreateCheckRun(*owner, p.Repository.Name, v41.CreateCheckRunOptions{
-			Name:    "Laboratory test",
-			Status:  v41.String("in_progress"),
-			HeadSHA: p.PullRequest.Head.Sha,
+			Name:       "Laboratory test",
+			Status:     v41.String("in_progress"),
+			HeadSHA:    p.PullRequest.Head.Sha,
+			DetailsURL: &p.PullRequest.HTMLURL,
+			ExternalID: &pullRequestNumber,
 		})
 	}
 }

pkg/github/worker.go

@@ -18,9 +18,8 @@ func (w *Worker) processIssueCommentEvent(p *ghwebhooks.IssueCommentPayload) {
 		var pullRequest *v41.PullRequest
 		owner, _ := getOwner(&w.Config)
 		if len(p.Issue.PullRequest.HTMLURL) > 0 {
-			pullRequestId, err := strconv.Atoi(strings.Split(p.Issue.PullRequest.HTMLURL, "/")[6])
-			if err == nil {
-				pullRequest, err = w.GetPullRequest(*owner, p.Repository.Name, pullRequestId)
+			if pullRequestNumber, err := strconv.Atoi(strings.Split(p.Issue.PullRequest.HTMLURL, "/")[6]); err != nil {
+				pullRequest, err = w.GetPullRequest(*owner, p.Repository.Name, pullRequestNumber)
 				if err != nil {
 					return
 				}
@@ -32,11 +31,20 @@ func (w *Worker) processIssueCommentEvent(p *ghwebhooks.IssueCommentPayload) {
 
 func (w *Worker) processCheckRunEvent(p *ghwebhooks.CheckRunPayload) {
 	if p.CheckRun.App.ID == int64(w.Config.Github.AppID) {
+		var pullRequest *v41.PullRequest
 		owner, _ := getOwner(&w.Config)
-		pullRequest, err := w.GetPullRequest(*owner, p.Repository.Name, int(p.CheckRun.PullRequests[0].Number))
-		if err != nil {
-			return
-		}	
+		if len(p.CheckRun.PullRequests) > 0 {
+			pullRequest, _ = w.GetPullRequest(*owner, p.Repository.Name, int(p.CheckRun.PullRequests[0].Number))
+		} else {
+			chekRun, err := w.GetCheckRun(*owner, p.Repository.Name, p.CheckRun.ID)
+			if err != nil {
+				return
+			}
+			if len(*chekRun.ExternalID) > 0 {
+				pullRequestId, _ := strconv.Atoi(*chekRun.ExternalID)
+				pullRequest, _ = w.GetPullRequest(*owner, p.Repository.Name, pullRequestId)
+			}
+		}
 		w.processCheckRun(owner, pullRequest, p)
 	}
 }