public class ActivityAction implements CeWsAction {
private static final int OFFSET = 0;
private static final int MAX_PAGE_SIZE = 1000;
+ private static final List<String> POSSIBLE_QUALIFIERS = ImmutableList.of(Qualifiers.PROJECT, Qualifiers.VIEW, "DEV");
private final UserSession userSession;
private final DbClient dbClient;
query.setStatuses(request.getStatus());
}
- loadComponentUuids(dbSession, request, query);
+ query.setComponentUuids(loadComponentUuids(dbSession, request));
return query;
}
- private void loadComponentUuids(DbSession dbSession, ActivityWsRequest request, CeTaskQuery query) {
+ @CheckForNull
+ private List<String> loadComponentUuids(DbSession dbSession, ActivityWsRequest request) {
String componentUuid = request.getComponentId();
String componentQuery = request.getQuery();
if (componentUuid != null) {
- query.setComponentUuid(componentUuid);
+ return singletonList(componentUuid);
}
if (componentQuery != null) {
- ComponentQuery componentDtoQuery = ComponentQuery.builder().setNameOrKeyQuery(componentQuery).setQualifiers(Qualifiers.PROJECT, Qualifiers.VIEW).build();
+ ComponentQuery componentDtoQuery = ComponentQuery.builder()
+ .setNameOrKeyQuery(componentQuery)
+ .setQualifiers(POSSIBLE_QUALIFIERS.toArray(new String[0]))
+ .build();
List<ComponentDto> componentDtos = dbClient.componentDao().selectByQuery(dbSession, componentDtoQuery, 0, CeTaskQuery.MAX_COMPONENT_UUIDS);
- query.setComponentUuids(Lists.transform(componentDtos, ComponentDtoFunctions.toUuid()));
+ return Lists.transform(componentDtos, ComponentDtoFunctions.toUuid());
}
+
+ return null;
}
private Iterable<WsCe.Task> loadQueuedTasks(DbSession dbSession, ActivityWsRequest request, CeTaskQuery query) {
import org.sonar.db.ce.CeQueueDto;
import org.sonar.db.ce.CeTaskTypes;
import org.sonar.db.component.ComponentDbTester;
+import org.sonar.db.component.ComponentDto;
import org.sonar.server.exceptions.BadRequestException;
import org.sonar.server.tester.UserSessionRule;
import org.sonar.server.ws.TestRequest;
import static org.mockito.Mockito.when;
import static org.sonar.api.utils.DateUtils.formatDate;
import static org.sonar.api.utils.DateUtils.formatDateTime;
+import static org.sonar.db.component.ComponentTesting.newDeveloper;
import static org.sonar.db.component.ComponentTesting.newProjectDto;
+import static org.sonar.db.component.ComponentTesting.newView;
import static org.sonarqube.ws.client.ce.CeWsParameters.PARAM_COMPONENT_QUERY;
import static org.sonarqube.ws.client.ce.CeWsParameters.PARAM_STATUS;
@Test
public void search_activity_by_component_name() throws IOException {
- componentDb.insertProjectAndSnapshot(newProjectDto().setName("apache struts").setUuid("P1"));
- componentDb.insertProjectAndSnapshot(newProjectDto().setName("apache zookeeper").setUuid("P2"));
- componentDb.insertProjectAndSnapshot(newProjectDto().setName("eclipse").setUuid("P3"));
+ ComponentDto struts = newProjectDto().setName("old apache struts").setUuid("P1");
+ ComponentDto zookeeper = newProjectDto().setName("new apache zookeeper").setUuid("P2");
+ ComponentDto eclipse = newProjectDto().setName("eclipse").setUuid("P3");
+ componentDb.insertProjectAndSnapshot(struts);
+ componentDb.insertProjectAndSnapshot(zookeeper);
+ componentDb.insertProjectAndSnapshot(eclipse);
dbTester.commit();
- componentDb.indexProjects();
+ componentDb.indexComponents(struts.getId(), zookeeper.getId(), eclipse.getId());
userSession.setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
insertActivity("T1", "P1", CeActivityDto.Status.SUCCESS);
insertActivity("T2", "P2", CeActivityDto.Status.SUCCESS);
assertThat(activityResponse.getTasksList()).extracting("id").containsOnly("T1", "T2");
}
+ @Test
+ public void search_activity_returns_views_and_developers() {
+ ComponentDto developer = newDeveloper("Apache Developer").setUuid("D1");
+ ComponentDto apacheView = newView().setName("Apache View").setUuid("V1");
+ componentDb.insertDeveloperAndSnapshot(developer);
+ componentDb.insertViewAndSnapshot(apacheView);
+ componentDb.indexComponents(developer.getId(), apacheView.getId());
+ userSession.setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
+ insertActivity("T1", "D1", CeActivityDto.Status.SUCCESS);
+ insertActivity("T2", "V1", CeActivityDto.Status.SUCCESS);
+
+ ActivityResponse activityResponse = call(ws.newRequest().setParam(PARAM_COMPONENT_QUERY, "apac"));
+
+ assertThat(activityResponse.getTasksList()).extracting("id").containsOnly("T1", "T2");
+ }
+
@Test
public void search_task_id_in_queue_ignoring_other_parameters() throws IOException {
insertQueue("T1", "PROJECT_1", CeQueueDto.Status.IN_PROGRESS);
SnapshotDto directorySnapshot = componentDb.insertComponentAndSnapshot(newDirectory(project, "directory-path-1"), moduleSnapshot);
componentDb.insertComponentAndSnapshot(newFileDto(project, 10), directorySnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
TreeWsResponse response = call(ws.newRequest()
.setParam(PARAM_STRATEGY, "children")
SnapshotDto directorySnapshot = componentDb.insertComponentAndSnapshot(newDirectory(project, "directory-path-1"), moduleSnapshot);
componentDb.insertComponentAndSnapshot(newFileDto(project, 1), directorySnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
TreeWsResponse response = call(ws.newRequest()
.setParam(PARAM_STRATEGY, "all")
SnapshotDto directorySnapshot = componentDb.insertComponentAndSnapshot(newDirectory(project, "directory-path-1"), moduleSnapshot);
componentDb.insertComponentAndSnapshot(newFileDto(project, 3), directorySnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
TreeWsResponse response = call(ws.newRequest()
.setParam(PARAM_STRATEGY, "leaves")
componentDb.insertComponentAndSnapshot(newFileDto(project, 2), projectSnapshot);
componentDb.insertComponentAndSnapshot(newModuleDto("module-uuid-1", project), projectSnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
TreeWsResponse response = call(ws.newRequest()
.setParam(PARAM_STRATEGY, "all")
componentDb.insertComponentAndSnapshot(module, projectSnapshot);
componentDb.insertComponentAndSnapshot(newDirectory(project, "path/directory/", "directory-uuid-1"), projectSnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
TreeWsResponse response = call(ws.newRequest()
.setParam(PARAM_STRATEGY, "all")
componentDb.insertComponentAndSnapshot(newProjectCopy("project-uuid-1-copy", project, view), viewSnapshot);
componentDb.insertComponentAndSnapshot(newSubView(view, "sub-view-uuid", "sub-view-key").setName("sub-view-name"), viewSnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
TreeWsResponse response = call(ws.newRequest()
.setParam(PARAM_STRATEGY, "children")
projectSnapshot);
}
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
return project;
}
public void search_by_query_on_name() {
componentDb.insertProjectAndSnapshot(newProjectDto().setName("project-name"));
componentDb.insertProjectAndSnapshot(newProjectDto().setName("another-name"));
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
String result = ws.newRequest()
.setParam(TEXT_QUERY, "project")
public void search_by_query_on_key_must_match_exactly() {
componentDb.insertProjectAndSnapshot(newProjectDto().setKey("project-key"));
componentDb.insertProjectAndSnapshot(newProjectDto().setKey("another-key"));
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
String result = ws.newRequest()
.setParam(TEXT_QUERY, "project-key")
for (int i = 1; i <= 1001; i++) {
componentDb.insertProjectAndSnapshot(newProjectDto("project-uuid-" + i));
}
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
String result = ws.newRequest()
.setParam(TEXT_QUERY, "project")
// match must be exact on key
ComponentDto projectUntouched = newProjectDto().setKey("new-sonar").setName("project-name");
componentDb.insertProjectAndSnapshot(projectUntouched);
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
call(ws.newRequest()
.setParam(PARAM_TEMPLATE_ID, template1.getUuid())
select
<include refid="componentColumns"/>
<include refid="sqlSelectByQuery"/>
- ORDER BY LOWER(p.name), p.name
+ ORDER BY LOWER(p.name), p.name, p.id
</select>
<select id="countByQuery" resultType="int">
for (int i = 9; i >= 1; i--) {
componentDb.insertProjectAndSnapshot(newProjectDto().setName("project-" + i));
}
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentQuery query = ComponentQuery.builder().setNameOrKeyQuery("oJect").setQualifiers(Qualifiers.PROJECT).build();
List<ComponentDto> result = underTest.selectByQuery(dbSession, query, 1, 3);
@Test
public void select_by_query_name_with_special_characters() {
componentDb.insertProjectAndSnapshot(newProjectDto().setName("project-\\_%/-name"));
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentQuery query = ComponentQuery.builder().setNameOrKeyQuery("-\\_%/-").setQualifiers(Qualifiers.PROJECT).build();
List<ComponentDto> result = underTest.selectByQuery(dbSession, query, 0, 10);
@Test
public void select_by_query_key_with_special_characters() {
componentDb.insertProjectAndSnapshot(newProjectDto().setKey("project-_%-key"));
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentQuery query = ComponentQuery.builder().setNameOrKeyQuery("project-_%-key").setQualifiers(Qualifiers.PROJECT).build();
List<ComponentDto> result = underTest.selectByQuery(dbSession, query, 0, 10);
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-1-uuid"), projectSnapshot);
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-2-uuid"), moduleSnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery query = newTreeQuery(projectSnapshot).build();
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-1-uuid").setName("file-name-1"), projectSnapshot);
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-2-uuid").setName("file-name-2"), moduleSnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery query = newTreeQuery(projectSnapshot)
.setNameOrKeyQuery("file-name").build();
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-1-uuid").setKey("file-key-1").setName("File one"), projectSnapshot);
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-2-uuid").setKey("file-key-2").setName("File two"), moduleSnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery query = newTreeQuery(projectSnapshot)
.setNameOrKeyQuery("file-key-1").build();
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-uuid-" + i), projectSnapshot);
}
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery query = newTreeQuery(projectSnapshot)
.setPage(2)
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-uuid-2").setName("file-name-2").setPath("2"), projectSnapshot);
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-uuid-3").setName("file-name-3").setPath("1"), projectSnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery query = newTreeQuery(projectSnapshot)
.setSortFields(singletonList("path"))
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-1-uuid"), projectSnapshot);
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-2-uuid"), moduleSnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery query = newTreeQuery(moduleSnapshot).build();
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-1-uuid"), projectSnapshot);
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-2-uuid"), moduleSnapshot);
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery query = newTreeQuery(projectSnapshot).build();
ComponentDto project = newProjectDto("project-uuid").setName("project-name");
componentDb.insertProjectAndSnapshot(project);
componentDb.insertComponentAndSnapshot(newProjectCopy("project-copy-uuid", project, view), viewSnapshot);
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery dbQuery = newTreeQuery(viewSnapshot).build();
List<ComponentDtoWithSnapshotId> components = underTest.selectDirectChildren(dbSession, dbQuery);
ComponentDto project = newProjectDto("project-uuid").setName("project name");
componentDb.insertProjectAndSnapshot(project);
componentDb.insertComponentAndSnapshot(newProjectCopy("project-copy-uuid", project, view), viewSnapshot);
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery dbQuery = newTreeQuery(viewSnapshot).setNameOrKeyQuery("name").build();
List<ComponentDtoWithSnapshotId> components = underTest.selectDirectChildren(dbSession, dbQuery);
componentDb.insertComponentAndSnapshot(newFileDto(project, "file-uuid-" + i).setName("file-name-" + i), moduleSnapshot);
}
db.commit();
- componentDb.indexProjects();
+ componentDb.indexProjectsAndViews();
ComponentTreeQuery query = newTreeQuery(projectSnapshot)
.setQualifiers(newArrayList(Qualifiers.FILE))
db.commit();
}
- public void indexProjects() {
+ public void indexProjectsAndViews() {
dbClient.componentIndexDao().indexProjects();
db.commit();
}
+
+ public void indexComponents(long... componentIdList) {
+ for (long componentId : componentIdList) {
+ dbClient.componentIndexDao().indexResource(dbSession, componentId);
+ }
+ db.commit();
+ }
}