Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
0d38cd09
by Tony CHEMIT at 2018-05-19T10:26:58Z
7 changed files:
- persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_0.java
- + persistence/src/main/resources/db/migration/8.0/03_update_vesseltype-common.sql
- services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java
- test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
- test/src/main/resources/db/8.0/dataForTestLongline.sql.gz
- test/src/main/resources/db/8.0/dataForTestSeine.sql.gz
- test/src/main/resources/db/8.0/referentiel.sql.gz
Changes:
| ... | ... | @@ -45,6 +45,7 @@ public class DataSourceMigrationForVersion_8_0 extends MigrationVersionResource |
| 45 | 45 |
executor.removeFK("observe_seine", "Activity", "wind");
|
| 46 | 46 |
executor.addScript("01", "move_wind_referential");
|
| 47 | 47 |
executor.addScript("02", "wind_i18n");
|
| 48 |
+ executor.addScript("03", "update_vesseltype");
|
|
| 48 | 49 |
}
|
| 49 | 50 |
|
| 50 | 51 |
}
|
| 1 |
+---
|
|
| 2 |
+-- #%L
|
|
| 3 |
+-- ObServe :: Persistence
|
|
| 4 |
+-- %%
|
|
| 5 |
+-- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
|
|
| 6 |
+-- %%
|
|
| 7 |
+-- This program is free software: you can redistribute it and/or modify
|
|
| 8 |
+-- it under the terms of the GNU General Public License as
|
|
| 9 |
+-- published by the Free Software Foundation, either version 3 of the
|
|
| 10 |
+-- License, or (at your option) any later version.
|
|
| 11 |
+--
|
|
| 12 |
+-- This program is distributed in the hope that it will be useful,
|
|
| 13 |
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
| 14 |
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
| 15 |
+-- GNU General Public License for more details.
|
|
| 16 |
+--
|
|
| 17 |
+-- You should have received a copy of the GNU General Public
|
|
| 18 |
+-- License along with this program. If not, see
|
|
| 19 |
+-- <http://www.gnu.org/licenses/gpl-3.0.html>.
|
|
| 20 |
+-- #L%
|
|
| 21 |
+---
|
|
| 22 |
+INSERT INTO observe_common.VesselType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.VesselType#666#1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, null,'Industrial longliner', 'Palangrier industriel','Industrial longliner #TODO');
|
|
| 23 |
+INSERT INTO observe_common.VesselType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.VesselType#666#2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, null,'Semi industrial longliner', 'Palangrier semi industriel','Semi industrial longliner #TODO');
|
|
| \ No newline at end of file |
| ... | ... | @@ -165,7 +165,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { |
| 165 | 165 |
assertValidateResult(result, SpeciesListDto.class, 1);
|
| 166 | 166 |
assertValidateResult(result, LightsticksColorDto.class, 2);
|
| 167 | 167 |
assertValidateResult(result, BaitSettingStatusDto.class, 1);
|
| 168 |
- assertValidateResult(result, VesselTypeDto.class, 3);
|
|
| 168 |
+ assertValidateResult(result, VesselTypeDto.class, 4);
|
|
| 169 | 169 |
assertValidateResult(result, SexDto.class, 2);
|
| 170 | 170 |
assertValidateResult(result, NonTargetCatchReleaseConformityDto.class, 2);
|
| 171 | 171 |
|
| ... | ... | @@ -271,7 +271,7 @@ public class ObserveFixtures { |
| 271 | 271 |
.put("observe_common.specieslist", 6L)
|
| 272 | 272 |
.put("observe_common.vessel", 1172L)
|
| 273 | 273 |
.put("observe_common.vesselsizecategory", 13L)
|
| 274 |
- .put("observe_common.vesseltype", 14L)
|
|
| 274 |
+ .put("observe_common.vesseltype", 16L)
|
|
| 275 | 275 |
.put("observe_common.weightmeasuretype", 3L)
|
| 276 | 276 |
.put("observe_common.wind", 13L)
|
| 277 | 277 |
.build();
|