Jira Transition Search Plugin

 Index: project.xml
===================================================================
--- project.xml	(revision 8428)
+++ project.xml	(working copy)
@@ -6,7 +6,7 @@

     <id>jira-transition-search-plugin</id>
     <name>Plugin project template</name>
-    <currentVersion>0.1</currentVersion>
+    <currentVersion>0.1.1</currentVersion>

     <organization>
         <name></name>
Index: src/etc/atlassian-plugin.xml
===================================================================
--- src/etc/atlassian-plugin.xml	(revision 8428)
+++ src/etc/atlassian-plugin.xml	(working copy)
@@ -2,7 +2,7 @@
 	name="Search Workflow Transition Plugin">
 	<plugin-info>
 		<description></description>
-		<version>0.1</version>
+		<version>0.1.1</version>
 		<application-version min="3.6" max="3.7" />
 		<vendor name="Atlassian Software Systems Pty Ltd"
 			url="http://www.atlassian.com" />
Index: src/java/de/phil/jira/plugin/searchhistory/AbstractTransitionSearchField.java
===================================================================
--- src/java/de/phil/jira/plugin/searchhistory/AbstractTransitionSearchField.java	(revision 8428)
+++ src/java/de/phil/jira/plugin/searchhistory/AbstractTransitionSearchField.java	(working copy)
@@ -2,6 +2,8 @@

 import java.util.Collection;
 import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.List;

 import org.apache.log4j.Logger;

@@ -16,9 +18,10 @@
 {
     private static Logger log = Logger.getLogger(AbstractTransitionSearchField.class);

-    protected Long getActionID(CustomField customfield, Issue issue)
+    protected List getActionIDs(CustomField customfield, Issue issue)
     {
         Collection actions;
+        List ret = new ArrayList();
         try
         {
             actions = ManagerFactory.getWorkflowManager().getWorkflow(issue).getAllActions();
@@ -29,14 +32,17 @@
                 {
                     String description = customfield.getRelevantConfig(issue).getCustomField().getDescription();
                     if (description != null && actionDescriptor.getName().toLowerCase().equals(description.toLowerCase()))
-                        return new Long(actionDescriptor.getId());
+                        ret.add(new Long(actionDescriptor.getId()));
                 }
             }
         } catch (WorkflowException e)
         {
             log.error(e);
         }
-       return getActionIDParam();
+        if (ret.size() == 0) {
+            ret.add(getActionIDParam());
+        }
+        return ret;
     }

     protected Long getActionIDParam()
