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

Commits:

4 changed files:

Changes:

  • models/persistence/java/src/test/resources/fixtures/persistence/table_count/referential.properties
    ... ... @@ -80,14 +80,14 @@ ll_observation.sensortype=4
    80 80 
     ll_observation.stomachfullness=7
    81 81 
     ps_common.objectmaterial=81
    82 82 
     ps_common.objectmaterialtype=4
    83 
    -ps_common.objectoperation=10
    83 
    +ps_common.objectoperation=11
    84 84 
     ps_common.observedsystem=24
    85 85 
     ps_common.schooltype=3
    86 86 
     ps_common.speciesfate=14
    87 
    -ps_common.transmittingbuoyoperation=3
    87 
    +ps_common.transmittingbuoyoperation=4
    88 88 
     ps_common.transmittingbuoyownership=5
    89 89 
     ps_common.transmittingbuoytype=42
    90 
    -ps_common.vesselactivity=23
    90 
    +ps_common.vesselactivity=33
    91 91 
     ps_landing.fate=17
    92 92 
     ps_landing.weightcategory=61
    93 93 
     ps_localmarket.batchcomposition=2

  • models/persistence/migration/src/main/resources/db/migration/9.0/01_update_referential-common.sql
    ... ... @@ -24,3 +24,24 @@ INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, st
    24 24 
     INSERT INTO common.speciesList_species (species, speciesList) (SELECT species , 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}0.9' FROM common.speciesList_species WHERE speciesList= 'fr.ird.referential.common.SpeciesList#1239832675370#0.1');
    25 25 
     INSERT INTO common.speciesList_species (species, speciesList) (SELECT species , 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}0.9' FROM common.speciesList_species WHERE speciesList= 'fr.ird.referential.common.SpeciesList#1239832675370#0.2');
    26 26 
     UPDATE common.LastUpdateDate SET lastUpdateDate =${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.common.SpeciesList';
    27 
    +
    28 
    +-- add a new ps VesselActivity
    29 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}22', 0, '22', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Avarie TODO','Avarie', 'Avarie TODO');
    30 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}23', 0, '23', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Appât TODO','Appât', 'Appât TODO');
    31 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}24', 0, '24', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Attente TODO','Attente', 'Attente TODO');
    32 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}25', 0, '25', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Transbordement en mer (sans précision) TODO','Transbordement en mer (sans précision)', 'Transbordement en mer (sans précision) TODO');
    33 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}26', 0, '26', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Transbordement depuis un senneur TODO','Transbordement depuis un senneur', 'Transbordement depuis un senneur TODO');
    34 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}27', 0, '27', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Transbordement vers un senneur TODO','Transbordement vers un senneur', 'Transbordement vers un senneur TODO');
    35 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}28', 0, '28', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Chavirage de la poche TODO','Chavirage de la poche', 'Chavirage de la poche TODO');
    36 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}29', 0, '29', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Transbordement vers un canneur TODO','Transbordement vers un canneur', 'Transbordement vers un canneur TODO');
    37 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}30', 0, '30', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Transbordement depuis un canneur TODO','Transbordement depuis un canneur', 'Transbordement depuis un canneur TODO');
    38 
    +INSERT INTO ps_common.VesselActivity(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, allowfad, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}31', 0, '31', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, false, 'Rejet de poisson TODO','Rejet de poisson', 'Rejet de poisson TODO');
    39 
    +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.VesselActivity';
    40 
    +
    41 
    +-- add a new ps ObjectOperation
    42 
    +INSERT INTO ps_common.ObjectOperation(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, whenLeaving, whenArriving, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.ObjectOperation#${REFERENTIAL_PREFIX}11', 0, '11', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, true, true, 'Perte TODO', 'Perte', 'Perte TODO');
    43 
    +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.ObjectOperation';
    44 
    +
    45 
    +-- add a new ps TransmittingBuoyOperation
    46 
    +INSERT INTO ps_common.TransmittingBuoyOperation(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, label1, label2, label3) VALUES ('fr.ird.referential.ps.common.TransmittingBuoyOperation#${REFERENTIAL_PREFIX}4', 0, '4', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, 'Perte signal TODO', 'Perte signal', 'Perte signal TODO');
    47 
    +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOperation';

  • services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/DataSourceService.properties
    ... ... @@ -21,4 +21,4 @@
    21 21 
     ###
    22 22 
     defaultId=${REFERENTIAL_COMMON_PROGRAM}
    23 23 
     isIdValid.id=${defaultId}
    24 
    -referential.count=3911
    24 
    +referential.count=3923

  • services/api-test/src/main/resources/fixtures/validate-service-referential.properties
    ... ... @@ -70,13 +70,13 @@ ll.observation.SensorTypeDto=2
    70 70 
     ll.observation.StomachFullnessDto=2
    71 71 
     ps.common.ObjectMaterialDto=10
    72 72 
     ps.common.ObjectMaterialTypeDto=2
    73 
    -ps.common.ObjectOperationDto=2
    73 
    +ps.common.ObjectOperationDto=3
    74 74 
     ps.common.ObservedSystemDto=2
    75 75 
     ps.common.SpeciesFateDto=3
    76 76 
     ps.common.TransmittingBuoyOperationDto=2
    77 77 
     ps.common.TransmittingBuoyOwnershipDto=1
    78 78 
     ps.common.TransmittingBuoyTypeDto=3
    79 
    -ps.common.VesselActivityDto=2
    79 
    +ps.common.VesselActivityDto=3
    80 80 
     ps.landing.FateDto=3
    81 81 
     ps.landing.WeightCategoryDto=2
    82 82 
     ps.localmarket.BatchCompositionDto=1

    • —
    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.