Bug fixes for importer after UUID migration

Author: jloux-brapi

src/main/java/org/brapi/test/BrAPITestServer/service/germ/CrossingProjectService.java

@@ -68,6 +68,12 @@ public List<CrossingProject> findCrossingProjects(String crossingProjectDbId, St
 	}
 
 	public List<CrossingProjectEntity> findCrossingProjectsByIds(List<String> crossingProjectIds) {
+		var result = new ArrayList<CrossingProjectEntity>();
+
+		if (crossingProjectIds.isEmpty()) {
+			return result;
+		}
+
 		return crossingProjectRepository.findByIdIn(crossingProjectIds.stream().map(UUID::fromString).toList());
 	}
 

src/main/java/org/brapi/test/BrAPITestServer/service/germ/GermplasmService.java

@@ -777,13 +777,21 @@ public List<GermplasmEntity> findByNames(List<String> germplasmNames) {
 
 	public List<GermplasmEntity> findByIds(List<String> germplasmDbIds)
 		throws BrAPIServerException {
-		List<GermplasmEntity> germsFoundInDb = germplasmRepository.findByIdIn(germplasmDbIds.stream().map(UUID::fromString).toList());
+
+		var result = new ArrayList<GermplasmEntity>();
+
+		if (germplasmDbIds.isEmpty()) {
+			return result;
+		}
+
+		List<UUID> germIdsAsUUIDs = germplasmDbIds.stream().map(UUID::fromString).toList();
+		List<GermplasmEntity> germsFoundInDb = germplasmRepository.findByIdIn(germIdsAsUUIDs);
 
 		Set<UUID> germIdsFoundInDB = germsFoundInDb.stream()
 				.map(BrAPIBaseEntity::getId)
 				.collect(Collectors.toSet());
 
-		if (!germIdsFoundInDB.containsAll(germplasmDbIds)) {
+		if (!germIdsFoundInDB.containsAll(germIdsAsUUIDs)) {
 			throw new BrAPIServerDbIdNotFoundException("Germplasm Ids passed to findByIds were not found in the DB", HttpStatus.BAD_REQUEST);
 		}
 

src/main/java/org/brapi/test/BrAPITestServer/service/germ/PedigreeService.java

@@ -565,12 +565,12 @@ static public String getPedigreeString(PedigreeNodeEntity entity) {
 	private List<PedigreeNodeEntity> createEntitiesInBatch(List<PedigreeNode> nodes)
 		throws BrAPIServerException {
 		List<String> germIds = nodes.stream()
-				.filter(Objects::nonNull)
 				.map(PedigreeNode::getGermplasmDbId)
+				.filter(Objects::nonNull)
 				.toList();
 		List<String> crossingProjIds = nodes.stream()
-				.filter(Objects::nonNull)
 				.map(PedigreeNode::getCrossingProjectDbId)
+				.filter(Objects::nonNull)
 				.toList();
 
 		Map<UUID, GermplasmEntity> foundGermsById = germplasmService.findByIds(germIds)
@@ -613,8 +613,8 @@ private void updateEntitiesWithEdgesInBatch(Map<String, Pair<PedigreeNodeEntity,
 		List<String> germIds = new ArrayList<>(entityDtoPairsByGermId.keySet());
 		List<String> crossingProjIds = entityDtoPairsByGermId.values()
 				.stream()
-				.filter(Objects::nonNull)
 				.map(nodePair -> nodePair.getRight().getCrossingProjectDbId())
+				.filter(Objects::nonNull)
 				.toList();
 
 		List<String> germIdsWithParentNodes = entityDtoPairsByGermId.entrySet()