+ * Last generated at 2023-03-08 09:00.

+* [[Type::Anomalie 2546]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2546) **Quelques inexactitudes sur la persistence (découvert en voulant migrer vers Hibernate 6)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)

+* [[Type::Evolution 2218]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2218) **tms_version va-t-elle rester dans le schéma public ?** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)

+* [[Type::Evolution 2435]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2435) **Renommer l'entité  common.LengthMeasureMethod en common.SizeMeasureMethod** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil)

+* [[Type::Evolution 2478]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2478) **Réusinage du plan de cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)

+* [[Type::Evolution 2600]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2600) **Nouvelle référence 'Refueling'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)

+* [[Type::Evolution 2602]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2602) **Table ll_common.weightdeterminationmethod inutile ?** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)

+* [[Type::Evolution 2612]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2612) **Gestion des FAD sur OPERA AVDTH non mappées vers VesselActivity avec allowFad=TRUE** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)

+* [[Type::Evolution 2617]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2617) **Ajout de ps_common.TransmittingBuoyOperation 99** (Thanks to ) (Reported by Tony CHEMIT)

+* [[Type::Evolution 2618]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2618) **Ajout de ps_landing.Destination 28 et 29** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)

+* [[Type::Evolution 2620]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2620) **Nettoyage de la table LastUpdateDate** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)

+

+## Version [9.0.26](https://gitlab.com/ultreiaio/ird-observe/-/milestones/256)

+

+**Closed at 2023-03-08.**

+

+### Download

+* [Client (observe-9.0.26-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.26/observe-9.0.26-client.zip)

+* [Serveur (observe-9.0.26.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.26/observe-9.0.26.war)

+* [Serveur (observe-9.0.26-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.26/observe-9.0.26-server.zip)

+

+### Issues

+  * [[Type::Anomalie 2629]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2629) **Revue de la précision lors des calcul de RTP et RTT** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)

+  * [[Type::Anomalie 2630]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2630) **Revue du code de l'action de consolidation et amélioration de la sortie de l'action** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)

+  * [[Type::Anomalie 2631]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2631) **Ajouter des options dans la configuration du client pour configurer l'action de consolidation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)

+  * [[Type::Anomalie 2632]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2632) **Problème lors de la connexion à des bases distantes (la version du modèle de la première base testée est conservée ensuite comme version de modèle requis)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)

+  * [[Type::Evolution 2633]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2633) **Supprimer de la génération des Dto de méthodes non utilisées (pour les propriétés à multiplicité n)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)

+    <dependency>

+      <groupId>io.ultreia.java4all.decorator</groupId>

+      <artifactId>decorator-api</artifactId>

+    </dependency>

+            logModification(context, data);

+

+    default void logModification(C context, E data) {

+        String fieldName = fieldName();

+        logModification(context, data, fieldName);

+    }

+

+    default void logModification(C context, E data, String fieldName) {

+        context.getModification(fieldName).ifPresent(modification -> log.info(String.format("[%s] property '%s.%s' has changed [old value: %s - new value: %s] (by action %s)",

+                                                                                            data.getTopiaId(),

+                                                                                            context.dataType().getSimpleName(),

+                                                                                            fieldName,

+                                                                                            modification.getOldValue(),

+                                                                                            modification.getNewValue(),

+                                                                                            this)));

+    }

+

+package fr.ird.observe.consolidation.data.ps.localmarket;

+

+/*-

+ * #%L

+ * ObServe Core :: API :: Dto Consolidation

+ * %%

+ * Copyright (C) 2008 - 2023 IRD, Ultreia.io

+ * %%

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation, either version 3 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public

+ * License along with this program.  If not, see

+ * <http://www.gnu.org/licenses/gpl-3.0.html>.

+ * #L%

+ */

+

+import fr.ird.observe.consolidation.AtomicConsolidateAction;

+import fr.ird.observe.dto.ProtectedIdsPs;

+import fr.ird.observe.dto.data.ps.localmarket.BatchDto;

+import fr.ird.observe.dto.data.ps.localmarket.BatchWeightComputedValueSource;

