This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 4fe49c1bb51b488d274d27ba84a640cea6ca9ee9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 11:07:08 2016 +0100 Utilisation du devenir espèce dans la consolidation de données --- .../main/java/fr/ird/observe/entities/seine/SetSeines.java | 13 ++++++++++--- .../actions/consolidate/ConsolidateDataServiceTopia.java | 7 ++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java b/entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java index 0650334..e19935c 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java @@ -22,10 +22,12 @@ package fr.ird.observe.entities.seine; * #L% */ -import com.google.common.collect.Collections2; import fr.ird.observe.entities.referentiel.Species; +import fr.ird.observe.entities.referentiel.seine.SpeciesFate; import java.util.Collection; +import java.util.Objects; +import java.util.stream.Collectors; /** * Created on 28/08/15. @@ -34,12 +36,17 @@ import java.util.Collection; */ public class SetSeines { - public static Collection<NonTargetLength> getNonTargetLengths(SetSeine setSeine, final Species species) { + public static Collection<NonTargetLength> getNonTargetLengths(SetSeine setSeine, Species species, SpeciesFate speciesFate) { Collection<NonTargetLength> nonTargetLengths = null; if (!setSeine.isNonTargetSampleEmpty()) { - nonTargetLengths = Collections2.filter(setSeine.getNonTargetSample().iterator().next().getNonTargetLength(), input -> species.equals(input.getSpecies())); + + nonTargetLengths = setSeine.getNonTargetSample().iterator().next().getNonTargetLength() + .stream() + .filter(l -> species.equals(l.getSpecies()) && Objects.equals(speciesFate, l.getSpeciesFate())) + .collect(Collectors.toList()); + } return nonTargetLengths; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java index 6e14b14..a0d75d3 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -289,7 +289,12 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements // répération des échantillon de cette espèce sur les calée - Collection<NonTargetLength> nonTargetLengths = SetSeines.getNonTargetLengths(activityContext.getSetSeine(), species); + // on recherche sur le couple species/speciesFate + Collection<NonTargetLength> nonTargetLengths = SetSeines.getNonTargetLengths(activityContext.getSetSeine(), species, nonTargetCatch.getSpeciesFate()); + if (nonTargetLengths.isEmpty()) { + // on recherche sur le couple species/null + nonTargetLengths = SetSeines.getNonTargetLengths(activityContext.getSetSeine(), species, null); + } if (nonTargetCatch.getCatchWeight() != null || nonTargetCatch.getTotalCount() != null) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.