Skip to content

The Unified and Autonomous Development Platform

fix issue #142: Issue transition rules to transit issues with no activity for certain period of time

Robin Shenf98d667c9402
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index 3d398e5206..cf0933f2d6 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -12,6 +12,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
@@ -242,8 +243,9 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
}
- private Predicate[] getPredicates(Project project, io.onedev.server.search.entity.EntityCriteria<CodeComment> criteria,
- PullRequest request, Root<CodeComment> root, CriteriaBuilder builder) {
+ private Predicate[] getPredicates(Project project,
+ @Nullable io.onedev.server.search.entity.EntityCriteria<CodeComment> criteria,
+ @Nullable PullRequest request, Root<CodeComment> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (request != null)
predicates.add(builder.equal(root.get(CodeComment.PROP_REQUEST), request));
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index 25a5921b22..9ff204326f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -22,6 +22,9 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
+import org.joda.time.DateTime;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.ScheduleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,6 +46,8 @@ import io.onedev.server.event.build.BuildFinished;
import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestOpened;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
@@ -59,9 +64,10 @@ import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;
import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;
import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;
-import io.onedev.server.model.support.issue.transitiontrigger.DiscardPullRequest;
-import io.onedev.server.model.support.issue.transitiontrigger.MergePullRequest;
-import io.onedev.server.model.support.issue.transitiontrigger.OpenPullRequest;
+import io.onedev.server.model.support.issue.transitiontrigger.DiscardPullRequestTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.MergePullRequestTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.NoActivityTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.OpenPullRequestTrigger;
import io.onedev.server.model.support.issue.transitiontrigger.PullRequestTrigger;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
@@ -72,7 +78,9 @@ import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.IssueQueryLexer;
import io.onedev.server.search.entity.issue.StateCriteria;
+import io.onedev.server.search.entity.issue.UpdateDateCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
@@ -81,10 +89,12 @@ import io.onedev.server.util.match.Matcher;
import io.onedev.server.util.match.PathMatcher;
import io.onedev.server.util.match.StringMatcher;
import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.util.schedule.SchedulableTask;
+import io.onedev.server.util.schedule.TaskScheduler;
@Singleton
public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange>
- implements IssueChangeManager {
+ implements IssueChangeManager, SchedulableTask {
private static final Logger logger = LoggerFactory.getLogger(DefaultIssueChangeManager.class);
@@ -106,12 +116,16 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
private final ListenerRegistry listenerRegistry;
+ private final TaskScheduler taskScheduler;
+
+ private String taskId;
+
@Inject
public DefaultIssueChangeManager(Dao dao, TransactionManager transactionManager,
IssueManager issueManager, IssueFieldManager issueFieldManager,
ProjectManager projectManager, BuildManager buildManager,
ExecutorService executorService, PullRequestManager pullRequestManager,
- ListenerRegistry listenerRegistry) {
+ ListenerRegistry listenerRegistry, TaskScheduler taskScheduler) {
super(dao);
this.issueManager = issueManager;
this.issueFieldManager = issueFieldManager;
@@ -121,6 +135,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
this.buildManager = buildManager;
this.executorService = executorService;
this.listenerRegistry = listenerRegistry;
+ this.taskScheduler = taskScheduler;
}
@Transactional
@@ -291,7 +306,8 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
fromStateCriterias.add(new StateCriteria(fromState));
criterias.add(IssueCriteria.or(fromStateCriterias));
- criterias.add(query.getCriteria());
+ if (query.getCriteria() != null)
+ criterias.add(query.getCriteria());
query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
Build.push(build);
try {
@@ -355,7 +371,8 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
fromStateCriterias.add(new StateCriteria(fromState));
criterias.add(IssueCriteria.or(fromStateCriterias));
- criterias.add(query.getCriteria());
+ if (query.getCriteria() != null)
+ criterias.add(query.getCriteria());
query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
PullRequest.push(request);
try {
@@ -389,17 +406,17 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Listen
public void on(PullRequestChangeEvent event) {
if (event.getChange().getData() instanceof PullRequestMergeData)
- on(event.getRequest(), MergePullRequest.class);
+ on(event.getRequest(), MergePullRequestTrigger.class);
else if (event.getChange().getData() instanceof PullRequestDiscardData)
- on(event.getRequest(), DiscardPullRequest.class);
+ on(event.getRequest(), DiscardPullRequestTrigger.class);
else if (event.getChange().getData() instanceof PullRequestReopenData)
- on(event.getRequest(), OpenPullRequest.class);
+ on(event.getRequest(), OpenPullRequestTrigger.class);
}
@Transactional
@Listen
public void on(PullRequestOpened event) {
- on(event.getRequest(), OpenPullRequest.class);
+ on(event.getRequest(), OpenPullRequestTrigger.class);
}
private String getLockKey(Long projectId) {
@@ -480,7 +497,8 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
fromStateCriterias.add(new StateCriteria(fromState));
criterias.add(IssueCriteria.or(fromStateCriterias));
- criterias.add(query.getCriteria());
+ if (query.getCriteria() != null)
+ criterias.add(query.getCriteria());
query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
ProjectScopedCommit.push(new ProjectScopedCommit(project, newCommitId) {
@@ -520,4 +538,51 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
}
}
+ @Transactional
+ @Override
+ public void execute() {
+ for (TransitionSpec transition: getTransitionSpecs()) {
+ if (transition.getTrigger() instanceof NoActivityTrigger) {
+ NoActivityTrigger trigger = (NoActivityTrigger) transition.getTrigger();
+ IssueQuery query = IssueQuery.parse(null, trigger.getIssueQuery(),
+ false, false, false, false, false);
+ List<IssueCriteria> criterias = new ArrayList<>();
+
+ List<IssueCriteria> fromStateCriterias = new ArrayList<>();
+ for (String fromState: transition.getFromStates())
+ fromStateCriterias.add(new StateCriteria(fromState));
+
+ criterias.add(IssueCriteria.or(fromStateCriterias));
+ if (query.getCriteria() != null)
+ criterias.add(query.getCriteria());
+
+ criterias.add(new UpdateDateCriteria(
+ new DateTime().minusDays(trigger.getDays()).toDate(),
+ IssueQueryLexer.IsBefore));
+
+ query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
+
+ for (Issue issue: issueManager.query(null, query, 0, Integer.MAX_VALUE, true)) {
+ changeState(issue, transition.getToState(), new HashMap<>(),
+ transition.getRemoveFields(), null);
+ }
+ }
+ }
+ }
+
+ @Override
+ public ScheduleBuilder<?> getScheduleBuilder() {
+ return CronScheduleBuilder.dailyAtHourAndMinute(1, 0);
+ }
+
+ @Listen
+ public void on(SystemStarted event) {
+ taskId = taskScheduler.schedule(this);
+ }
+
+ @Listen
+ public void on(SystemStopping event) {
+ taskScheduler.unschedule(taskId);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 4be568cc86..6d4c01d3f8 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -201,7 +201,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
private Predicate[] getPredicates(@Nullable Project project,
- io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Root<Issue> root,
+ @Nullable io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Root<Issue> root,
CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (project != null) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index bfe456113d..06c8eab548 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -14,6 +14,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
+import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
@@ -558,7 +559,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>
return query;
}
- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Project> criteria,
+ private Predicate[] getPredicates(@Nullable io.onedev.server.search.entity.EntityCriteria<Project> criteria,
Root<Project> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (!SecurityUtils.isAdministrator()) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 3933db51f1..47e64f6922 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -975,7 +975,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
private Predicate[] getPredicates(@Nullable Project targetProject,
- io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,
+ @Nullable io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,
Root<PullRequest> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (targetProject != null) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequestTrigger.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java
rename to server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequestTrigger.java
index 1b55a89592..dffacc7876 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequestTrigger.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.transitiontrigger;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=300, name="Pull request is discarded")
-public class DiscardPullRequest extends PullRequestTrigger {
+public class DiscardPullRequestTrigger extends PullRequestTrigger {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequestTrigger.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java
rename to server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequestTrigger.java
index 6d70bc5dc5..108cc723f8 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequestTrigger.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.transitiontrigger;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=250, name="Pull request is merged")
-public class MergePullRequest extends PullRequestTrigger {
+public class MergePullRequestTrigger extends PullRequestTrigger {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/NoActivityTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/NoActivityTrigger.java
new file mode 100644
index 0000000000..34f00ed498
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/NoActivityTrigger.java
@@ -0,0 +1,29 @@
+package io.onedev.server.model.support.issue.transitiontrigger;
+
+import javax.validation.constraints.Min;
+
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable(order=600, name="No activity for some time")
+public class NoActivityTrigger extends TransitionTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ private int days;
+
+ @Editable(order=200, name="No Activity Days")
+ @Min(1)
+ public int getDays() {
+ return days;
+ }
+
+ public void setDays(int days) {
+ this.days = days;
+ }
+
+ @Override
+ public String getDescription() {
+ return "No activity for " + days + " days";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequestTrigger.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java
rename to server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequestTrigger.java
index e63e24934d..805e2f8c9d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequestTrigger.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.transitiontrigger;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=200, name="Pull request is opened")
-public class OpenPullRequest extends PullRequestTrigger {
+public class OpenPullRequestTrigger extends PullRequestTrigger {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java
index a36b501797..bf0698edcd 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java
@@ -22,8 +22,8 @@ public abstract class TransitionTrigger implements Serializable {
private String issueQuery;
@Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")
- @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = true,
- withCurrentPullRequestCriteria = true, withCurrentCommitCriteria = true)
+ @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = false,
+ withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)
@NameOfEmptyValue("All")
public String getIssueQuery() {
return issueQuery;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
index 13322ed79a..b431a062db 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
@@ -10,6 +10,7 @@ import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.DateUtils;
public class UpdateDateCriteria extends IssueCriteria {
@@ -27,6 +28,12 @@ public class UpdateDateCriteria extends IssueCriteria {
this.value = value;
}
+ public UpdateDateCriteria(Date date, int operator) {
+ this.date = date;
+ this.operator = operator;
+ this.value = DateUtils.formatDate(date);
+ }
+
@Override
public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {
Path<Date> attribute = IssueQuery.getPath(root, Issue.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java
index e1f7cd76d7..fc67117649 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.project.issues.boards;
+import javax.annotation.Nullable;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -87,6 +89,7 @@ abstract class NewCardPanel extends Panel {
add(form);
}
+ @Nullable
protected abstract IssueCriteria getTemplate();
protected abstract void onClose(AjaxRequestTarget target);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index e5097c47eb..8545b5f364 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -49,8 +49,7 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIde
@Override
protected IssueCriteria load() {
try {
- IssueQuery query = IssueQuery.parse(getProject(), queryString, true, true, false, false, false);
- return query.getCriteria();
+ return IssueQuery.parse(getProject(), queryString, true, true, false, false, false).getCriteria();
} catch (Exception e) {
return null;
}