Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Search component by group #3761

Merged
merged 3 commits into from
May 27, 2024
Merged

Search component by group #3761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86731aa
Testing component search by name
rcsilva83 May 27, 2024
7936a50
Adding support for component search by group
rcsilva83 May 27, 2024
f894e8f
Fixing test assertions
rcsilva83 May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/dependencytrack/persistence/ComponentQueryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public PaginatedResult getComponents(final Project project, final boolean includ
final PaginatedResult result;
String querySring ="SELECT FROM org.dependencytrack.model.Component WHERE project == :project ";
if (filter != null) {
querySring += " && (project == :project) && name.toLowerCase().matches(:name)";
querySring += " && (project == :project) && (name.toLowerCase().matches(:filter) || group.toLowerCase().matches(:filter))";
}
if (onlyOutdated) {
// Components are considered outdated when metadata does exists, but the version is different than latestVersion
Expand Down
32 changes: 32 additions & 0 deletions src/test/java/org/dependencytrack/resources/v1/ComponentResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,38 @@ public void getAllDirectComponentsTest() throws MalformedPackageURLException {
assertThat(json).hasSize(100);
}

@Test
public void getComponentsByNameTest() throws MalformedPackageURLException {
final Project project = prepareProject();

final Response response = jersey.target(V1_COMPONENT + "/project/" + project.getUuid())
.queryParam("searchText", "name-1")
.request()
.header(X_API_KEY, apiKey)
.get(Response.class);
assertThat(response.getStatus()).isEqualTo(HttpStatus.SC_OK);
assertThat(response.getHeaderString(TOTAL_COUNT_HEADER)).isEqualTo("111"); // 75 outdated direct dependencies

final JsonArray json = parseJsonArray(response);
assertThat(json).hasSize(100);
}

@Test
public void getComponentsByGroupTest() throws MalformedPackageURLException {
final Project project = prepareProject();

final Response response = jersey.target(V1_COMPONENT + "/project/" + project.getUuid())
.queryParam("searchText", "group")
.request()
.header(X_API_KEY, apiKey)
.get(Response.class);
assertThat(response.getStatus()).isEqualTo(HttpStatus.SC_OK);
assertThat(response.getHeaderString(TOTAL_COUNT_HEADER)).isEqualTo("1000"); // 75 outdated direct dependencies

final JsonArray json = parseJsonArray(response);
assertThat(json).hasSize(100);
}

@Test
public void getComponentByUuidTest() {
Project project = qm.createProject("Acme Application", null, null, null, null, null, true, false);
Expand Down