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

Commits:

8 changed files:

Changes:

  • persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java
    ... ... @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_7_2 extends AbstractObserveMigrationC
    47 47 
         @Override
    48 48 
         protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) {
    49 49
    50 
    -        addScript("01", "update_dcp", queries);
    50 
    +        addScript("01", "update_objectMaterial", queries);
    51 51 
             addScript("02", "add_non_target_catch_release_conformity", queries);
    52 52 
             addScript("03", "add_non_target_catch_releasing_time", queries);
    53 53 
             addScript("04", "update_non_target_catch_release_status", queries);

  • persistence/src/main/resources/db/migration/7.2/01_update_dcp-common.sql deleted
    1 
    -update observe_seine.objectmaterial set parent ='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2', topiaversion = topiaversion + 1 where topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4'
    \ No newline at end of file

  • persistence/src/main/resources/db/migration/7.2/01_update_objectMaterial-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe :: Persistence
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2018 IRD, Code Lutin, 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 
    +-- Le nœud 1-12 n'est pas rattaché au bon père (1-1)
    23 
    +update observe_seine.objectmaterial set parent ='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2', topiaversion = topiaversion + 1 where topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4';
    24 
    +-- Supprimer 1-1-1-1-3
    25 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.84';
    26 
    +-- Supprimer 1-1-2-7
    27 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.37';
    28 
    +-- Supprimer 1-1-2-8
    29 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.38';
    30 
    +-- Supprimer 1-1-3-7
    31 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.45';
    32 
    +-- Supprimer 1-1-1-2-1 et mettre 1-1-1-2-1-1 et 1-1-1-2-1-2 au niveau supérieur
    33 
    +-- parent fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9 (1-1-1-2)
    34 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11 (1-1-1-2-1-1) → (1-1-1-2-1)
    35 
    +update observe_seine.objectmaterial set code='1-1-1-2-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11';
    36 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12 (1-1-1-2-1-1) → (1-1-1-2-2)
    37 
    +update observe_seine.objectmaterial set code='1-1-1-2-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12';
    38 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13 was (1-1-1-2-2) → (1-1-1-2-3)
    39 
    +update observe_seine.objectmaterial set code='1-1-1-2-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13';
    40 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14 was (1-1-1-2-3) → (1-1-1-2-4)
    41 
    +update observe_seine.objectmaterial set code='1-1-1-2-4', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14';
    42 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15 (1-1-1-2-4) → (1-1-1-2-5)
    43 
    +update observe_seine.objectmaterial set code='1-1-1-2-5', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15';
    44 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10 (remove)
    45 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10';
    46 
    +
    47 
    +-- Supprimer 1-1-1-3-1 et mettre 1-1-1-3-1-1 et 1-1-1-3-1-2 au niveau supérieur
    48 
    +-- parent fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16 (1-1-1-3)
    49 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18 (1-1-1-3-1-1) → (1-1-1-3-1)
    50 
    +update observe_seine.objectmaterial set code='1-1-1-3-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18';
    51 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19 (1-1-1-3-1-1) → (1-1-1-3-2)
    52 
    +update observe_seine.objectmaterial set code='1-1-1-3-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19';
    53 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20 was (1-1-1-3-2) → (1-1-1-3-3)
    54 
    +update observe_seine.objectmaterial set code='1-1-1-3-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20';
    55 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21 was (1-1-1-3-3) → (1-1-1-3-4)
    56 
    +update observe_seine.objectmaterial set code='1-1-1-3-4', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21';
    57 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22 (1-1-1-3-4) → (1-1-1-3-5)
    58 
    +update observe_seine.objectmaterial set code='1-1-1-3-5', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22';
    59 
    +-- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17 (remove)
    60 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17';
    61 
    +
    62 
    +-- 1-1-3 other components (tous les fils sont sélectionnables non exclusif) ? deja fait ?
    63 
    +update observe_seine.objectmaterial set childrenmultiselectable = TRUE , topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5';
    64 
    +
    65 
    +-- pour 1.1.2 (fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4)
    66 
    +-- * not structure (1-1-2-6) -> (1-1-2-1) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36
    67 
    +update observe_seine.objectmaterial set code = '1-1-2-1', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36';
    68 
    +-- * not visible   (1-1-2-6) -> (1-1-2-2) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.35
    69 
    +update observe_seine.objectmaterial set code = '1-1-2-2', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.35';
    70 
    +-- * rope/no mesh  (1-1-2-6) -> (1-1-2-3) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.34
    71 
    +update observe_seine.objectmaterial set code = '1-1-2-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.34';
    72 
    +-- * mesh (5 fils non exclusif) (new node) (1-1-2-4)
    73 
    +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL, NULL, '1-1-2-4'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Mesh', 'Maille', 'Malla', false, true , false, NULL, NULL, false, false);
    74 
    +--  * net in sausage (1-1-2-1) → (1-1-2-4-1) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25
    75 
    +update observe_seine.objectmaterial set code = '1-1-2-4-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25';
    76 
    +--   * open net < 7 (1-1-2-2-1) → (1-1-2-4-2) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.29
    77 
    +update observe_seine.objectmaterial set code = '1-1-2-4-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.29';
    78 
    +--   * open net > 7 (1-1-2-2-2) → (1-1-2-4-3) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.30
    79 
    +update observe_seine.objectmaterial set code = '1-1-2-4-3', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.30';
    80 
    +--   * single net < 7 (1-1-2-3-1) → (1-1-2-4-4) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.32
    81 
    +update observe_seine.objectmaterial set code = '1-1-2-4-4', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.32';
    82 
    +--   * single net > 7 (1-1-2-3-2) → (1-1-2-4-5) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.33
    83 
    +update observe_seine.objectmaterial set code = '1-1-2-4-5', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.33';
    84 
    +
    85 
    +--   remove 1-1-2-1-1 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26
    86 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26';
    87 
    +--   remove 1-1-2-1-2 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27
    88 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27';
    89 
    +--   remove 1-1-2-2 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28
    90 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28';
    91 
    +--   remove 1-1-2-3 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31
    92 
    +delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31';
    93 
    +
    94 
    +-- Passage en disabled 4-1
    95 
    +update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.69';
    96 
    +-- Passage en disabled 4-2
    97 
    +update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.70';
    98 
    +-- Passage en disabled 4-3
    99 
    +update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.71';
    100 
    +-- Mise à jour label 4-4
    101 
    +update observe_seine.objectmaterial set label1='subsurface depth', label2='profondeur (partie immergée)', label3='profundidad del rabo', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.72';
    102 
    +-- Mise à jour validation 4-6
    103 
    +update observe_seine.objectmaterial set validation='x >= 5 && x <= 1000', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.74';
    104 
    +-- Mise à jour label 4-8
    105 
    +update observe_seine.objectmaterial set label2='Number of tangled FOBs', label3='Numero de FADs enmallados', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.76';

  • services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java
    ... ... @@ -208,7 +208,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport {
    208 208 
             assertValidateResult(result, WindDto.class, 3);
    209 209 
             assertValidateResult(result, SpeciesStatusDto.class, 3);
    210 210 
             assertValidateResult(result, VesselActivityLonglineDto.class, 1);
    211 
    -        assertValidateResult(result, ObjectMaterialDto.class, 11);
    211 
    +        assertValidateResult(result, ObjectMaterialDto.class, 10);
    212 212 
             assertValidateResult(result, LineTypeDto.class, 2);
    213 213 
             assertValidateResult(result, ProgramDto.class, 9);
    214 214 
             assertValidateResult(result, BaitTypeDto.class, 3);

  • test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
    ... ... @@ -117,7 +117,7 @@ public class ObserveFixtures {
    117 117 
                 .put("observe_seine.nontargetcatchreleasestatus", 5L)
    118 118 
                 .put("observe_seine.nontargetcatchreleasingtime", 4L)
    119 119 
                 .put("observe_seine.objectoperation", 10L)
    120 
    -            .put("observe_seine.objectmaterial", 86L)
    120 
    +            .put("observe_seine.objectmaterial", 77L)
    121 121 
                 .put("observe_seine.objectmaterialtype", 4L)
    122 122 
                 .put("observe_seine.observedsystem", 21L)
    123 123 
                 .put("observe_seine.reasonfordiscard", 5L)

  • test/src/main/resources/db/7.2/dataForTestLongline.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.2/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.2/referentiel.sql.gz
    No preview for this file type

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.