[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Mise à jour des objectmaterial - Closes #1170 - Observe-commits

14 Nov 2018

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


Commits:
a8d6f5a2 by tchemit at 2018-11-14T11:57:06Z
Mise à jour des objectmaterial - Closes #1170

- - - - -
8f3cb485 by tchemit at 2018-11-14T11:57:35Z
Mise à jour des objectmaterial - Closes #1170 (update tests)

- - - - -


8 changed files:

- persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java
- persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql
- − persistence/src/main/resources/db/migration/6.1/10_update_objectMaterial-common.sql
- persistence/src/main/resources/db/migration/6.1/11_update_object_operation-common.sql → persistence/src/main/resources/db/migration/6.1/10_update_object_operation-common.sql
- − persistence/src/main/resources/db/migration/6.1/12_update_object_material-common.sql
- test/src/main/resources/db/7.0/dataForTestLongline.sql.gz
- test/src/main/resources/db/7.0/dataForTestSeine.sql.gz
- test/src/main/resources/db/7.0/referentiel.sql.gz


Changes:

=====================================
persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java
=====================================
@@ -69,11 +69,7 @@ public class DataSourceMigrationForVersion_6_1 extends MigrationVersionResource
         executor.addScript("07", "drop_table_sizemeasuretype");
         executor.addScript("08", "add_floating_object_fields");
         executor.addScript("09", "fill_object_material");
-        // was in version 7.2
-        executor.addScript("10", "update_objectMaterial");
-        // was in version 7.4
-        executor.addScript("11", "update_object_operation");
-        executor.addScript("12", "update_object_material");
+        executor.addScript("10", "update_object_operation");
 
     }
 


=====================================
persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql
=====================================
The diff for this file was not included because it is too large.

=====================================
persistence/src/main/resources/db/migration/6.1/10_update_objectMaterial-common.sql deleted
=====================================
@@ -1,112 +0,0 @@
----

--- #%L
--- ObServe :: Persistence
--- %%
--- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
--- %%
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public
--- License along with this program.  If not, see
--- <http://www.gnu.org/licenses/gpl-3.0.html>.
--- #L%
----
--- Le nœud 1-12 n'est pas rattaché au bon père (1-1)
-update observe_seine.objectmaterial set parent ='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2', topiaversion = topiaversion + 1 where topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4';
--- Supprimer 1-1-1-1-3
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.84';
--- Supprimer 1-1-2-7
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.37';
--- Supprimer 1-1-2-8
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.38';
--- Supprimer 1-1-3-7
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.45';
--- Supprimer 1-1-1-2-1 et mettre 1-1-1-2-1-1 et 1-1-1-2-1-2 au niveau supérieur
--- parent fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9 (1-1-1-2)
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11 (1-1-1-2-1-1) → (1-1-1-2-1)
-update observe_seine.objectmaterial set code='1-1-1-2-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12 (1-1-1-2-1-1) → (1-1-1-2-2)
-update observe_seine.objectmaterial set code='1-1-1-2-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13 was (1-1-1-2-2) → (1-1-1-2-3)
-update observe_seine.objectmaterial set code='1-1-1-2-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14 was (1-1-1-2-3) → (1-1-1-2-4)
-update observe_seine.objectmaterial set code='1-1-1-2-4', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15 (1-1-1-2-4) → (1-1-1-2-5)
-update observe_seine.objectmaterial set code='1-1-1-2-5', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10 (remove)
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10';
-
--- Supprimer 1-1-1-3-1 et mettre 1-1-1-3-1-1 et 1-1-1-3-1-2 au niveau supérieur
--- parent fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16 (1-1-1-3)
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18 (1-1-1-3-1-1) → (1-1-1-3-1)
-update observe_seine.objectmaterial set code='1-1-1-3-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19 (1-1-1-3-1-1) → (1-1-1-3-2)
-update observe_seine.objectmaterial set code='1-1-1-3-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20 was (1-1-1-3-2) → (1-1-1-3-3)
-update observe_seine.objectmaterial set code='1-1-1-3-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21 was (1-1-1-3-3) → (1-1-1-3-4)
-update observe_seine.objectmaterial set code='1-1-1-3-4', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22 (1-1-1-3-4) → (1-1-1-3-5)
-update observe_seine.objectmaterial set code='1-1-1-3-5', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22';
--- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17 (remove)
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17';
-
--- 1-1-3 other components (tous les fils sont sélectionnables non exclusif) ? deja fait ?
-update observe_seine.objectmaterial set childrenmultiselectable = TRUE , topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5';
-
--- pour 1.1.2 (fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4)
--- * not structure (1-1-2-6) -> (1-1-2-1) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36
-update observe_seine.objectmaterial set code = '1-1-2-1', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36';
--- * not visible   (1-1-2-6) -> (1-1-2-2) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.35
-update observe_seine.objectmaterial set code = '1-1-2-2', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.35';
--- * rope/no mesh  (1-1-2-6) -> (1-1-2-3) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.34
-update observe_seine.objectmaterial set code = '1-1-2-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.34';
--- * mesh (5 fils non exclusif) (new node) (1-1-2-4)
-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#1.1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL, NULL, '1-1-2-4'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Mesh', 'Maille', 'Malla', false, true , false, NULL, NULL, false, false);
---  * net in sausage (1-1-2-1) → (1-1-2-4-1) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25
-update observe_seine.objectmaterial set code = '1-1-2-4-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25';
---   * open net < 7 (1-1-2-2-1) → (1-1-2-4-2) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.29
-update observe_seine.objectmaterial set code = '1-1-2-4-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.29';
---   * open net > 7 (1-1-2-2-2) → (1-1-2-4-3) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.30
-update observe_seine.objectmaterial set code = '1-1-2-4-3', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.30';
---   * single net < 7 (1-1-2-3-1) → (1-1-2-4-4) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.32
-update observe_seine.objectmaterial set code = '1-1-2-4-4', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.32';
---   * single net > 7 (1-1-2-3-2) → (1-1-2-4-5) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.33
-update observe_seine.objectmaterial set code = '1-1-2-4-5', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.33';
-
---   remove 1-1-2-1-1 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26';
---   remove 1-1-2-1-2 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27';
---   remove 1-1-2-2 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28';
---   remove 1-1-2-3 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31
-delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31';
-
--- Passage en disabled 4-1
-update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.69';
--- Passage en disabled 4-2
-update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.70';
--- Passage en disabled 4-3
-update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.71';
--- Mise à jour label 4-4
-update observe_seine.objectmaterial set label1='subsurface depth', label2='profondeur (partie immergée)', label3='profundidad del rabo', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.72';
--- Mise à jour validation 4-6
-update observe_seine.objectmaterial set validation='x >= 5 && x <= 1000', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.74';
--- Mise à jour label 4-8
-update observe_seine.objectmaterial set label2='Number of tangled FOBs', label3='Numero de FADs enmallados', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.76';
--- Mise à jour formule de validation len
-update observe_seine.objectmaterial set validation='x.length() >= 3 && x.length() <= 64', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.75';
--- Re-add entry for FOB with '' code
-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#1.3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL, 'FOB', ''        , null , 'FOB', 'FOB', 'FOB', false, true , true, NULL, NULL, false, false);
-UPDATE observe_seine.objectmaterial SET parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3' WHERE parent IS NULL;
-UPDATE observe_seine.objectmaterial SET parent= NULL WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3';
-UPDATE observe_seine.objectmaterial SET SELECTABLE = TRUE WHERE parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3' and status = '1';


