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

Commits:

7 changed files:

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
    71 71 
             issue2932(executor,withIds);
    72 72 
             // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2959
    73 73 
             issue2959(executor,withIds);
    74 
    +        if (withIds) {
    75 
    +            // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2958
    76 
    +            executor.addScript("07", "issue-2958");
    77 
    +        }
    74 78 
         }
    75 79
    76 80 
         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 @@
    20 20 
     -- #L%
    21 21 
     ---
    22 22 
     -- add a new species list PS - Catch
    23 
    -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);
    23 
    +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);
    24 24 
     INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
    25 25 
     INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
    26 26 
     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 @@
    19 19 
     -- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     -- #L%
    21 21 
     ---
    22 
    -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);
    22 
    +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);
    23 23 
     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
    24 24 
     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
    25 25 
     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
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe Core :: Persistence :: Migration
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2024 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 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);
    23 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    24 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    25 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    26 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.5618871286604711', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    27 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.8024257002747615', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    28 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.3846921632590058', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    29 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1441287921299#0.016754076421811148', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    30 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1433499265113#0.891799515346065', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    31 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.2673009297087321', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    32 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685478#0.7676744877900202', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    33 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.5989181185528589', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    34 
    +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.36339915670317835', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102');
    35 
    +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);
    36 
    +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
    37 
    +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
    38 
    +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
    39 
    +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
    40 
    +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
    42 42 
     common.species=315
    43 43 
     common.speciesGroup=12
    44 44 
     common.speciesGroupReleaseMode=10
    45 
    -common.speciesList=12
    45 
    +common.speciesList=14
    46 46 
     common.vessel=1250
    47 47 
     common.vesselSizeCategory=13
    48 48 
     common.vesselType=18
    ... ... @@ -120,4 +120,4 @@ common.gear_allowedGearCharacteristic=108
    120 120 
     common.gear_defaultGearCharacteristic=45
    121 121 
     common.species_ocean=553
    122 122 
     common.speciesGroup_speciesGroupReleaseMode=19
    123 
    -common.speciesList_species=981
    123 
    +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 @@
    44081 44081 
         },
    44082 44082 
         {
    44083 44083 
           "datum": {
    44084 
    -        "text": "100##Consolidation (PS Logbook SampleActivity.weightedWeight)",
    44084 
    +        "text": "100##Consolidation - PS Logbook - Poids pondérés - flotte France",
    44085 44085 
             "type": "fr.ird.observe.dto.referential.common.SpeciesListDto",
    44086 44086 
             "id": "fr.ird.referential.common.SpeciesList#1464000000000#100",
    44087 44087 
             "topiaVersion": 0,
    44088 44088 
             "lastUpdateDate": "2024-09-11T00:00:00.000Z"
    44089 44089 
           },
    44090 44090 
           "messages": [
    44091 
    -        {
    44092 
    -          "fieldName": "label1",
    44093 
    -          "scope": "WARNING",
    44094 
    -          "message": "Le libellé anglais n'est pas traduit."
    44095 
    -        },
    44096 
    -        {
    44097 
    -          "fieldName": "label3",
    44098 
    -          "scope": "WARNING",
    44099 
    -          "message": "Le libellé espagnol n'est pas traduit."
    44100 
    -        },
    44101 
    -        {
    44091 
    +       {
    44102 44092 
               "fieldName": "uri",
    44103 44093 
               "scope": "WARNING",
    44104 44094 
               "message": "Le champ n'est pas renseigné."
    ... ... @@ -44107,23 +44097,46 @@
    44107 44097 
         },
    44108 44098 
         {
    44109 44099 
           "datum": {
    44110 
    -        "text": "101##Consolidation (PS Logbook Sample.weights)",
    44100 
    +        "text": "101##Consolidation - PS Logbook - Poids des catégories - flotte France",
    44111 44101 
             "type": "fr.ird.observe.dto.referential.common.SpeciesListDto",
    44112 44102 
             "id": "fr.ird.referential.common.SpeciesList#1464000000000#101",
    44113 44103 
             "topiaVersion": 0,
    44114 44104 
             "lastUpdateDate": "2024-09-11T00:00:00.000Z"
    44115 44105 
           },
    44116 44106 
           "messages": [
    44107 
    +
    44117 44108 
             {
    44118 
    -          "fieldName": "label1",
    44109 
    +          "fieldName": "uri",
    44119 44110 
               "scope": "WARNING",
    44120 
    -          "message": "Le libellé anglais n'est pas traduit."
    44121 
    -        },
    44111 
    +          "message": "Le champ n'est pas renseigné."
    44112 
    +        }
    44113 
    +      ]
    44114 
    +    },
    44115 
    +    {
    44116 
    +      "datum": {
    44117 
    +        "text": "100##Consolidation - PS Logbook - Poids pondérés - flotte Espagne",
    44118 
    +        "type": "fr.ird.observe.dto.referential.common.SpeciesListDto",
    44119 
    +        "id": "fr.ird.referential.common.SpeciesList#1464000000000#102",
    44120 
    +        "topiaVersion": 0,
    44121 
    +        "lastUpdateDate": "2024-09-11T00:00:00.000Z"
    44122 
    +      },
    44123 
    +      "messages": [
    44122 44124 
             {
    44123 
    -          "fieldName": "label3",
    44125 
    +          "fieldName": "uri",
    44124 44126 
               "scope": "WARNING",
    44125 
    -          "message": "Le libellé espagnol n'est pas traduit."
    44126 
    -        },
    44127 
    +          "message": "Le champ n'est pas renseigné."
    44128 
    +        }
    44129 
    +      ]
    44130 
    +    },
    44131 
    +    {
    44132 
    +      "datum": {
    44133 
    +        "text": "101##Consolidation - PS Logbook - Poids des catégories - flotte Espagne",
    44134 
    +        "type": "fr.ird.observe.dto.referential.common.SpeciesListDto",
    44135 
    +        "id": "fr.ird.referential.common.SpeciesList#1464000000000#103",
    44136 
    +        "topiaVersion": 0,
    44137 
    +        "lastUpdateDate": "2024-09-11T00:00:00.000Z"
    44138 
    +      },
    44139 
    +      "messages": [
    44127 44140 
             {
    44128 44141 
               "fieldName": "uri",
    44129 44142 
               "scope": "WARNING",

  • 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=4393
    28 
    +REFERENTIAL_COUNT=4395

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