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 0435df041130749808b8e41ee84c48cec5ea10b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 09:12:55 2016 +0200 Lors d'un import multipost au niveau des espèces, bien regénéré le cache des échantillons (See #8277) --- .../ifremer/tutti/service/PersistenceService.java | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index c7928e0..3318223 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -1690,7 +1690,41 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer @Override public Collection<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations) { - return driver.createIndividualObservationBatches(individualObservations); + + Optional<CruiseCache> optionalCruiseCache = getOptionalCruiseCache(); + + if (optionalCruiseCache.isPresent()) { + + // on supprime du cache les observation individuelles de l'opération + CruiseCache cruiseCache = optionalCruiseCache.get(); + + FishingOperation fishingOperation = context.getDataContext().getFishingOperation(); + List<IndividualObservationBatch> individualObservationsToRemove = getAllIndividualObservationBatchsForFishingOperation(fishingOperation.getIdAsInt()); + + if (log.isInfoEnabled()) { + log.info("Remove from cruise sampling cache: " + fishingOperation + " with " + individualObservationsToRemove.size() + " individual observations."); + } + cruiseCache.removeFishingOperation(fishingOperation, individualObservationsToRemove); + + } + + Collection<IndividualObservationBatch> individualObservationBatches = driver.createIndividualObservationBatches(individualObservations); + + if (optionalCruiseCache.isPresent()) { + + // on ajoute les observation individuelles de l'opération du cache + CruiseCache cruiseCache = optionalCruiseCache.get(); + + FishingOperation fishingOperation = context.getDataContext().getFishingOperation(); + List<IndividualObservationBatch> individualObservationsToAdd = getAllIndividualObservationBatchsForFishingOperation(fishingOperation.getIdAsInt()); + if (log.isInfoEnabled()) { + log.info("Add to cruise sampling cache: " + fishingOperation + " with " + individualObservationsToAdd.size() + " individual observations."); + } + cruiseCache.addFishingOperation(fishingOperation, individualObservationsToAdd); + + } + + return individualObservationBatches; } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.