- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Update .gitlab-ci.yml file
by Tony CHEMIT (＠tchemit) Dec. 12, 2024

Dec. 12, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6ac0889d by Tony CHEMIT at 2024-12-12T17:48:03+00:00 Update .gitlab-ci.yml file - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -21,11 +21,11 @@ cache: - ${REPOSITORY_CACHE_DIR} - ${GITLAB_CACHE_DIR} - ${SITE_CACHE_DIR} - - "${BUILD_DIR}/observe/target/*.zip" - - "${BUILD_DIR}/observe/target/*.war" + - "${BUILD_DIR}/.git/observe/target/*.zip" + - "${BUILD_DIR}/.git/observe/target/*.war" .stage_docker: &stage_docker - stage: .pre + stage: .post .stage_build: &stage_build stage: Build .stage_test: &stage_test @@ -100,7 +100,7 @@ trigger-make-release: .automatic: &automatic rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^feature/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ - if: $CI_PIPELINE_SOURCE != 'trigger' build: @@ -136,7 +136,7 @@ release-publish-site: .manual: &manual rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^feature/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ when: manual create-docker: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6ac0889d6b10a8f13c7071a09… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6ac0889d6b10a8f13c7071a09… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Remove Docker stage
by Tony CHEMIT (＠tchemit) Dec. 12, 2024

Dec. 12, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 11aab725 by Tony Chemit at 2024-12-12T18:31:19+01:00 Remove Docker stage - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -25,7 +25,7 @@ cache: - "${BUILD_DIR}/observe/target/*.war" .stage_docker: &stage_docker - stage: Docker + stage: .pre .stage_build: &stage_build stage: Build .stage_test: &stage_test View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/11aab72521e6b6aab6d0d45fa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/11aab72521e6b6aab6d0d45fa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Remove Docker stage
by Tony CHEMIT (＠tchemit) Dec. 12, 2024

Dec. 12, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f877e44a by Tony Chemit at 2024-12-12T18:29:58+01:00 Remove Docker stage - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,5 +1,4 @@ stages: - - Docker - Build - Test - Release View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f877e44acec80b6db9a2294fd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f877e44acec80b6db9a2294fd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue_2960
by Tony CHEMIT (＠tchemit) Dec. 12, 2024

Dec. 12, 2024

Tony CHEMIT pushed new branch feature/issue_2960 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/issue_2960 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: update generated validation files - See #2949
by Tony CHEMIT (＠tchemit) Dec. 12, 2024

