The Unified and Autonomous Development Platform
Add "required by pull request" build query criteria
Robin Shen5666d14b95be
diff --git a/core/src/main/java/io/onedev/server/ci/job/Job.java b/core/src/main/java/io/onedev/server/ci/job/Job.javaindex c43ef02749..e3b4c40827 100644--- a/core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/core/src/main/java/io/onedev/server/ci/job/Job.java@@ -1,5 +1,12 @@package io.onedev.server.ci.job;+import static io.onedev.server.search.entity.EntityQuery.quote;+import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;+import static io.onedev.server.search.entity.build.BuildQueryLexer.And;+import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;+import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;+import static io.onedev.server.util.BuildConstants.FIELD_JOB;+import java.io.Serializable;import java.util.ArrayList;import java.util.HashSet;@@ -9,6 +16,7 @@ import java.util.Set;import javax.validation.ConstraintValidatorContext;+import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.ci.JobDependency;@@ -234,4 +242,11 @@ public class Job implements Serializable, Validatable {return paramSpecMap;}+ public static String getBuildQuery(ObjectId commitId, String jobName) {+ return ""+ + quote(FIELD_COMMIT) + " " + getRuleName(Is) + " " + quote(commitId.name())+ + " " + getRuleName(And) + " "+ + quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(jobName);+ }+}diff --git a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java b/core/src/main/java/io/onedev/server/model/PullRequestBuild.javaindex b0d836fc40..a680df4fec 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestBuild.java@@ -6,15 +6,20 @@ import javax.persistence.Index;import javax.persistence.JoinColumn;import javax.persistence.ManyToOne;import javax.persistence.Table;+import javax.persistence.UniqueConstraint;@Entity-@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="o_build_id")})+@Table(+ indexes={@Index(columnList="o_request_id"), @Index(columnList="o_build_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_build_id"})})public class PullRequestBuild extends AbstractEntity {private static final long serialVersionUID = 1L;public static final String ATTR_BUILD = "build";+ public static final String ATTR_REQUEST = "request";+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private PullRequest request;diff --git a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex 153f1e641c..7d3bf98e1a 100644--- a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -18,11 +18,13 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.util.DateUtils;@@ -99,6 +101,16 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializathrow new OneException("Unable to find issue: #" + number);}+ public static PullRequest getPullRequest(Project project, String number) {+ if (number.startsWith("#"))+ number = number.substring(1);+ PullRequest request = OneDev.getInstance(PullRequestManager.class).find(project, getLongValue(number));+ if (request != null)+ return request;+ else+ throw new OneException("Unable to find pull request: #" + number);+ }+public static Build getBuild(Project project, String number) {if (number.startsWith("#"))number = number.substring(1);diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index 396caa59a9..fe218de7a2 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -8,7 +8,7 @@ querycriteria: operator=(Successful|Failed|InError|Cancelled|Running|Waiting|Queueing|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria- | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf) WS+ criteriaValue=Quoted #OperatorValueCriteria+ | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|RequiredByPullRequest) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -84,6 +84,10 @@ FixedIssue: 'fixed' WS+ 'issue';+RequiredByPullRequest+ : 'required' WS+ 'by' WS+ 'pull' WS+ 'request'+ ;+OrderBy: 'order by';diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex e8e127e7c5..9e44a8694d 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -138,6 +138,8 @@ public class BuildQuery extends EntityQuery<Build> {return new DependsOnCriteria(getBuild(project, value));} else if (ctx.DependenciesOf() != null) {return new DependenciesOfCriteria(getBuild(project, value));+ } else if (ctx.RequiredByPullRequest() != null) {+ return new RequiredByPullRequestCriteria(getPullRequest(project, value));} else {throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());}diff --git a/core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.javanew file mode 100644index 0000000000..9c11903dc0--- /dev/null+++ b/core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java@@ -0,0 +1,49 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.From;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.BuildConstants;++public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ private PullRequest value;++ public RequiredByPullRequestCriteria(PullRequest value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ From<?, ?> join = root.join(BuildConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);++ return builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), value);+ }++ @Override+ public boolean matches(Build build, User user) {+ return build.getPullRequestBuilds().stream().anyMatch(it->it.getRequest().equals(value));+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequest) + " " + BuildQuery.quote("#" + value.getNumber());+ }++}diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.javaindex 8c9fcd0db0..f15754852d 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java@@ -21,8 +21,8 @@ public class HasFailedBuildsCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root- .join(PullRequestConstants.ATTR_BUILDS, JoinType.LEFT)- .join(PullRequestBuild.ATTR_BUILD, JoinType.LEFT);+ .join(PullRequestConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT)+ .join(PullRequestBuild.ATTR_BUILD, JoinType.INNER);Path<?> status = join.get(Build.STATUS);return builder.or(@@ -35,11 +35,10 @@ public class HasFailedBuildsCriteria extends PullRequestCriteria {@Overridepublic boolean matches(PullRequest request, User user) {for (PullRequestBuild build: request.getPullRequestBuilds()) {- if (build.getBuild() != null &&- (build.getBuild().getStatus() == Build.Status.IN_ERROR+ if (build.getBuild().getStatus() == Build.Status.IN_ERROR|| build.getBuild().getStatus() == Build.Status.FAILED|| build.getBuild().getStatus() == Build.Status.CANCELLED- || build.getBuild().getStatus() == Build.Status.TIMED_OUT)) {+ || build.getBuild().getStatus() == Build.Status.TIMED_OUT) {return true;}}diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.javaindex 30cfac67dc..775c650bb6 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java@@ -21,13 +21,12 @@ public class HasPendingBuildsCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root- .join(PullRequestConstants.ATTR_BUILDS, JoinType.LEFT)- .join(PullRequestBuild.ATTR_BUILD, JoinType.LEFT);+ .join(PullRequestConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT)+ .join(PullRequestBuild.ATTR_BUILD, JoinType.INNER);Path<?> status = join.get(Build.STATUS);return builder.or(- builder.isNull(status),builder.equal(status, Build.Status.RUNNING),builder.equal(status, Build.Status.QUEUEING),builder.equal(status, Build.Status.WAITING));@@ -36,8 +35,7 @@ public class HasPendingBuildsCriteria extends PullRequestCriteria {@Overridepublic boolean matches(PullRequest request, User user) {for (PullRequestBuild build: request.getPullRequestBuilds()) {- if (build.getBuild() == null- || build.getBuild().getStatus() == Build.Status.RUNNING+ if (build.getBuild().getStatus() == Build.Status.RUNNING|| build.getBuild().getStatus() == Build.Status.QUEUEING|| build.getBuild().getStatus() == Build.Status.WAITING) {return true;diff --git a/core/src/main/java/io/onedev/server/util/BuildConstants.java b/core/src/main/java/io/onedev/server/util/BuildConstants.javaindex 79a3036089..0da6d46175 100644--- a/core/src/main/java/io/onedev/server/util/BuildConstants.java+++ b/core/src/main/java/io/onedev/server/util/BuildConstants.java@@ -71,6 +71,8 @@ public class BuildConstants {public static final String ATTR_DEPENDENTS = "dependents";+ public static final String ATTR_PULL_REQUEST_BUILDS = "pullRequestBuilds";+public static final Set<String> ALL_FIELDS = Sets.newHashSet(FIELD_NUMBER, FIELD_JOB, FIELD_STATUS, FIELD_SUBMITTER, FIELD_CANCELLER,FIELD_SUBMIT_DATE, FIELD_QUEUEING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE,diff --git a/core/src/main/java/io/onedev/server/util/PullRequestConstants.java b/core/src/main/java/io/onedev/server/util/PullRequestConstants.javaindex fc6e6633d3..13f96320cf 100644--- a/core/src/main/java/io/onedev/server/util/PullRequestConstants.java+++ b/core/src/main/java/io/onedev/server/util/PullRequestConstants.java@@ -76,7 +76,7 @@ public class PullRequestConstants {public static final String ATTR_REVIEWS = "reviews";- public static final String ATTR_BUILDS = "builds";+ public static final String ATTR_PULL_REQUEST_BUILDS = "pullRequestBuilds";public static final String STATE_OPEN = "Open";diff --git a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex fc7bef6697..e182079d89 100644--- a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -97,8 +97,10 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));else if (operator == BuildQueryLexer.DependsOn || operator == BuildQueryLexer.DependenciesOf)suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith)));- else+ else if (operator == BuildQueryLexer.FixedIssue)suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, unfencedLowerCaseMatchWith)));+ else+ suggestions.addAll(escape(SuggestionUtils.suggestPullRequests(project, unfencedLowerCaseMatchWith)));} else {String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());try {diff --git a/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex b6526cdbef..22b0054efe 100644--- a/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -1,12 +1,5 @@package io.onedev.server.web.component.commit.status;-import static io.onedev.server.search.entity.EntityQuery.quote;-import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;-import static io.onedev.server.search.entity.build.BuildQueryLexer.And;-import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;-import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;-import static io.onedev.server.util.BuildConstants.FIELD_JOB;-import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;@@ -35,8 +28,8 @@ import io.onedev.server.OneDev;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.model.Build.Status;import io.onedev.server.model.Build;+import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;import io.onedev.server.web.component.build.status.BuildStatusIcon;@@ -140,13 +133,8 @@ public class CommitStatusPanel extends Panel {});- String query = ""- + quote(FIELD_COMMIT) + " " + getRuleName(Is) + " " + quote(commitId.name())- + " " + getRuleName(And) + " "- + quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(job.getName());-jobItem.add(new BookmarkablePageLink<Void>("showInList", ProjectBuildsPage.class,- ProjectBuildsPage.paramsOf(getProject(), query, 0)) {+ ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName()), 0)) {@Overrideprotected void onConfigure() {diff --git a/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.javaindex c76f687058..1b9cb049df 100644--- a/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.java@@ -1,12 +1,5 @@package io.onedev.server.web.component.job;-import static io.onedev.server.search.entity.EntityQuery.quote;-import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;-import static io.onedev.server.search.entity.build.BuildQueryLexer.And;-import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;-import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;-import static io.onedev.server.util.BuildConstants.FIELD_JOB;-import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;@@ -24,6 +17,7 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.collect.Lists;import io.onedev.server.OneDev;+import io.onedev.server.ci.job.Job;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;@@ -84,13 +78,8 @@ public class JobStatusPanel extends Panel {@Overrideprotected Component newListLink(String componentId) {- String query = ""- + quote(FIELD_COMMIT) + " " + getRuleName(Is) + " " + quote(commitId.name())- + " " + getRuleName(And) + " "- + quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(jobName);-return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,- ProjectBuildsPage.paramsOf(getProject(), query, 0)) {+ ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, jobName), 0)) {@Overrideprotected void onConfigure() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 16d57433fc..6181fc751d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -4,6 +4,12 @@ import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MEimport static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;+import static io.onedev.server.search.entity.EntityQuery.quote;+import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;+import static io.onedev.server.search.entity.build.BuildQueryLexer.And;+import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;+import static io.onedev.server.search.entity.build.BuildQueryLexer.RequiredByPullRequest;+import static io.onedev.server.util.BuildConstants.FIELD_JOB;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.APPROVE;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DELETE_SOURCE_BRANCH;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DISCARD;@@ -47,6 +53,7 @@ import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.FormComponent;import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -119,6 +126,7 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@@ -518,7 +526,12 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overrideprotected Component newListLink(String componentId) {- return new WebMarkupContainer(componentId);+ String query = ""+ + getRuleName(RequiredByPullRequest) + " " + quote("#" + getPullRequest().getNumber())+ + " " + getRuleName(And) + " "+ + quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(jobName);+ return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,+ ProjectBuildsPage.paramsOf(getPullRequest().getTargetProject(), query, 0));}};diff --git a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 8e7e15d9e3..f7e15c53e8 100644--- a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -21,12 +21,14 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Build;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ProjectPrivilege;@@ -111,6 +113,14 @@ public class SuggestionUtils {return suggestions;}+ public static List<InputSuggestion> suggestPullRequests(Project project, String matchWith) {+ matchWith = matchWith.toLowerCase();+ List<InputSuggestion> suggestions = new ArrayList<>();+ for (PullRequest request: OneDev.getInstance(PullRequestManager.class).query(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS))+ suggestions.add(new InputSuggestion("#" + request.getNumber(), request.getTitle(), null));+ return suggestions;+ }+public static List<InputSuggestion> suggestBuilds(Project project, String matchWith) {matchWith = matchWith.toLowerCase();if (matchWith.startsWith("#"))