=====================================
persistence/src/main/resources/db/migration/6.1/11_update_object_operation-common.sql → persistence/src/main/resources/db/migration/6.1/10_update_object_operation-common.sql
=====================================


=====================================
persistence/src/main/resources/db/migration/6.1/12_update_object_material-common.sql deleted
=====================================
@@ -1,44 +0,0 @@
----
--- #%L
--- ObServe :: Persistence
--- %%
--- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
--- %%
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public
--- License along with this program.  If not, see
--- <http://www.gnu.org/licenses/gpl-3.0.html>.
--- #L%
----
-
-UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1';
-UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.50';
-UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68';
-UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77';
-
-UPDATE observe_seine.objectmaterial SET childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3';
-
-UPDATE observe_seine.objectmaterial SET childrenmultiselectable = TRUE , childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6';
-UPDATE observe_seine.objectmaterial SET childrenmultiselectable = FALSE , childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9';
-UPDATE observe_seine.objectmaterial SET childrenmultiselectable = FALSE , childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16';
-
-UPDATE observe_seine.objectmaterial SET objectmaterialtype ='fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', selectable = TRUE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4';
-
-UPDATE observe_seine.objectmaterial SET objectmaterialtype ='fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', selectable = TRUE , childrenmultiselectable = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25';
-
-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, '', '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Not visible', 'Non visible', 'No se ve', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL, false, false);
-
--- See https://gitlab.com/ultreiaio/ird-observe/issues/1136
-UPDATE observe_seine.objectmaterial SET legacyCode ='22*, 23*', topiaVersion = topiaVersion + 1 WHERE topiaid = 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3';
-UPDATE observe_seine.objectmaterial SET legacyCode = NULL, topiaVersion = topiaVersion + 1   WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2';
-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.100', 0, CURRENT_DATE, CURRENT_TIMESTAMP, true,  0, '16', null, '6-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77' , ' Raft or buoy drifting', 'Radeau ou bouée en dérive','Parilla o buoy a la deriva', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL, false, false);
-ALTER TABLE observe_seine.objectmaterial DROP COLUMN selectable;


=====================================
test/src/main/resources/db/7.0/dataForTestLongline.sql.gz
=====================================
The diff for this file was not included because it is too large.

=====================================
test/src/main/resources/db/7.0/dataForTestSeine.sql.gz
=====================================
The diff for this file was not included because it is too large.

=====================================
test/src/main/resources/db/7.0/referentiel.sql.gz
=====================================
The diff for this file was not included because it is too large.


View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2c21fc3e8e761df7c0183f30409...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2c21fc3e8e761df7c0183f30409...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Mise à jour des objectmaterial - Closes #1170

Tony CHEMIT

tags

participants (1)