Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java
    ... ... @@ -26,10 +26,11 @@ import java.util.Optional;
    26 26
    27 27 
     public class LengthLengthParameterTopiaDao extends AbstractLengthLengthParameterTopiaDao<LengthLengthParameter> {
    28 28
    29 
    -    Optional<LengthLengthParameter> find(SizeMeasureType inputSizeMeasureType, SizeMeasureType outputSizeMeasureType) {
    29 
    +    Optional<LengthLengthParameter> find(Species species, SizeMeasureType inputSizeMeasureType, SizeMeasureType outputSizeMeasureType) {
    30 30
    31 31 
             return Optional.ofNullable(
    32 
    -                forProperties(LengthLengthParameter.PROPERTY_INPUT_SIZE_MEASURE_TYPE, inputSizeMeasureType,
    32 
    +                forProperties(LengthLengthParameter.PROPERTY_SPECIES, species,
    33 
    +                        LengthLengthParameter.PROPERTY_INPUT_SIZE_MEASURE_TYPE, inputSizeMeasureType,
    33 34 
                                   LengthLengthParameter.PROPERTY_OUTPUT_SIZE_MEASURE_TYPE, outputSizeMeasureType)
    34 35 
                             .tryFindAny()
    35 36 
                             .orNull());

  • persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java
    ... ... @@ -35,9 +35,10 @@ import java.util.Optional;
    35 35 
     public class LengthLengthParameters {
    36 36
    37 37 
         public static Optional<LengthLengthParameter> findLengthLengthParameter(ObserveTopiaDaoSupplier daoSupplier,
    38 
    +                                                                            Species species,
    38 39 
                                                                                 SizeMeasureType inputSizeMeasureType,
    39 40 
                                                                                 SizeMeasureType outputSizeMeasureType) {
    40 
    -        return daoSupplier.getLengthLengthParameterDao().find(inputSizeMeasureType, outputSizeMeasureType);
    41 
    +        return daoSupplier.getLengthLengthParameterDao().find(species, inputSizeMeasureType, outputSizeMeasureType);
    41 42 
         }
    42 43
    43 44 
     }

  • 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
    680 680 
             if (outputSizeMeasureType != null && !outputSizeMeasureType.equals(inputSizeMeasureType)) {
    681 681
    682 682 
                 // on doit effectuer une conversion taille - taille avant de convertir en poids
    683 
    -            Optional<LengthLengthParameter> optionalLengthLengthParameter = LengthLengthParameters.findLengthLengthParameter(activityContext.daoSupplier, inputSizeMeasureType, outputSizeMeasureType);
    683 
    +            Optional<LengthLengthParameter> optionalLengthLengthParameter = LengthLengthParameters.findLengthLengthParameter(activityContext.daoSupplier, species,inputSizeMeasureType, outputSizeMeasureType);
    684 684
    685 685 
                 if (optionalLengthLengthParameter.isPresent()) {
    686 686

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.