gitlab: fix iterator (paginate with first index 1) and avoid the trailing API call

1 files changed, 16 insertions, 6 deletions

diff --git a/bridge/gitlab/iterator/note.go b/bridge/gitlab/iterator/note.go
index 486ca94e..a1e0544c 100644
--- a/bridge/gitlab/iterator/note.go
+++ b/bridge/gitlab/iterator/note.go
@@ -7,10 +7,11 @@ import (
 )
 
 type noteIterator struct {
-	issue int
-	page  int
-	index int
-	cache []*gitlab.Note
+	issue    int
+	page     int
+	lastPage bool
+	index    int
+	cache    []*gitlab.Note
 }
 
 func newNoteIterator() *noteIterator {
@@ -39,10 +40,14 @@ func (in *noteIterator) Value() *gitlab.Note {
 }
 
 func (in *noteIterator) getNext(ctx context.Context, conf config) (bool, error) {
+	if in.lastPage {
+		return false, nil
+	}
+
 	ctx, cancel := context.WithTimeout(ctx, conf.timeout)
 	defer cancel()
 
-	notes, _, err := conf.gc.Notes.ListIssueNotes(
+	notes, resp, err := conf.gc.Notes.ListIssueNotes(
 		conf.project,
 		in.issue,
 		&gitlab.ListIssueNotesOptions{
@@ -61,6 +66,10 @@ func (in *noteIterator) getNext(ctx context.Context, conf config) (bool, error)
 		return false, err
 	}
 
+	if resp.TotalPages == in.page {
+		in.lastPage = true
+	}
+
 	if len(notes) == 0 {
 		return false, nil
 	}
@@ -75,6 +84,7 @@ func (in *noteIterator) getNext(ctx context.Context, conf config) (bool, error)
 func (in *noteIterator) Reset(issue int) {
 	in.issue = issue
 	in.index = -1
-	in.page = -1
+	in.page = 1
+	in.lastPage = false
 	in.cache = nil
 }