SONAR-5770 add WS api/ce/project

2 files changed, 9 insertions, 4 deletions

diff --git a/sonar-db/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml b/sonar-db/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml
index eb8f7d8cd27..44502db6dfb 100644
--- a/sonar-db/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml
@@ -47,16 +47,16 @@
     from ce_activity ca
     <where>
       <if test="query.onlyCurrents">
-        ca.is_last=${_true}
+        and ca.is_last=${_true}
       </if>
       <if test="query.componentUuid != null">
-        ca.component_uuid=#{query.componentUuid}
+        and ca.component_uuid=#{query.componentUuid}
       </if>
       <if test="query.status != null">
-        ca.status=#{query.status}
+        and ca.status=#{query.status}
       </if>
       <if test="query.type != null">
-        ca.task_type=#{query.type}
+        and ca.task_type=#{query.type}
       </if>
     </where>
     order by ca.id desc
diff --git a/sonar-db/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java b/sonar-db/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java
index 6031e116e20..1323435fcdc 100644
--- a/sonar-db/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java
@@ -108,6 +108,11 @@ public class CeActivityDaoTest {
     query = new CeActivityQuery().setType("views");
     dtos = underTest.selectByQuery(db.getSession(), query, new RowBounds(0, 10));
     assertThat(dtos).extracting("uuid").containsExactly("TASK_4");
+
+    // select by multiple conditions
+    query = new CeActivityQuery().setType(REPORT).setOnlyCurrents(true).setComponentUuid("PROJECT_1");
+    dtos = underTest.selectByQuery(db.getSession(), query, new RowBounds(0, 10));
+    assertThat(dtos).extracting("uuid").containsExactly("TASK_2");
   }
 
   @Test