Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d9ad9a27 by Tony CHEMIT at 2018-05-19T19:21:34Z Modification du référentiel Person - Closes #890 - - - - - 20 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUIModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/java/fr/ird/observe/binder/referential/common/PersonDtoReferenceBinder.java - dto/src/main/models/Observe.model - persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityReferenceBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_0.java - persistence/src/main/models/Observe.model - + persistence/src/main/resources/db/migration/8.0/04_update_person-common.sql - + persistence/src/main/resources/db/migration/8.0/04_update_person2-common.sql - 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/empty_h2.sql.gz - test/src/main/resources/db/8.0/empty_pg.sql.gz - test/src/main/resources/db/8.0/referentiel.sql.gz Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jaxx @@ -148,5 +148,11 @@ public void decorateUniqueKeyTable(JTable table, onStateChanged='getBean().setDataEntryOperator(dataEntryOperator.isSelected())'/> </cell> </row> + <!-- is dataSource --> + <row> + <cell columns="2"> + <JCheckBox id='dataSource2' styleClass="skipI18n" onStateChanged='getBean().setDataSource(dataSource2.isSelected())'/> + </cell> + </row> </Table> </fr.ird.observe.client.ui.content.ref.ContentReferenceUI> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jcss @@ -46,6 +46,11 @@ selected:{bean.isDataEntryOperator()}; } +#dataSource2 { + selected:{bean.isDataSource()}; + text:"observe.common.PersonDto.dataSource"; +} + #country { property:{PersonDto.PROPERTY_COUNTRY}; selectedItem:{bean.getCountry()}; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUIModel.java @@ -45,6 +45,7 @@ public class PersonUIModel extends ContentReferenceUIModel<PersonDto, PersonRefe PersonDto.PROPERTY_CAPTAIN, PersonDto.PROPERTY_OBSERVER, PersonDto.PROPERTY_DATA_ENTRY_OPERATOR, + PersonDto.PROPERTY_DATA_SOURCE, PersonDto.PROPERTY_COUNTRY }, new String[]{PersonDto.PROPERTY_CODE}, @@ -54,6 +55,7 @@ public class PersonUIModel extends ContentReferenceUIModel<PersonDto, PersonRefe PersonUI.BINDING_CAPTAIN_SELECTED, PersonUI.BINDING_OBSERVER_SELECTED, PersonUI.BINDING_DATA_ENTRY_OPERATOR_SELECTED, + PersonUI.BINDING_DATA_SOURCE2_SELECTED, PersonUI.BINDING_COUNTRY_SELECTED_ITEM, } ); ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -807,6 +807,7 @@ observe.common.OpenableDto.action.reopen=Re-open observe.common.OpenableDto.action.reopen.tip=Reopen data observe.common.PersonDto.captain=Captain observe.common.PersonDto.dataEntryOperator=Data entry operator +observe.common.PersonDto.dataSource=Data source observe.common.PersonDto.observer=Observed observe.common.ProgramDto.action.goToOpen.short=Open program observe.common.ProgramDto.action.goToOpen.tip=Go to opened program ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -807,6 +807,7 @@ observe.common.OpenableDto.action.reopen=Reabrir observe.common.OpenableDto.action.reopen.tip=Reabrir la base de datos observe.common.PersonDto.captain=Patrón observe.common.PersonDto.dataEntryOperator=Operador de captación de datos +observe.common.PersonDto.dataSource=Data source \#TODO observe.common.PersonDto.observer=Observador observe.common.ProgramDto.action.goToOpen.short=Programa abierto observe.common.ProgramDto.action.goToOpen.tip=Acceder al programa abierto ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -807,6 +807,7 @@ observe.common.OpenableDto.action.reopen=Rouvrir observe.common.OpenableDto.action.reopen.tip=Rouvrir la donnée observe.common.PersonDto.captain=Capitaine observe.common.PersonDto.dataEntryOperator=Saisisseur +observe.common.PersonDto.dataSource=Source d'information observe.common.PersonDto.observer=Observateur observe.common.ProgramDto.action.goToOpen.short=Programme ouvert observe.common.ProgramDto.action.goToOpen.tip=Accéder au programme ouvert ===================================== dto/src/main/java/fr/ird/observe/binder/referential/common/PersonDtoReferenceBinder.java ===================================== --- a/dto/src/main/java/fr/ird/observe/binder/referential/common/PersonDtoReferenceBinder.java +++ b/dto/src/main/java/fr/ird/observe/binder/referential/common/PersonDtoReferenceBinder.java @@ -45,7 +45,8 @@ public class PersonDtoReferenceBinder extends ReferentialDtoReferenceBinder<Pers dto.getLastName(), dto.isCaptain(), dto.isObserver(), - dto.isDataEntryOperator()); + dto.isDataEntryOperator(), + dto.isDataSource()); } } ===================================== dto/src/main/models/Observe.model ===================================== --- a/dto/src/main/models/Observe.model +++ b/dto/src/main/models/Observe.model @@ -414,12 +414,13 @@ referential.Organism > referential.I18nReferential description + {*:1} String country {*:1} fr.ird.observe.dto.referential.CountryReference -referential.Person > referential.Referential | references=firstName,lastName,captain,observer,dataEntryOperator +referential.Person > referential.Referential | references=firstName,lastName,captain,observer,dataEntryOperator,dataSource lastName + {*:1} String firstName + {*:1} String observer + {*:1} boolean captain + {*:1} boolean dataEntryOperator + {*:1} boolean +dataSource + {*:1} boolean country {*:0..1} fr.ird.observe.dto.referential.CountryReference referential.Program > referential.I18nReferential >> WithComment | references=code,label,gearType,gearTypePrefix,tripCount ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityDtoBinder.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityDtoBinder.java +++ b/persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityDtoBinder.java @@ -48,6 +48,7 @@ public class PersonEntityDtoBinder extends ReferentialEntityDtoBinderSupport<Per entity.setCaptain(dto.isCaptain()); entity.setObserver(dto.isObserver()); entity.setDataEntryOperator(dto.isDataEntryOperator()); + entity.setDataSource(dto.isDataSource()); entity.setCountry(toEntity(dto.getCountry())); } @@ -62,6 +63,7 @@ public class PersonEntityDtoBinder extends ReferentialEntityDtoBinderSupport<Per dto.setCaptain(entity.isCaptain()); dto.setObserver(entity.isObserver()); dto.setDataEntryOperator(entity.isDataEntryOperator()); + dto.setDataSource(entity.isDataSource()); dto.setCountry(toReferentialReference(referentialLocale, entity.getCountry())); } ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityReferenceBinder.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityReferenceBinder.java +++ b/persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityReferenceBinder.java @@ -46,7 +46,8 @@ public class PersonEntityReferenceBinder extends ReferentialEntityReferenceBinde dto.getLastName(), dto.isCaptain(), dto.isObserver(), - dto.isDataEntryOperator()); + dto.isDataEntryOperator(), + dto.isDataSource()); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_0.java @@ -23,10 +23,16 @@ package fr.ird.observe.persistence.migration; */ import com.google.auto.service.AutoService; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + /** * Created by tchemit on 18/05/2018. * @@ -46,6 +52,21 @@ public class DataSourceMigrationForVersion_8_0 extends MigrationVersionResource executor.addScript("01", "move_wind_referential"); executor.addScript("02", "wind_i18n"); executor.addScript("03", "update_vesseltype"); + executor.addScript("04", "update_person"); + Boolean withIds = executor.findSingleResult(new TopiaSqlQuery<Boolean>() { + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement("SELECT COUNT (*) FROM observe_common.person"); + } + + @Override + public Boolean prepareResult(ResultSet resultSet) throws SQLException { + return resultSet.getInt(1) > 0; + } + }); + if (withIds) { + executor.addScript("04", "update_person2"); + } } } ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -517,6 +517,7 @@ firstName + {*:1} String observer + {*:1} boolean captain + {*:1} boolean dataEntryOperator + {*:1} boolean +dataSource + {*:1} boolean country {*:0..1} referentiel.Country referentiel.Program > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/resources/db/migration/8.0/04_update_person-common.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/8.0/04_update_person-common.sql @@ -0,0 +1,25 @@ +--- +-- #%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% +--- +ALTER TABLE observe_common.Person ADD COLUMN dataSource BOOLEAN DEFAULT FALSE; +ALTER TABLE observe_common.Person ALTER COLUMN observer SET DEFAULT FALSE; +ALTER TABLE observe_common.Person ALTER COLUMN captain SET DEFAULT FALSE; +ALTER TABLE observe_common.Person ALTER COLUMN dataEntryOperator SET DEFAULT FALSE; ===================================== persistence/src/main/resources/db/migration/8.0/04_update_person2-common.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/8.0/04_update_person2-common.sql @@ -0,0 +1,47 @@ +--- +-- #%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% +--- +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Stephen', 'Andy', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Vidot', 'Agnes', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Boniface', 'Breta', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#04' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Theresine', 'Bernard', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#05' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Valentin', 'Bahiri', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#06' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Julienne', 'Cynthia', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#07' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Melanie', 'Cindy', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#08' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Sopha', 'Davis', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#09' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Augustin', 'Emilie', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#10' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Rose', 'Hendricka', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#11' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Melanie', 'Julienne', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#12' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Sinon', 'James', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#13' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Sinon', 'Marie-Claire', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#14' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Savy', 'Marie Stella', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#15' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Bamboche', 'Nattyfa', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Pothin', 'Nikita', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#17' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Dogley', 'Ruby', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#18' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Quatre', 'Ron', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#19' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Ramkalawan', 'Relix', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#20' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Claude', 'Samantha', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#21' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Pillay', 'Sandra', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#22' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Labrosse', 'Valentina', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#23' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Lagrenade', 'Vanessa', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#24' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Savy', 'Vincent', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#25' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Perikanan', 'Pengawas', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); + ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -258,7 +258,7 @@ public class ObserveFixtures { .put("observe_common.ocean", 3L) .put("observe_common.ocean_species", 500L) .put("observe_common.organism", 9L) - .put("observe_common.person", 512L) + .put("observe_common.person", 537L) .put("observe_common.program", 27L) .put("observe_common.shipowner", 27L) .put("observe_common.sex", 5L) ===================================== test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== --- a/test/src/main/resources/db/8.0/empty_h2.sql.gz +++ b/test/src/main/resources/db/8.0/empty_h2.sql.gz @@ -15,7 +15,7 @@ create table OBSERVE_COMMON.lengthWeightParameter (topiaId varchar(255) not null create table OBSERVE_COMMON.ocean (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.ocean_species (species varchar(255), ocean varchar(255) not null); create table OBSERVE_COMMON.organism (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), country varchar(255), description varchar(255), primary key (topiaId)); -create table OBSERVE_COMMON.person (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, lastName varchar(255), firstName varchar(255), observer boolean, captain boolean, dataEntryOperator boolean, country varchar(255), primary key (topiaId)); +create table OBSERVE_COMMON.person (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, lastName varchar(255), firstName varchar(255), observer boolean, captain boolean, dataEntryOperator boolean, dataSource boolean, country varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.program (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), organism varchar(255), nonTargetObservation integer, targetDiscardsObservation integer, samplesObservation integer, objectsObservation integer, detailledActivitiesObservation integer, mammalsObservation integer, birdsObservation integer, baitObservation integer, startDate timestamp, endDate timestamp, comment varchar(2147483647), gearType integer, primary key (topiaId)); create table OBSERVE_COMMON.sex (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.shipOwner (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label varchar(255), startDate timestamp, endDate timestamp, country varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== --- a/test/src/main/resources/db/8.0/empty_pg.sql.gz +++ b/test/src/main/resources/db/8.0/empty_pg.sql.gz @@ -15,7 +15,7 @@ create table OBSERVE_COMMON.lengthWeightParameter (topiaId varchar(255) not null create table OBSERVE_COMMON.ocean (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.ocean_species (species varchar(255), ocean varchar(255) not null); create table OBSERVE_COMMON.organism (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), country varchar(255), description varchar(255), primary key (topiaId)); -create table OBSERVE_COMMON.person (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, lastName varchar(255), firstName varchar(255), observer boolean, captain boolean, dataEntryOperator boolean, country varchar(255), primary key (topiaId)); +create table OBSERVE_COMMON.person (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, lastName varchar(255), firstName varchar(255), observer boolean, captain boolean, dataEntryOperator boolean, dataSource boolean, country varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.program (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), organism varchar(255), nonTargetObservation int4, targetDiscardsObservation int4, samplesObservation int4, objectsObservation int4, detailledActivitiesObservation int4, mammalsObservation int4, birdsObservation int4, baitObservation int4, startDate timestamp, endDate timestamp, comment text, gearType int4, primary key (topiaId)); create table OBSERVE_COMMON.sex (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.shipOwner (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label varchar(255), startDate timestamp, endDate timestamp, country varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.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/commit/d9ad9a278b663578a10dac98a717... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d9ad9a278b663578a10dac98a717... You're receiving this email because of your account on gitlab.com.