Unverified Commit 76ded458 authored by rnemykin's avatar rnemykin Committed by GitHub
Browse files

Add author_id param in MergeRequestFilter (#525)

parent 4b2f3a4e
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import static org.gitlab4j.api.Constants.MergeRequestScope.ALL;
import static org.gitlab4j.api.Constants.MergeRequestScope.ASSIGNED_TO_ME;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -31,6 +34,10 @@ public class MergeRequestFilter { ...@@ -31,6 +34,10 @@ public class MergeRequestFilter {
private Date updatedAfter; private Date updatedAfter;
private Date updatedBefore; private Date updatedBefore;
private MergeRequestScope scope; private MergeRequestScope scope;
/**
* Filter MR by created by the given user id. Combine with scope=all or scope=assigned_to_me
*/
private Integer authorId; private Integer authorId;
private Integer assigneeId; private Integer assigneeId;
private String myReactionEmoji; private String myReactionEmoji;
...@@ -322,25 +329,30 @@ public class MergeRequestFilter { ...@@ -322,25 +329,30 @@ public class MergeRequestFilter {
@JsonIgnore @JsonIgnore
public GitLabApiForm getQueryParams() { public GitLabApiForm getQueryParams() {
return (new GitLabApiForm() GitLabApiForm params = new GitLabApiForm()
.withParam("iids", iids) .withParam("iids", iids)
.withParam("state", state) .withParam("state", state)
.withParam("order_by", orderBy) .withParam("order_by", orderBy)
.withParam("sort", sort) .withParam("sort", sort)
.withParam("milestone", milestone) .withParam("milestone", milestone)
.withParam("view", (simpleView != null && simpleView ? "simple" : null)) .withParam("view", (simpleView != null && simpleView ? "simple" : null))
.withParam("labels", (labels != null? String.join(",", labels) : null)) .withParam("labels", (labels != null ? String.join(",", labels) : null))
.withParam("created_after", createdAfter) .withParam("created_after", createdAfter)
.withParam("created_before", createdBefore) .withParam("created_before", createdBefore)
.withParam("updated_after", updatedAfter) .withParam("updated_after", updatedAfter)
.withParam("updated_before", updatedBefore) .withParam("updated_before", updatedBefore)
.withParam("scope", scope) .withParam("scope", scope)
.withParam("assignee_id", assigneeId) .withParam("assignee_id", assigneeId)
.withParam("my_reaction_emoji", myReactionEmoji) .withParam("my_reaction_emoji", myReactionEmoji)
.withParam("source_branch", sourceBranch) .withParam("source_branch", sourceBranch)
.withParam("target_branch", targetBranch) .withParam("target_branch", targetBranch)
.withParam("search", search) .withParam("search", search)
.withParam("in", in) .withParam("in", in)
.withParam("wip", (wip == null ? null : wip ? "yes" : "no"))); .withParam("wip", (wip == null ? null : wip ? "yes" : "no"));
if (authorId != null && (scope == ALL || scope == ASSIGNED_TO_ME)) {
params.withParam("author_id", authorId);
}
return params;
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment