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

[Git][ultreiaio/ird-observe] Pushed new tag v9.3.1
by Tony CHEMIT (＠tchemit) 01 May '24

01 May '24

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

1 0

[Git][ultreiaio/ird-observe][release/9.3.1] [jgitflow-maven-plugin]updating poms for branch'release/9.3.1' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 01 May '24

01 May '24

Tony CHEMIT pushed to branch release/9.3.1 at ultreiaio / ird-observe Commits: d5c24bfd by Tony Chemit at 2024-05-01T17:27:30+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.1' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-pairing/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d5c24bfd05eaa1c3109b8a169… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d5c24bfd05eaa1c3109b8a169… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 24 commits: [jgitflow-maven-plugin]updating poms for 9.3.1-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 01 May '24

01 May '24

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: d0f6d809 by Tony Chemit at 2024-04-25T09:34:58+02:00 [jgitflow-maven-plugin]updating poms for 9.3.1-SNAPSHOT development[skip ci] - - - - - 53b669fd by Tony Chemit at 2024-04-25T09:50:53+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 12d7f83f by Tony Chemit at 2024-04-25T09:50:54+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 3ed637ff by Tony Chemit at 2024-04-25T09:50:55+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 6f65d79d by Tony Chemit at 2024-04-25T20:59:12+02:00 La sauvegarde en sql.gz ne fonctionne pas - Closes #2873 - - - - - 710a5ccf by Tony Chemit at 2024-04-25T20:59:39+02:00 Impossible d'effacer une marée (PS ou LL) en mode serveur - Closes #2872 - - - - - 597bc1ad by Tony Chemit at 2024-04-26T10:29:11+02:00 Augmenter la valeur d'un contrôle de formulaire LL Logbook - Closes #2871 - - - - - 55bb8fce by Tony Chemit at 2024-04-26T10:48:11+02:00 Lorsque l'on crée une marée dans un programme depuis l'arbre, le programme en question n'est plus sélectionné par défaut - Closes #2868 - - - - - 51de4e12 by Tony Chemit at 2024-04-26T17:42:45+02:00 Ajout des deux nouveaux drapeaux sur le référentiel VesselType (longline et seine) - - - - - 7a5943e0 by Tony Chemit at 2024-04-26T17:42:45+02:00 Ajout de la migration - - - - - f854d709 by Tony Chemit at 2024-04-26T17:42:45+02:00 Utilisation des nouveaux drapeaux pour filtrer les navire dans les formulaires marée - - - - - 3c9d72f4 by Tony Chemit at 2024-04-26T17:42:45+02:00 Suppression des options de configuration dédiées aux filtre des navires pour les formulaires marée - - - - - 7541a511 by Tony Chemit at 2024-04-26T17:43:12+02:00 Utilisation des nouveaux drapeaux pour filtrer les navire dans l'arbre de navigation - - - - - 463453dd by Tony Chemit at 2024-04-26T17:46:18+02:00 Merge branch 'feature/issue-2869' into develop En mode classement par bateau, il est possible de créer une marée PS avec un bateau LL, de plus avec un bateau désactivé - Closes #2869 - - - - - 46dcf544 by Tony Chemit at 2024-04-26T17:59:14+02:00 Encore une borne de poids à augmenter, sur PS localmarket batch - Closes #2874 - - - - - bb506c43 by Tony Chemit at 2024-04-26T17:59:14+02:00 update VesselType public api doc - - - - - 4d1534e0 by Tony Chemit at 2024-04-27T10:24:54+02:00 Le form PS logbook a perdu sa valeur Data quality par défaut lorsque la marée est créée par le programme logbook - Closes #2876 - - - - - 41034cbe by Tony Chemit at 2024-04-27T12:29:56+02:00 Il est possible de sauver un FOB sans lui avoir donné de type d'opération, et cela plante - Closes #2877 - - - - - 74b1a777 by Tony Chemit at 2024-04-27T12:30:37+02:00 Remove FloatingObjectUI.jcss and only use FloatingObjectUICommon.jcss - - - - - 35a7c66c by Tony Chemit at 2024-05-01T14:17:03+02:00 Suppression des valeurs balise pays et bateau si l'appartenance à désactiver ces champs - Closes #2879 - - - - - 4f29b4c2 by Tony Chemit at 2024-05-01T14:17:03+02:00 update pom - - - - - 5945ad81 by Tony Chemit at 2024-05-01T14:17:03+02:00 Update changelog for v.9.3.1 [skip CI] - - - - - d5c24bfd by Tony Chemit at 2024-05-01T17:27:30+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.1' with non-snapshot versions[skip ci] - - - - - aa9d0cf8 by Tony Chemit at 2024-05-01T17:44:40+02:00 [jgitflow-maven-plugin]merging 'release/9.3.1' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselTypeUI.jaxx - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIModelStates.java - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/FloatingObjectUICommon.jcss - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jcss - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jcss - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-pairing/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/79cff34a3ce3a3cad12bb9b6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/79cff34a3ce3a3cad12bb9b6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.3.1' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 01 May '24

