Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7afa7c77 by tchemit at 2019-01-16T15:24:34Z [LL] Fournir le contenu de la table LL Compagnies destinataires des débarquements (déplacement dans le bon schema ll_landing) - Closes #1122 - - - - - 29 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIModel.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-01-referential-common.model - dto/src/main/models/Observe-13-referential-ll-landing.model - dto/src/main/models/Observe-32-data-ll-landing.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/referential/common/CompagniesEntityDtoBinder.java → persistence/src/main/java/fr/ird/observe/binder/referential/ll/landing/CompagniesEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/Entities.java - persistence/src/main/models/Observe-01-referential-common.model - persistence/src/main/models/Observe-13-referential-ll-landing.model - persistence/src/main/models/Observe-32-data-ll-landing.model - persistence/src/main/resources/db/migration/7.2/01_create_common_schema-common.sql - persistence/src/main/resources/db/migration/7.2/07_create_ll_landing_schema-common.sql - persistence/src/main/resources/db/migration/7.2/10_add_home_id-common.sql - persistence/src/main/resources/db/migration/7.2/15_fill_ll_compagnies-common.sql - test/src/main/resources/db/7.2/dataForTestLongline.sql.gz - test/src/main/resources/db/7.2/dataForTestSeine.sql.gz - test/src/main/resources/db/7.2/empty_h2.sql.gz - test/src/main/resources/db/7.2/empty_pg.sql.gz - test/src/main/resources/db/7.2/referentiel.sql.gz - test/src/main/resources/fixtures/count-referential-common.properties - test/src/main/resources/fixtures/count-referential-longline.properties - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx ===================================== @@ -34,7 +34,7 @@ fr.ird.observe.dto.referential.common.SpeciesReference fr.ird.observe.dto.referential.common.VesselReference fr.ird.observe.dto.referential.ll.landing.DataSourceReference - fr.ird.observe.dto.referential.common.CompagniesReference + fr.ird.observe.dto.referential.ll.landing.CompagniesReference fr.ird.observe.client.ui.actions.content.data.ll.delete.DeleteTripLonglineLandingUIAction fr.ird.observe.client.ui.actions.content.data.ll.move.MoveSingleTripLonglineLandingUIAction ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUI.jaxx ===================================== @@ -21,22 +21,22 @@ --> <fr.ird.observe.client.ui.content.api.ref.ContentI18nReferenceUI - i18n="fr.ird.observe.dto.referential.common.CompagniesDto" + i18n="fr.ird.observe.dto.referential.ll.landing.CompagniesDto" superGenericType='CompagniesDto, CompagniesReference, CompagniesUI'> - <style source="../CommonReferential.jcss"/> + <style source="../../CommonReferential.jcss"/> <import> fr.ird.observe.dto.reference.ReferentialDtoReference - fr.ird.observe.dto.referential.common.CompagniesDto - fr.ird.observe.dto.referential.common.CompagniesReference + fr.ird.observe.dto.referential.ll.landing.CompagniesDto + fr.ird.observe.dto.referential.ll.landing.CompagniesReference static fr.ird.observe.client.ui.util.UIHelper.getStringValue fr.ird.observe.dto.referential.ReferenceStatus </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.referential.common.CompagniesDto' + <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.referential.ll.landing.CompagniesDto' context='create' errorTableModel='{getErrorTableModel()}'/> <!-- model --> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIHandler.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.ref.common; +package fr.ird.observe.client.ui.content.ref.ll.landing; /*- * #%L @@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.content.ref.common; */ import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUIHandler; -import fr.ird.observe.dto.referential.common.CompagniesDto; -import fr.ird.observe.dto.referential.common.CompagniesReference; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesReference; import org.nuiton.jaxx.runtime.spi.UIHandler; /** ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIModel.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.ref.common; +package fr.ird.observe.client.ui.content.ref.ll.landing; /* * #%L @@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.content.ref.common; */ import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUIModel; -import fr.ird.observe.dto.referential.common.CompagniesDto; -import fr.ird.observe.dto.referential.common.CompagniesReference; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesReference; /** * Created on 9/27/14. ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -133,8 +133,8 @@ import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.common.CompagniesDto; -import fr.ird.observe.dto.referential.common.CompagniesReference; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesReference; import fr.ird.observe.dto.referential.common.CountryDto; import fr.ird.observe.dto.referential.common.CountryReference; import fr.ird.observe.dto.referential.common.DataQualityDto; ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== @@ -93,7 +93,7 @@ import fr.ird.observe.dto.data.ps.observation.TargetSampleDto; import fr.ird.observe.dto.data.ps.observation.TransmittingBuoyDto; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ReferentialDto; -import fr.ird.observe.dto.referential.common.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; import fr.ird.observe.dto.referential.common.CountryDto; import fr.ird.observe.dto.referential.common.DataQualityDto; import fr.ird.observe.dto.referential.common.FpaZoneDto; @@ -191,7 +191,6 @@ public class DtoModelClasses { public static final ImmutableSet<Class<? extends ReferentialDto>> COMMON_REFERENTIAL_TYPES = ImmutableSet.of( VesselSizeCategoryDto.class, CountryDto.class, - CompagniesDto.class, LengthMeasureMethodDto.class, WeightMeasureMethodDto.class, DataQualityDto.class, @@ -267,6 +266,7 @@ public class DtoModelClasses { WeightDeterminationMethodDto.class); public static final ImmutableSet<Class<? extends ReferentialDto>> LONGLINE_LANDING_REFERENTIAL_TYPES = ImmutableSet.of( + CompagniesDto.class, ConservationDto.class, DataSourceDto.class); ===================================== dto/src/main/models/Observe-01-referential-common.model ===================================== @@ -29,8 +29,6 @@ species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference ocean {*:0..1} fr.ird.observe.dto.referential.common.OceanReference sex {*:1} fr.ird.observe.dto.referential.common.SexReference -referential.common.Compagnies > referential.I18nReferential - referential.common.Country > referential.I18nReferential | references=code,label,uri,iso2Code,iso3Code iso2Code + {*:1} String iso3Code + {*:1} String ===================================== dto/src/main/models/Observe-13-referential-ll-landing.model ===================================== @@ -1,5 +1,7 @@ package fr.ird.observe.dto.referential.ll.landing | form=self +referential.ll.landing.Compagnies > referential.I18nReferential + referential.ll.landing.Conservation > referential.I18nReferential referential.ll.landing.DataSource > referential.I18nReferential ===================================== dto/src/main/models/Observe-32-data-ll-landing.model ===================================== @@ -16,7 +16,7 @@ data.ll.landing.LandingLongline > data.Openable | references=startDate,harbourLa startDate + {*:1} Date endDate + {*:1} Date dataSource {*:1} fr.ird.observe.dto.referential.ll.landing.DataSourceReference -compagnies {*:1} fr.ird.observe.dto.referential.common.CompagniesReference +compagnies {*:1} fr.ird.observe.dto.referential.ll.landing.CompagniesReference person {*:1} fr.ird.observe.dto.referential.common.PersonReference harbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference vessel {*:0..1} fr.ird.observe.dto.referential.common.VesselReference ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1,4 +1,3 @@ -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date ClientConfig.description=ObServe configuration ObserveWebApplicationConfig.description=ObServe Web configuration observe.TripLongline.action.generateHomeId.tip=Generate a new id @@ -3278,6 +3277,7 @@ observe.validation.activity.required.vesselActivity=must be filled. observe.validation.activity.speed.bound=Activity speed is %s nd, which is more than the maximum authorized which is %s nd. observe.validation.activity.speed.bound.inter=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s). observe.validation.activityLongline.desactivated.fpaZone=Fpa zone is disabled. +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date observe.validation.baitsComposition.bound.individualSize=Size must be bound between %s and %s. observe.validation.baitsComposition.bound.individualWeight=Weight must be bound between %s and %s. observe.validation.baitsComposition.bound.proportion=Proportion must be bound between %s and %s. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1,4 +1,3 @@ -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date#TODO ClientConfig.description=Configuración de ObServe ObserveWebApplicationConfig.description=Configuración de Observe web observe.TripLongline.action.generateHomeId.tip=Génerer un identifiant \#TODO @@ -3278,6 +3277,7 @@ observe.validation.activity.required.vesselActivity=Se debe seleccionar la activ observe.validation.activity.speed.bound=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos. observe.validation.activity.speed.bound.inter=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd). observe.validation.activityLongline.desactivated.fpaZone=La zona FPA seleccionada está desactivada. +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date\#TODO observe.validation.baitsComposition.bound.individualSize=El tamaño debe ser entre %s y %s. observe.validation.baitsComposition.bound.individualWeight=El peso debe ser entre %s y %s. observe.validation.baitsComposition.bound.proportion=La proporción debe ser entre %s y %s. ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -11,7 +11,6 @@ observe.action.auto.copy.to.clipboard.tip=Mettre à jour automatiquement le cont observe.action.back.to.list=Retour à la liste observe.action.back.to.list.tip=Retour à la liste des données observe.action.cancel=Annuler -observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée observe.action.cancel.remote.tip=Annuler la création de la configuration observe.action.cancel.server.tip=Annuler la création de la configuration observe.action.change.storage=Changer la source de données @@ -3278,6 +3277,7 @@ observe.validation.activity.required.vesselActivity=L'activité du navire est ob observe.validation.activity.speed.bound=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd. observe.validation.activity.speed.bound.inter=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd). observe.validation.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée. +observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée observe.validation.baitsComposition.bound.individualSize=La taille doit être comprise entre %s et %s. observe.validation.baitsComposition.bound.individualWeight=Le poids doit être comprise entre %s et %s. observe.validation.baitsComposition.bound.proportion=La proportion doit être comprise entre %s et %s. ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/CompagniesEntityDtoBinder.java → persistence/src/main/java/fr/ird/observe/binder/referential/ll/landing/CompagniesEntityDtoBinder.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.binder.referential.common; +package fr.ird.observe.binder.referential.ll.landing; /*- * #%L @@ -23,9 +23,9 @@ package fr.ird.observe.binder.referential.common; */ import fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport; -import fr.ird.observe.dto.referential.common.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.entities.referential.common.Compagnies; +import fr.ird.observe.entities.referential.ll.landing.Compagnies; /** * Created on 24/11/15. ===================================== persistence/src/main/java/fr/ird/observe/entities/Entities.java ===================================== @@ -47,7 +47,6 @@ public class Entities { new ObserveEntityEnum[]{ ObserveEntityEnum.common_VesselSizeCategory, ObserveEntityEnum.common_Country, - ObserveEntityEnum.common_Compagnies, ObserveEntityEnum.common_LengthMeasureMethod, ObserveEntityEnum.common_WeightMeasureMethod, ObserveEntityEnum.common_DataQuality, @@ -112,6 +111,7 @@ public class Entities { ObserveEntityEnum.ll_common_VesselActivityLongline, ObserveEntityEnum.ll_common_OnBoardProcessing, ObserveEntityEnum.ll_common_TripType, + ObserveEntityEnum.ll_landing_Compagnies, ObserveEntityEnum.ll_landing_Conservation, ObserveEntityEnum.ll_landing_DataSource, ObserveEntityEnum.ll_observation_BaitHaulingStatus, ===================================== persistence/src/main/models/Observe-01-referential-common.model ===================================== @@ -26,8 +26,6 @@ label7 + {*:1} String label8 + {*:1} String getLabel(referentialLocale !fr.ird.observe.dto.referential.ReferentialLocale) String -referential.common.Compagnies > referential.I18nReferentialEntity | entity - referential.common.Country > referential.I18nReferentialEntity | entity iso2Code + {*:1} String iso3Code + {*:1} String ===================================== persistence/src/main/models/Observe-13-referential-ll-landing.model ===================================== @@ -1,5 +1,7 @@ package fr.ird.observe.entities.referential.ll.landing | dbSchema=ll_landing +referential.ll.landing.Compagnies > referential.I18nReferentialEntity | entity + referential.ll.landing.Conservation > referential.I18nReferentialEntity | entity referential.ll.landing.DataSource > referential.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-32-data-ll-landing.model ===================================== @@ -5,7 +5,7 @@ comment + {*:1} String | hibernateAttributeType=text startDate + {*:1} Date endDate + {*:1} Date dataSource {*:1} referential.ll.landing.DataSource -compagnies {*:1} referential.common.Compagnies +compagnies {*:1} referential.ll.landing.Compagnies person {*:1} referential.common.Person harbour {*:0..1} referential.common.Harbour vessel {*:0..1} referential.common.Vessel ===================================== persistence/src/main/resources/db/migration/7.2/01_create_common_schema-common.sql ===================================== @@ -22,7 +22,6 @@ CREATE SCHEMA common; -CREATE TABLE common.compagnies(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_compagnies PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)); CREATE TABLE common.country(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_country PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), uri VARCHAR(255), iso2code VARCHAR(255), iso3code VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); CREATE TABLE common.dataquality(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_dataquality PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)); CREATE TABLE common.fpazone(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_fpazone PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), startdate DATE, enddate DATE, needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); @@ -56,7 +55,6 @@ CREATE TABLE common.ocean_species(species VARCHAR(255) NOT NULL, ocean VARCHAR(2 CREATE TABLE common.speciesgroup_speciesgroupreleasemode(speciesgroup VARCHAR(255) NOT NULL, speciesgroupreleasemode VARCHAR(255) NOT NULL); CREATE TABLE common.species_specieslist(specieslist VARCHAR(255) NOT NULL, species VARCHAR(255) NOT NULL); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_common.compagnies; INSERT INTO common.country(topiaid, topiaversion, topiacreatedate, code, uri, iso2code, iso3code, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, uri, iso2code, iso3code, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate FROM observe_common.country; INSERT INTO common.dataquality(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_common.dataquality; INSERT INTO common.fpazone(topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, startdate, enddate, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, startdate, enddate, needcomment, lastupdatedate FROM observe_common.fpazone; @@ -91,7 +89,6 @@ INSERT INTO common.ocean_species( species, ocean) SELECT species, ocean FROM obs INSERT INTO common.speciesgroup_speciesgroupreleasemode( speciesgroup, speciesgroupreleasemode) SELECT speciesgroup, speciesgroupreleasemode FROM observe_common.speciesgroup_speciesgroupreleasemode; INSERT INTO common.species_specieslist( specieslist, species) SELECT specieslist, species FROM observe_common.species_specieslist; -UPDATE common.Compagnies SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1; UPDATE common.Country SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1; UPDATE common.DataQuality SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1; UPDATE common.FpaZone SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1; @@ -127,7 +124,6 @@ UPDATE common.ocean_species SET species = REPLACE(species,'observe.entities.refe UPDATE common.speciesgroup_speciesgroupreleasemode SET speciesgroup = REPLACE(speciesgroup,'observe.entities.referentiel','referential.common'), speciesgroupreleasemode=REPLACE(speciesgroupreleasemode,'observe.entities.referentiel','referential.common'); UPDATE common.species_specieslist SET specieslist = REPLACE(specieslist,'observe.entities.referentiel','referential.common'), species=REPLACE(species,'observe.entities.referentiel','referential.common'); -CREATE INDEX idx_common_compagnies_lastupdatedate ON common.compagnies(lastupdatedate); CREATE INDEX idx_common_country_lastupdatedate ON common.country(lastupdatedate); CREATE INDEX idx_common_dataquality_lastupdatedate ON common.dataquality(lastupdatedate); CREATE INDEX idx_common_fpazone_lastupdatedate ON common.fpazone(lastupdatedate); @@ -218,7 +214,6 @@ ALTER TABLE common.speciesgroup_speciesgroupreleasemode ADD CONSTRAINT fk_common ALTER TABLE common.species_specieslist ADD CONSTRAINT fk_common_species_specieslist_specieslist FOREIGN KEY(specieslist) REFERENCES common.specieslist; ALTER TABLE common.species_specieslist ADD CONSTRAINT fk_common_species_specieslist_species FOREIGN KEY(species) REFERENCES common.species; -UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Compagnies' , 'referential.common.Compagnies'); UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Country' , 'referential.common.Country'); UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.DataQuality' , 'referential.common.DataQuality'); UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.FpaZone' , 'referential.common.FpaZone'); ===================================== persistence/src/main/resources/db/migration/7.2/07_create_ll_landing_schema-common.sql ===================================== @@ -22,14 +22,17 @@ CREATE SCHEMA ll_landing; +CREATE TABLE ll_landing.compagnies(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_compagnies PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)); CREATE TABLE ll_landing.conservation(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), CONSTRAINT pk_ll_landing_conservation primary key(topiaid)); CREATE TABLE ll_landing.datasource(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), CONSTRAINT pk_ll_landing_datasource primary key(topiaid)); CREATE TABLE ll_landing.landingpart(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, lastupdatedate TIMESTAMP NOT NULL, dataquality VARCHAR(255), categorymin NUMERIC, categorymax NUMERIC, count INTEGER, weight NUMERIC, startdate DATE, enddate DATE, species VARCHAR(255), fpazone VARCHAR(255), onboardprocessing VARCHAR(255), conservation VARCHAR(255), landing VARCHAR(255), weightmeasuremethod VARCHAR(255), CONSTRAINT pk_ll_landing_landingpart primary key(topiaid)); CREATE TABLE ll_landing.landing(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, lastupdatedate TIMESTAMP NOT NULL, comment VARCHAR(1025), startdate DATE, enddate DATE, datasource VARCHAR(255), compagnies VARCHAR(255), person VARCHAR(255), harbour VARCHAR(255), vessel VARCHAR(255), trip VARCHAR(255), CONSTRAINT pk_ll_landing_landing primary key(topiaid)); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_common.compagnies; INSERT INTO ll_landing.conservation(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 ) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_longline.conservation; INSERT INTO ll_landing.datasource(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 ) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_longline.datasource; +UPDATE ll_landing.Compagnies SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.ll.landing'), topiaversion = topiaversion + 1; UPDATE ll_landing.conservation SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel.longline', 'referential.ll.landing'), topiaversion = topiaversion + 1; UPDATE ll_landing.datasource SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel.longline', 'referential.ll.landing'), topiaversion = topiaversion + 1; @@ -39,7 +42,7 @@ ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_fpaz ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_onboardprocessing foreign key(onboardprocessing) references ll_common.onboardprocessing; ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_species foreign key(species) references common.species; ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_weightmeasuremethod foreign key(weightmeasuremethod) references common.weightmeasuremethod; -ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_compagnies foreign key(compagnies) references common.compagnies; +ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_compagnies foreign key(compagnies) references ll_landing.compagnies; ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_datasource foreign key(datasource) references ll_landing.datasource; ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_harbour foreign key(harbour) references common.harbour; ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_person foreign key(person) references common.person; @@ -59,6 +62,7 @@ CREATE INDEX idx_ll_landing_landing_person ON ll_landing.landing(person); CREATE INDEX idx_ll_landing_landing_trip ON ll_landing.landing(trip); CREATE INDEX idx_ll_landing_landing_vessel ON ll_landing.landing(vessel); +CREATE INDEX idx_ll_landing_compagnies_lastupdatedate ON ll_landing.compagnies(lastupdatedate); CREATE INDEX idx_ll_landing_conservation_lastupdatedate ON ll_landing.conservation(lastupdatedate); CREATE INDEX idx_ll_landing_datasource_lastupdatedate ON ll_landing.datasource(lastupdatedate); CREATE INDEX idx_ll_landing_landingpart_lastupdatedate ON ll_landing.landingpart(lastupdatedate); @@ -67,6 +71,7 @@ CREATE INDEX idx_ll_landing_landing_lastupdatedate ON ll_landing.landing(lastupd INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1021', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.landing.LandingLongline', CURRENT_TIMESTAMP); INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1022', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.landing.LandingPartLongline', CURRENT_TIMESTAMP); +UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Compagnies' , 'referential.ll.landing.Compagnies'); UPDATE common.LASTUPDATEDATE SET TYPE = replace(TYPE, 'referentiel.longline.Conservation', 'referential.ll.landing.Conservation'); UPDATE common.LASTUPDATEDATE SET TYPE = replace(TYPE, 'referentiel.longline.DataSource', 'referential.ll.landing.DataSource'); ===================================== persistence/src/main/resources/db/migration/7.2/10_add_home_id-common.sql ===================================== @@ -20,7 +20,6 @@ -- #L% --- -ALTER TABLE common.compagnies ADD COLUMN homeId VARCHAR(255); ALTER TABLE common.country ADD COLUMN homeId VARCHAR(255); ALTER TABLE common.dataquality ADD COLUMN homeId VARCHAR(255); ALTER TABLE common.fpazone ADD COLUMN homeId VARCHAR(255); @@ -67,6 +66,7 @@ ALTER TABLE ll_common.triptype ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_common.vesselactivity ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_common.weightcategory ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_common.weightdeterminationmethod ADD COLUMN homeId VARCHAR(255); +ALTER TABLE ll_landing.compagnies ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_landing.conservation ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_landing.datasource ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_landing.landing ADD COLUMN homeId VARCHAR(255); ===================================== persistence/src/main/resources/db/migration/7.2/15_fill_ll_compagnies-common.sql ===================================== @@ -20,33 +20,33 @@ -- #L% --- -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.01', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AFM', 'FINSS-00003638', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.02', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMIRANTES', 'FINSS-00003643', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.03', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMO', 'FINSS-00003557', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.04', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'ARC', 'FINSS-00003662', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.05', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'B&E', 'FINSS-00000096', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.06', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'BFR', 'FINSS-00003535', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.07', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'DCE', 'FINSS-00003473', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.08', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'Ephelia', 'FINSS-00003634', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.09', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FSS', 'FINSS-00003651', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.10', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FTE', 'FINSS-00003663', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.11', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GFM', 'FINSS-00003640', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.12', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GPO', 'FINSS-00000098', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.13', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GRA', 'FINSS-00003347', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.14', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'HOTEL&REST', 'FINSS-00003624', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.15', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'IFM', 'FINSS-00003639', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.16', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JAMES LESP', 'FINSS-00000129', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.17', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JHL', 'FINSS-00003652', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.18', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'kalanda', 'FINSS-00000177', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.19', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'LE MURIA', 'FINSS-00003633', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.20', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MARINE INV', 'FINSS-00000099', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.21', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MGE', 'FINSS-00000128', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.22', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN ', 'FINSS-00003629', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.23', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN HARV', 'FINSS-00000065', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.24', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEANA', 'FINSS-00000094', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.25', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SANS SOUCI', 'FINSS-00000100', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.26', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEA HARVES', 'FINSS-00000132', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.27', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEASTAR', 'FINSS-00000511', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.28', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SFA', 'FINSS-00000101', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.29', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'TROPICALTU', 'FINSS-00003654', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.30', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'UNK', 'FINSS-00000000', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.01', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AFM', 'FINSS-00003638', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.02', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMIRANTES', 'FINSS-00003643', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.03', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMO', 'FINSS-00003557', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.04', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'ARC', 'FINSS-00003662', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.05', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'B&E', 'FINSS-00000096', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.06', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'BFR', 'FINSS-00003535', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.07', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'DCE', 'FINSS-00003473', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.08', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'Ephelia', 'FINSS-00003634', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.09', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FSS', 'FINSS-00003651', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.10', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FTE', 'FINSS-00003663', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.11', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GFM', 'FINSS-00003640', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.12', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GPO', 'FINSS-00000098', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.13', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GRA', 'FINSS-00003347', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.14', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'HOTEL&REST', 'FINSS-00003624', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.15', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'IFM', 'FINSS-00003639', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.16', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JAMES LESP', 'FINSS-00000129', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.17', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JHL', 'FINSS-00003652', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.18', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'kalanda', 'FINSS-00000177', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.19', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'LE MURIA', 'FINSS-00003633', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.20', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MARINE INV', 'FINSS-00000099', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.21', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MGE', 'FINSS-00000128', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.22', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN ', 'FINSS-00003629', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.23', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN HARV', 'FINSS-00000065', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.24', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEANA', 'FINSS-00000094', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.25', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SANS SOUCI', 'FINSS-00000100', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.26', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEA HARVES', 'FINSS-00000132', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.27', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEASTAR', 'FINSS-00000511', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.28', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SFA', 'FINSS-00000101', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.29', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'TROPICALTU', 'FINSS-00003654', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.30', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'UNK', 'FINSS-00000000', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]'); ===================================== test/src/main/resources/db/7.2/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.2/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/empty_h2.sql.gz and b/test/src/main/resources/db/7.2/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/empty_pg.sql.gz and b/test/src/main/resources/db/7.2/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.2/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/referentiel.sql.gz and b/test/src/main/resources/db/7.2/referentiel.sql.gz differ ===================================== test/src/main/resources/fixtures/count-referential-common.properties ===================================== @@ -20,7 +20,6 @@ # #L% ### common.country=72 -common.compagnies=30 common.dataquality=5 common.fpazone=42 common.gear=26 ===================================== test/src/main/resources/fixtures/count-referential-longline.properties ===================================== @@ -43,6 +43,7 @@ ll_common.settingshape=6 ll_observation.stomacfullness=7 ll_common.vesselactivity=27 ll_common.weightcategory=0 +ll_landing.compagnies=30 ll_landing.datasource=20 ll_common.triptype=2 ll_common.onboardprocessing=5 ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -1,9 +1,7 @@ observe.validation.activity.duplicated.time observe.validation.activity.null.dcp -observe.validation.activity.required.date observe.validation.activity.required.observedSystem.for.nonTargetCatch -observe.validation.activity.required.time -observe.validation.activity.required.vesselActivity +observe.validation.activityLongline.startDate.before.currentTrip.endDate observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped observe.validation.catchLongline.required.position observe.validation.field.mandatory View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7afa7c77100788008ccf15f4d716... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7afa7c77100788008ccf15f4d716... You're receiving this email because of your account on gitlab.com.