This is an automated email from the git hooks/post-receive script. New commit to branch feature/8061 in repository tutti. See http://git.codelutin.com/tutti.git commit e3a10a01e91248cc4038b68bc42f7ad2c3ce444d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 9 17:10:52 2016 +0100 Début de revue de l'import multi-poste --- .../catches/multipost/MultiPostImportService.java | 49 ++++++++++++++++++---- .../multipost/MultiPostImportServiceTest.java | 2 +- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java index 17995a1..8b9071a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java @@ -286,7 +286,9 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult * @return the list of the species which have not been imported, because there were concurrent batches */ public Map<String, Object> importSpecies(final File file, - final FishingOperation operation) { + final FishingOperation operation, + final boolean importFrequencies, + final boolean importIndividualObservations) { Callable<Map<String, Object>> call = () -> { @@ -319,15 +321,48 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult notImportedBatches, speciesList); - List<Caracteristic> caracteristics = dataContext.getCaracteristics(); // Import frequencies - importSpeciesFrequencies( - tempDir, - batches, - notImportedBatches, - caracteristics); + if (importFrequencies) { + List<Caracteristic> caracteristics = dataContext.getCaracteristics(); + importSpeciesFrequencies( + tempDir, + batches, + notImportedBatches, + caracteristics); + } + + if (importIndividualObservations) { + + List<Caracteristic> caracteristics = dataContext.getCaracteristicWithProtected(); + + // Import batches + // map containing the batches by their persistence id + final Map<String, IndividualObservationBatch> individualObservatiosnBatches = importIndividualObservationBatches( + tempDir, + operation, + speciesList, + caracteristics); + + // Import caracteristics + + importIndividualObservationCaracteristics(tempDir, + individualObservatiosnBatches, + caracteristics); + + // Persist batches + + //FIXME +// for (IndividualObservationBatch batch : batches.values()) { +// persistenceService.createIndividualObservationBatch(batch); +// } + + // Import attachments + + importAttachments(tempDir, individualObservatiosnBatches, ObjectTypeCode.SAMPLE); + + } // Import attachments diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java index ffe91f9..546701d 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java @@ -148,7 +148,7 @@ public class MultiPostImportServiceTest { log.info("Import multiImport " + speciesImportFile); } - multiPostImportService.importSpecies(speciesImportFile, fishingOperation); + multiPostImportService.importSpecies(speciesImportFile, fishingOperation, true, false); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.