Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

8 changed files:

Changes:

  • 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
    40 40
    41 41 
         public DataSourceMigrationForVersion_9_3() {
    42 42 
             super(Version.valueOf("9.3"), false);
    43 
    -        createResourceScriptVariables(this, "2024-04-29", "2023-12-01 00:00:00.000000");
    43 
    +        createResourceScriptVariables(this, "2024-05-01", "2024-05-01 00:00:00.000000");
    44 44 
         }
    45 45
    46 46 
         @Override
    ... ... @@ -48,7 +48,7 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe
    48 48 
             boolean withIds = executor.findSingleResult(SqlQuery.wrap("SELECT COUNT (*) FROM common.person", r -> r.getInt(1) > 0));
    49 49 
             if (withIds) {
    50 50 
                 // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044
    51 
    -            executor.addScript("01", "issue-2044");
    51 
    +            executor.addScript("01", "issue-2879");
    52 52 
                 // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2857
    53 53 
                 executor.addScript("02", "issue-2857");
    54 54 
                 // 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 
    ----
    2 
    --- #%L
    3 
    --- ObServe Core :: Persistence :: Migration
    4 
    --- %%
    5 
    --- Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    --- %%
    7 
    --- This program is free software: you can redistribute it and/or modify
    8 
    --- it under the terms of the GNU General Public License as
    9 
    --- published by the Free Software Foundation, either version 3 of the
    10 
    --- License, or (at your option) any later version.
    11 
    ---
    12 
    --- This program is distributed in the hope that it will be useful,
    13 
    --- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    --- GNU General Public License for more details.
    16 
    ---
    17 
    --- You should have received a copy of the GNU General Public
    18 
    --- License along with this program.  If not, see
    19 
    --- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    --- #L%
    21 
    ----
    22 
    --- Unknown vessel → no vessel
    23 
    -UPDATE ps_observation.TransmittingBuoy SET vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0';
    24 
    -UPDATE ps_logbook.TransmittingBuoy SET vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0';
    25 
    --- This vessel → no country, nor vessel
    26 
    -UPDATE ps_observation.TransmittingBuoy SET country = NULL, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3';
    27 
    -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
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe Core :: Persistence :: Migration
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +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);
    23 
    +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOwnership';
    24 
    +
    25 
    +-- This vessel
    26 
    +UPDATE ps_observation.TransmittingBuoy 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 ) = vessel;
    27 
    +UPDATE ps_logbook.TransmittingBuoy     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 ) = vessel;
    28 
    +
    29 
    +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;
    30 
    +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;
    31 
    +
    32 
    +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 v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code 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');
    33 
    +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 v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code 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');
    34 
    +
    35 
    +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 v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code 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');
    36 
    +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 v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code 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');
    37 
    +
    38 
    +UPDATE ps_observation.TransmittingBuoy 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 ) != vessel;
    39 
    +UPDATE ps_logbook.TransmittingBuoy     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 ) != vessel;
    40 
    +
    41 
    +-- Unknown vessel
    42 
    +UPDATE ps_observation.TransmittingBuoy 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 ) = vessel;
    43 
    +UPDATE ps_logbook.TransmittingBuoy     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 ) = vessel;
    44 
    +
    45 
    +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 v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000;
    46 
    +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 v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000;
    47 
    +
    48 
    +UPDATE ps_observation.TransmittingBuoy 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 ) != vessel;
    49 
    +UPDATE ps_logbook.TransmittingBuoy     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 ) != vessel;
    50 
    +
    51 
    +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL WHERE country != NULL AND vessel != NULL;
    52 
    +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
    88 88 
     ps_common.schoolType=4
    89 89 
     ps_common.speciesFate=15
    90 90 
     ps_common.transmittingBuoyOperation=6
    91 
    -ps_common.transmittingBuoyOwnership=5
    91 
    +ps_common.transmittingBuoyOwnership=6
    92 92 
     ps_common.transmittingBuoyType=62
    93 93 
     ps_common.vesselActivity=39
    94 94 
     ps_common.weightCategory=137

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json
    ... ... @@ -90400,7 +90400,7 @@
    90400 90400 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90401 90401 
             "id": "fr.ird.referential.common.VesselType#1239832675737#0.43324169605639407",
    90402 90402 
             "topiaVersion": 15,
    90403 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90403 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90404 90404 
           },
    90405 90405 
           "messages": [
    90406 90406 
             {
    ... ... @@ -90431,7 +90431,7 @@
    90431 90431 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90432 90432 
             "id": "fr.ird.referential.common.VesselType#1308149641588#0.8724092935671164",
    90433 90433 
             "topiaVersion": 6,
    90434 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90434 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90435 90435 
           },
    90436 90436 
           "messages": [
    90437 90437 
             {
    ... ... @@ -90462,7 +90462,7 @@
    90462 90462 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90463 90463 
             "id": "fr.ird.referential.common.VesselType#1239832675737#0.3189669579867931",
    90464 90464 
             "topiaVersion": 15,
    90465 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90465 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90466 90466 
           },
    90467 90467 
           "messages": [
    90468 90468 
             {
    ... ... @@ -90493,7 +90493,7 @@
    90493 90493 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90494 90494 
             "id": "fr.ird.referential.common.VesselType#1239832675737#0.03138158577140615",
    90495 90495 
             "topiaVersion": 15,
    90496 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90496 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90497 90497 
           },
    90498 90498 
           "messages": [
    90499 90499 
             {
    ... ... @@ -90524,7 +90524,7 @@
    90524 90524 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90525 90525 
             "id": "fr.ird.referential.common.VesselType#1308149718650#0.791946073811996",
    90526 90526 
             "topiaVersion": 6,
    90527 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90527 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90528 90528 
           },
    90529 90529 
           "messages": [
    90530 90530 
             {
    ... ... @@ -90555,7 +90555,7 @@
    90555 90555 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90556 90556 
             "id": "fr.ird.referential.common.VesselType#1464000000000#0.16",
    90557 90557 
             "topiaVersion": 1,
    90558 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90558 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90559 90559 
           },
    90560 90560 
           "messages": [
    90561 90561 
             {
    ... ... @@ -90576,7 +90576,7 @@
    90576 90576 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90577 90577 
             "id": "fr.ird.referential.common.VesselType#1464000000000#0.17",
    90578 90578 
             "topiaVersion": 1,
    90579 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90579 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90580 90580 
           },
    90581 90581 
           "messages": [
    90582 90582 
             {
    ... ... @@ -90597,7 +90597,7 @@
    90597 90597 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90598 90598 
             "id": "fr.ird.referential.common.VesselType#1239832675734#0.24685054061673772",
    90599 90599 
             "topiaVersion": 15,
    90600 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90600 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90601 90601 
           },
    90602 90602 
           "messages": [
    90603 90603 
             {
    ... ... @@ -90628,7 +90628,7 @@
    90628 90628 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90629 90629 
             "id": "fr.ird.referential.common.VesselType#1308149674400#0.8030832839591066",
    90630 90630 
             "topiaVersion": 6,
    90631 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90631 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90632 90632 
           },
    90633 90633 
           "messages": [
    90634 90634 
             {
    ... ... @@ -90654,7 +90654,7 @@
    90654 90654 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90655 90655 
             "id": "fr.ird.referential.common.VesselType#1239832675734#0.4191950326431938",
    90656 90656 
             "topiaVersion": 15,
    90657 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90657 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90658 90658 
           },
    90659 90659 
           "messages": [
    90660 90660 
             {
    ... ... @@ -90680,7 +90680,7 @@
    90680 90680 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90681 90681 
             "id": "fr.ird.referential.common.VesselType#1239832675735#0.7380146830307519",
    90682 90682 
             "topiaVersion": 15,
    90683 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90683 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90684 90684 
           },
    90685 90685 
           "messages": [
    90686 90686 
             {
    ... ... @@ -90711,7 +90711,7 @@
    90711 90711 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90712 90712 
             "id": "fr.ird.referential.common.VesselType#1239832675735#0.9086075071905084",
    90713 90713 
             "topiaVersion": 15,
    90714 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90714 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90715 90715 
           },
    90716 90716 
           "messages": [
    90717 90717 
             {
    ... ... @@ -90737,7 +90737,7 @@
    90737 90737 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90738 90738 
             "id": "fr.ird.referential.common.VesselType#1239832675735#0.307197212385357",
    90739 90739 
             "topiaVersion": 15,
    90740 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90740 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90741 90741 
           },
    90742 90742 
           "messages": [
    90743 90743 
             {
    ... ... @@ -90763,7 +90763,7 @@
    90763 90763 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90764 90764 
             "id": "fr.ird.referential.common.VesselType#1239832675736#0.8708229847859869",
    90765 90765 
             "topiaVersion": 15,
    90766 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90766 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90767 90767 
           },
    90768 90768 
           "messages": [
    90769 90769 
             {
    ... ... @@ -90789,7 +90789,7 @@
    90789 90789 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90790 90790 
             "id": "fr.ird.referential.common.VesselType#1239832686137#0.1",
    90791 90791 
             "topiaVersion": 3,
    90792 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90792 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90793 90793 
           },
    90794 90794 
           "messages": [
    90795 90795 
             {
    ... ... @@ -90815,7 +90815,7 @@
    90815 90815 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90816 90816 
             "id": "fr.ird.referential.common.VesselType#1464000000000#0.14",
    90817 90817 
             "topiaVersion": 1,
    90818 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90818 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90819 90819 
           },
    90820 90820 
           "messages": [
    90821 90821 
             {
    ... ... @@ -90831,7 +90831,7 @@
    90831 90831 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90832 90832 
             "id": "fr.ird.referential.common.VesselType#1464000000000#0.15",
    90833 90833 
             "topiaVersion": 1,
    90834 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90834 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90835 90835 
           },
    90836 90836 
           "messages": [
    90837 90837 
             {
    ... ... @@ -90847,7 +90847,7 @@
    90847 90847 
             "type": "fr.ird.observe.dto.referential.common.VesselTypeDto",
    90848 90848 
             "id": "fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505",
    90849 90849 
             "topiaVersion": 15,
    90850 
    -        "lastUpdateDate": "2023-12-01T00:00:00.000Z"
    90850 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    90851 90851 
           },
    90852 90852 
           "messages": [
    90853 90853 
             {

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps.json
    ... ... @@ -6322,6 +6322,22 @@
    6322 6322 
             }
    6323 6323 
           ]
    6324 6324 
         },
    6325 
    +    {
    6326 
    +      "datum": {
    6327 
    +        "text": "5##A un autre bateau, armement non précisé",
    6328 
    +        "type": "fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipDto",
    6329 
    +        "id": "fr.ird.referential.ps.common.TransmittingBuoyOwnership#1464000000000#5",
    6330 
    +        "topiaVersion": 0,
    6331 
    +        "lastUpdateDate": "2024-05-01T00:00:00.000Z"
    6332 
    +      },
    6333 
    +      "messages": [
    6334 
    +        {
    6335 
    +          "fieldName": "uri",
    6336 
    +          "scope": "WARNING",
    6337 
    +          "message": "Le champ n'est pas renseigné."
    6338 
    +        }
    6339 
    +      ]
    6340 
    +    },
    6325 6341 
         {
    6326 6342 
           "datum": {
    6327 6343 
             "text": "1##Radiogoniomètre##[0-9]{1,10}",

  • model/src/main/resources/fixtures/global.properties
    ... ... @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68
    25 25 
     ENTITIES_LIMIT_SIZE=100
    26 26 
     # fr.ird.observe.services.service.referential.ReferentialService
    27 27 
     # fr.ird.observe.services.local.service.referential.DifferentialModelTest
    28 
    -REFERENTIAL_COUNT=4368
    28 
    +REFERENTIAL_COUNT=4369

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23 
       <parent>
    24 24 
         <groupId>io.ultreia.maven</groupId>
    25 25 
         <artifactId>pom</artifactId>
    26 
    -    <version>2024.22</version>
    26 
    +    <version>2024.23</version>
    27 27 
       </parent>
    28 28 
       <groupId>fr.ird.observe</groupId>
    29 29 
       <artifactId>ird-observe</artifactId>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help