Browse Source

Apply feedback from code review

tags/5.2-RC1
Jean-Baptiste Lievremont 9 years ago
parent
commit
fb9f54a033

+ 2
- 5
server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java View File

@@ -496,12 +496,9 @@ public class IssueIndex extends BaseIndex {
}

private void addAssignedToMeFacetIfNeeded(SearchRequestBuilder builder, SearchOptions options, IssueQuery query, Map<String, FilterBuilder> filters, QueryBuilder queryBuilder) {
if (!options.getFacets().contains(IssueFilterParameters.FACET_ASSIGNED_TO_ME)) {
return;
}

String login = UserSession.get().login();
if (StringUtils.isEmpty(login)) {

if (!options.getFacets().contains(IssueFilterParameters.FACET_ASSIGNED_TO_ME) || StringUtils.isEmpty(login)) {
return;
}


+ 2
- 2
server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java View File

@@ -172,8 +172,8 @@ public class SearchAction implements BaseIssuesWsAction {
.setDescription("Comma-separated list of SCM accounts")
.setExampleValue("torvalds@linux-foundation.org");
action.createParam(IssueFilterParameters.ASSIGNEES)
.setDescription("Comma-separated list of assignee logins. The value '__me__' can be used as a placeholder for the current authenticating user")
.setExampleValue("admin,usera");
.setDescription("Comma-separated list of assignee logins. The value '__me__' can be used as a placeholder for user who performs the request")
.setExampleValue("admin,usera,__me__");
action.createParam(IssueFilterParameters.ASSIGNED)
.setDescription("To retrieve assigned or unassigned issues")
.setBooleanPossibleValues();

+ 28
- 0
server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java View File

@@ -482,6 +482,34 @@ public class SearchActionMediumTest {
.assertJson(this.getClass(), "empty_result.json", false);
}

@Test
public void filter_by_assigned_to_me_unauthenticated() throws Exception {
ComponentDto project = insertComponent(ComponentTesting.newProjectDto("ABCD").setKey("MyProject"));
setDefaultProjectPermission(project);
ComponentDto file = insertComponent(ComponentTesting.newFileDto(project, "BCDE").setKey("MyComponent"));
RuleDto rule = newRule();
IssueDto issue1 = IssueTesting.newDto(rule, file, project)
.setStatus("OPEN")
.setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")
.setAssignee("john");
IssueDto issue2 = IssueTesting.newDto(rule, file, project)
.setStatus("OPEN")
.setKee("7b112bd4-b650-4037-80bc-82fd47d4eac2")
.setAssignee("alice");
IssueDto issue3 = IssueTesting.newDto(rule, file, project)
.setStatus("OPEN")
.setKee("82fd47d4-4037-b650-80bc-7b112bd4eac2");
db.issueDao().insert(session, issue1, issue2, issue3);
session.commit();
tester.get(IssueIndexer.class).indexAll();

wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION)
.setParam("resolved", "false")
.setParam("assignees", "__me__")
.execute()
.assertJson(this.getClass(), "empty_result.json", false);
}

@Test
public void hide_rules() throws Exception {
ComponentDto project = insertComponent(ComponentTesting.newProjectDto("ABCD").setKey("MyProject"));

Loading…
Cancel
Save