From a5433ef8e095a467c8d1b51156ba8a54ee7b3d44 Mon Sep 17 00:00:00 2001 From: Jason Loux Date: Mon, 19 Oct 2026 19:06:11 -0400 Subject: [PATCH 1/2] Set entry number sorting/filtering to correct brapi column name --- .../brapi/v2/model/request/query/GermplasmQuery.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/breedinginsight/brapi/v2/model/request/query/GermplasmQuery.java b/src/main/java/org/breedinginsight/brapi/v2/model/request/query/GermplasmQuery.java index d00255f68..22188a05f 100644 --- a/src/main/java/org/breedinginsight/brapi/v2/model/request/query/GermplasmQuery.java +++ b/src/main/java/org/breedinginsight/brapi/v2/model/request/query/GermplasmQuery.java @@ -74,7 +74,7 @@ public SearchRequest constructSearchRequest() { public Map getFilterValuesByBrAPIColumnName() { Map filterValuesByBrAPIColumnName = new HashMap<>(); - filterValuesByBrAPIColumnName.put("importEntryNumber", getImportEntryNumber()); + filterValuesByBrAPIColumnName.put("listItemPosition", getImportEntryNumber()); filterValuesByBrAPIColumnName.put("accessionNumber", getAccessionNumber()); filterValuesByBrAPIColumnName.put("defaultDisplayName", getDefaultDisplayName()); filterValuesByBrAPIColumnName.put("breedingMethod", getBreedingMethod()); @@ -93,7 +93,7 @@ public Map getFilterValuesByBrAPIColumnName() { public Map getBrAPIColumnNamesByBiColumnName() { Map brAPIColumnNamesByBiColumnName = new HashMap<>(); - brAPIColumnNamesByBiColumnName.put("importEntryNumber", "importEntryNumber"); + brAPIColumnNamesByBiColumnName.put("importEntryNumber", "listItemPosition"); brAPIColumnNamesByBiColumnName.put("accessionNumber", "accessionNumber"); brAPIColumnNamesByBiColumnName.put("defaultDisplayName", "defaultDisplayName"); brAPIColumnNamesByBiColumnName.put("breedingMethod", "breedingMethod"); From c5a3665dcd66efc7afdac4ee627b03de4215024d Mon Sep 17 00:00:00 2001 From: Jason Loux Date: Tue, 20 Oct 2026 16:30:54 -0400 Subject: [PATCH 2/2] Continue support of original importEntryNumber, add support for listEntryNumber --- .../model/request/query/GermplasmQuery.java | 55 +++++-------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/src/main/java/org/breedinginsight/brapi/v2/model/request/query/GermplasmQuery.java b/src/main/java/org/breedinginsight/brapi/v2/model/request/query/GermplasmQuery.java index 22188a05f..28bf28b0a 100644 --- a/src/main/java/org/breedinginsight/brapi/v2/model/request/query/GermplasmQuery.java +++ b/src/main/java/org/breedinginsight/brapi/v2/model/request/query/GermplasmQuery.java @@ -15,6 +15,7 @@ @Getter @Introspected public class GermplasmQuery extends BrapiQuery { + // Actual DB entry number stored in each germplasm.additional_info private String importEntryNumber; private String accessionNumber; private String defaultDisplayName; @@ -26,55 +27,20 @@ public class GermplasmQuery extends BrapiQuery { private String createdDate; private String createdByUserName; private String synonym; + // This entry number depicts the sequential order of any given germplasm list. + // To be used only in the use case where listDbId is present and a search request is occurring on a germplasm list. + private String listEntryNumber; // This is a meta-parameter, it describes the display format of any date fields. private String dateDisplayFormat; // The list id used to get a collection of germplasm private String listDbId; - public SearchRequest constructSearchRequest() { - List filters = new ArrayList<>(); - if (!StringUtils.isBlank(getImportEntryNumber())) { - filters.add(constructFilterRequest("importEntryNumber", getImportEntryNumber())); - } - if (!StringUtils.isBlank(getAccessionNumber())) { - filters.add(constructFilterRequest("accessionNumber", getAccessionNumber())); - } - if (!StringUtils.isBlank(getDefaultDisplayName())) { - filters.add(constructFilterRequest("defaultDisplayName", getDefaultDisplayName())); - } - if (!StringUtils.isBlank(getBreedingMethod())) { - filters.add(constructFilterRequest("breedingMethod", getBreedingMethod())); - } - if (!StringUtils.isBlank(getSeedSource())) { - filters.add(constructFilterRequest("seedSource", getSeedSource())); - } - if (!StringUtils.isBlank(getPedigree())) { - filters.add(constructFilterRequest("pedigree", getPedigree())); - } - if (!StringUtils.isBlank(getFemaleParentGID())) { - filters.add(constructFilterRequest("femaleParentGID", getFemaleParentGID())); - } - if (!StringUtils.isBlank(getMaleParentGID())) { - filters.add(constructFilterRequest("maleParentGID", getMaleParentGID())); - } - if (!StringUtils.isBlank(getCreatedDate())) { - filters.add(constructFilterRequest("createdDate", getCreatedDate())); - } - if (!StringUtils.isBlank(getCreatedByUserName())) { - filters.add(constructFilterRequest("createdByUserName", getCreatedByUserName())); - } - if (!StringUtils.isBlank(getSynonym())) { - filters.add(constructFilterRequest("synonyms", getSynonym())); - } - return new SearchRequest(filters); - } - @Override public Map getFilterValuesByBrAPIColumnName() { Map filterValuesByBrAPIColumnName = new HashMap<>(); - filterValuesByBrAPIColumnName.put("listItemPosition", getImportEntryNumber()); + filterValuesByBrAPIColumnName.put("importEntryNumber", getImportEntryNumber()); filterValuesByBrAPIColumnName.put("accessionNumber", getAccessionNumber()); filterValuesByBrAPIColumnName.put("defaultDisplayName", getDefaultDisplayName()); filterValuesByBrAPIColumnName.put("breedingMethod", getBreedingMethod()); @@ -86,6 +52,10 @@ public Map getFilterValuesByBrAPIColumnName() { filterValuesByBrAPIColumnName.put("createdBy", getCreatedByUserName()); filterValuesByBrAPIColumnName.put("synonyms", getSynonym()); + if (!StringUtils.isBlank(listDbId)) { + filterValuesByBrAPIColumnName.put("listItemPosition", getListEntryNumber()); + } + return filterValuesByBrAPIColumnName; } @@ -93,7 +63,7 @@ public Map getFilterValuesByBrAPIColumnName() { public Map getBrAPIColumnNamesByBiColumnName() { Map brAPIColumnNamesByBiColumnName = new HashMap<>(); - brAPIColumnNamesByBiColumnName.put("importEntryNumber", "listItemPosition"); + brAPIColumnNamesByBiColumnName.put("importEntryNumber", "importEntryNumber"); brAPIColumnNamesByBiColumnName.put("accessionNumber", "accessionNumber"); brAPIColumnNamesByBiColumnName.put("defaultDisplayName", "defaultDisplayName"); brAPIColumnNamesByBiColumnName.put("breedingMethod", "breedingMethod"); @@ -105,6 +75,11 @@ public Map getBrAPIColumnNamesByBiColumnName() { brAPIColumnNamesByBiColumnName.put("createdByUserName", "createdBy"); brAPIColumnNamesByBiColumnName.put("synonyms", "synonyms"); + if (!StringUtils.isBlank(listDbId)) { + brAPIColumnNamesByBiColumnName.put("listEntryNumber", "listItemPosition"); + } + + return brAPIColumnNamesByBiColumnName; } }