This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 3caec5e7725ddf94df985d387f017f2bddacb644 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 27 14:00:16 2016 +0200 On préfère explicitement mettre le code de prélèvement plutôt que de l'importer en lâche via la map de caractéristiques (See #8252) --- .../GenericformatImportPersistenceHelper.java | 6 ++++++ .../ValidateIndividualObservationAction.java | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersistenceHelper.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersistenceHelper.java index d07a64c..507ec87 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersistenceHelper.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersistenceHelper.java @@ -87,6 +87,7 @@ public class GenericformatImportPersistenceHelper { private final Caracteristic copyIndividualObservationModeCaracteristic; private final Caracteristic weightMeasuredCaracteristic; private final Caracteristic pmfmIdCaracteristic; + private final Caracteristic sampleCodeCaracteristic; public GenericformatImportPersistenceHelper(TuttiServiceContext context, GenericFormatContextSupport importContext) { this.importContext = importContext; @@ -99,6 +100,7 @@ public class GenericformatImportPersistenceHelper { this.weightMeasuredCaracteristic = persistenceService.getWeightMeasuredCaracteristic(); this.copyIndividualObservationModeCaracteristic = persistenceService.getCopyIndividualObservationModeCaracteristic(); this.pmfmIdCaracteristic = persistenceService.getPmfmIdCaracteristic(); + this.sampleCodeCaracteristic = persistenceService.getSampleCodeCaracteristic(); } public Set<FishingOperation> getFishingOperations(Integer cruiseId) { @@ -311,4 +313,8 @@ public class GenericformatImportPersistenceHelper { } + public Caracteristic getSampleCodeCaracteristic() { + return sampleCodeCaracteristic; + } + } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateIndividualObservationAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateIndividualObservationAction.java index 2a53c6a..baf4d6f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateIndividualObservationAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateIndividualObservationAction.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.service.genericformat.importactions; */ import com.google.common.collect.ImmutableList; +import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -138,27 +139,31 @@ public class ValidateIndividualObservationAction extends ImportActionSupport { public static void prepareIndividualObservationsForPersist(GenericformatImportPersistenceHelper persistenceHelper, ImmutableList<IndividualObservationBatch> individualObservations) { - for (IndividualObservationBatch individualObservation : individualObservations) { - CaracteristicQualitativeValue copyModeCaracteristic = individualObservation.getCaracteristics().removeQualitativeValue(persistenceHelper.getCopyIndividualObservationModeCaracteristic()); + CaracteristicMap caracteristics = individualObservation.getCaracteristics(); + + CaracteristicQualitativeValue copyModeCaracteristic = caracteristics.removeQualitativeValue(persistenceHelper.getCopyIndividualObservationModeCaracteristic()); Objects.requireNonNull(copyModeCaracteristic, "No copy mode found for individual observation: " + individualObservation.getId()); CopyIndividualObservationMode copyMode = CopyIndividualObservationMode.valueOf(copyModeCaracteristic.getIdAsInt()); individualObservation.setCopyIndividualObservationMode(copyMode); - String lengthClassId = individualObservation.getCaracteristics().removeStringValue(persistenceHelper.getPmfmIdCaracteristic()); + String lengthClassId = caracteristics.removeStringValue(persistenceHelper.getPmfmIdCaracteristic()); Objects.requireNonNull(lengthClassId, "No lengthClassId found for individual observation: " + individualObservation.getId()); Caracteristic lengthStepCaracteristic = persistenceHelper.getCaracteristic(Integer.valueOf(lengthClassId)); Objects.requireNonNull(lengthStepCaracteristic, "lengthStepCaracteristic " + lengthClassId + " does not exist."); individualObservation.setLengthStepCaracteristic(lengthStepCaracteristic); - Float length = individualObservation.getCaracteristics().removeFloatValue(lengthStepCaracteristic); + Float length = caracteristics.removeFloatValue(lengthStepCaracteristic); individualObservation.setSize(length); - Float weigth = individualObservation.getCaracteristics().removeFloatValue(persistenceHelper.getWeightMeasuredCaracteristic()); + Float weigth = caracteristics.removeFloatValue(persistenceHelper.getWeightMeasuredCaracteristic()); individualObservation.setWeight(weigth); + String samplingCode = caracteristics.removeStringValue(persistenceHelper.getSampleCodeCaracteristic()); + individualObservation.setSamplingCode(samplingCode); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.