01 May '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d5c24bfd by Tony Chemit at 2024-05-01T17:27:30+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.1' with non-snapshot versions[skip ci] - - - - - aa9d0cf8 by Tony Chemit at 2024-05-01T17:44:40+02:00 [jgitflow-maven-plugin]merging 'release/9.3.1' into 'master' - - - - - c464121c by Tony Chemit at 2024-05-01T17:44:45+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 57f7c16e by Tony Chemit at 2024-05-01T17:44:46+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - f8086b0c by Tony Chemit at 2024-05-01T17:44:47+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/41c253f484a13fc76c5854c5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/41c253f484a13fc76c5854c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.3.2-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 01 May '24

01 May '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 41c253f4 by Tony Chemit at 2024-05-01T17:27:13+02:00 [jgitflow-maven-plugin]updating poms for 9.3.2-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-pairing/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/41c253f484a13fc76c5854c5d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/41c253f484a13fc76c5854c5d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.3.1
by Tony CHEMIT (＠tchemit) 01 May '24

01 May '24

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

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Suppression des valeurs balise pays et bateau si l'appartenance à désactiver...
by Tony CHEMIT (＠tchemit) 01 May '24

01 May '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 35a7c66c by Tony Chemit at 2024-05-01T14:17:03+02:00 Suppression des valeurs balise pays et bateau si l'appartenance à désactiver ces champs - Closes #2879 - - - - - 4f29b4c2 by Tony Chemit at 2024-05-01T14:17:03+02:00 update pom - - - - - 5945ad81 by Tony Chemit at 2024-05-01T14:17:03+02:00 Update changelog for v.9.3.1 [skip CI] - - - - - 9 changed files: - CHANGELOG.md - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - − core/persistence/migration/src/main/resources/db/migration/v9/9.3/01_issue-2044-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.3/01_issue-2879-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.json - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps.json - model/src/main/resources/fixtures/global.properties - pom.xml Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,27 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-04-25 09:34. + * Last generated at 2024-04-30 10:17. + +## Version [9.3.1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/277) + +**Closed at 2024-04-30.** + +### Download +* [Client (observe-9.3.1-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.3.1.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.3.1-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + +### Issues + * [[Type::Anomalie 2868]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2868) **Lorsque l'on crée une marée dans un programme depuis l'arbre, le programme en question n'est plus sélectionné par défaut** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2872]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2872) **Impossible d'effacer une marée (PS ou LL) en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2873]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2873) **La sauvegarde en sql.gz ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2876]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2876) **Le form PS logbook a perdu sa valeur Data quality par défaut lorsque la marée est créée par le programme logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2877]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2877) **Il est possible de sauver un FOB sans lui avoir donné de type d'opération, et cela plante** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2869]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2869) **En mode classement par bateau, il est possible de créer une marée PS avec un bateau LL, de plus avec un bateau désactivé** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2871]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2871) **Augmenter la valeur d'un contrôle de formulaire LL Logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2874]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2874) **Encore une borne de poids à augmenter, sur PS localmarket batch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2879]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2879) **Suppression des valeurs balise pays et bateau si l'appartenance à désactiver ces champs** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.3.0](https://gitlab.com/ultreiaio/ird-observe/-/milestones/271) ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java ===================================== @@ -40,7 +40,7 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe public DataSourceMigrationForVersion_9_3() { super(Version.valueOf("9.3"), false); - createResourceScriptVariables(this, "2024-04-29", "2023-12-01 00:00:00.000000"); + createResourceScriptVariables(this, "2024-05-01", "2024-05-01 00:00:00.000000"); } @Override @@ -48,7 +48,7 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe boolean withIds = executor.findSingleResult(SqlQuery.wrap("SELECT COUNT (*) FROM common.person", r -> r.getInt(1) > 0)); if (withIds) { // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044 - executor.addScript("01", "issue-2044"); + executor.addScript("01", "issue-2879"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2857 executor.addScript("02", "issue-2857"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2869 ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/01_issue-2044-common.sql deleted ===================================== @@ -1,27 +0,0 @@ ---- --- #%L --- ObServe Core :: Persistence :: Migration --- %% --- 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% ---- --- Unknown vessel → no vessel -UPDATE ps_observation.TransmittingBuoy SET vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0'; -UPDATE ps_logbook.TransmittingBuoy SET vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0'; --- This vessel → no country, nor vessel -UPDATE ps_observation.TransmittingBuoy SET country = NULL, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3'; -UPDATE ps_logbook.TransmittingBuoy SET country = NULL, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3'; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/01_issue-2879-common.sql ===================================== @@ -0,0 +1,52 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- 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% +--- +INSERT INTO ps_common.TransmittingBuoyOwnership (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, code, uri, homeid, needComment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '5', null, null, false, 1, 'Other vessel, company not precised', 'A un autre bateau, armement non précisé', 'Barco ajeno, armador no especificado', null, null, null, null, null); +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOwnership'; + +-- This vessel +UPDATE ps_observation.TransmittingBuoy z SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_observation.Route r ON r.trip = t.topiaId JOIN ps_observation.Activity a ON a.route = r.topiaId JOIN ps_observation.FloatingObject f ON f.activity = a.topiaId JOIN ps_observation.TransmittingBuoy tb ON tb.floatingObject = f.topiaId WHERE tb.topiaId = z.topiaId) = z.vessel; +UPDATE ps_logbook.TransmittingBuoy z SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_logbook.Route r ON r.trip = t.topiaId JOIN ps_logbook.Activity a ON a.route = r.topiaId JOIN ps_logbook.FloatingObject f ON f.activity = a.topiaId JOIN ps_logbook.TransmittingBuoy tb ON tb.floatingObject = f.topiaId WHERE tb.topiaId = z.topiaId) = z.vessel; + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel = NULL; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel = NULL; + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000 AND (SELECT t.code FROM ps_common.TransmittingBuoyOperation t WHERE t.topiaId = transmittingBuoyOperation) IN ('1', '2', '99'); +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000 AND (SELECT t.code FROM ps_common.TransmittingBuoyOperation t WHERE t.topiaId = transmittingBuoyOperation) IN ('1', '2', '99'); + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL, country = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000 AND (SELECT t.code FROM ps_common.TransmittingBuoyOperation t WHERE t.topiaId = transmittingBuoyOperation) IN ('3', '4', '5'); +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL, country = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000 AND (SELECT t.code FROM ps_common.TransmittingBuoyOperation t WHERE t.topiaId = transmittingBuoyOperation) IN ('3', '4', '5'); + +UPDATE ps_observation.TransmittingBuoy z SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_observation.Route r ON r.trip = t.topiaId JOIN ps_observation.Activity a ON a.route = r.topiaId JOIN ps_observation.FloatingObject f ON f.activity = a.topiaId JOIN ps_observation.TransmittingBuoy tb ON tb.floatingObject = f.topiaId WHERE tb.topiaId = z.topiaId) != z.vessel; +UPDATE ps_logbook.TransmittingBuoy z SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_logbook.Route r ON r.trip = t.topiaId JOIN ps_logbook.Activity a ON a.route = r.topiaId JOIN ps_logbook.FloatingObject f ON f.activity = a.topiaId JOIN ps_logbook.TransmittingBuoy tb ON tb.floatingObject = f.topiaId WHERE tb.topiaId = z.topiaId) != z.vessel; + +-- Unknown vessel +UPDATE ps_observation.TransmittingBuoy z SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, vessel = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_observation.Route r ON r.trip = t.topiaId JOIN ps_observation.Activity a ON a.route = r.topiaId JOIN ps_observation.FloatingObject f ON f.activity = a.topiaId JOIN ps_observation.TransmittingBuoy tb ON tb.floatingObject = f.topiaId WHERE tb.topiaId = z.topiaId) = z.vessel; +UPDATE ps_logbook.TransmittingBuoy z SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, vessel = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_logbook.Route r ON r.trip = t.topiaId JOIN ps_logbook.Activity a ON a.route = r.topiaId JOIN ps_logbook.FloatingObject f ON f.activity = a.topiaId JOIN ps_logbook.TransmittingBuoy tb ON tb.floatingObject = f.topiaId WHERE tb.topiaId = z.topiaId) = z.vessel; + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT CAST(v.code AS INT) FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000; + +UPDATE ps_observation.TransmittingBuoy z SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_observation.Route r ON r.trip = t.topiaId JOIN ps_observation.Activity a ON a.route = r.topiaId JOIN ps_observation.FloatingObject f ON f.activity = a.topiaId JOIN ps_observation.TransmittingBuoy tb ON tb.floatingObject = f.topiaId WHERE tb.topiaId = z.topiaId) != z.vessel; +UPDATE ps_logbook.TransmittingBuoy z SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_logbook.Route r ON r.trip = t.topiaId JOIN ps_logbook.Activity a ON a.route = r.topiaId JOIN ps_logbook.FloatingObject f ON f.activity = a.topiaId JOIN ps_logbook.TransmittingBuoy tb ON tb.floatingObject = f.topiaId WHERE tb.topiaId = z.topiaId) != z.vessel; + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL WHERE country != NULL AND vessel != NULL; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL WHERE country != NULL AND vessel != NULL; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -88,7 +88,7 @@ ps_common.sampleType=6 ps_common.schoolType=4 ps_common.speciesFate=15 ps_common.transmittingBuoyOperation=6 -ps_common.transmittingBuoyOwnership=5 +ps_common.transmittingBuoyOwnership=6 ps_common.transmittingBuoyType=62 ps_common.vesselActivity=39 ps_common.weightCategory=137 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json ===================================== @@ -90400,7 +90400,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675737#0.43324169605639407", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90431,7 +90431,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1308149641588#0.8724092935671164", "topiaVersion": 6, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90462,7 +90462,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675737#0.3189669579867931", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90493,7 +90493,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675737#0.03138158577140615", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90524,7 +90524,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1308149718650#0.791946073811996", "topiaVersion": 6, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90555,7 +90555,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1464000000000#0.16", "topiaVersion": 1, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90576,7 +90576,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1464000000000#0.17", "topiaVersion": 1, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90597,7 +90597,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675734#0.24685054061673772", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90628,7 +90628,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1308149674400#0.8030832839591066", "topiaVersion": 6, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90654,7 +90654,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675734#0.4191950326431938", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90680,7 +90680,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675735#0.7380146830307519", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90711,7 +90711,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675735#0.9086075071905084", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90737,7 +90737,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675735#0.307197212385357", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90763,7 +90763,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675736#0.8708229847859869", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90789,7 +90789,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832686137#0.1", "topiaVersion": 3, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90815,7 +90815,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1464000000000#0.14", "topiaVersion": 1, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90831,7 +90831,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1464000000000#0.15", "topiaVersion": 1, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90847,7 +90847,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps.json ===================================== @@ -6322,6 +6322,22 @@ } ] }, + { + "datum": { + "text": "5##A un autre bateau, armement non précisé", + "type": "fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipDto", + "id": "fr.ird.referential.ps.common.TransmittingBuoyOwnership#1464000000000#5", + "topiaVersion": 0, + "lastUpdateDate": "2024-05-01T00:00:00.000Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, { "datum": { "text": "1##Radiogoniomètre##[0-9]{1,10}", ===================================== 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=4368 +REFERENTIAL_COUNT=4369 ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.22</version> + <version>2024.23</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6c0e0c9d0322deed7d7bb162… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6c0e0c9d0322deed7d7bb162… You're receiving this email because of your account on gitlab.com.

1 0