+import fr.ird.observe.dto.referential.common.SpeciesReference;

+import fr.ird.observe.dto.referential.ps.localmarket.BatchWeightTypeReference;

+import io.ultreia.java4all.lang.Numbers;

+

+import java.util.Date;

+import java.util.Optional;

+

+/**

+ * Created on 24/02/2023.

+ *

+ * @author Tony Chemit - dev@tchemit.fr

+ * @since 9.0.26

+ */

+public enum BatchConsolidateActions implements AtomicConsolidateAction<BatchConsolidateContext, BatchDto> {

+

+

+    ComputeWeightFromSpeciesMeanWeight() {

+        @Override

+        public boolean test(BatchConsolidateContext context, BatchDto dto) {

+            if (dto.getCount() == null) {

+                // this method requires count

+                return false;

+            }

+            BatchWeightTypeReference batchWeightType = dto.getPackaging().getBatchWeightType();

+            return batchWeightType != null && ProtectedIdsPs.PS_LOCAL_MARKET_BATCH_WEIGHT_TYPE_SINGLE_SPECIES_INDIVIDUAL.equals(batchWeightType.getId());

+        }

+

+        @Override

+        public void accept(BatchConsolidateContext context, BatchDto dto) {

+

+            // espèce unité

+            // P = poids moyen de l'espèce * batch.count / 1000

+            // ocean = océan de débarquement de la marée = ps_common.trip.ocean

+            //lengthweightparameter.startdate <= trip.enddate <= lengthweightparameter.enddate

+            //sex = 0 - indéterminé (fr.ird.referential.common.Sex#1239832686121#0.0)

+            //sizemeasuretype = type de mesure par défaut de l'espèce = common.species.sizemeasuretype

+            // Si aucun poids moyen n'est trouvé P = NULL.

+

+            SpeciesReference species = dto.getSpecies();

+            String sizeMeasureTypeId = species.getSizeMeasureTypeId();

+            BatchConsolidateRequest request = context.getRequest();

+            String oceanId = request.getOceanId();

+            Date date = request.getDate();

+            boolean failIfLengthWeightParameterNotFound = request.isFailIfLengthWeightParameterNotFound();

+            Optional<Float> optionalMeanWeight = context.getRtpMeanWeightFinder().get(species.getId(),

+                                                                                      "fr.ird.referential.common.Sex#1239832686121#0.0",

+                                                                                      oceanId,

+                                                                                      sizeMeasureTypeId,

+                                                                                      date,

+                                                                                      failIfLengthWeightParameterNotFound,

+                                                                                      context::registerLengthWeightParameterNotFound);

+            if (optionalMeanWeight.isPresent()) {

+                Float meanWeight = optionalMeanWeight.get();

+                dto.setWeight(Numbers.roundFourDigits(meanWeight * dto.getCount() / 1000));

+                dto.setWeightComputedSource(BatchWeightComputedValueSource.fromSpeciesMeanWeight);

+            } else {

+                dto.setWeight(null);

+                dto.setWeightComputedSource(null);

+            }

+        }

+

+    },

+    ComputeWeightFromPackagingMeanWeight() {

+        @Override

+        public boolean test(BatchConsolidateContext context, BatchDto dto) {

+            if (dto.getCount() == null) {

+                // this method requires count

+                return false;

+            }

+            BatchWeightTypeReference batchWeightType = dto.getPackaging().getBatchWeightType();

+            return batchWeightType != null && ProtectedIdsPs.PS_LOCAL_MARKET_BATCH_WEIGHT_TYPE_PACKAGING_NOT_WEIGHTED.equals(batchWeightType.getId());

+        }

+

+        @Override

+        public void accept(BatchConsolidateContext context, BatchDto dto) {

+            //  Paquet/Conditionnement non pesé

+            //  P = batch.packaging.meanWeight * batch.count (ou null si pas de packaging.meanWeight)

+            Float meanWeight = dto.getPackaging().getMeanWeight();

+            if (meanWeight == null) {

+                dto.setWeight(null);

+                dto.setWeightComputedSource(null);

+            } else {

+                dto.setWeight(Numbers.roundFourDigits(dto.getCount() * meanWeight));

+                dto.setWeightComputedSource(BatchWeightComputedValueSource.fromPackagingMeanWeight);

+            }

+        }

+    },

+    ResetWeightValues() {

+        @Override

+        public boolean test(BatchConsolidateContext context, BatchDto dto) {

+            return true;

+        }

+

+        @Override

+        public void accept(BatchConsolidateContext context, BatchDto dto) {

+            dto.setWeight(null);

+            dto.setWeightComputedSource(null);

+        }

+    };

+

+    @Override

+    public String fieldName() {

+        return BatchDto.PROPERTY_WEIGHT;

+    }

+

+

+    @Override

+    public void logModification(BatchConsolidateContext context, BatchDto data) {

+        AtomicConsolidateAction.super.logModification(context, data);

+        AtomicConsolidateAction.super.logModification(context, data, BatchDto.PROPERTY_WEIGHT_COMPUTED_SOURCE);

+    }

+}

