fix PR matching

vilmibm · vilmibm · commit 85ff75e8f363 · 2021-03-11T16:30:31.000-06:00
diff --git a/pkg/cmd/run/shared/shared.go b/pkg/cmd/run/shared/shared.go
@@ -15,41 +15,48 @@ import (
 
 const (
 	// Run statuses
-	Queued     = "queued"
-	Completed  = "completed"
-	InProgress = "in_progress"
-	Requested  = "requested"
-	Waiting    = "waiting"
+	Queued     Status = "queued"
+	Completed  Status = "completed"
+	InProgress Status = "in_progress"
+	Requested  Status = "requested"
+	Waiting    Status = "waiting"
 
 	// Run conclusions
-	ActionRequired = "action_required"
-	Cancelled      = "cancelled"
-	Failure        = "failure"
-	Neutral        = "neutral"
-	Skipped        = "skipped"
-	Stale          = "stale"
-	StartupFailure = "startup_failure"
-	Success        = "success"
-	TimedOut       = "timed_out"
+	ActionRequired Conclusion = "action_required"
+	Cancelled      Conclusion = "cancelled"
+	Failure        Conclusion = "failure"
+	Neutral        Conclusion = "neutral"
+	Skipped        Conclusion = "skipped"
+	Stale          Conclusion = "stale"
+	StartupFailure Conclusion = "startup_failure"
+	Success        Conclusion = "success"
+	TimedOut       Conclusion = "timed_out"
 )
 
 type Status string
 type Conclusion string
-type RunEvent string
 
 type Run struct {
-	Name       string
-	CreatedAt  time.Time `json:"created_at"`
-	UpdatedAt  time.Time `json:"updated_at"`
-	Status     Status
-	Conclusion Conclusion
-	Event      RunEvent
-	ID         int
-	HeadBranch string `json:"head_branch"`
-	JobsURL    string `json:"jobs_url"`
-	HeadCommit Commit `json:"head_commit"`
-	HeadSha    string `json:"head_sha"`
-	URL        string `json:"html_url"`
+	Name           string
+	CreatedAt      time.Time `json:"created_at"`
+	UpdatedAt      time.Time `json:"updated_at"`
+	Status         Status
+	Conclusion     Conclusion
+	Event          string
+	ID             int
+	HeadBranch     string `json:"head_branch"`
+	JobsURL        string `json:"jobs_url"`
+	HeadCommit     Commit `json:"head_commit"`
+	HeadSha        string `json:"head_sha"`
+	URL            string `json:"html_url"`
+	HeadRepository Repo   `json:"head_repository"`
+}
+
+type Repo struct {
+	Owner struct {
+		Login string
+	}
+	Name string
 }
 
 type Commit struct {
diff --git a/pkg/cmd/run/shared/test.go b/pkg/cmd/run/shared/test.go
@@ -32,6 +32,10 @@ func TestRun(name string, id int, s Status, c Conclusion) Run {
 		},
 		HeadSha: "1234567890",
 		URL:     fmt.Sprintf("runs/%d", id),
+		HeadRepository: Repo{
+			Owner: struct{ Login string }{Login: "OWNER"},
+			Name:  "REPO",
+		},
 	}
 }
 
diff --git a/pkg/cmd/run/view/view.go b/pkg/cmd/run/view/view.go
@@ -205,7 +205,13 @@ func prForRun(client *api.Client, repo ghrepo.Interface, run shared.Run) (int, e
 		Repository struct {
 			PullRequests struct {
 				Nodes []struct {
-					Number int
+					Number         int
+					HeadRepository struct {
+						Owner struct {
+							Login string
+						}
+						Name string
+					}
 				}
 			}
 		}
@@ -224,6 +230,12 @@ func prForRun(client *api.Client, repo ghrepo.Interface, run shared.Run) (int, e
 				pullRequests(headRefName: $headRefName, first: 1, orderBy: { field: CREATED_AT, direction: DESC }) {
 					nodes {
 						number
+						headRepository {
+							owner {
+								login
+							}
+							name
+						}
 					}
 				}
 			}
@@ -241,5 +253,17 @@ func prForRun(client *api.Client, repo ghrepo.Interface, run shared.Run) (int, e
 		return -1, fmt.Errorf("no matching PR found for %s", run.HeadBranch)
 	}
 
-	return prs[0].Number, nil
+	number := -1
+
+	for _, pr := range prs {
+		if pr.HeadRepository.Owner.Login == run.HeadRepository.Owner.Login && pr.HeadRepository.Name == run.HeadRepository.Name {
+			number = pr.Number
+		}
+	}
+
+	if number == -1 {
+		return number, fmt.Errorf("no matching PR found for %s", run.HeadBranch)
+	}
+
+	return number, nil
 }
