Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 846b9c4f by Tony Chemit at 2021-05-20T12:37:47+02:00 [PS] Constitution de la liste de référence VesselActivity - See ultreiaio/ird-observe#1608 Migration des DCP d'AVDTH vers ObServe et son modèle FOB - See ultreiaio/ird-observe#1609 - - - - - 4 changed files: - models/persistence/java/src/test/resources/fixtures/persistence/table_count/referential.properties - models/persistence/migration/src/main/resources/db/migration/9.0/01_update_referential-common.sql - services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/DataSourceService.properties - services/api-test/src/main/resources/fixtures/validate-service-referential.properties Changes: ===================================== models/persistence/java/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -80,14 +80,14 @@ ll_observation.sensortype=4 ll_observation.stomachfullness=7 ps_common.objectmaterial=81 ps_common.objectmaterialtype=4 -ps_common.objectoperation=10 +ps_common.objectoperation=11 ps_common.observedsystem=24 ps_common.schooltype=3 ps_common.speciesfate=14 -ps_common.transmittingbuoyoperation=3 +ps_common.transmittingbuoyoperation=4 ps_common.transmittingbuoyownership=5 ps_common.transmittingbuoytype=42 -ps_common.vesselactivity=23 +ps_common.vesselactivity=33 ps_landing.fate=17 ps_landing.weightcategory=61 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 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'); 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'); UPDATE common.LastUpdateDate SET lastUpdateDate =${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.common.SpeciesList'; + +-- add a new ps VesselActivity +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'); +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'); +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'); +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'); +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'); +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'); +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'); +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'); +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'); +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'); +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.VesselActivity'; + +-- add a new ps ObjectOperation +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'); +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.ObjectOperation'; + +-- add a new ps TransmittingBuoyOperation +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'); +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 @@ ### defaultId=${REFERENTIAL_COMMON_PROGRAM} isIdValid.id=${defaultId} -referential.count=3911 +referential.count=3923 ===================================== services/api-test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -70,13 +70,13 @@ ll.observation.SensorTypeDto=2 ll.observation.StomachFullnessDto=2 ps.common.ObjectMaterialDto=10 ps.common.ObjectMaterialTypeDto=2 -ps.common.ObjectOperationDto=2 +ps.common.ObjectOperationDto=3 ps.common.ObservedSystemDto=2 ps.common.SpeciesFateDto=3 ps.common.TransmittingBuoyOperationDto=2 ps.common.TransmittingBuoyOwnershipDto=1 ps.common.TransmittingBuoyTypeDto=3 -ps.common.VesselActivityDto=2 +ps.common.VesselActivityDto=3 ps.landing.FateDto=3 ps.landing.WeightCategoryDto=2 ps.localmarket.BatchCompositionDto=1 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/846b9c4f614c098c1c03c7b996... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/846b9c4f614c098c1c03c7b996... You're receiving this email because of your account on gitlab.com.