Skip to content

Feature merge request beyond 20 #551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Clement-Hue wants to merge 3 commits into
base: develop
Choose a base branch
from
+14 −18
Open

Feature merge request beyond 20 #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeeeb91
feat(choose_merge_request): add per_page option for merge request fet…
clement-hue-trainline Apr 24, 2026
681fa7e
Remove the per_page option and now fetch all merge request internally
Clement-Hue Apr 25, 2026
4741611
Implement merge request pagination using gitlab api
clement-hue-trainline Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions cmd/app/merge_requests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"errors"
"net/http"
"slices"

gitlab "gitlab.com/gitlab-org/api/client-go"
)
Expand Down Expand Up @@ -35,23 +36,18 @@ func (a mergeRequestListerService) ServeHTTP(w http.ResponseWriter, r *http.Requ
payload.Scope = gitlab.Ptr("all")
}

payload.PerPage = 100
var mergeRequests []*gitlab.BasicMergeRequest
for nextPage := int64(1); nextPage != 0; {
payload.Page = nextPage
mrs, res, err := a.client.ListProjectMergeRequests(a.projectInfo.ProjectId, payload)
if err != nil {
handleError(w, err, "Failed to list merge requests", http.StatusInternalServerError)
return
}
payload.ListOptions = gitlab.ListOptions{
PerPage: 100,
}

if res.StatusCode >= 300 {
handleError(w, GenericError{r.URL.Path}, "Failed to list merge requests", res.StatusCode)
return
}
it, hasErr := gitlab.Scan(func(p gitlab.PaginationOptionFunc) ([]*gitlab.BasicMergeRequest, *gitlab.Response, error) {
return a.client.ListProjectMergeRequests(a.projectInfo.ProjectId, payload, p)
})
mergeRequests := slices.Collect(it)

mergeRequests = append(mergeRequests, mrs...)
nextPage = res.NextPage
if err := hasErr(); err != nil {
handleError(w, err, "Failed to list merge requests", http.StatusInternalServerError)
return
}

if len(mergeRequests) == 0 {
Expand Down
6 changes: 3 additions & 3 deletions cmd/app/merge_requests_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ func TestMergeRequestHandler(t *testing.T) {
t.Run("Handles non-200s from Gitlab client", func(t *testing.T) {
request := makeRequest(t, http.MethodPost, "/merge_requests", testListMergeRequestsRequest)
svc := middleware(
mergeRequestListerService{testProjectData, fakeMergeRequestLister{testBase: testBase{status: http.StatusSeeOther}}},
mergeRequestListerService{testProjectData, fakeMergeRequestLister{testBase: testBase{errFromGitlab: true}}},
withPayloadValidation(methodToPayload{http.MethodPost: newPayload[gitlab.ListProjectMergeRequestsOptions]}),
withMethodCheck(http.MethodPost),
)
data, status := getFailData(t, svc, request)
checkNon200(t, data, "Failed to list merge requests", "/merge_requests")
assert(t, status, http.StatusSeeOther)
checkErrorFromGitlab(t, data, "Failed to list merge requests")
assert(t, status, http.StatusInternalServerError)
})
t.Run("Should handle not having any merge requests with 404", func(t *testing.T) {
request := makeRequest(t, http.MethodPost, "/merge_requests", testListMergeRequestsRequest)
Expand Down
Loading