Skip to content

[BI-1629] Add filtering to Ontology Table #243

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

Merged
dmeidlin merged 2 commits into from
Mar 10, 2023
Merged

[BI-1629] Add filtering to Ontology Table #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ef3e81
add search query params to GET /traits
dmeidlin Mar 3, 2023
4f9d159
add trait query field methodHandle
dmeidlin Mar 7, 2023
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
112 changes: 112 additions & 0 deletions src/main/java/org/breedinginsight/api/model/v1/request/query/TraitsQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,121 @@

import io.micronaut.core.annotation.Introspected;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;

@Getter
@Introspected
public class TraitsQuery extends QueryParams {
private String name;
private String traitDescription;
private String entityAttribute;
private String mainAbbreviation;
private String synonyms;
private String level;
private String status;
private String methodDescription;
private String methodClass;
private String methodFormula;
private String methodHandle;
private String scaleName;
private String scaleClass;
private String scaleDecimalPlaces;
private String scaleLowerLimit;
private String scaleUpperLimit;
private String scaleCategories;
private String createdAt;
private String updatedAt;
private String createdByUserId;
private String createdByUserName;
private String updatedByUserId;
private String updatedByUserName;
private String termType;

public SearchRequest constructSearchRequest() {
List<FilterRequest> filters = new ArrayList<>();
if (!StringUtils.isBlank(getName())) {
filters.add(constructFilterRequest("name", getName()));
}
if (!StringUtils.isBlank(getTraitDescription())) {
filters.add(constructFilterRequest("traitDescription", getTraitDescription()));
}
if (!StringUtils.isBlank(getEntityAttribute())) {
filters.add(constructFilterRequest("entityAttribute", getEntityAttribute()));
}
if (!StringUtils.isBlank(getMainAbbreviation())) {
filters.add(constructFilterRequest("mainAbbreviation", getMainAbbreviation()));
}
if (!StringUtils.isBlank(getSynonyms())) {
filters.add(constructFilterRequest("synonyms", getSynonyms()));
}
if (!StringUtils.isBlank(getLevel())) {
filters.add(constructFilterRequest("level", getLevel()));
}
if (!StringUtils.isBlank(getStatus())) {
filters.add(constructFilterRequest("status", getStatus()));
}
if (!StringUtils.isBlank(getMethodDescription())) {
filters.add(constructFilterRequest("methodDescription", getMethodDescription()));
}
if (!StringUtils.isBlank(getMethodClass())) {
filters.add(constructFilterRequest("methodClass", getMethodClass()));
}
Comment on lines +77 to +82
Copy link
Member

@timparsons timparsons Mar 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these two fields need to be combined together for filtering purposes because the UI combines them together for display purposes. When I tried filtering by that column, the filter only applies to the method description.

Example UI filtering: on the UI the "Method" column shows "test Measurement". If I type in "test" as my filter, then the ontology term shows correctly, however, if I type "Measurement", the term does not show in the table.

if (!StringUtils.isBlank(getMethodFormula())) {
filters.add(constructFilterRequest("methodFormula", getMethodFormula()));
}
if (!StringUtils.isBlank(getMethodHandle())) {
filters.add(constructFilterRequest("methodHandle", getMethodHandle()));
}
if (!StringUtils.isBlank(getScaleName())) {
filters.add(constructFilterRequest("scaleName", getScaleName()));
}
if (!StringUtils.isBlank(getScaleClass())) {
filters.add(constructFilterRequest("scaleClass", getScaleClass()));
}
if (!StringUtils.isBlank(getScaleDecimalPlaces())) {
filters.add(constructFilterRequest("scaleDecimalPlaces", getScaleDecimalPlaces()));
}
if (!StringUtils.isBlank(getScaleLowerLimit())) {
filters.add(constructFilterRequest("scaleLowerLimit", getScaleLowerLimit()));
}
if (!StringUtils.isBlank(getScaleUpperLimit())) {
filters.add(constructFilterRequest("scaleUpperLimit", getScaleUpperLimit()));
}
if (!StringUtils.isBlank(getScaleCategories())) {
filters.add(constructFilterRequest("scaleCategories", getScaleCategories()));
}
if (!StringUtils.isBlank(getCreatedAt())) {
filters.add(constructFilterRequest("createdAt", getCreatedAt()));
}
if (!StringUtils.isBlank(getUpdatedAt())) {
filters.add(constructFilterRequest("updatedAt", getUpdatedAt()));
}
if (!StringUtils.isBlank(getCreatedByUserId())) {
filters.add(constructFilterRequest("createdByUserId", getCreatedByUserId()));
}
if (!StringUtils.isBlank(getCreatedByUserName())) {
filters.add(constructFilterRequest("createdByUserName", getCreatedByUserName()));
}
if (!StringUtils.isBlank(getUpdatedByUserId())) {
filters.add(constructFilterRequest("updatedByUserId", getUpdatedByUserId()));
}
if (!StringUtils.isBlank(getUpdatedByUserName())) {
filters.add(constructFilterRequest("updatedByUserName", getUpdatedByUserName()));
}
if (!StringUtils.isBlank(getTermType())) {
filters.add(constructFilterRequest("termType", getTermType()));
}
return new SearchRequest(filters);
}
private FilterRequest constructFilterRequest(String field, String value) {
return FilterRequest.builder()
.field(field)
.value(value)
.build();
}


Boolean full = false;
}
3 changes: 2 additions & 1 deletion src/main/java/org/breedinginsight/api/v1/controller/TraitController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public HttpResponse<Response<DataResponse<Trait>>> getTraits(

try {
List<Trait> traits = ontologyService.getTraitsByProgramId(programId, traitsQuery.getFull());
return ResponseUtils.getQueryResponse(traits, traitQueryMapper, traitsQuery);
SearchRequest searchRequest = traitsQuery.constructSearchRequest();
return ResponseUtils.getQueryResponse(traits, traitQueryMapper, searchRequest, traitsQuery);
} catch (DoesNotExistException e) {
return HttpResponse.notFound();
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/breedinginsight/utilities/response/mappers/TraitQueryMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public TraitQueryMapper() {
trait -> trait.getMethod() != null ? trait.getMethod().getMethodClass() : null),
Map.entry("methodFormula",
trait -> trait.getMethod() != null ? trait.getMethod().getFormula() : null),
Map.entry("methodHandle",
trait -> trait.getMethod() != null ?
trait.getMethod().getDescription() + " " + trait.getMethod().getMethodClass() : null ),
Map.entry("scaleName",
trait -> trait.getScale() != null ? trait.getScale().getScaleName() : null),
Map.entry("scaleClass",
Expand Down