Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0f13168a by Tony CHEMIT at 2018-06-17T12:35:30Z [REFERENTIEL] Lien entre lengthlengthparameter et species ? - See #962 - - - - - 3 changed files: - persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java @@ -26,10 +26,11 @@ import java.util.Optional; public class LengthLengthParameterTopiaDao extends AbstractLengthLengthParameterTopiaDao<LengthLengthParameter> { - Optional<LengthLengthParameter> find(SizeMeasureType inputSizeMeasureType, SizeMeasureType outputSizeMeasureType) { + Optional<LengthLengthParameter> find(Species species, SizeMeasureType inputSizeMeasureType, SizeMeasureType outputSizeMeasureType) { return Optional.ofNullable( - forProperties(LengthLengthParameter.PROPERTY_INPUT_SIZE_MEASURE_TYPE, inputSizeMeasureType, + forProperties(LengthLengthParameter.PROPERTY_SPECIES, species, + LengthLengthParameter.PROPERTY_INPUT_SIZE_MEASURE_TYPE, inputSizeMeasureType, LengthLengthParameter.PROPERTY_OUTPUT_SIZE_MEASURE_TYPE, outputSizeMeasureType) .tryFindAny() .orNull()); ===================================== persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java @@ -35,9 +35,10 @@ import java.util.Optional; public class LengthLengthParameters { public static Optional<LengthLengthParameter> findLengthLengthParameter(ObserveTopiaDaoSupplier daoSupplier, + Species species, SizeMeasureType inputSizeMeasureType, SizeMeasureType outputSizeMeasureType) { - return daoSupplier.getLengthLengthParameterDao().find(inputSizeMeasureType, outputSizeMeasureType); + return daoSupplier.getLengthLengthParameterDao().find(species, inputSizeMeasureType, outputSizeMeasureType); } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java @@ -680,7 +680,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements if (outputSizeMeasureType != null && !outputSizeMeasureType.equals(inputSizeMeasureType)) { // on doit effectuer une conversion taille - taille avant de convertir en poids - Optional<LengthLengthParameter> optionalLengthLengthParameter = LengthLengthParameters.findLengthLengthParameter(activityContext.daoSupplier, inputSizeMeasureType, outputSizeMeasureType); + Optional<LengthLengthParameter> optionalLengthLengthParameter = LengthLengthParameters.findLengthLengthParameter(activityContext.daoSupplier, species,inputSizeMeasureType, outputSizeMeasureType); if (optionalLengthLengthParameter.isPresent()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0f13168a61eb00e94bcddce5cb1d... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0f13168a61eb00e94bcddce5cb1d... You're receiving this email because of your account on gitlab.com.