From d94cc73a609dabb6fa82f7545dbbab813020c789 Mon Sep 17 00:00:00 2001 From: mlm483 <128052931+mlm483@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:23:54 -0400 Subject: [PATCH 1/2] [BI-2266] - use GID as Entry No for all germplasm export --- .../brapi/v2/services/BrAPIGermplasmService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java b/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java index 74fc8017d..468a6b5b3 100644 --- a/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java +++ b/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java @@ -85,7 +85,8 @@ public List> processListData(List germplasm, // Use the entry number in the list map if generated if(new UUID(0,0).compareTo(germplasmListId) == 0) { - row.put("Entry No", germplasmEntry.getAdditionalInfo().get(BrAPIAdditionalInfoFields.GERMPLASM_IMPORT_ENTRY_NUMBER).getAsInt()); + // Not downloading a real list, use GID (https://breedinginsight.atlassian.net/browse/BI-2266). + row.put("Entry No", Integer.valueOf(germplasmEntry.getAccessionNumber())); } else { row.put("Entry No", germplasmEntry.getAdditionalInfo() .getAsJsonObject(BrAPIAdditionalInfoFields.GERMPLASM_LIST_ENTRY_NUMBERS).get(germplasmListId.toString()).getAsInt()); @@ -153,6 +154,7 @@ public List getGermplasmByList(UUID programId, String listDbId) return germplasm; } else throw new ApiException(); } + public DownloadFile exportGermplasm(UUID programId, FileType fileExtension) throws IllegalArgumentException, ApiException, IOException { List columns = GermplasmFileColumns.getOrderedColumns(); From d3b7ea8f32e1b6b978aa81d2fc16c10e2ee43ad9 Mon Sep 17 00:00:00 2001 From: mlm483 <128052931+mlm483@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:19:14 -0400 Subject: [PATCH 2/2] [BI-2266] - updated test --- .../services/BrAPIGermplasmServiceUnitTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/breedinginsight/services/BrAPIGermplasmServiceUnitTest.java b/src/test/java/org/breedinginsight/services/BrAPIGermplasmServiceUnitTest.java index afa00df4e..8f906c169 100644 --- a/src/test/java/org/breedinginsight/services/BrAPIGermplasmServiceUnitTest.java +++ b/src/test/java/org/breedinginsight/services/BrAPIGermplasmServiceUnitTest.java @@ -169,6 +169,8 @@ public void getGermplasmListExport() { assertEquals(expectedColumnNames, resultTable.columnNames(), "Incorrect columns were exported"); assertEquals(2, resultTable.rowCount(), "Wrong number of rows were exported"); assertEquals("Germplasm A", resultTable.get(0, 1), "Incorrect data exported"); - assertEquals("2", resultTable.get(0, 6), "Incorrect data exported"); + // Check that "GID" column matches "Entry No" for both (https://breedinginsight.atlassian.net/browse/BI-2266). + assertEquals(resultTable.get(0,0), resultTable.get(0, 6), "Incorrect data exported"); + assertEquals(resultTable.get(1,0), resultTable.get(1, 6), "Incorrect data exported"); } }