[Observe-commits] [Git][ultreiaio/ird-observe][develop] review referentials

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b092b50b by Tony CHEMIT at 2017-07-31T23:14:53+02:00 review referentials - - - - - 5 changed files: - persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java - test/src/main/resources/db/6.901/dataForTestLongline.sql.gz - test/src/main/resources/db/6.901/dataForTestSeine.sql.gz - test/src/main/resources/db/6.901/referentiel.sql.gz Changes: ===================================== persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql +++ b/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql @@ -23,26 +23,26 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate 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#0.1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'FAD' , '1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.01', 'FAD' , 'FAD' , 'FAD' , false, false, false, NULL , NULL , false, false); 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#0.2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '16' , 'DFAD' , '1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'DFAD (drifting FAD)' , 'DFAD (FAD dérivant)' , 'DFAD (FAD a la deriva)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.55' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'Floating structure' , 'Structure flottante' , 'Parrilla' , false, false, false, NULL , NULL , false, false); -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#0.6' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Frame' , 'Chassis' , 'Estructura' , false, false, true , NULL , NULL , false, false); +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#0.6' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Frame' , 'Chassis' , 'Estructura' , false, false, true , NULL , NULL , false, false); 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#0.7' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '6, 15, 25' , NULL , '1-1-1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Vegetal, canes,bamboo' , 'Végétal, tiges,bambou' , 'Bambú, cañas' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.8' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '20, 21*,26' , NULL , '1-1-1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Metallic or PVC' , 'Métal ou PVC' , 'Metállica ó PVC' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -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#0.85' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal, and metallic or PVC' , 'A la fois végétal et métallique ou PVC' , 'Mixta (metálica ó PVC y cañas)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -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#0.9' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Superior coverage' , 'Revêtement supérieur' , 'Recubrimiento superior' , false, true , true , NULL , NULL , false, false); +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#0.87' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal, and metallic or PVC' , 'A la fois végétal et métallique ou PVC' , 'Mixta (metálica ó PVC y cañas)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +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#0.9' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Superior coverage' , 'Revêtement supérieur' , 'Recubrimiento superior' , false, true , true , NULL , NULL , false, false); 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#0.10' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Net' , 'Filet' , 'Red' , false, true , false, NULL , NULL , false, false); 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#0.11' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 'Net with mesh ≤7cm' , 'Filet avec maillage ≤7cm' , 'Red con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.12' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 'Net with mesh >7cm' , 'Filet avec maillage >7cm' , 'Red con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.13' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.14' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.15' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Not visible' , 'Non visible' , 'No se ve' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -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#0.16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Inferior coverage' , 'Revêtement inférieur' , 'Recubrimiento inferior' , false, true , true , NULL , NULL , false, false); +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#0.16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Inferior coverage' , 'Revêtement inférieur' , 'Recubrimiento inferior' , false, true , true , NULL , NULL , false, false); 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#0.17' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Net' , 'Filet' , 'Red' , false, true , false, NULL , NULL , false, false); 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#0.18' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', 'Net with mesh ≤7cm' , 'Filet avec maillage ≤7cm' , 'Red con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.19' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', 'Net with mesh >7cm' , 'Filet avec maillage >7cm' , 'Red con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.20' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.21' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.22' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Not visible' , 'Non visible' , 'No se ve' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -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#0.23' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Modified' , 'Modifié' , 'Se modifica' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -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#0.24' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Replaced' , 'Remplacé' , 'Se reemplaza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +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#0.23' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Modified' , 'Modifié' , 'Se modifica' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +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#0.24' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Replaced' , 'Remplacé' , 'Se reemplaza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.85' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Subsurface structure' , 'Structure immergée' , 'Rabo' , false, true , true , NULL , NULL , false, false); 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#0.25' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.85', 'Net in sausage' , 'Filet saucisse' , 'Red en chorizo' , false, true , false, NULL , NULL , false, false); 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#0.26' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '1-1-1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25', 'Net in sausage with mesh ≤7cm' , 'Filet saucisse avec maillage ≤7cm' , 'Red en chorizo con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); @@ -77,7 +77,7 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate 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#0.52' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'VNLOG' , '1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'VNLOG (vegetal NLOG)' , 'VNLOG (NLOG vegetal)' , 'VNLOG (NLOG vegetal)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.53' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1' , NULL , '1-2-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Straw heap' , 'Tas de paille' , 'Monton the hierba' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.54' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2' , NULL , '1-2-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Palm tree, palm' , 'Palmier, palme' , 'Palma, hoja de palmera' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -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#0.55' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3' , NULL , '1-2-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Tree, branche' , 'Arbre, branche' , 'Árbol, rama' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +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#0.88' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3' , NULL , '1-2-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Tree, branche' , 'Arbre, branche' , 'Árbol, rama' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.56' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'ANLOG' , '1-2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'ANLOG (animal NLOG)' , 'ANLOG (NLOG animal)' , 'ANLOG (NLOG animal)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.57' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '4, 5*, 24' , NULL , '1-2-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Carrion' , 'Charogne' , 'Carroña' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); 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#0.58' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-2-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Whale shark' , 'Requin-baleine' , 'Tiburón ballena' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java @@ -29,6 +29,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.seine.ObjectMaterial; +import fr.ird.observe.entities.referentiel.seine.ObjectMaterialTopiaDao; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.FloatingObjectPart; @@ -69,7 +70,8 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F @Override public List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchy() { - List<ObjectMaterial> objectMaterials = getTopiaPersistenceContext().getObjectMaterialDao().findAll(); + ObjectMaterialTopiaDao dao = getTopiaPersistenceContext().getObjectMaterialDao(); + List<ObjectMaterial> objectMaterials = dao.findAll(); return getObjectMaterialHierarchyDtos(objectMaterials); } @@ -233,7 +235,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F private List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchyDtos(List<ObjectMaterial> objectMaterials) { Multimap<String, ObjectMaterial> childrenByParent = ArrayListMultimap.create(); objectMaterials.forEach(o -> childrenByParent.put(Optional.ofNullable(o.getParent()).map(ObjectMaterial::getTopiaId).orElse(null), o)); - Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get(null); + Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get("fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.01"); ReferentialBinderSupport<ObserveReferentialEntity, ObjectMaterialDto> referentialBinder = getReferentialBinder(ObjectMaterialDto.class); ReferentialLocale referentialLocale = getReferentialLocale(); List<ObjectMaterialHierarchyDto> result = new LinkedList<>(); ===================================== test/src/main/resources/db/6.901/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/6.901/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/6.901/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/referentiel.sql.gz and b/test/src/main/resources/db/6.901/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b092b50bc2f6b787a39824bcf7d4... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b092b50bc2f6b787a39824bcf7d4... You're receiving this email because of your account on gitlab.com.