The Unified and Autonomous Development Platform
feat: Issue Query on Custom Field with Type Iteration (OD-2035)
Robin Shen51573553b0e2
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex cadad9e9f3..8eadd46360 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -172,16 +172,18 @@ public class BuildQuery extends EntityQuery<Build> {switch (operator) {case BuildQueryLexer.IsUntil:case BuildQueryLexer.IsSince:- if (fieldName.equals(NAME_SUBMIT_DATE))- return new SubmitDateCriteria(value, operator);- else if (fieldName.equals(NAME_PENDING_DATE))- return new PendingDateCriteria(value, operator);- else if (fieldName.equals(NAME_RUNNING_DATE))- return new RunningDateCriteria(value, operator);- else if (fieldName.equals(NAME_FINISH_DATE))- return new FinishDateCriteria(value, operator);- else- throw new IllegalStateException();+ switch (fieldName) {+ case NAME_SUBMIT_DATE:+ return new SubmitDateCriteria(value, operator);+ case NAME_PENDING_DATE:+ return new PendingDateCriteria(value, operator);+ case NAME_RUNNING_DATE:+ return new RunningDateCriteria(value, operator);+ case NAME_FINISH_DATE:+ return new FinishDateCriteria(value, operator);+ default:+ throw new IllegalStateException();+ }case BuildQueryLexer.Is:case BuildQueryLexer.IsNot:switch (fieldName) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 3a6b95c82e..1447ae49da 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -233,14 +233,15 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>elsereturn new DateFieldCriteria(fieldName, value, operator);case IssueQueryLexer.Contains:- if (fieldName.equals(NAME_TITLE)) {- return new TitleCriteria(value);- } else if (fieldName.equals(NAME_DESCRIPTION)) {- return new DescriptionCriteria(value);- } else if (fieldName.equals(NAME_COMMENT)) {- return new CommentCriteria(value);- } else {- return new StringFieldCriteria(fieldName, value, operator);+ switch (fieldName) {+ case NAME_TITLE:+ return new TitleCriteria(value);+ case NAME_DESCRIPTION:+ return new DescriptionCriteria(value);+ case NAME_COMMENT:+ return new CommentCriteria(value);+ default:+ return new StringFieldCriteria(fieldName, value, operator);}case IssueQueryLexer.Is:case IssueQueryLexer.IsNot:@@ -282,39 +283,44 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>} else if (field instanceof UserChoiceField|| field instanceof GroupChoiceField) {return new ChoiceFieldCriteria(fieldName, value, -1, operator, field.isAllowMultiple());+ } else if (field instanceof IterationChoiceField) {+ return new IterationFieldCriteria(fieldName, value, operator, field.isAllowMultiple());} else {return new StringFieldCriteria(fieldName, value, operator);}}case IssueQueryLexer.IsLessThan:case IssueQueryLexer.IsGreaterThan:- if (fieldName.equals(NAME_VOTE_COUNT)) {- return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(NAME_COMMENT_COUNT)) {- return new CommentCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NAME_NUMBER)) {- return new ReferenceCriteria(project, value, operator);- } else if (fieldName.equals(NAME_ESTIMATED_TIME)) {- int intValue = value.equals(NAME_SPENT_TIME)? -1: timeTrackingSetting.parseWorkingPeriod(value);- return new EstimatedTimeCriteria(intValue, operator);- } else if (fieldName.equals(NAME_SPENT_TIME)) {- int intValue = value.equals(NAME_ESTIMATED_TIME)? -1: timeTrackingSetting.parseWorkingPeriod(value);- return new SpentTimeCriteria(intValue, operator);- } else if (fieldName.equals(NAME_PROGRESS)) {- var floatValue = getFloatValue(value);- return new ProgressCriteria(floatValue, operator);- } else {- FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);- if (field instanceof IntegerField) {- return new NumericFieldCriteria(fieldName, getIntValue(value), operator);- } else {- long ordinal;- if (validate)- ordinal = getValueOrdinal((ChoiceField) field, value);- else- ordinal = 0;- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);+ switch (fieldName) {+ case NAME_VOTE_COUNT:+ return new VoteCountCriteria(getIntValue(value), operator);+ case NAME_COMMENT_COUNT:+ return new CommentCountCriteria(getIntValue(value), operator);+ case Issue.NAME_NUMBER:+ return new ReferenceCriteria(project, value, operator);+ case NAME_ESTIMATED_TIME: {+ int intValue = value.equals(NAME_SPENT_TIME) ? -1 : timeTrackingSetting.parseWorkingPeriod(value);+ return new EstimatedTimeCriteria(intValue, operator);+ }+ case NAME_SPENT_TIME: {+ int intValue = value.equals(NAME_ESTIMATED_TIME) ? -1 : timeTrackingSetting.parseWorkingPeriod(value);+ return new SpentTimeCriteria(intValue, operator);}+ case NAME_PROGRESS:+ var floatValue = getFloatValue(value);+ return new ProgressCriteria(floatValue, operator);+ default:+ FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);+ if (field instanceof IntegerField) {+ return new NumericFieldCriteria(fieldName, getIntValue(value), operator);+ } else {+ long ordinal;+ if (validate)+ ordinal = getValueOrdinal((ChoiceField) field, value);+ else+ ordinal = 0;+ return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);+ }}case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:@@ -452,6 +458,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>&& !(fieldSpec instanceof ChoiceField)&& !(fieldSpec instanceof UserChoiceField)&& !(fieldSpec instanceof GroupChoiceField)+ && !(fieldSpec instanceof IterationChoiceField)&& !(fieldSpec instanceof TextField)) {throw newOperatorException(fieldName, operator);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.javaindex e105c85794..163813b295 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java@@ -36,7 +36,7 @@ public class IterationCriteria extends Criteria<Issue> {Join<?, ?> iterationJoin = schedule.join(IssueSchedule.PROP_ITERATION, JoinType.INNER);scheduleQuery.where(builder.and(builder.equal(schedule.get(IssueSchedule.PROP_ISSUE), from),- builder.like(iterationJoin.get(Iteration.PROP_NAME), iterationName.replace("*", "%"))));+ builder.like(builder.lower(iterationJoin.get(Iteration.PROP_NAME)), iterationName.toLowerCase().replace("*", "%"))));var predicate = builder.exists(scheduleQuery);if (operator == IssueQueryLexer.IsNot)predicate = builder.not(predicate);@@ -46,7 +46,7 @@ public class IterationCriteria extends Criteria<Issue> {@Overridepublic boolean matches(Issue issue) {var matches = issue.getSchedules().stream()- .anyMatch(it->WildcardUtils.matchString(iterationName, it.getIteration().getName()));+ .anyMatch(it->WildcardUtils.matchString(iterationName.toLowerCase(), it.getIteration().getName().toLowerCase()));if (operator == IssueQueryLexer.IsNot)matches = !matches;return matches;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationFieldCriteria.javanew file mode 100644index 0000000000..d07bf9a5ea--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationFieldCriteria.java@@ -0,0 +1,70 @@+package io.onedev.server.search.entity.issue;++import io.onedev.commons.utils.match.WildcardUtils;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueField;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;+import java.util.ArrayList;+import java.util.List;++public class IterationFieldCriteria extends FieldCriteria {++ private static final long serialVersionUID = 1L;++ private final String value;++ private final int operator;++ private final boolean allowMultiple;++ public IterationFieldCriteria(String name, String value, int operator, boolean allowMultiple) {+ super(name);+ this.value = value;+ this.operator = operator;+ this.allowMultiple = allowMultiple;+ }++ @Override+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {+ var predicate = builder.like(builder.lower(fieldFrom.get(IssueField.PROP_VALUE)), value.toLowerCase().replace("*", "%"));+ if (operator == IssueQueryLexer.IsNot)+ predicate = builder.not(predicate);+ return predicate;+ }++ @Override+ public boolean matches(Issue issue) {+ List<String> fieldValue = (List<String>) issue.getFieldValue(getFieldName());+ var matches = fieldValue.stream().anyMatch(it-> WildcardUtils.matchString(value.toLowerCase(), it.toLowerCase()));+ if (operator == IssueQueryLexer.IsNot)+ matches = !matches;+ return matches;+ }++ @SuppressWarnings({"unchecked" })+ @Override+ public void fill(Issue issue) {+ if (operator == IssueQueryLexer.Is) {+ if (allowMultiple) {+ List<String> valueFromIssue = (List<String>) issue.getFieldValue(getFieldName());+ if (valueFromIssue == null)+ valueFromIssue = new ArrayList<>();+ valueFromIssue.add(value);+ issue.setFieldValue(getFieldName(), valueFromIssue);+ } else {+ issue.setFieldValue(getFieldName(), value);+ }+ }+ }++ @Override+ public String toStringWithoutParens() {+ return quote(getFieldName()) + " "+ + IssueQuery.getRuleName(operator) + " "+ + quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 417251ded5..6df9d89662 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -205,8 +205,13 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} else if (fieldSpec instanceof BooleanField) {return SuggestionUtils.suggest(newArrayList("true", "false"), matchWith);} else if (fieldSpec instanceof GroupChoiceField) {- List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());+ List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it -> it.getName()).collect(Collectors.toList());return SuggestionUtils.suggest(candidates, matchWith);+ } else if (fieldSpec instanceof IterationChoiceField) {+ if (project != null && !matchWith.contains("*"))+ return SuggestionUtils.suggestIterations(project, matchWith);+ else+ return null;} else if (fieldName.equals(NAME_PROJECT)) {if (!matchWith.contains("*"))return SuggestionUtils.suggestProjectPaths(matchWith);@@ -319,18 +324,21 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<String> getHints(TerminalExpect terminalExpect) {List<String> hints = new ArrayList<>();+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());+ var fieldSpec = issueSetting.getFieldSpec(fieldName);if (fieldName.equals(Issue.NAME_PROJECT)) {hints.add("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>");} else if (fieldName.equals(Issue.NAME_TITLE)|| fieldName.equals(Issue.NAME_DESCRIPTION)|| fieldName.equals(Issue.NAME_COMMENT)- || fieldName.equals(IssueSchedule.NAME_ITERATION)) {+ || fieldName.equals(IssueSchedule.NAME_ITERATION)+ || fieldSpec instanceof IterationChoiceField) {hints.add("Use '*' for wildcard match");hints.add("Use '\\' to escape quotes");}