From a309419ebbe2053cd7d5927ec7b7fb321573f6cf Mon Sep 17 00:00:00 2001 From: HMS17 <84345306+HMS17@users.noreply.github.com> Date: Thu, 23 Jun 2022 12:45:26 -0400 Subject: [PATCH 1/2] [BI-1224] - Show list creator in Germplasm lists table --- .../brapi/v2/services/BrAPIGermplasmService.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 b715ca85b..59c1083ff 100644 --- a/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java +++ b/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java @@ -83,6 +83,18 @@ public List getGermplasmListsByProgramId(UUID programId, HttpR String listName = germplasmList.getListName(); String newListName = removeAppendedKey(listName, program.getKey()); germplasmList.setListName(newListName); + + //Retrieve germplasm details to get list owner name + BrAPIListDetails listData = brAPIListDAO.getListById(germplasmList.getListDbId(), programId).getResult(); + List germplasmNames = listData.getData().subList(0,1); + List germplasm = germplasmDAO.getGermplasmByRawName(germplasmNames, programId); + String createdBy = germplasm.get(0).getAdditionalInfo().getAsJsonObject("createdBy").get("userName").getAsString(); + germplasmList.setListOwnerName(createdBy); + + //germplasmList.getListType(); value germplasm name GERMPLASM + //germplasmList.getAdditionalInfo(); todo utilize this instead if possible + //logic based on listType to know what BrAPI endpoint to call after fetching the first record in the list + //in order to fetch the full object } return germplasmLists; From ee65a8f5a5819f1dc8e930bc1295da3fd8b3a8d8 Mon Sep 17 00:00:00 2001 From: HMS17 <84345306+HMS17@users.noreply.github.com> Date: Mon, 27 Jun 2022 16:18:08 -0400 Subject: [PATCH 2/2] [BI-1224] - cleanup --- .../brapi/v2/services/BrAPIGermplasmService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 59c1083ff..b0c49b3bb 100644 --- a/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java +++ b/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java @@ -85,16 +85,12 @@ public List getGermplasmListsByProgramId(UUID programId, HttpR germplasmList.setListName(newListName); //Retrieve germplasm details to get list owner name + //Due to listOwnerName not being stored in breedbase BrAPIListDetails listData = brAPIListDAO.getListById(germplasmList.getListDbId(), programId).getResult(); List germplasmNames = listData.getData().subList(0,1); List germplasm = germplasmDAO.getGermplasmByRawName(germplasmNames, programId); String createdBy = germplasm.get(0).getAdditionalInfo().getAsJsonObject("createdBy").get("userName").getAsString(); germplasmList.setListOwnerName(createdBy); - - //germplasmList.getListType(); value germplasm name GERMPLASM - //germplasmList.getAdditionalInfo(); todo utilize this instead if possible - //logic based on listType to know what BrAPI endpoint to call after fetching the first record in the list - //in order to fetch the full object } return germplasmLists;