branch develop updated (667a7fc -> e8d3dca)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 667a7fc Livrable #8237 Merge branch 'feature/8237' into develop new 0435df0 Lors d'un import multipost au niveau des espèces, bien regénéré le cache des échantillons (See #8277) new e8d3dca Livrable #8277 Merge branch 'feature/8277' into develop 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 e8d3dca259e4990c202d228d4f8a71c997013175 Merge: 667a7fc 0435df0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 09:13:37 2016 +0200 Livrable #8277 Merge branch 'feature/8277' into develop 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) Summary of changes: .../ifremer/tutti/service/PersistenceService.java | 36 +++++++++++++++++++++- 1 file changed, 35 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 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>.
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 e8d3dca259e4990c202d228d4f8a71c997013175 Merge: 667a7fc 0435df0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 09:13:37 2016 +0200 Livrable #8277 Merge branch 'feature/8277' into develop .../ifremer/tutti/service/PersistenceService.java | 36 +++++++++++++++++++++- 1 file changed, 35 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