This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 6290d1b5c05551ddcc6cb1aa76d0d4b785efe78d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:12:27 2015 +0100 refs #6848 on utilise l'espèce complete dans les lots --- .../tutti/service/bigfin/BigfinImportService.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java index 3ccb390..4fb893e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java @@ -50,6 +50,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.persistence.entities.referential.Speciess; import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; @@ -134,7 +135,6 @@ public class BigfinImportService extends AbstractTuttiService { } List<Species> allReferentSpecies = persistenceService.getAllReferentSpecies(); - Map<String, Species> speciesBySurveyCode = Maps.newTreeMap(); for (Species species : allReferentSpecies) { String surveyCode = species.getSurveyCode(); @@ -159,6 +159,21 @@ public class BigfinImportService extends AbstractTuttiService { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + // make sure we use survey codes if possible in species batches (see https://forge.codelutin.com/issues/6848) + if (!rootSpeciesBatch.isEmptyChildren()) { + + Map<String, Species> speciesByReferenceTaxonId = Speciess.splitByTaxonId(allReferentSpecies); + + for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { + Species species = speciesBatch.getSpecies(); + Integer referenceTaxonId = species.getReferenceTaxonId(); + Preconditions.checkNotNull(referenceTaxonId, "Can't have a null referenceTaxonId for species: " + species); + Species species1 = speciesByReferenceTaxonId.get(referenceTaxonId.toString()); + speciesBatch.setSpecies(species1); + } + + } + BigfinImportContext bigfinImportContext = new BigfinImportContext(importFile, operation, catchBatch, signsToCaracteristicValue, speciesBySurveyCode, speciesProtocolBySurveyCode, rootSpeciesBatch); return bigfinImportContext; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.