SONAR-6693 WS issue_filters/search return both favorite and shared filters

2 files changed, 9 insertions, 5 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/SearchAction.java
index 2c1f3d2a59b..71c6313ec99 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/SearchAction.java
@@ -59,9 +59,11 @@ public class SearchAction implements IssueFilterWsAction {
 
     // Favorite filters, if logged in
     if (userSession.isLoggedIn()) {
-      List<IssueFilterDto> favorites = service.findByUser(userSession);
+      List<IssueFilterDto> filters = service.findFavoriteFilters(userSession);
+      List<IssueFilterDto> sharedFiltersWithoutUserFilters = service.findSharedFiltersWithoutUserFilters(userSession);
+      filters.addAll(sharedFiltersWithoutUserFilters);
       json.name("issueFilters").beginArray();
-      for (IssueFilterDto favorite : favorites) {
+      for (IssueFilterDto favorite : filters) {
         issueFilterJsonWriter.write(json, favorite, userSession);
       }
       json.endArray();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/SearchActionTest.java
index 33fb4c24198..050cb131a08 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/SearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/SearchActionTest.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.issue.filter;
 
-import java.util.Arrays;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -28,6 +27,7 @@ import org.sonar.db.issue.IssueFilterDto;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.WsTester;
 
+import static com.google.common.collect.Lists.newArrayList;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.sonar.test.JsonAssert.assertJson;
@@ -69,12 +69,14 @@ public class SearchActionTest {
   @Test
   public void logged_in_app_with_all_issue_filters() throws Exception {
     userSessionRule.login("eric").setUserId(123);
-    when(service.findByUser(userSessionRule)).thenReturn(Arrays.asList(
+    when(service.findFavoriteFilters(userSessionRule)).thenReturn(newArrayList(
       new IssueFilterDto()
         .setId(3L)
         .setName("My Unresolved Issues")
         .setShared(true)
-        .setData("resolved=false|assignees=__me__"),
+        .setData("resolved=false|assignees=__me__")
+      ));
+    when(service.findSharedFiltersWithoutUserFilters(userSessionRule)).thenReturn(newArrayList(
       new IssueFilterDto()
         .setId(2L)
         .setName("False Positive and Won't Fix Issues")