Index: src/java/de/phil/jira/plugin/searchhistory/ActionExecutionCallerField.java
===================================================================
--- src/java/de/phil/jira/plugin/searchhistory/ActionExecutionCallerField.java	(revision 8428)
+++ src/java/de/phil/jira/plugin/searchhistory/ActionExecutionCallerField.java	(working copy)
@@ -34,7 +34,7 @@

     public Object getValueFromIssue(CustomField customfield, Issue issue)
     {
-        Map value = workflowHistoryDAO.findWorkflowEntry(issue, getActionID(customfield,issue));
+        Map value = workflowHistoryDAO.findWorkflowEntry(issue, getActionIDs(customfield,issue));
         User caller = null;
         if (value.containsKey(WorkflowHistoryDAO.CALLER_KEY))
             caller = (User)value.get(WorkflowHistoryDAO.CALLER_KEY);
Index: src/java/de/phil/jira/plugin/searchhistory/ActionExecutionTimeField.java
===================================================================
--- src/java/de/phil/jira/plugin/searchhistory/ActionExecutionTimeField.java	(revision 8428)
+++ src/java/de/phil/jira/plugin/searchhistory/ActionExecutionTimeField.java	(working copy)
@@ -37,7 +37,7 @@

     public Object getValueFromIssue(CustomField customfield, Issue issue)
     {
-        Map value = workflowHistoryDAO.findWorkflowEntry(issue, getActionID(customfield,issue));
+        Map value = workflowHistoryDAO.findWorkflowEntry(issue, getActionIDs(customfield,issue));
         Timestamp finishDate = null;
         if (value.containsKey(WorkflowHistoryDAO.FINISHDATE_KEY))
             finishDate = (Timestamp)value.get(WorkflowHistoryDAO.FINISHDATE_KEY);
Index: src/java/de/phil/jira/plugin/searchhistory/WorkflowHistoryDAO.java
===================================================================
--- src/java/de/phil/jira/plugin/searchhistory/WorkflowHistoryDAO.java	(revision 8428)
+++ src/java/de/phil/jira/plugin/searchhistory/WorkflowHistoryDAO.java	(working copy)
@@ -4,6 +4,8 @@
 import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Iterator;
+import java.util.List;

 import org.apache.log4j.Logger;
 import org.ofbiz.core.entity.DelegatorInterface;
@@ -12,6 +14,7 @@
 import com.atlassian.core.user.UserUtils;
 import com.atlassian.jira.issue.Issue;
 import com.opensymphony.user.User;
+import com.sun.org.apache.xerces.internal.impl.xs.util.StringListImpl;

 public class WorkflowHistoryDAO
 {
@@ -23,7 +26,8 @@

     String ENTITY_DS = "defaultDS";

-    private final String selectStatement;
+    private final String selectStatementPart1;
+    private final String selectStatementPart2;

     private final DelegatorInterface delegatorInterface;

@@ -39,10 +43,12 @@
         buffer.append(getTableName("Issue")).append(" issue INNER JOIN ").append(getTableName("OSHistoryStep"));
         buffer.append(" workflow ON ").append("issue.").append(getColName("Issue", "workflowId"));
         buffer.append(" = workflow.").append(getColName("OSHistoryStep", "entryId")).append(" WHERE ");
-        buffer.append("issue.").append(getColName("Issue", "id")).append(" = ? AND workflow.");
-        buffer.append(getColName("OSHistoryStep", "actionId")).append(" = ? ORDER BY workflow.");
+        buffer.append("issue.").append(getColName("Issue", "id")).append(" = ? AND ");
+        selectStatementPart1 = buffer.toString();
+        buffer = new StringBuffer();
+        buffer.append(" ORDER BY workflow.");
         buffer.append(getColName("OSHistoryStep", "finishDate")).append(" DESC");
-        selectStatement = buffer.toString();
+        selectStatementPart2 = buffer.toString();
     }

     protected String getTableName(String entityName)
@@ -55,17 +61,25 @@
         return delegatorInterface.getModelEntity(entityName).getField(fieldName).getColName();
     }

-    public Map findWorkflowEntry(Issue issue, Long actionId)
+    public Map findWorkflowEntry(Issue issue, List actionIds)
     {
         Map workflowEntry = new HashMap();
         SQLProcessor sqlProcessor = null;
         ResultSet resultSet = null;
         try
         {
+            StringBuffer actionIdClause = new StringBuffer();
+            Iterator actionIdIterator = actionIds.iterator();
+            actionIdClause.append("workflow.").append(getColName("OSHistoryStep", "actionId")).append(" = ").append((Long)actionIdIterator.next());
+            for (;actionIdIterator.hasNext();)
+            {
+                actionIdClause.append(" OR workflow.").append(getColName("OSHistoryStep", "actionId")).append(" = ").append((Long)actionIdIterator.next());
+            }
+            String selectStatement = selectStatementPart1+"("+actionIdClause.toString()+")"+selectStatementPart2;
+
             sqlProcessor = new SQLProcessor(ENTITY_DS);
             sqlProcessor.prepareStatement(selectStatement);
             sqlProcessor.setValue(issue.getId());
-            sqlProcessor.setValue(actionId);
             sqlProcessor.executeQuery();
             resultSet = sqlProcessor.getResultSet();
             // Just the last entry if a transition was executed multiple times