Skip to content

The Unified and Autonomous Development Platform

Able to query against issue last update date

Robin Shen49b8e8957cc6
diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.java
index 2acfa9693c..c99f54da88 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java
@@ -25,8 +25,6 @@ public interface IssueManager extends EntityManager<Issue> {
Collection<String> getUndefinedStates(Project project);
- void test();
-
List<Issue> query(IssueQuery issueQuery, int firstResult, int maxResults);
int count(@Nullable IssueCriteria issueCriteria);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
index d713c5fdee..b45d328688 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
@@ -13,7 +13,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
import javax.persistence.criteria.Root;
import org.apache.commons.lang3.StringUtils;
@@ -27,7 +26,6 @@ import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.manager.IssueFieldManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.issue.query.IssueCriteria;
@@ -65,89 +63,6 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
return find(criteria);
}
- @Transactional
- @Override
- public void test() {
- CriteriaBuilder builder = getSession().getCriteriaBuilder();
- CriteriaQuery<Issue> query = builder.createQuery(Issue.class);
- Root<Issue> root = query.from(Issue.class);
- Join<Issue, IssueField> join = root.join("fields");
- join.on(builder.equal(join.get("name"), "Type"));
- query.where(builder.or(builder.equal(join.get("value"), "Bug"), builder.equal(join.get("value"), "New Feature")));
- query.orderBy(builder.asc(join.get("ordinal")));
- Query<Issue> underlyingQuery = getSession().createQuery(query);
- underlyingQuery.setMaxResults(10);
- for (Issue issue: underlyingQuery.getResultList()) {
- System.out.println(issue.getId());
- }
-
- /*
- Project project = OneDev.getInstance(ProjectManager.class).load(1L);
- User user = OneDev.getInstance(UserManager.class).load(1L);
- IssueFieldManager issueFieldManager = OneDev.getInstance(IssueFieldManager.class);
- for (int i=1; i<=100000; i++) {
- Issue issue = new Issue();
- issue.setProject(project);
- issue.setTitle("issue " + i);
- issue.setReportDate(new Date());
- issue.setState("Open");
- issue.setReporter(user);
- issue.setVotes(0);
- save(issue);
-
- if (i % 3 == 0) {
- IssueField field = new IssueField();
- field.setIssue(issue);
- field.setName("Type");
- field.setOrdinal(0);
- field.setType("Choice");
- field.setValue("Feature");
- issueFieldManager.save(field);
-
- field = new IssueField();
- field.setIssue(issue);
- field.setName("Severity");
- field.setOrdinal(0);
- field.setType("Choice");
- field.setValue("Major");
- issueFieldManager.save(field);
- } else if (i % 3 == 1) {
- IssueField field = new IssueField();
- field.setIssue(issue);
- field.setName("Type");
- field.setOrdinal(1);
- field.setType("Choice");
- field.setValue("Bug");
- issueFieldManager.save(field);
-
- field = new IssueField();
- field.setIssue(issue);
- field.setName("Severity");
- field.setOrdinal(1);
- field.setType("Choice");
- field.setValue("Normal");
- issueFieldManager.save(field);
- } else {
- IssueField field = new IssueField();
- field.setIssue(issue);
- field.setName("Type");
- field.setOrdinal(2);
- field.setType("Choice");
- field.setValue("Task");
- issueFieldManager.save(field);
-
- field = new IssueField();
- field.setIssue(issue);
- field.setName("Severity");
- field.setOrdinal(2);
- field.setType("Choice");
- field.setValue("Minor");
- issueFieldManager.save(field);
- }
- }
- */
- }
-
@Transactional
@Override
public void open(Issue issue, Serializable fieldBean, Collection<String> promptedFields) {
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index 897728fe0a..56bb53e131 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -56,7 +56,7 @@ public class Issue extends AbstractEntity implements Referenceable {
private static final long serialVersionUID = 1L;
- public static final Map<String, String> BUILTIN_FIELDS = new HashMap<>();
+ public static final Map<String, String> BUILTIN_FIELDS = new LinkedHashMap<>();
public static final String NUMBER = "Number";
@@ -74,6 +74,8 @@ public class Issue extends AbstractEntity implements Referenceable {
public static final String COMMENTS = "Comments";
+ public static final String UPDATE_DATE = "Update Date";
+
static {
BUILTIN_FIELDS.put(NUMBER, "number");
BUILTIN_FIELDS.put(STATE, "state");
@@ -81,6 +83,7 @@ public class Issue extends AbstractEntity implements Referenceable {
BUILTIN_FIELDS.put(DESCRIPTION, "description");
BUILTIN_FIELDS.put(SUBMITTER, "submitter");
BUILTIN_FIELDS.put(SUBMIT_DATE, "submitDate");
+ BUILTIN_FIELDS.put(UPDATE_DATE, "lastActivity.date");
BUILTIN_FIELDS.put(VOTES, "numOfVotes");
BUILTIN_FIELDS.put(COMMENTS, "numOfComments");
}
diff --git a/core/src/main/java/io/onedev/server/model/support/LastActivity.java b/core/src/main/java/io/onedev/server/model/support/LastActivity.java
index 93e80e0b5d..ee4bfe95b4 100644
--- a/core/src/main/java/io/onedev/server/model/support/LastActivity.java
+++ b/core/src/main/java/io/onedev/server/model/support/LastActivity.java
@@ -28,7 +28,7 @@ public class LastActivity implements Serializable {
private String action;
@Column(name="LAST_ACT_DATE")
- private Date date;
+ private long date;
public String getAction() {
return action;
@@ -39,11 +39,11 @@ public class LastActivity implements Serializable {
}
public Date getDate() {
- return date;
+ return new Date(date);
}
public void setDate(Date date) {
- this.date = date;
+ this.date = date.getTime();
}
@Nullable
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java
index b6bb6c3066..86841e44dd 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java
@@ -2,7 +2,13 @@ package io.onedev.server.model.support.issue.query;
import java.io.Serializable;
+import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import com.google.common.base.Splitter;
+
+import io.onedev.server.model.Issue;
public abstract class IssueCriteria implements Serializable {
@@ -10,4 +16,15 @@ public abstract class IssueCriteria implements Serializable {
public abstract Predicate getPredicate(QueryBuildContext context);
+ protected <T> Path<T> getPath(Root<Issue> root, String pathName) {
+ int index = pathName.indexOf('.');
+ if (index != -1) {
+ Path<T> path = root.get(pathName.substring(0, index));
+ for (String field: Splitter.on(".").split(pathName.substring(index+1)))
+ path = path.get(field);
+ return path;
+ } else {
+ return root.get(pathName);
+ }
+ }
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
index 5b6f7dc4b4..c3e1a15867 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
@@ -257,6 +257,8 @@ public class IssueQuery implements Serializable {
throw new OneException("Unrecognized date: " + value);
if (fieldName.equals(Issue.SUBMIT_DATE))
return new SubmitDateCriteria(dateValue, operator);
+ else if (fieldName.equals(Issue.UPDATE_DATE))
+ return new UpdateDateCriteria(dateValue, operator);
else
return new DateFieldCriteria(fieldName, dateValue, operator);
case IssueQueryLexer.Contains:
@@ -352,8 +354,9 @@ public class IssueQuery implements Serializable {
List<IssueSort> issueSorts = new ArrayList<>();
for (OrderContext order: queryContext.order()) {
String fieldName = getValue(order.Quoted().getText());
- if (!fieldName.equals(Issue.SUBMIT_DATE) && !fieldName.equals(Issue.VOTES)
- && !fieldName.equals(Issue.COMMENTS) && !fieldName.equals(Issue.NUMBER)) {
+ if (!fieldName.equals(Issue.SUBMIT_DATE) && !fieldName.equals(Issue.UPDATE_DATE)
+ && !fieldName.equals(Issue.VOTES) && !fieldName.equals(Issue.COMMENTS)
+ && !fieldName.equals(Issue.NUMBER)) {
InputSpec field = project.getIssueWorkflow().getField(fieldName);
if (!(field instanceof ChoiceInput) && !(field instanceof DateInput)
&& !(field instanceof NumberInput)) {
@@ -399,7 +402,7 @@ public class IssueQuery implements Serializable {
break;
case IssueQueryLexer.IsBefore:
case IssueQueryLexer.IsAfter:
- if (!fieldName.equals(Issue.SUBMIT_DATE) && !(field instanceof DateInput))
+ if (!fieldName.equals(Issue.SUBMIT_DATE) && !fieldName.equals(Issue.UPDATE_DATE) && !(field instanceof DateInput))
throw newOperatorException(fieldName, operator);
break;
case IssueQueryLexer.Contains:
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java
new file mode 100644
index 0000000000..fa778b6ce2
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java
@@ -0,0 +1,32 @@
+package io.onedev.server.model.support.issue.query;
+
+import java.util.Date;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+
+public class UpdateDateCriteria extends IssueCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final Date value;
+
+ public UpdateDateCriteria(Date value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(QueryBuildContext context) {
+ Path<Long> attribute = getPath(context.getRoot(), Issue.BUILTIN_FIELDS.get(Issue.UPDATE_DATE));
+ if (operator == IssueQueryLexer.IsBefore)
+ return context.getBuilder().lessThan(attribute, value.getTime());
+ else
+ return context.getBuilder().greaterThan(attribute, value.getTime());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java
index 5f7384a38d..042c3c0e8a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java
@@ -107,7 +107,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
candidates.add(field.getName());
suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
} else if ("orderField".equals(spec.getLabel())) {
- List<String> candidates = Lists.newArrayList(Issue.VOTES, Issue.COMMENTS, Issue.NUMBER, Issue.SUBMIT_DATE);
+ List<String> candidates = Lists.newArrayList(Issue.VOTES, Issue.COMMENTS, Issue.NUMBER,
+ Issue.SUBMIT_DATE, Issue.UPDATE_DATE);
for (InputSpec field: project.getIssueWorkflow().getFields()) {
if (field instanceof NumberInput || field instanceof ChoiceInput || field instanceof DateInput)
candidates.add(field.getName());
@@ -124,7 +125,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
try {
IssueQuery.checkField(project, fieldName, IssueQuery.getOperator(operatorName));
InputSpec field = project.getIssueWorkflow().getField(fieldName);
- if (field instanceof DateInput || fieldName.equals(Issue.SUBMIT_DATE)) {
+ if (field instanceof DateInput || fieldName.equals(Issue.SUBMIT_DATE)
+ || fieldName.equals(Issue.UPDATE_DATE)) {
List<String> candidates = new ArrayList<>(DATE_EXAMPLES);
candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));
candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));