Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f664945e by tchemit at 2018-12-21T03:25:02Z Un type d'objet flottant (28) n'est pas pris en compte par la migration - Closes #1188 - - - - - 91712433 by tchemit at 2018-12-21T04:03:32Z Conformité des topiaid de floatingobjectpart - See #1191 - - - - - 2 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java ===================================== @@ -171,7 +171,7 @@ public class DataSourceMigrationForVersion_6_2 extends MigrationVersionResource int materialIndex = 0; Set<String> materialIds = materialIdsForTypeId.get(typeId); for (String materialId : materialIds) { - String topiaId = idFactory.newTopiaId(FloatingObjectPart.class, idFactory.getRandomPart(dcpId) + materialIndex++); + String topiaId = idFactory.newTopiaId(FloatingObjectPart.class, idFactory.getRandomPart(idFactory.getRandomPart(dcpId)) + materialIndex++); executor.writeSql(String.format(INSERT_FLOATING_OBJECT_PART, topiaId, materialId, dcpId, whenArriving, whenLeaving)); } } ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== @@ -23,7 +23,7 @@ INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',0, '2018-11-12','2018-11-12 17:27:06.06232','',null, 'FOB',null, 1, false, null, null, false, false, 'FOB','FOB','FOB',null, null, null, null, null, true, true, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',0, '2018-11-12','2018-11-12 17:27:06.06232','1',null, 'FAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',1, false, null, null, null, null, 'FAD','FAD','FAD',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1, '2018-11-12','2018-11-12 17:27:06.06232','1-1',null, 'DFAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'DFAD (drifting FAD)','DFAD (FAD dérivant)','DFAD (FAD a la deriva)',null, null, null, null, null, true, false, null); -INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3',1, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1','22*, 23*',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Raft','Radeau','Parrilla',null, null, null, null, null, true, false, null); +INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3',1, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1','22*, 23*, 28*',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Raft','Radeau','Parrilla',null, null, null, null, null, true, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6',0, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1-1',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3',1, false, null, null, null, null, 'Frame','Chassis','Estructura',null, null, null, null, null, true, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.7',0, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1-1-1','6, 15, 25',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', true, null, 'Vegetal, canes,bamboo','Végétal, tiges,bambou','Bambú, cañas',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.8',0, '2018-11-12','2018-11-12 17:27:06.06232','1-1-1-1-2','20, 21*,26',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, null, 'Metallic or PVC','Métal ou PVC','Metállica ó PVC',null, null, null, null, null, false, false, null); @@ -92,6 +92,8 @@ INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.74',1, '2018-11-12','2018-11-12 17:27:06.06232','4-6',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', null, null, 'Size of largest mesh','Taille de la maille la plus grande (en mm)','Talla de la malla más grandes (en mm)',null, null, null, null, null, false, false, 'x >= 5 && x <= 1000'); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.75',1, '2018-11-12','2018-11-12 17:27:06.06232','4-7',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', null, null, 'FOB identifier','Identifiant du FOB','Identificador del FOB',null, null, null, null, null, false, false, 'x.length() >= 3 && x.length() <= 64'); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.76',1, '2018-11-12','2018-11-12 17:27:06.06232','4-8',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', null, null, 'Number of FOBs entangled','Nombre de FOBs emmêlés','Numero de FOBs enmallados',null, null, null, null, null, false, false, 'x >= 2 && x <= 100'); +INSERT INTO observe_seine.objectmaterial( topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, selectable, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#1464000000000#0.004009', 1, '2018-12-13', '2018-12-13 16:00:00', '4-9', '28*', null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 1, FALSE, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Submerged or half-submerged', 'Submergé ou partiellement submergé', 'Sumergido o parcialmente sumergido', null, null, null, null, null, true, FALSE, FALSE, null); + INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, '2018-11-12','2018-11-12 17:27:06.06232','6',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',0, false, null, null, null, null, 'Legacy codes','Anciens codes','Códigos antiguos',null, null, null, null, null, true, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.78',0, '2018-11-12','2018-11-12 17:27:06.06232','6-1','99',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Other, unknown','Autre, inconnu','Otro, desconocido',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.79',0, '2018-11-12','2018-11-12 17:27:06.06232','6-2','14','ALOG','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'One of the previous (10, 11, 12, 13) tagged','Un des antérieurs (10, 11, 12, 13) balisé','Una de los anterior (10, 11, 12, 13) con Baliza',null, null, null, null, null, false, false, null); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/285a3f13a8dbe8216208ceb37cd... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/285a3f13a8dbe8216208ceb37cd... You're receiving this email because of your account on gitlab.com.