SONAR-5329 - Added Since date filter

diff --git a/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndex.java b/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndex.java
index 1f55f196fa0cbe31b37765116061468c6bc5597a..e2c0966f69a3926af3d56c4b2aa5c6d7dfc50135 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndex.java
@@ -25,9 +25,11 @@ import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.index.query.AndFilterBuilder;
 import org.elasticsearch.index.query.FilterBuilders;
 import org.elasticsearch.index.query.OrFilterBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.RangeFilterBuilder;
 import org.sonar.core.activity.Activity;
 import org.sonar.core.activity.db.ActivityDto;
 import org.sonar.core.activity.db.ActivityKey;
@@ -94,17 +96,35 @@ public class ActivityIndex extends BaseIndex<Activity, ActivityDto, ActivityKey>
   }
 
   public Result<Activity> search(ActivityQuery query, QueryOptions options) {
+
+    // Prepare query
     SearchRequestBuilder esSearch = getClient()
       .prepareSearch(this.getIndexName())
       .setTypes(this.getIndexType())
       .setIndices(this.getIndexName());
 
-    OrFilterBuilder filter = FilterBuilders.orFilter();
+    AndFilterBuilder filter = FilterBuilders.andFilter();
+
+    // implement Type Filtering
+    OrFilterBuilder typeFilter = FilterBuilders.orFilter();
     for (Activity.Type type : query.getTypes()) {
-      filter.add(FilterBuilders.termFilter(ActivityNormalizer.LogFields.TYPE.field(), type));
+      typeFilter.add(FilterBuilders.termFilter(ActivityNormalizer.LogFields.TYPE.field(), type));
     }
+    filter.add(typeFilter);
+
+    // Implement date Filter
+    if (query.getSince() != null || query.getTo() != null) {
+      RangeFilterBuilder dateFilter = FilterBuilders.rangeFilter(ActivityNormalizer.LogFields.CREATED_AT.field());
+      if (query.getSince() != null) {
+        dateFilter.from(query.getSince());
+      }
+      if (query.getTo() != null) {
+        dateFilter.to(query.getTo());
+      }
+      filter.add(dateFilter);
+    }
+
 
-    // TODO implement query and filters based on LogQuery
     esSearch.setQuery(QueryBuilders.filteredQuery(
       QueryBuilders.matchAllQuery(), filter));
 

diff --git a/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java
index c765cdc103f8bacbc124566024877bab9e8cd8f5..8873e733a0c5a961306d3b71d9c2af0e80d2073f 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java
@@ -37,6 +37,7 @@ import org.sonar.server.search.QueryOptions;
 import org.sonar.server.search.Result;
 import org.sonar.server.tester.ServerTester;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -103,7 +104,7 @@ public class ActivityServiceMediumTest {
 
 
   @Test
-  public void search_by_type() {
+  public void filter_by_type() {
     service.write(dbSession, Activity.Type.NONE, getActivity());
     service.write(dbSession, Activity.Type.SERVER, getActivity());
     service.write(dbSession, Activity.Type.SERVER, testValue);
@@ -122,6 +123,37 @@ public class ActivityServiceMediumTest {
       new QueryOptions()).getHits()).hasSize(1);
   }
 
+  @Test
+  public void filter_by_date() throws InterruptedException {
+
+    Date t0 = new Date();
+    service.write(dbSession, Activity.Type.SERVER, testValue);
+    service.write(dbSession, Activity.Type.SERVER, testValue);
+    dbSession.commit();
+    Date t1 = new Date();
+    service.write(dbSession, Activity.Type.SERVER, testValue);
+    dbSession.commit();
+    Date t2 = new Date();
+
+    assertThat(service.search(new ActivityQuery()
+        .setSince(t0),
+      new QueryOptions()).getHits()).hasSize(3);
+
+    assertThat(service.search(new ActivityQuery()
+        .setSince(t1),
+      new QueryOptions()).getHits()).hasSize(1);
+
+    assertThat(service.search(new ActivityQuery()
+        .setSince(t2),
+      new QueryOptions()).getHits()).hasSize(0);
+
+    //FIXME bracket not working yet
+//    assertThat(service.search(new ActivityQuery()
+//        .setSince(t0)
+//        .setTo(t1),
+//      new QueryOptions()).getHits()).hasSize(2);
+  }
+
   @Test
   public void iterate_all() throws InterruptedException {
     int max = QueryOptions.DEFAULT_LIMIT + 3;