branch support/3.13.x updated (3371c73 -> c2616b6)
This is an automated email from the git hooks/post-receive script. New change to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git from 3371c73 next version snapshot new a18e356 refs #6848 on utilise l'espèce complete dans les lots new c2616b6 fixes #6848: [IMPORT] mauvais fonctionnement de l'import BigFin, confusion code campagne et code rubin Merge branch 'feature/6848' into support/3.13.x The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c2616b69f7d9561d4d632a9dc0781b5773116ca6 Merge: 3371c73 a18e356 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:13:15 2015 +0100 fixes #6848: [IMPORT] mauvais fonctionnement de l'import BigFin, confusion code campagne et code rubin Merge branch 'feature/6848' into support/3.13.x commit a18e35664c836eaa94a787e8ab269bed157d737e 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 Summary of changes: .../tutti/service/bigfin/BigfinImportService.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit a18e35664c836eaa94a787e8ab269bed157d737e 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>.
This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit c2616b69f7d9561d4d632a9dc0781b5773116ca6 Merge: 3371c73 a18e356 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:13:15 2015 +0100 fixes #6848: [IMPORT] mauvais fonctionnement de l'import BigFin, confusion code campagne et code rubin Merge branch 'feature/6848' into support/3.13.x .../tutti/service/bigfin/BigfinImportService.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm