Skip to content

The Unified and Autonomous Development Platform

Able to query issue/build/pull request number in fuzzy query mode

Robin Sheneedfcc5222b5
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 496ea2ac92..b1b104d03d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -154,7 +154,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
throw new OneException("Unable to find build: " + value);
}
- public static ProjectScopedNumber getEntityNumber(@Nullable Project project, String value) {
+ public static ProjectScopedNumber getProjectScopedNumber(@Nullable Project project, String value) {
if (project != null) {
if (value.startsWith("#"))
value = project.getName() + value;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java
index 95fc2ae01c..5c46504d1d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java
@@ -25,7 +25,7 @@ public class NumberCriteria extends EntityCriteria<Build> {
public NumberCriteria(@Nullable Project project, String value, int operator) {
this.operator = operator;
this.value = value;
- number = EntityQuery.getEntityNumber(project, value);
+ number = EntityQuery.getProjectScopedNumber(project, value);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
index 026e268e16..dd991cac10 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
@@ -25,7 +25,7 @@ public class NumberCriteria extends IssueCriteria {
public NumberCriteria(@Nullable Project project, String value, int operator) {
this.operator = operator;
this.value = value;
- number = EntityQuery.getEntityNumber(project, value);
+ number = EntityQuery.getProjectScopedNumber(project, value);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
index ebd05a172d..c107537b97 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
@@ -25,7 +25,7 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {
public NumberCriteria(@Nullable Project project, String value, int operator) {
this.operator = operator;
this.value = value;
- number = EntityQuery.getEntityNumber(project, value);
+ number = EntityQuery.getProjectScopedNumber(project, value);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 94433cf3fb..ad6d78a3ec 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -58,9 +58,12 @@ import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.OrEntityCriteria;
import io.onedev.server.search.entity.build.BuildQuery;
+import io.onedev.server.search.entity.build.BuildQueryLexer;
import io.onedev.server.search.entity.build.JobCriteria;
+import io.onedev.server.search.entity.build.NumberCriteria;
import io.onedev.server.search.entity.build.VersionCriteria;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
@@ -104,10 +107,16 @@ public abstract class BuildListPanel extends Panel {
return null;
} catch (Exception e) {
warn("Not a valid formal query, performing fuzzy query");
- List<EntityCriteria<Build>> criterias = new ArrayList<>();
- criterias.add(new VersionCriteria("*" + query + "*"));
- criterias.add(new JobCriteria("*" + query + "*"));
- return BuildQuery.merge(getBaseQuery(), new BuildQuery(new OrEntityCriteria<Build>(criterias)));
+ try {
+ EntityQuery.getProjectScopedNumber(getProject(), query);
+ return BuildQuery.merge(getBaseQuery(),
+ new BuildQuery(new NumberCriteria(getProject(), query, BuildQueryLexer.Is)));
+ } catch (Exception e2) {
+ List<EntityCriteria<Build>> criterias = new ArrayList<>();
+ criterias.add(new VersionCriteria("*" + query + "*"));
+ criterias.add(new JobCriteria("*" + query + "*"));
+ return BuildQuery.merge(getBaseQuery(), new BuildQuery(new OrEntityCriteria<Build>(criterias)));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 8f123899f7..89f590d810 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -56,9 +56,10 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.search.entity.issue.OrIssueCriteria;
+import io.onedev.server.search.entity.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.issue.NumberCriteria;
import io.onedev.server.search.entity.issue.TitleCriteria;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.util.DateUtils;
@@ -105,9 +106,13 @@ public abstract class IssueListPanel extends Panel {
return null;
} catch (Exception e) {
warn("Not a valid formal query, performing fuzzy query");
- List<IssueCriteria> criterias = new ArrayList<>();
- criterias.add(new TitleCriteria("*" + query + "*"));
- return IssueQuery.merge(getBaseQuery(), new IssueQuery(new OrIssueCriteria(criterias)));
+ try {
+ EntityQuery.getProjectScopedNumber(getProject(), query);
+ return IssueQuery.merge(getBaseQuery(),
+ new IssueQuery(new NumberCriteria(getProject(), query, IssueQueryLexer.Is)));
+ } catch (Exception e2) {
+ return IssueQuery.merge(getBaseQuery(), new IssueQuery(new TitleCriteria("*" + query + "*")));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 8ce0696a21..42ab3d2bd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -51,9 +51,10 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.LastUpdate;
-import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.OrEntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.pullrequest.NumberCriteria;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
import io.onedev.server.search.entity.pullrequest.TitleCriteria;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.DateUtils;
@@ -94,9 +95,12 @@ public abstract class PullRequestListPanel extends Panel {
return null;
} catch (Exception e) {
warn("Not a valid formal query, performing fuzzy query");
- List<EntityCriteria<PullRequest>> criterias = new ArrayList<>();
- criterias.add(new TitleCriteria("*" + query + "*"));
- return new PullRequestQuery(new OrEntityCriteria<PullRequest>(criterias));
+ try {
+ EntityQuery.getProjectScopedNumber(getProject(), query);
+ return new PullRequestQuery(new NumberCriteria(getProject(), query, PullRequestQueryLexer.Is));
+ } catch (Exception e2) {
+ return new PullRequestQuery(new TitleCriteria("*" + query + "*"));
+ }
}
}