diff --git a/pkg/cmd/run/view/view_test.go b/pkg/cmd/run/view/view_test.go
@@ -129,7 +129,12 @@ func TestViewRun(t *testing.T) {
             "repository": {
                 "pullRequests": {
                     "nodes": [
-                        {"number": 2898}
+                        {"number": 2898,
+                         "headRepository": {
+                          "owner": {
+                           "login": "OWNER"
+                          },
+													"name": "REPO"}}
                     ]}}}}`))
 				reg.Register(
 					httpmock.REST("GET", "runs/3/jobs"),

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@ func TestRun(name string, id int, s Status, c Conclusion) Run {`
`32`	`32`	`},`
`33`	`33`	`HeadSha: "1234567890",`
`34`	`34`	`URL: fmt.Sprintf("runs/%d", id),`
	`35`	`+ HeadRepository: Repo{`
	`36`	`+ Owner: struct{ Login string }{Login: "OWNER"},`
	`37`	`+ Name: "REPO",`
	`38`	`+ },`
`35`	`39`	`}`
`36`	`40`	`}`
`37`	`41`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,13 @@ func prForRun(client *api.Client, repo ghrepo.Interface, run shared.Run) (int, e`
`205`	`205`	`Repository struct {`
`206`	`206`	`PullRequests struct {`
`207`	`207`	`Nodes []struct {`
`208`		`- Number int`
	`208`	`+ Number int`
	`209`	`+ HeadRepository struct {`
	`210`	`+ Owner struct {`
	`211`	`+ Login string`
	`212`	`+ }`
	`213`	`+ Name string`
	`214`	`+ }`
`209`	`215`	`}`
`210`	`216`	`}`
`211`	`217`	`}`
`@@ -224,6 +230,12 @@ func prForRun(client *api.Client, repo ghrepo.Interface, run shared.Run) (int, e`
`224`	`230`	`pullRequests(headRefName: $headRefName, first: 1, orderBy: { field: CREATED_AT, direction: DESC }) {`
`225`	`231`	`nodes {`
`226`	`232`	`number`
	`233`	`+ headRepository {`
	`234`	`+ owner {`
	`235`	`+ login`
	`236`	`+ }`
	`237`	`+ name`
	`238`	`+ }`
`227`	`239`	`}`
`228`	`240`	`}`
`229`	`241`	`}`
`@@ -241,5 +253,17 @@ func prForRun(client *api.Client, repo ghrepo.Interface, run shared.Run) (int, e`
`241`	`253`	`return -1, fmt.Errorf("no matching PR found for %s", run.HeadBranch)`
`242`	`254`	`}`
`243`	`255`
`244`		`- return prs[0].Number, nil`
	`256`	`+ number := -1`
	`257`	`+`
	`258`	`+ for _, pr := range prs {`
	`259`	`+ if pr.HeadRepository.Owner.Login == run.HeadRepository.Owner.Login && pr.HeadRepository.Name == run.HeadRepository.Name {`
	`260`	`+ number = pr.Number`
	`261`	`+ }`
	`262`	`+ }`
	`263`	`+`
	`264`	`+ if number == -1 {`
	`265`	`+ return number, fmt.Errorf("no matching PR found for %s", run.HeadBranch)`
	`266`	`+ }`
	`267`	`+`
	`268`	`+ return number, nil`
`245`	`269`	`}`