Skip to content

fix(gitlab): always re-collect MR commits regardless of MR updated_at… #8959

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
bujjibabukatta wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −5
Open

fix(gitlab): always re-collect MR commits regardless of MR updated_at… #8959

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions backend/plugins/gitlab/tasks/shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,19 @@ func GetMergeRequestsIterator(taskCtx plugin.SubTaskContext, apiCollector *api.S
data.Options.ProjectId, data.Options.ConnectionId,
),
}
if apiCollector != nil {
if apiCollector.GetSince() != nil {
clauses = append(clauses, dal.Where("gitlab_updated_at > ?", *apiCollector.GetSince()))
}
}
if apiCollector != nil
{
if apiCollector.GetSince() != nil {
// Filter by the LATER of gitlab_updated_at or commit_updated_at.
// Using only gitlab_updated_at misses MRs where new commits were pushed
// without the MR itself being updated (e.g. force-pushed commits).
// COALESCE handles MRs with no recorded commit_updated_at.
clauses = append(clauses, dal.Where(
`GREATEST(gmr.gitlab_updated_at, COALESCE(gmr.commit_updated_at, gmr.gitlab_updated_at)) > ?`,
*apiCollector.GetSince(),
))
}
}
// construct the input iterator
cursor, err := db.Cursor(clauses...)
if err != nil {
Expand Down