Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: eaed2fad by Tony Chemit at 2020-06-27T19:54:57+02:00 [CALCULS] L'assistant calculs bloque après la sélection des marées - Closes #1547 - - - - - 1 changed file: - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -28,7 +28,6 @@ import fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.decoration.DecoratorService; -import fr.ird.observe.dto.decoration.DecoratorServiceApplicationComponent; import fr.ird.observe.dto.referential.I18nReferentialHelper; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.EntityHelper; @@ -54,6 +53,7 @@ import fr.ird.observe.entities.referential.common.Species; import fr.ird.observe.entities.referential.ps.common.SchoolType; import fr.ird.observe.entities.referential.ps.common.SpeciesFate; import fr.ird.observe.entities.referential.ps.observation.ObjectMaterial; +import fr.ird.observe.services.local.ObserveServiceContextLocal; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; @@ -143,6 +143,13 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements } return ImmutableMap.copyOf(mappingBuilder); } + private DecoratorService decoratorService; + + @Override + public void setServiceContext(ObserveServiceContextLocal serviceContext) { + super.setServiceContext(serviceContext); + decoratorService = new DecoratorService(ConsolidateDataServiceLocal.this::getReferentialLocale); + } @Override public ConsolidateTripSeineDataResult consolidateTripSeine(SimplifiedObjectTypeSpecializedRules simplifiedObjectTypeSpecializedRules, ConsolidateTripSeineDataRequest request) { @@ -154,7 +161,6 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements SimplifiedObjectTypeManager simplifiedObjectTypeManager = newSimplifiedObjectTypeManager(simplifiedObjectTypeSpecializedRules); FloatingObjectConsolidateEngine floatingObjectConsolidateEngine = new FloatingObjectConsolidateEngine(simplifiedObjectTypeManager); - DecoratorService decoratorService = DecoratorServiceApplicationComponent.value(); Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(decoratorService,referenceLocale, floatingObjectConsolidateEngine, request.getTripSeineId(), failIfLengthWeightParameterNotFound, failIfLengthLengthParameterNotFound); return consolidateTripSeineDataResult.orElse(null); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/eaed2fad340b9f7dcb181fb040... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/eaed2fad340b9f7dcb181fb040... You're receiving this email because of your account on gitlab.com.