fix issue #27: Multiple from states prevent build successful trigger to

transit issues automatically

Author: robinshine

server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java

@@ -155,10 +155,14 @@ private void checkBuild(TransitionSpec transition, Build build) {
 					&& (branches == null || project.isCommitOnBranches(commitId, branches))) {
 				IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, true, false, false);
 				List<IssueCriteria> criterias = new ArrayList<>();
+				
+				List<IssueCriteria> fromStateCriterias = new ArrayList<>();
 				for (String fromState: transition.getFromStates()) 
-					criterias.add(new StateCriteria(fromState));
+					fromStateCriterias.add(new StateCriteria(fromState));
+				
+				criterias.add(IssueCriteria.or(fromStateCriterias));
 				criterias.add(query.getCriteria());
-				query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());
+				query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
 				Build.push(build);
 				try {
 					for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {
@@ -297,10 +301,14 @@ public void run() {
 								if (trigger.getBranches() == null || PatternSet.parse(trigger.getBranches()).matches(matcher, request.getTargetBranch())) {
 									IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, false, true, false);
 									List<IssueCriteria> criterias = new ArrayList<>();
+									
+									List<IssueCriteria> fromStateCriterias = new ArrayList<>();
 									for (String fromState: transition.getFromStates()) 
-										criterias.add(new StateCriteria(fromState));
+										fromStateCriterias.add(new StateCriteria(fromState));
+									
+									criterias.add(IssueCriteria.or(fromStateCriterias));
 									criterias.add(query.getCriteria());
-									query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());
+									query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
 									PullRequest.push(request);
 									try {
 										for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {
@@ -418,10 +426,14 @@ public void run() {
 										IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), 
 												true, false, false, false, true);
 										List<IssueCriteria> criterias = new ArrayList<>();
+										
+										List<IssueCriteria> fromStateCriterias = new ArrayList<>();
 										for (String fromState: transition.getFromStates()) 
-											criterias.add(new StateCriteria(fromState));
+											fromStateCriterias.add(new StateCriteria(fromState));
+										
+										criterias.add(IssueCriteria.or(fromStateCriterias));
 										criterias.add(query.getCriteria());
-										query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());
+										query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
 										ProjectAwareCommit.push(commit);
 										try {
 											for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {

server-core/src/main/java/io/onedev/server/issue/TransitionSpec.java

@@ -197,7 +197,7 @@ private static List<String> getStateChoices() {
 
 	@Override
 	public String toString() {
-		return StringUtils.join(getFromStates()) + "-->" + getToState();		
+		return StringUtils.join(getFromStates()) + "->" + getToState();		
 	}
 
 	public boolean canTransitManually(Issue issue, @Nullable String toState) {

server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java

@@ -50,7 +50,7 @@ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
 	}
 
 	@Nullable
-	public static IssueCriteria of(List<IssueCriteria> criterias) {
+	public static IssueCriteria and(List<IssueCriteria> criterias) {
 		if (criterias.size() > 1)
 			return new AndIssueCriteria(criterias);
 		else if (criterias.size() == 1)
@@ -59,6 +59,16 @@ else if (criterias.size() == 1)
 			return null;
 	}
 
+	@Nullable
+	public static IssueCriteria or(List<IssueCriteria> criterias) {
+		if (criterias.size() > 1)
+			return new OrIssueCriteria(criterias);
+		else if (criterias.size() == 1)
+			return criterias.iterator().next();
+		else
+			return null;
+	}
+	
 	public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
 		return false;
 	}

server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java

@@ -506,7 +506,7 @@ public static IssueQuery merge(IssueQuery query1, IssueQuery query2) {
 		List<EntitySort> sorts = new ArrayList<>();
 		sorts.addAll(query1.getSorts());
 		sorts.addAll(query2.getSorts());
-		return new IssueQuery(IssueCriteria.of(criterias), sorts);
+		return new IssueQuery(IssueCriteria.and(criterias), sorts);
 	}
 
 }

server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java

@@ -50,7 +50,7 @@ protected IssueQuery load() {
 				if (backlogQuery.getCriteria() != null)
 					criterias.add(backlogQuery.getCriteria());
 				criterias.add(new MilestoneIsEmptyCriteria());
-				return new IssueQuery(IssueCriteria.of(criterias), backlogQuery.getSorts());
+				return new IssueQuery(IssueCriteria.and(criterias), backlogQuery.getSorts());
 			} else {
 				return null;
 			}

server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java

@@ -90,7 +90,7 @@ protected IssueQuery load() {
 				} else {
 					criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty, false));
 				}
-				return new IssueQuery(IssueCriteria.of(criterias), boardQuery.getSorts());
+				return new IssueQuery(IssueCriteria.and(criterias), boardQuery.getSorts());
 			} else {
 				return null;
 			}