From 4857530ba1b70d15a8a90fa31361e4726ea3066c Mon Sep 17 00:00:00 2001 From: HMS17 Date: Tue, 9 Jan 2024 11:57:48 -0500 Subject: [PATCH] [BI-1868] - Ontology: Display full name in table and details pane --- .../api/model/v1/request/query/TraitsQuery.java | 4 ++++ .../utilities/response/mappers/TraitQueryMapper.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/breedinginsight/api/model/v1/request/query/TraitsQuery.java b/src/main/java/org/breedinginsight/api/model/v1/request/query/TraitsQuery.java index a0ae2bb6f..c567ce909 100644 --- a/src/main/java/org/breedinginsight/api/model/v1/request/query/TraitsQuery.java +++ b/src/main/java/org/breedinginsight/api/model/v1/request/query/TraitsQuery.java @@ -50,6 +50,7 @@ public class TraitsQuery extends QueryParams { private String updatedByUserId; private String updatedByUserName; private String termType; + private String fullName; public SearchRequest constructSearchRequest() { List filters = new ArrayList<>(); @@ -125,6 +126,9 @@ public SearchRequest constructSearchRequest() { if (!StringUtils.isBlank(getTermType())) { filters.add(constructFilterRequest("termType", getTermType())); } + if (!StringUtils.isBlank(getFullName())) { + filters.add(constructFilterRequest("fullName", getFullName())); + } return new SearchRequest(filters); } private FilterRequest constructFilterRequest(String field, String value) { diff --git a/src/main/java/org/breedinginsight/utilities/response/mappers/TraitQueryMapper.java b/src/main/java/org/breedinginsight/utilities/response/mappers/TraitQueryMapper.java index ff1638b12..2705dda71 100644 --- a/src/main/java/org/breedinginsight/utilities/response/mappers/TraitQueryMapper.java +++ b/src/main/java/org/breedinginsight/utilities/response/mappers/TraitQueryMapper.java @@ -77,7 +77,8 @@ public TraitQueryMapper() { trait -> trait.getUpdatedByUser() != null ? trait.getUpdatedByUser().getId() : null), Map.entry("updatedByUserName", trait -> trait.getUpdatedByUser() != null ? trait.getUpdatedByUser().getName() : null), - Map.entry("termType", Trait::getTermType) + Map.entry("termType", Trait::getTermType), + Map.entry("fullName", Trait::getFullName) ); }