Dec. 12, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f295fd3d by Tony Chemit at 2024-12-11T19:38:35+01:00 update generated validation files - See #2949 - - - - - 67452ae2 by Tony Chemit at 2024-12-12T18:09:34+01:00 Fix Pmd plugin version - - - - - 47f90d0f by Tony Chemit at 2024-12-12T18:10:43+01:00 Make site publish ok with gitlab CI - - - - - 4 changed files: - .gitlab-ci.yml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-update.json - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -10,13 +10,18 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat variables: MAVEN_CLI_OPTS: "--batch-mode" BUILD_DIR: "/builds/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}" - CACHE_DIR: "${BUILD_DIR}/.mvn/repository" - MAVEN_OPTS: "-Dmaven.repo.local=${CACHE_DIR} -Xmx2048m" + MVN_CACHE_DIR: "${BUILD_DIR}/.mvn" + REPOSITORY_CACHE_DIR: "${MVN_CACHE_DIR}/repository" + GITLAB_CACHE_DIR: "${MVN_CACHE_DIR}/gitlab-cache" + SITE_CACHE_DIR: "${MVN_CACHE_DIR}/site-cache" + MAVEN_OPTS: "-Dmaven.repo.local=${REPOSITORY_CACHE_DIR} -Xmx2048m -Dscmpublish.checkoutDirectory=${SITE_CACHE_DIR} -Dgitlab.cachePath=${GITLAB_CACHE_DIR}" cache: key: MAVEN_CACHE paths: - - ${CACHE_DIR} + - ${REPOSITORY_CACHE_DIR} + - ${GITLAB_CACHE_DIR} + - ${SITE_CACHE_DIR} - "${BUILD_DIR}/observe/target/*.zip" - "${BUILD_DIR}/observe/target/*.war" @@ -53,7 +58,9 @@ cache: environment: name: site script: - - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate-only; fi + - if [[ -n "${PUBLISH_SITE}" && ! -d "${SITE_CACHE_DIR}" ]]; then ( git clone ${CI_REPOSITORY_URL} ${SITE_CACHE_DIR} ; cd ${SITE_CACHE_DIR} ; git checkout pages ); fi + - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate-inline; fi + - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-git-init; fi - if [ -n "${PUBLISH_SITE}" ]; then bash .mvn/scripts/publish-site.sh; fi .make-release: &make-release @@ -70,8 +77,8 @@ cache: ################################################################################################### .triggers: &triggers - only: - - triggers + rules: + - if: $CI_PIPELINE_SOURCE == 'trigger' trigger-create-docker: <<: *stage_docker @@ -93,11 +100,9 @@ trigger-make-release: ################################################################################################### .automatic: &automatic - only: - - /^develop.*$/i - - /^feature/.+$/i - except: - - triggers + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ + - if: $CI_PIPELINE_SOURCE != 'trigger' build: <<: *stage_build @@ -116,15 +121,8 @@ build-for-release: ################################################################################################### .automatic-release: &automatic-release - only: - - tags - -release-create-docker: - <<: *stage_docker - <<: *automatic-release - <<: *create-docker - before_script: - - export CREATE_DOCKER=true + rules: + - if: $CI_COMMIT_TAG release-publish-site: <<: *stage_build @@ -138,10 +136,9 @@ release-publish-site: ################################################################################################### .manual: &manual - only: - - /^develop.*$/i - - /^features/.+$/i - when: manual + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ + when: manual create-docker: <<: *stage_docker ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-create.json ===================================== @@ -6,7 +6,7 @@ }, "length": { "errors": [ - "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "length is a positive number", "length is mandatory" ] ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-update.json ===================================== @@ -6,7 +6,7 @@ }, "length": { "errors": [ - "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "length is a positive number", "length is mandatory" ] ===================================== pom.xml ===================================== @@ -151,7 +151,7 @@ <plugin.version.jarSigner>3.1.0</plugin.version.jarSigner> <plugin.version.javadoc>3.10.1</plugin.version.javadoc> <plugin.version.plugins>3.15.0</plugin.version.plugins> - <plugin.version.pmd>3.25.0</plugin.version.pmd> + <plugin.version.pmd>3.26.0</plugin.version.pmd> <plugin.version.release>3.1.1</plugin.version.release> <plugin.version.resources>3.3.1</plugin.version.resources> <plugin.version.scm>3.3.0</plugin.version.scm> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a7c86a07d2f2238a84432239… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a7c86a07d2f2238a84432239… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Blocks ASAP re-entrant code
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26edebf8 by Tony Chemit at 2024-12-11T19:02:32+01:00 Blocks ASAP re-entrant code - - - - - a713fd38 by Tony Chemit at 2024-12-11T19:03:29+01:00 Do consolidate in Swing thread after all jaxx bindings have been done - - - - - d7570dab by Tony Chemit at 2024-12-11T19:12:03+01:00 Always reset weightComputedSource if model is can consolidate - - - - - a7c86a07 by Tony Chemit at 2024-12-11T19:13:11+01:00 Merge branch 'feature/issue_2953' into develop Toute petite imperfection sur le formulaire PS / Lots de marché local - Closes #2953 - - - - - 1 changed file: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUIModelStates.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUIModelStates.java ===================================== @@ -45,6 +45,7 @@ import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.swing.SwingUtilities; import java.beans.PropertyChangeEvent; import java.util.LinkedHashSet; import java.util.Set; @@ -75,17 +76,23 @@ public class TripBatchUIModelStates extends GeneratedTripBatchUIModelStates { } public void resetComputedValues(PropertyChangeEvent event) { - if (event.getNewValue() == null && getTableModel().isCanConsolidate()) { + if (computing) { + return; + } + if (getTableModel().isCanConsolidate()) { getTableEditBean().setWeightComputedSource(null); } } public void recomputeComputedValues(PropertyChangeEvent event) { + if (computing) { + return; + } String propertyName = event.getPropertyName(); if (!COMPUTE_PROPERTIES.contains(propertyName) || !getTableModel().isCanConsolidate()) { return; } - recomputeComputedValues(); + SwingUtilities.invokeLater(this::recomputeComputedValues); } public void recomputeComputedValues() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/93f16ff2c231fed39c3fcdf3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/93f16ff2c231fed39c3fcdf3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Amélioration possible sur l'UI PS / Logbook / Echantillon / minus10weight et...
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 36e4a668 by Tony Chemit at 2024-12-11T17:56:46+01:00 Amélioration possible sur l'UI PS / Logbook / Echantillon / minus10weight et plus10weight - Closes #2954 - - - - - 93f16ff2 by Tony Chemit at 2024-12-11T18:01:50+01:00 Libellés sur l'UI consolidation - Closes #2957 - - - - - 5 changed files: - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleUIResetWeights.java - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/java.getter ===================================== @@ -1,3 +1,4 @@ +bean.action.reset.tip boolean.true observe.Common.action.move.down.tip observe.Common.action.move.up.tip ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx ===================================== @@ -114,6 +114,9 @@ <cell anchor='west'> <JLabel id='smallsWeightLabel'/> </cell> + <cell> + <JPanel/> + </cell> <cell anchor='east' weightx="1" fill="both"> <NumberEditor id='smallsWeight' styleClass="float2"/> </cell> @@ -126,6 +129,11 @@ <cell anchor='west'> <JLabel id='bigsWeightLabel'/> </cell> + <cell> + <JToolBar> + <JButton id='resetWeights'/> + </JToolBar> + </cell> <cell anchor='east' weightx="1" fill="both"> <NumberEditor id='bigsWeight' styleClass="float2"/> </cell> @@ -140,6 +148,9 @@ <cell anchor='west'> <JLabel id='totalWeightLabel'/> </cell> + <cell> + <JPanel/> + </cell> <cell anchor='east' weightx="1" fill="both"> <NumberEditor id='totalWeight' styleClass="float2"/> </cell> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIHandler.java ===================================== @@ -58,6 +58,9 @@ public class SampleUIHandler extends GeneratedSampleUIHandler { public void onInit(SampleUI ui) { super.onInit(ui); ui.getSampleActivityTableModel().init(ui); + ui.getTotalWeight().setShowReset(false); + ui.getSmallsWeight().setShowReset(false); + ui.getBigsWeight().setShowReset(false); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleUIResetWeights.java ===================================== @@ -0,0 +1,55 @@ +package fr.ird.observe.client.datasource.editor.ps.data.logbook.actions; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * Copyright (C) 2008 - 2024 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.client.datasource.editor.api.content.data.open.actions.ContentOpenableUIActionSupport; +import fr.ird.observe.client.datasource.editor.ps.data.logbook.SampleUI; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.ps.logbook.SampleDto; + +import java.awt.event.ActionEvent; + +import static io.ultreia.java4all.i18n.I18n.n; + +/** + * To reset the three weights values on {@link SampleDto}. + * <p> + * Created at 11/12/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + * @see <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2957">issue 2957</a> + */ +public class SampleUIResetWeights extends ContentOpenableUIActionSupport<SampleDto, SampleUI> { + + public SampleUIResetWeights() { + super(SampleDto.class, null, n("bean.action.reset.tip"), "combobox-reset", null); + } + + @Override + protected final void doActionPerformed(ActionEvent e, SampleUI ui) { + ui.getModel().getStates().getBean().setTotalWeight(null); + ui.getModel().getStates().getBean().setSmallsWeight(null); + ui.getModel().getStates().getBean().setBigsWeight(null); + } +} ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -39,8 +39,8 @@ observe.config.client.logFiles.timeout.description=Nettoyage des fichiers de log observe.config.client.temporaryFiles.timeout.description=Nettoyage des fichiers temporaires (en heures) observe.config.consolidation.failIfLengthLengthParameterNotFound=Dans l'action de consolidation, déclencher une erreur si une relation taille-taille n'est pas trouvée, sinon consigner cela en avertissement de l'action observe.config.consolidation.failIfLengthWeightParameterNotFound=Dans l'action de consolidation, déclencher une erreur si une relation taille-poids n'est pas trouvée, sinon consigner cela en avertissement de l'action -observe.config.consolidation.speciesListForLogbookSampleActivityWeightedWeight=Liste des espèces à utiliser dans l'action de consolidation du champs Poids pondéré des échantillons calée (Senne / Livre de bord) -observe.config.consolidation.speciesListForLogbookSampleWeights=Liste des espèces à utiliser dans l'action de consolidation des champs Poids des échantillons (Senne / Livre de bord) +observe.config.consolidation.speciesListForLogbookSampleActivityWeightedWeight=Liste des espèces pour le calcul des poids pondérés des échantillons calée (Senne / Livre de bord) +observe.config.consolidation.speciesListForLogbookSampleWeights=Liste des espèces pour la sommation des poids des cuves échantillonnées (Senne / Livre de bord) observe.config.coordinate.format=Format des positions (DMD, DD, DMS) observe.config.db.locale=La langue du référentiel (fr_FR, en_GB ou es_ES) observe.config.dcpPresetsDirectory.description=Répertoire des pré-configurations de DCP View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/07f534f1c21ac8f2865063eb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/07f534f1c21ac8f2865063eb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: update data.ll.observation.FloatlinesComposition.length boundNauticalLength max value
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80a7e30b by Tony Chemit at 2024-12-11T14:55:20+01:00 update data.ll.observation.FloatlinesComposition.length boundNauticalLength max value - - - - - 3e591281 by Tony Chemit at 2024-12-11T17:22:24+01:00 update generated validation files - - - - - 25878fae by Tony Chemit at 2024-12-11T17:22:24+01:00 Update public api documentation - - - - - 07f534f1 by Tony Chemit at 2024-12-11T17:22:26+01:00 Merge branch 'feature/issue_2949' into develop Bornes de longueurs d'orins en ftm - Closes #2949 - - - - - 6 changed files: - core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/FloatlinesCompositionDto-create-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/FloatlinesCompositionDto-update-error-validation.json - model/src/main/models/Observe/dto/attribute/boundNauticalLength.properties - server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-create-error.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-update-error.json Changes: ===================================== core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json ===================================== @@ -3150,7 +3150,7 @@ "length": [ "length is mandatory", "length is a positive number", - "Nautical Length bound (unit m) 0.0 <= length <= 100.0" + "Nautical Length bound (unit m) 0.0 <= length <= 125.0" ], "lineType": [ "lineType is mandatory", @@ -3178,7 +3178,7 @@ "length": [ "length is mandatory", "length is a positive number", - "Nautical Length bound (unit m) 0.0 <= length <= 100.0" + "Nautical Length bound (unit m) 0.0 <= length <= 125.0" ], "lineType": [ "lineType is mandatory", ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/FloatlinesCompositionDto-create-error-validation.json ===================================== @@ -16,10 +16,10 @@ }, { "validator": "io.ultreia.java4all.jaxx.widgets.validation.validator.NauticalLengthBoundFieldValidator", - "comment": "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "comment": "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "parameters": { "min": "0.0", - "max": "100.0", + "max": "125.0", "defaultNauticalLengthFormat": "m" } } ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/FloatlinesCompositionDto-update-error-validation.json ===================================== @@ -16,10 +16,10 @@ }, { "validator": "io.ultreia.java4all.jaxx.widgets.validation.validator.NauticalLengthBoundFieldValidator", - "comment": "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "comment": "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "parameters": { "min": "0.0", - "max": "100.0", + "max": "125.0", "defaultNauticalLengthFormat": "m" } } ===================================== model/src/main/models/Observe/dto/attribute/boundNauticalLength.properties ===================================== @@ -27,5 +27,5 @@ data.ll.observation.Basket.attribute.floatline2Length=0.0:150.0:M data.ll.observation.Branchline.attribute.branchlineLength=0.0:50.0:M data.ll.observation.Branchline.attribute.tracelineLength=0.0:50.0:M data.ll.observation.BranchlinesComposition.attribute.length=0.0:50.0:M -data.ll.observation.FloatlinesComposition.attribute.length=0.0:100.0:M +data.ll.observation.FloatlinesComposition.attribute.length=0.0:125.0:M data.ll.observation.Set.attribute.maxDepthTargeted=0.0:1000.0:M ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-create-error.json ===================================== @@ -16,10 +16,10 @@ }, { "validator": "io.ultreia.java4all.jaxx.widgets.validation.validator.NauticalLengthBoundFieldValidator", - "comment": "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "comment": "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "parameters": { "min": "0.0", - "max": "100.0", + "max": "125.0", "defaultNauticalLengthFormat": "m" } } ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-update-error.json ===================================== @@ -16,10 +16,10 @@ }, { "validator": "io.ultreia.java4all.jaxx.widgets.validation.validator.NauticalLengthBoundFieldValidator", - "comment": "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "comment": "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "parameters": { "min": "0.0", - "max": "100.0", + "max": "125.0", "defaultNauticalLengthFormat": "m" } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d7fc7e1771d24864d8267daf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d7fc7e1771d24864d8267daf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Fix speciesList 100 labels
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5ccdb8cd by Tony Chemit at 2024-12-11T14:19:14+01:00 Fix speciesList 100 labels - - - - - 2378fde7 by Tony Chemit at 2024-12-11T14:19:20+01:00 Fix speciesList 101 labels - - - - - 2cae2d9f by Tony Chemit at 2024-12-11T14:28:09+01:00 add speciesList 102 and 103 - - - - - d3d58cd2 by Tony Chemit at 2024-12-11T14:29:14+01:00 Update tests fixtures - - - - - d7fc7e17 by Tony Chemit at 2024-12-11T14:45:00+01:00 Merge branch 'feature/issue_2958' into develop A propos des listes d'espèces pour les calculs de consolidation - Closes #2958 - - - - - 7 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java - core/persistence/migration/src/main/resources/db/migration/v9/9.4/01_issue-2931-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.4/04_02_issue-2669-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/07_issue-2958-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common-default.json - model/src/main/resources/fixtures/global.properties Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java ===================================== @@ -71,6 +71,10 @@ public class DataSourceMigrationForVersion_9_4 extends ByMajorMigrationVersionRe issue2932(executor,withIds); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2959 issue2959(executor,withIds); + if (withIds) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2958 + executor.addScript("07", "issue-2958"); + } } private void issue2914(MigrationVersionResourceExecutor executor) { ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/01_issue-2931-common.sql ===================================== @@ -20,7 +20,7 @@ -- #L% --- -- add a new species list PS - Catch -INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100', 0, ${CURRENT_DATE}, '100', 1, null, 'Consolidation (PS Logbook SampleActivity.weightedWeight)', 'Consolidation (PS Logbook SampleActivity.weightedWeight)', 'Consolidation (PS Logbook SampleActivity.weightedWeight) TODO', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); +INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100', 0, ${CURRENT_DATE}, '100', 1, null, 'Consolidation - PS Logbook - Weighted weights - fleet France', 'Consolidation - PS Logbook - Poids pondérés - flotte France', 'Consolidación - PS Logbook - Pesos ponderados - flota de Francia', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100'); INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100'); INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100'); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/04_02_issue-2669-common.sql ===================================== @@ -19,7 +19,7 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101', 0, ${CURRENT_DATE}, '101', 1, null, 'Consolidation (PS Logbook Sample.weights)', 'Consolidation (PS Logbook Sample.weights)', 'Consolidation (PS Logbook Sample.weights) TODO', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); +INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101', 0, ${CURRENT_DATE}, '101', 1, null, ' Consolidation - PS Logbook - Categories'' weights - fleet France', 'Consolidation - PS Logbook - Poids des catégories - flotte France', 'Consolidación - PS Logbook - Pesos de categorías - flota de Francia', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101'); -- BET INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101'); -- YFT INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101'); -- SKJ ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/07_issue-2958-common.sql ===================================== @@ -0,0 +1,40 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 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% +--- +INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102', 0, ${CURRENT_DATE}, '102', 1, null, 'Consolidation - PS Logbook - Weighted weights - fleet Spain', 'Consolidation - PS Logbook - Poids pondérés - flotte Espagne', 'Consolidación - PS Logbook - Pesos ponderados - flota de España', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.5618871286604711', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.8024257002747615', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.3846921632590058', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1441287921299#0.016754076421811148', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1433499265113#0.891799515346065', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.2673009297087321', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685478#0.7676744877900202', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.5989181185528589', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.36339915670317835', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103', 0, ${CURRENT_DATE}, '103', 1, null, ' Consolidation - PS Logbook - Categories'' weights - fleet Spain', 'Consolidation - PS Logbook - Poids des catégories - flotte Espagne', 'Consolidación - PS Logbook - Pesos de categorías - flota de España', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103'); -- BET +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103'); -- YFT +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103'); -- SKJ +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.5618871286604711', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103'); -- ALB +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.common.SpeciesList'; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -42,7 +42,7 @@ common.sizeMeasureType=21 common.species=315 common.speciesGroup=12 common.speciesGroupReleaseMode=10 -common.speciesList=12 +common.speciesList=14 common.vessel=1250 common.vesselSizeCategory=13 common.vesselType=18 @@ -120,4 +120,4 @@ common.gear_allowedGearCharacteristic=108 common.gear_defaultGearCharacteristic=45 common.species_ocean=553 common.speciesGroup_speciesGroupReleaseMode=19 -common.speciesList_species=981 +common.speciesList_species=997 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common-default.json ===================================== @@ -44081,24 +44081,14 @@ }, { "datum": { - "text": "100##Consolidation (PS Logbook SampleActivity.weightedWeight)", + "text": "100##Consolidation - PS Logbook - Poids pondérés - flotte France", "type": "fr.ird.observe.dto.referential.common.SpeciesListDto", "id": "fr.ird.referential.common.SpeciesList#1464000000000#100", "topiaVersion": 0, "lastUpdateDate": "2024-09-11T00:00:00.000Z" }, "messages": [ - { - "fieldName": "label1", - "scope": "WARNING", - "message": "Le libellé anglais n'est pas traduit." - }, - { - "fieldName": "label3", - "scope": "WARNING", - "message": "Le libellé espagnol n'est pas traduit." - }, - { + { "fieldName": "uri", "scope": "WARNING", "message": "Le champ n'est pas renseigné." @@ -44107,23 +44097,46 @@ }, { "datum": { - "text": "101##Consolidation (PS Logbook Sample.weights)", + "text": "101##Consolidation - PS Logbook - Poids des catégories - flotte France", "type": "fr.ird.observe.dto.referential.common.SpeciesListDto", "id": "fr.ird.referential.common.SpeciesList#1464000000000#101", "topiaVersion": 0, "lastUpdateDate": "2024-09-11T00:00:00.000Z" }, "messages": [ + { - "fieldName": "label1", + "fieldName": "uri", "scope": "WARNING", - "message": "Le libellé anglais n'est pas traduit." - }, + "message": "Le champ n'est pas renseigné." + } + ] + }, + { + "datum": { + "text": "100##Consolidation - PS Logbook - Poids pondérés - flotte Espagne", + "type": "fr.ird.observe.dto.referential.common.SpeciesListDto", + "id": "fr.ird.referential.common.SpeciesList#1464000000000#102", + "topiaVersion": 0, + "lastUpdateDate": "2024-09-11T00:00:00.000Z" + }, + "messages": [ { - "fieldName": "label3", + "fieldName": "uri", "scope": "WARNING", - "message": "Le libellé espagnol n'est pas traduit." - }, + "message": "Le champ n'est pas renseigné." + } + ] + }, + { + "datum": { + "text": "101##Consolidation - PS Logbook - Poids des catégories - flotte Espagne", + "type": "fr.ird.observe.dto.referential.common.SpeciesListDto", + "id": "fr.ird.referential.common.SpeciesList#1464000000000#103", + "topiaVersion": 0, + "lastUpdateDate": "2024-09-11T00:00:00.000Z" + }, + "messages": [ { "fieldName": "uri", "scope": "WARNING", ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4393 +REFERENTIAL_COUNT=4395 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/62e92c6727efc2b1d37343e5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/62e92c6727efc2b1d37343e5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Review import code for Landing.fate field
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: daaf003d by Tony Chemit at 2024-12-11T11:23:11+01:00 Review import code for Landing.fate field - - - - - 0c74c297 by Tony Chemit at 2024-12-11T11:23:11+01:00 Update AVDTH documentation - - - - - 0c44ebc6 by Tony Chemit at 2024-12-11T11:23:11+01:00 Add by migration ps_landing.Fate 3 and 4 if necessary - - - - - 2bca2b11 by Tony Chemit at 2024-12-11T11:43:57+01:00 Update tests fixtures - - - - - 62e92c67 by Tony Chemit at 2024-12-11T13:46:33+01:00 Merge branch 'feature/issue_2959' into develop Peaufinage sur la migration des LOT_COM AVDTH - Closes #2959 - - - - - 10 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingReader.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_3-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_4-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_finalize-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps-default.json - model/src/main/resources/fixtures/global.properties - src/site/markdown/avdth/landing.md Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -69,7 +69,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.TreeMap; -import java.util.function.Consumer; /** * Contains all referential used in import and all the logic of them. @@ -113,8 +112,10 @@ public class ImportReferentialContext { private SizeMeasureType sizeMeasureTypeDL; private DataQuality dataQualityA; private DataQuality dataQualityE; - private Fate fate1; - private Fate fate2; + private Fate fateProcessed; + private Fate fateDiscarded; + private Fate fateSoldOnLocalMarket; + private Fate fateTransshipment; private AcquisitionStatus acquisitionStatus1; private AcquisitionStatus acquisitionStatus999; private TransmittingBuoyType transmittingBuoyType98; @@ -185,8 +186,10 @@ public class ImportReferentialContext { landingCategories = Maps.uniqueIndex(referential.getWeightCategory(), WeightCategory::getCode); Map<String, Fate> fates = Maps.uniqueIndex(referential.getFate(), Fate::getCode); - fate1 = fates.get("1"); - fate2 = fates.get("2"); + fateProcessed = fates.get("1"); + fateDiscarded = fates.get("2"); + fateSoldOnLocalMarket = fates.get("3"); + fateTransshipment = fates.get("4"); destinations = Maps.uniqueIndex(referential.getDestination(), Destination::getCode); @@ -388,8 +391,12 @@ public class ImportReferentialContext { return schoolType2; } + public boolean isSpeciesDiscarded(String speciesCode) { + return speciesCode.equals("8") || (speciesCode.startsWith("8") && speciesCode.length() == 3); + } + public SpeciesFate getSpeciesFate(String speciesCode) { - if (speciesCode.equals("8") || (speciesCode.startsWith("8") && speciesCode.length() == 3)) { + if (isSpeciesDiscarded(speciesCode)) { // all species in avdth with code 8 or 8xx are discard return speciesFate11; } @@ -453,12 +460,20 @@ public class ImportReferentialContext { return transmittingBuoyOperation1; } - public Fate getFateBySpeciesCode(String originalSpeciesCode) { - // fate 1 if not discarded, 2 discarded (only for species 8) - if (originalSpeciesCode.equals("8")) { - return fate2; - } - return fate1; + public Fate getFateProcessed() { + return fateProcessed; + } + + public Fate getFateDiscarded() { + return fateDiscarded; + } + + public Fate getFateSoldOnLocalMarket() { + return fateSoldOnLocalMarket; + } + + public Fate getFateTransshipment() { + return fateTransshipment; } public Harbour getHarbour(String code) { ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingReader.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.entities.data.ps.landing.Landing; import fr.ird.observe.entities.referential.common.Species; import fr.ird.observe.entities.referential.ps.common.WeightCategory; import fr.ird.observe.entities.referential.ps.landing.Destination; +import fr.ird.observe.entities.referential.ps.landing.Fate; import fr.ird.observe.persistence.avdth.data.DataQueryDefinition; import fr.ird.observe.persistence.avdth.data.DataReader; import fr.ird.observe.persistence.avdth.data.ImportDataContext; @@ -106,8 +107,34 @@ public class LandingReader extends DataReader<Landing> { String destinationCode = resultSet.getString(7); Destination destination = dataContext.getDestination(destinationCode); entity.setDestination(destination); - entity.setFate(dataContext.getFateBySpeciesCode(originalSpeciesCode)); + Fate fate = getFate(dataContext, originalSpeciesCode, destinationCode); + entity.setFate(fate); return entity; } + + private Fate getFate(ImportDataContext dataContext, String originalSpeciesCode, String avdthDestinationCode) { + if (avdthDestinationCode != null) { + int code = Integer.parseInt(avdthDestinationCode); + if (isDestinationCodeToTransshipment(code)) { + return dataContext.getFateTransshipment(); + } + if (isDestinationCodeToSoldOnLocalMarket(code)) { + return dataContext.getFateSoldOnLocalMarket(); + } + } + if (dataContext.isSpeciesDiscarded(originalSpeciesCode)) { + return dataContext.getFateDiscarded(); + } + return dataContext.getFateProcessed(); + } + + private boolean isDestinationCodeToTransshipment(int code) { + return code == 3 || code == 4; + } + + private boolean isDestinationCodeToSoldOnLocalMarket(int code) { + return code == 18 || code == 28 || (code >= 40 && code <= 61) || (code >= 64 && code <= 65); + } + } ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java ===================================== @@ -34,6 +34,9 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.stream.Stream; /** * Created at 11/09/2024. @@ -66,6 +69,8 @@ public class DataSourceMigrationForVersion_9_4 extends ByMajorMigrationVersionRe issue2669(executor); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2932 issue2932(executor,withIds); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2959 + issue2959(executor,withIds); } private void issue2914(MigrationVersionResourceExecutor executor) { @@ -104,6 +109,23 @@ public class DataSourceMigrationForVersion_9_4 extends ByMajorMigrationVersionRe executor.addScript("05_06", "issue-2932_update-table-ll-observation-weight-measure"); } + + private void issue2959(MigrationVersionResourceExecutor executor, boolean withIds) { + if (withIds) { + Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT CODE FROM ps_landing.Fate", resultSet -> resultSet.getString(1))); + Set<String> newCodes = new LinkedHashSet<>(); + Stream.of("3", "4").forEach(code -> { + if (!existingCodes.contains(code)) { + executor.addScript("06_issue-2959_add_referential_ps_landing_Fate", code); + newCodes.add(code); + } + }); + if (!newCodes.isEmpty()) { + executor.addScript("06_issue-2959_add_referential_ps_landing_Fate", "finalize"); + } + } + } + private static class BasketRecord { private final String id; private final Float floatline1Length; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_3-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 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% +--- +INSERT INTO ps_landing.Fate(topiaid, topiaversion, topiacreatedate, lastUpdateDate, needComment, status, code, label1, label2, label3, discard) VALUES ('fr.ird.referential.ps.landing.Fate#1714114980513#0.3095970028802679', 0, '2024-04-26T09:00:41.215Z'::timestamp, '2024-04-26T09:03:00.513Z'::timestamp, FALSE, 1, '3' , 'Sold for local market', 'Vendu sur le marché local', 'Vendido en el mercado local', false); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_4-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 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% +--- +INSERT INTO ps_landing.Fate(topiaid, topiaversion, topiacreatedate, lastUpdateDate, needComment, status, code, label1, label2, label3, discard) VALUES ('fr.ird.referential.ps.landing.Fate#1714115075625#0.4347800278392995', 0, '2024-04-26T09:03:12.339Z'::timestamp, '2024-04-26T09:04:35.625Z'::timestamp, FALSE, 1, '4' , 'Transshipment (container or cargo)', 'Transbordé (conteneur ou cargo)', 'Transbordo (contenedor o carga)', false); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_finalize-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 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% +--- +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.landing.Fate'; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -95,7 +95,7 @@ ps_common.transmittingBuoyType=62 ps_common.vesselActivity=39 ps_common.weightCategory=137 ps_landing.destination=30 -ps_landing.fate=2 +ps_landing.fate=4 ps_localmarket.batchComposition=3 ps_localmarket.batchWeightType=4 ps_localmarket.packaging=53 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps-default.json ===================================== @@ -13483,6 +13483,38 @@ } ] }, + { + "datum": { + "text": "3##Vendu sur le marché local", + "type": "fr.ird.observe.dto.referential.ps.landing.FateDto", + "id": "fr.ird.referential.ps.landing.Fate#1714114980513#0.3095970028802679", + "topiaVersion": 0, + "lastUpdateDate": "2024-04-26T11:03:00.513Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, + { + "datum": { + "text": "4##Transbordé (conteneur ou cargo)", + "type": "fr.ird.observe.dto.referential.ps.landing.FateDto", + "id": "fr.ird.referential.ps.landing.Fate#1714115075625#0.4347800278392995", + "topiaVersion": 0, + "lastUpdateDate": "2024-04-26T11:04:35.625Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, { "datum": { "text": "1##Multi spécifique (sondage)", ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4391 +REFERENTIAL_COUNT=4393 ===================================== src/site/markdown/avdth/landing.md ===================================== @@ -14,7 +14,7 @@ Table déversée dans la table d'ObServe **Landing**. | LOT_COM_04 | C_ESP | Landing.species | [2](#n_0_2), [5](#n_0_5) | | LOT_COM_05 | C_CAT_C | Landing.weightCategory | [3](#n_0_3) | | LOT_COM_06 | V_POIDS_LC | Landing.weight | | -| LOT_COM_07 | C_DEST | Landing.destination | [4](#n_0_4) | +| LOT_COM_07 | C_DEST | Landing.destination | [4](#n_0_4), [5](#n_0_5) | * Note 1 <a name="n_0_1"></a> @@ -34,8 +34,15 @@ Mapping direct sur le code du référentiel **ps_landing.Destination**. * Note 5 <a name="n_0_5"></a> -On positionne **ps_landing.Landing.fate** à partir du code suivant +On positionne **ps_landing.Landing.fate** en suivant ce code -```ps_landing.Fate(LOT_COM.C_ESP == 8 ? 2 : 1)``` +**FIXME Voir https://gitlab.com/ultreiaio/ird-observe/-/issues/2959 ** + +On distingue quatre cas : + +1. Si LOT_COM.C_DEST dans ```4 ou 5``` alors on utilise ps_landing.Fate de code 4 (transbordement) +2. Si LOT_COM.C_DEST dans ```18, 28, 40 à 61, 64 à 65)``` alors on utilise ps_landing.Fate de code 3 (vendu au marché local) +2. Sinon si LOT_COM.C_ESP est dans ```8, 800 à 899``` alors on utilise ps_landing.Fate de code 2 (rejeté) +3. Sinon on utilise ps_landing.Fate de code 1 (traité) [Retour à l'introduction](./index.html) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2fd990750c8b5a6f5535b7c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2fd990750c8b5a6f5535b7c4… You're receiving this email because of your account on gitlab.com.

1 0