Skip to content

Commit 7feec17

Browse files
committed
wire MinimalPullRequest into list_pull_requests
1 parent a32a757 commit 7feec17

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

pkg/github/pullrequests.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,14 @@ func ListPullRequests(t translations.TranslationHelperFunc) inventory.ServerTool
11481148
}
11491149
}
11501150

1151-
r, err := json.Marshal(prs)
1151+
minimalPRs := make([]MinimalPullRequest, 0, len(prs))
1152+
for _, pr := range prs {
1153+
if pr != nil {
1154+
minimalPRs = append(minimalPRs, convertToMinimalPullRequest(pr))
1155+
}
1156+
}
1157+
1158+
r, err := json.Marshal(minimalPRs)
11521159
if err != nil {
11531160
return utils.NewToolResultErrorFromErr("failed to marshal response", err), nil, nil
11541161
}

pkg/github/pullrequests_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -671,16 +671,16 @@ func Test_ListPullRequests(t *testing.T) {
671671
textContent := getTextResult(t, result)
672672

673673
// Unmarshal and verify the result
674-
var returnedPRs []*github.PullRequest
674+
var returnedPRs []MinimalPullRequest
675675
err = json.Unmarshal([]byte(textContent.Text), &returnedPRs)
676676
require.NoError(t, err)
677677
assert.Len(t, returnedPRs, 2)
678-
assert.Equal(t, *tc.expectedPRs[0].Number, *returnedPRs[0].Number)
679-
assert.Equal(t, *tc.expectedPRs[0].Title, *returnedPRs[0].Title)
680-
assert.Equal(t, *tc.expectedPRs[0].State, *returnedPRs[0].State)
681-
assert.Equal(t, *tc.expectedPRs[1].Number, *returnedPRs[1].Number)
682-
assert.Equal(t, *tc.expectedPRs[1].Title, *returnedPRs[1].Title)
683-
assert.Equal(t, *tc.expectedPRs[1].State, *returnedPRs[1].State)
678+
assert.Equal(t, *tc.expectedPRs[0].Number, returnedPRs[0].Number)
679+
assert.Equal(t, *tc.expectedPRs[0].Title, returnedPRs[0].Title)
680+
assert.Equal(t, *tc.expectedPRs[0].State, returnedPRs[0].State)
681+
assert.Equal(t, *tc.expectedPRs[1].Number, returnedPRs[1].Number)
682+
assert.Equal(t, *tc.expectedPRs[1].Title, returnedPRs[1].Title)
683+
assert.Equal(t, *tc.expectedPRs[1].State, returnedPRs[1].State)
684684
})
685685
}
686686
}

0 commit comments

Comments
 (0)