DEVPROD-14383 Remove includeCommitQueue field #8667
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
minnakt
approved these changes
Jan 28, 2025
minnakt
approved these changes
Feb 3, 2025
graphql/project_resolver.go
Outdated
| Statuses: patchesInput.Statuses, | ||
| Page: patchesInput.Page, | ||
| Limit: patchesInput.Limit, | ||
| OnlyMergeQueue: patchesInput.OnlyCommitQueue, |
There was a problem hiding this comment.
could we also add an optional GraphQL input param OnlyMergeQueue and migrate the frontend to use that parameter?
model/patch/db.go
Outdated
Comment on lines
190
to
197
| if len(opts.Requesters) > 0 || utility.FromBoolPtr(opts.OnlyMergeQueue) { | ||
| pipeline = append(pipeline, bson.M{"$addFields": bson.M{"requester": requesterExpression}}) | ||
| match["requester"] = bson.M{"$in": opts.Requesters} | ||
| } | ||
| // Conditionally add the commit queue filter if the user is explicitly filtering on it. | ||
| // This is only used on the project patches page when we want to conditionally only show the commit queue patches. | ||
| if utility.FromBoolPtr(opts.OnlyCommitQueue) { | ||
| match[AliasKey] = evergreen.CommitQueueAlias | ||
| } | ||
|
|
||
| // This is only used on the user patches page when we want to filter out the commit queue | ||
| if opts.IncludeCommitQueue != nil && !utility.FromBoolPtr(opts.IncludeCommitQueue) { | ||
| match[AliasKey] = commitQueueFilter | ||
| // Conditionally add the merge queue requester filter if the user is explicitly filtering on it. | ||
| // This is only used on the project patches page when we want to conditionally only show merge queue patches. | ||
| if utility.FromBoolPtr(opts.OnlyMergeQueue) { | ||
| match["requester"] = evergreen.GithubMergeRequester |
There was a problem hiding this comment.
the construction of the if statements is a bit clunky, could we organize it in a different way? something like this maybe?
if len(opts.Requesters) > 0 || utility.FromBoolPtr(opts.OnlyMergeQueue) {
requesterMatch := bson.M{"$in": opts.Requesters}
if utility.FromBoolPtr(opts.OnlyMergeQueue) {
requesterMatch = bson.M{"$eq": evergreen.GithubMergeRequester}
}
pipeline = append(pipeline, bson.M{"$addFields": bson.M{"requester": requesterExpression}})
match["requester"] = requesterMatch
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DEVPROD-14383
Description
Remove unused includeCommitQueue field and realized we filter on merge queue patches incorrectly. Updated the logic to reflect that.