From 378623e1454d6f8e9ecef2704c459fcd5f481f51 Mon Sep 17 00:00:00 2001 From: timparsons Date: Tue, 28 Feb 2023 16:32:19 -0500 Subject: [PATCH] [BI-1721] fixing error when trying to enable breeding methods, and there is an existing program breeding method --- .../services/impl/BreedingMethodServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/breedinginsight/services/impl/BreedingMethodServiceImpl.java b/src/main/java/org/breedinginsight/services/impl/BreedingMethodServiceImpl.java index 2756f43ce..9b5c9fab6 100644 --- a/src/main/java/org/breedinginsight/services/impl/BreedingMethodServiceImpl.java +++ b/src/main/java/org/breedinginsight/services/impl/BreedingMethodServiceImpl.java @@ -85,7 +85,7 @@ public ProgramBreedingMethodEntity updateBreedingMethod(ProgramBreedingMethodEnt @Override public void enableSystemMethods(List systemBreedingMethods, UUID programId, UUID userId) throws ApiException, BadRequestException { List inUseMethods = fetchBreedingMethodsInUse(programId); - if(!systemBreedingMethods.containsAll(inUseMethods.stream().map(method -> method.getId()).collect(Collectors.toList()))) { + if(!systemBreedingMethods.containsAll(inUseMethods.stream().filter(method -> method.getProgramId() == null).map(method -> method.getId()).collect(Collectors.toList()))) { throw new BadRequestException("Breeding method is not allowed to be edited"); }