ACT-725: priority min/max added to taskQuery - Applied patch submitted by Tim Stephenson

modules/activiti-engine/src/main/java/org/activiti/engine/impl/TaskQueryImpl.java

@@ -38,6 +38,8 @@ public class TaskQueryImpl extends AbstractQuery<TaskQuery, Task> implements Tas
   protected String description;
   protected String descriptionLike;
   protected Integer priority;
+  protected Integer minPriority;
+  protected Integer maxPriority;
   protected String assignee;
   protected String involvedUser;
   protected String owner;
@@ -115,6 +117,22 @@ public class TaskQueryImpl extends AbstractQuery<TaskQuery, Task> implements Tas
     return this;
   }
 
+  public TaskQuery taskMinPriority(Integer minPriority) {
+    if (minPriority == null) {
+      throw new ActivitiException("Min Priority is null");
+    }
+    this.minPriority = minPriority;
+    return this;
+  }
+
+  public TaskQuery taskMaxPriority(Integer maxPriority) {
+    if (maxPriority == null) {
+      throw new ActivitiException("Max Priority is null");
+    }
+    this.maxPriority = maxPriority;
+    return this;
+  }
+
   public TaskQueryImpl taskAssignee(String assignee) {
     if (assignee == null) {
       throw new ActivitiException("Assignee is null");

modules/activiti-engine/src/main/java/org/activiti/engine/task/TaskQuery.java

@@ -46,6 +46,12 @@ public interface TaskQuery extends Query<TaskQuery, Task>{
   /** Only select tasks with the given priority. */
   TaskQuery taskPriority(Integer priority);
 
+  /** Only select tasks with the given priority or higher. */
+  TaskQuery taskMinPriority(Integer minPriority);
+
+  /** Only select tasks with the given priority or lower. */
+  TaskQuery taskMaxPriority(Integer maxPriority);
+
   /** Only select tasks which are assigned to the given user. */
   TaskQuery taskAssignee(String assignee);
   

modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Task.xml

@@ -157,6 +157,12 @@
       <if test="priority != null">
         and T.PRIORITY_ = #{priority}
       </if> 
+      <if test="minPriority != null">
+        and T.PRIORITY_ &gt;= #{minPriority}
+      </if> 
+      <if test="maxPriority != null">
+        and T.PRIORITY_ &lt;= #{maxPriority}
+      </if> 
       <if test="assignee != null">
         and T.ASSIGNEE_ = #{assignee}
       </if>

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/TaskQueryTest.java

@@ -208,6 +208,18 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     assertNull(query.singleResult());
     assertEquals(0, query.list().size());
     assertEquals(0, query.count());
+
+    query = taskService.createTaskQuery().taskMinPriority(50);
+    assertEquals(3, query.list().size());
+
+    query = taskService.createTaskQuery().taskMinPriority(10);
+    assertEquals(5, query.list().size());
+
+    query = taskService.createTaskQuery().taskMaxPriority(10);
+    assertEquals(9, query.list().size());
+
+    query = taskService.createTaskQuery().taskMaxPriority(3);
+    assertEquals(6, query.list().size());
   }
   
   public void testQueryByInvalidPriority() {
@@ -546,6 +558,15 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     Calendar otherDate = Calendar.getInstance();
     otherDate.add(Calendar.YEAR, 1);
     assertEquals(0, taskService.createTaskQuery().dueDate(otherDate.getTime()).count());
+
+    Calendar priorDate = Calendar.getInstance();
+    priorDate.setTime(dueDate);
+    priorDate.roll(Calendar.YEAR, -1);
+    assertEquals(1, taskService.createTaskQuery().dueAfter(priorDate.getTime())
+        .count());
+
+    assertEquals(1, taskService.createTaskQuery()
+        .dueBefore(otherDate.getTime()).count());
   }
   
   @Deployment(resources={"org/activiti/engine/test/api/task/TaskQueryTest.testProcessDefinition.bpmn20.xml"})