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

Commits:

7 changed files:

Changes:

  • models/persistence/src/main/resources/db/migration/8.0/01_update_referential-common.sql
    ... ... @@ -20,8 +20,10 @@
    20 20
     -- #L%
    
    21 21
     ---
    
    22 22
     
    
    23
    -INSERT INTO observe_common.VesselType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.VesselType#666#1' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, null,'Industrial longliner', 'Palangrier industriel','Palangrero industrial');
    
    24
    -INSERT INTO observe_common.VesselType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.VesselType#666#2' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, null,'Semi industrial longliner', 'Palangrier semi industriel','Palangreros semindustriales');
    
    23
    +INSERT INTO observe_common.VesselType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.common.VesselType#1464000000000#0.14' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '14','Industrial longliner', 'Palangrier industriel','Palangrero industrial');
    
    24
    +INSERT INTO observe_common.VesselType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.common.VesselType#1464000000000#0.15' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '15','Semi industrial longliner', 'Palangrier semi industriel','Palangreros semindustriales');
    
    25
    +INSERT INTO observe_common.VesselType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.common.VesselType#1464000000000#0.16' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '16','Schooner', 'Goélette','Goleta');
    
    26
    +INSERT INTO observe_common.VesselType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.common.VesselType#1464000000000#0.17' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '17','Handliner', 'Palangrotte','Handlin');
    
    25 27
     
    
    26 28
     INSERT INTO observe_longline.vesselactivity(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'CRUISE',      'Cruising',             'Route','Route #TODO');
    
    27 29
     INSERT INTO observe_longline.vesselactivity(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'DRIFT',       'Drifting',             'En dérive','En dérive #TODO');
    

  • models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties
    ... ... @@ -48,7 +48,7 @@ common.speciesgroup_speciesgroupreleasemode=19
    48 48
     common.specieslist=8
    
    49 49
     common.vessel=1172
    
    50 50
     common.vesselsizecategory=13
    
    51
    -common.vesseltype=16
    
    51
    +common.vesseltype=18
    
    52 52
     common.weightmeasuremethod=4
    
    53 53
     common.weightmeasuretype=3
    
    54 54
     common.wind=13

  • models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties
    ... ... @@ -42,7 +42,7 @@ fr.ird.observe.entities.referential.common.SpeciesGroupReleaseMode=9
    42 42
     fr.ird.observe.entities.referential.common.SpeciesList=8
    
    43 43
     fr.ird.observe.entities.referential.common.Vessel=1172
    
    44 44
     fr.ird.observe.entities.referential.common.VesselSizeCategory=13
    
    45
    -fr.ird.observe.entities.referential.common.VesselType=16
    
    45
    +fr.ird.observe.entities.referential.common.VesselType=18
    
    46 46
     fr.ird.observe.entities.referential.common.WeightMeasureMethod=4
    
    47 47
     fr.ird.observe.entities.referential.common.WeightMeasureType=3
    
    48 48
     fr.ird.observe.entities.referential.common.Wind=13
    

  • tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz
    No preview for this file type
  • tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz
    No preview for this file type
  • tests/test/src/main/resources/db/8.0/referentiel.sql.gz
    No preview for this file type
  • tests/test/src/main/resources/fixtures/global.properties
    ... ... @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161
    35 35
     # for fr.ird.observe.spi.DbModelHelperTest
    
    36 36
     REFERENCE_DATA_COUNT=52
    
    37 37
     # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest
    
    38
    -REFERENTIAL_COUNT=3017
    
    38
    +REFERENTIAL_COUNT=3019
    
    39 39
     ENTITIES_LIMIT_SIZE=100