+import fr.ird.observe.consolidation.ConsolidateContext;

+import io.ultreia.java4all.decoration.Decorator;

+public class BatchConsolidateContext implements ConsolidateContext<BatchDto> {

+    private final GetOptionalRtpMeanWeight rtpMeanWeightFinder;

+    private final Decorator decorator;

+    private BatchConsolidateRequest request;

+    private BatchDto batch;

+    public BatchConsolidateContext(GetOptionalRtpMeanWeight rtpMeanWeightFinder, JavaBeanMonitor monitor, Decorator decorator) {

+        this.rtpMeanWeightFinder = rtpMeanWeightFinder;

+        this.decorator = decorator;

+    public void watch(BatchConsolidateRequest request) {

+        this.request = Objects.requireNonNull(request);

+        this.batch = Objects.requireNonNull(request.getBatch());

+        monitor.setBean(batch);

+    }

+

+    public Optional<ToolkitIdModifications> build() {

+            batch.registerDecorator(decorator);

+            Optional<ToolkitIdModifications> result = monitor.toModifications(modifications -> new ToolkitIdModifications(batch, modifications, lengthWeightParameterNotFound == null ? null : Set.of(lengthWeightParameterNotFound)));

+            result.ifPresent(m -> m.reset(batch));

+            return result;

+            return Optional.of(new ToolkitIdModifications(batch, Set.of(), Set.of(lengthWeightParameterNotFound)));

+    public BatchConsolidateRequest getRequest() {

+        return request;

+    }

+

+    public GetOptionalRtpMeanWeight getRtpMeanWeightFinder() {

+        return rtpMeanWeightFinder;

+    }

+

+    public void clear() {

+        this.batch = null;

+        this.request = null;

+

+    @Override

+    public JavaBeanMonitor monitor() {

+        return monitor;

+    }

+

+    @Override

+    public Class<BatchDto> dataType() {

+        return BatchDto.class;

+    }

+    private final BatchConsolidateContext context;

+        JavaBeanMonitor monitor = new JavaBeanMonitor(BatchDto.PROPERTY_WEIGHT, BatchDto.PROPERTY_WEIGHT_COMPUTED_SOURCE);

+        this.context = new BatchConsolidateContext(rtpMeanWeightFinder, monitor, decoratorService.getDecoratorByType(BatchDto.class));

+

+        // the only thing we can consolidate is the batch.weight

+        if (dto.getWeight() != null && dto.getWeightComputedSource() == null) {

+            // the value was set by user, do not change any thing

+            return Optional.empty();

+        }

+        context.watch(request);

+

+        try {

+            if (!BatchConsolidateActions.ComputeWeightFromSpeciesMeanWeight.execute(context, dto)) {

+                if (!BatchConsolidateActions.ComputeWeightFromPackagingMeanWeight.execute(context, dto)) {

+                    BatchConsolidateActions.ResetWeightValues.execute(context, dto);

+                }

+            }

+            Optional<ToolkitIdModifications> result = context.build();

+                    log.warn(String.format("Found some warnings on batch: %s", request.getBatch().getId()));

+        } finally {

+            context.clear();

+import fr.ird.observe.dto.data.ps.localmarket.BatchWeightComputedValueSource;

+import fr.ird.observe.dto.referential.common.SpeciesReference;

+import fr.ird.observe.dto.referential.ps.localmarket.PackagingReference;

+import io.ultreia.java4all.util.Dates;

+        request.setOceanId("fr.ird.referential.common.Ocean#1239832686152#0.8325731048817705");

+

+

+        {

+

+            BatchDto createDto = new BatchDto();

+            createDto.setId("fr.ird.data.ps.localmarket.Batch#1617103690104#0.1");

+            createDto.setCount(5);

+            createDto.setPackaging(servicesProvider.getReferenceService().loadReferential(PackagingReference.class, "fr.ird.referential.ps.localmarket.Packaging#1464000000000#001"));

+            createDto.setSpecies(servicesProvider.getReferenceService().loadReferential(SpeciesReference.class, "fr.ird.referential.common.Species#1560863653582#0.22356459159799613"));

+            createDto.setDate(Dates.createDate(30, 3, 2021));

+            request.setBatch(createDto);

+            request.setDate(createDto.getDate());

+

+            actual = service.consolidateLocalmarketBatch(request);

+

+            Assert.assertNotNull(actual);

+        }

+        {

+

+            BatchDto createDto = new BatchDto();

+            createDto.setId("fr.ird.data.ps.localmarket.Batch#1617103690104#0.2");

+            createDto.setCount(5);

+            createDto.setPackaging(servicesProvider.getReferenceService().loadReferential(PackagingReference.class, "fr.ird.referential.ps.localmarket.Packaging#1464000000000#039"));

+            createDto.setSpecies(servicesProvider.getReferenceService().loadReferential(SpeciesReference.class, "fr.ird.referential.common.Species#1560863653582#0.22356459159799613"));

+            createDto.setDate(Dates.createDate(30, 3, 2021));

+            request.setBatch(createDto);

+            request.setDate(createDto.getDate());

+

+            actual = service.consolidateLocalmarketBatch(request);

+

+            Assert.assertNotNull(actual);

+        }

+        {

+

+            BatchDto createDto = new BatchDto();

+            createDto.setId("fr.ird.data.ps.localmarket.Batch#1617103690104#0.3");

+            createDto.setWeightComputedSource(BatchWeightComputedValueSource.fromPackagingMeanWeight);

+            createDto.setPackaging(servicesProvider.getReferenceService().loadReferential(PackagingReference.class, "fr.ird.referential.ps.localmarket.Packaging#1464000000000#022"));

+            createDto.setSpecies(servicesProvider.getReferenceService().loadReferential(SpeciesReference.class, "fr.ird.referential.common.Species#1560863653582#0.22356459159799613"));

+            createDto.setDate(Dates.createDate(30, 3, 2021));

+            request.setBatch(createDto);

+            request.setDate(createDto.getDate());

+

+            actual = service.consolidateLocalmarketBatch(request);

+

+            Assert.assertNotNull(actual);

+        }

+

+        {

+

+            BatchDto createDto = new BatchDto();

+            createDto.setId("fr.ird.data.ps.localmarket.Batch#1617103690104#0.4");

+            createDto.setWeightComputedSource(BatchWeightComputedValueSource.fromSpeciesMeanWeight);

+            createDto.setPackaging(servicesProvider.getReferenceService().loadReferential(PackagingReference.class, "fr.ird.referential.ps.localmarket.Packaging#1464000000000#022"));

+            createDto.setSpecies(servicesProvider.getReferenceService().loadReferential(SpeciesReference.class, "fr.ird.referential.common.Species#1560863653582#0.22356459159799613"));

+            createDto.setDate(Dates.createDate(30, 3, 2021));

+            createDto.setWeight(100.0f);

+            request.setBatch(createDto);

+            request.setDate(createDto.getDate());

+

+            actual = service.consolidateLocalmarketBatch(request);

+

+            Assert.assertNotNull(actual);

+        }

+    <version>2023.10</version>