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

Commits:

29 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx
    ... ... @@ -34,7 +34,7 @@
    34 34
         fr.ird.observe.dto.referential.common.SpeciesReference
    
    35 35
         fr.ird.observe.dto.referential.common.VesselReference
    
    36 36
         fr.ird.observe.dto.referential.ll.landing.DataSourceReference
    
    37
    -    fr.ird.observe.dto.referential.common.CompagniesReference
    
    37
    +    fr.ird.observe.dto.referential.ll.landing.CompagniesReference
    
    38 38
     
    
    39 39
         fr.ird.observe.client.ui.actions.content.data.ll.delete.DeleteTripLonglineLandingUIAction
    
    40 40
         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.jaxxclient-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUI.jaxx
    ... ... @@ -21,22 +21,22 @@
    21 21
       -->
    
    22 22
     
    
    23 23
     <fr.ird.observe.client.ui.content.api.ref.ContentI18nReferenceUI
    
    24
    -    i18n="fr.ird.observe.dto.referential.common.CompagniesDto"
    
    24
    +    i18n="fr.ird.observe.dto.referential.ll.landing.CompagniesDto"
    
    25 25
         superGenericType='CompagniesDto, CompagniesReference, CompagniesUI'>
    
    26 26
     
    
    27
    -  <style source="../CommonReferential.jcss"/>
    
    27
    +  <style source="../../CommonReferential.jcss"/>
    
    28 28
     
    
    29 29
       <import>
    
    30 30
         fr.ird.observe.dto.reference.ReferentialDtoReference
    
    31
    -    fr.ird.observe.dto.referential.common.CompagniesDto
    
    32
    -    fr.ird.observe.dto.referential.common.CompagniesReference
    
    31
    +    fr.ird.observe.dto.referential.ll.landing.CompagniesDto
    
    32
    +    fr.ird.observe.dto.referential.ll.landing.CompagniesReference
    
    33 33
     
    
    34 34
         static fr.ird.observe.client.ui.util.UIHelper.getStringValue
    
    35 35
         fr.ird.observe.dto.referential.ReferenceStatus
    
    36 36
       </import>
    
    37 37
     
    
    38 38
       <!-- validator -->
    
    39
    -  <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.referential.common.CompagniesDto'
    
    39
    +  <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.referential.ll.landing.CompagniesDto'
    
    40 40
                      context='create' errorTableModel='{getErrorTableModel()}'/>
    
    41 41
     
    
    42 42
       <!-- model -->
    

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIHandler.javaclient-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIHandler.java
    1
    -package fr.ird.observe.client.ui.content.ref.common;
    
    1
    +package fr.ird.observe.client.ui.content.ref.ll.landing;
    
    2 2
     
    
    3 3
     /*-
    
    4 4
      * #%L
    
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.content.ref.common;
    23 23
      */
    
    24 24
     
    
    25 25
     import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUIHandler;
    
    26
    -import fr.ird.observe.dto.referential.common.CompagniesDto;
    
    27
    -import fr.ird.observe.dto.referential.common.CompagniesReference;
    
    26
    +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto;
    
    27
    +import fr.ird.observe.dto.referential.ll.landing.CompagniesReference;
    
    28 28
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    
    29 29
     
    
    30 30
     /**
    

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIModel.javaclient-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIModel.java
    1
    -package fr.ird.observe.client.ui.content.ref.common;
    
    1
    +package fr.ird.observe.client.ui.content.ref.ll.landing;
    
    2 2
     
    
    3 3
     /*
    
    4 4
      * #%L
    
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.content.ref.common;
    23 23
      */
    
    24 24
     
    
    25 25
     import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUIModel;
    
    26
    -import fr.ird.observe.dto.referential.common.CompagniesDto;
    
    27
    -import fr.ird.observe.dto.referential.common.CompagniesReference;
    
    26
    +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto;
    
    27
    +import fr.ird.observe.dto.referential.ll.landing.CompagniesReference;
    
    28 28
     
    
    29 29
     /**
    
    30 30
      * 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;
    133 133
     import fr.ird.observe.dto.reference.ReferentialDtoReference;
    
    134 134
     import fr.ird.observe.dto.referential.ReferentialDto;
    
    135 135
     import fr.ird.observe.dto.referential.ReferentialLocale;
    
    136
    -import fr.ird.observe.dto.referential.common.CompagniesDto;
    
    137
    -import fr.ird.observe.dto.referential.common.CompagniesReference;
    
    136
    +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto;
    
    137
    +import fr.ird.observe.dto.referential.ll.landing.CompagniesReference;
    
    138 138
     import fr.ird.observe.dto.referential.common.CountryDto;
    
    139 139
     import fr.ird.observe.dto.referential.common.CountryReference;
    
    140 140
     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;
    93 93
     import fr.ird.observe.dto.data.ps.observation.TransmittingBuoyDto;
    
    94 94
     import fr.ird.observe.dto.reference.DtoReference;
    
    95 95
     import fr.ird.observe.dto.referential.ReferentialDto;
    
    96
    -import fr.ird.observe.dto.referential.common.CompagniesDto;
    
    96
    +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto;
    
    97 97
     import fr.ird.observe.dto.referential.common.CountryDto;
    
    98 98
     import fr.ird.observe.dto.referential.common.DataQualityDto;
    
    99 99
     import fr.ird.observe.dto.referential.common.FpaZoneDto;
    
    ... ... @@ -191,7 +191,6 @@ public class DtoModelClasses {
    191 191
         public static final ImmutableSet<Class<? extends ReferentialDto>> COMMON_REFERENTIAL_TYPES = ImmutableSet.of(
    
    192 192
                 VesselSizeCategoryDto.class,
    
    193 193
                 CountryDto.class,
    
    194
    -            CompagniesDto.class,
    
    195 194
                 LengthMeasureMethodDto.class,
    
    196 195
                 WeightMeasureMethodDto.class,
    
    197 196
                 DataQualityDto.class,
    
    ... ... @@ -267,6 +266,7 @@ public class DtoModelClasses {
    267 266
                 WeightDeterminationMethodDto.class);
    
    268 267
     
    
    269 268
         public static final ImmutableSet<Class<? extends ReferentialDto>> LONGLINE_LANDING_REFERENTIAL_TYPES = ImmutableSet.of(
    
    269
    +            CompagniesDto.class,
    
    270 270
                 ConservationDto.class,
    
    271 271
                 DataSourceDto.class);
    
    272 272
     
    

  • dto/src/main/models/Observe-01-referential-common.model
    ... ... @@ -29,8 +29,6 @@ species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference
    29 29
     ocean {*:0..1} fr.ird.observe.dto.referential.common.OceanReference
    
    30 30
     sex {*:1} fr.ird.observe.dto.referential.common.SexReference
    
    31 31
     
    
    32
    -referential.common.Compagnies > referential.I18nReferential
    
    33
    -
    
    34 32
     referential.common.Country > referential.I18nReferential | references=code,label,uri,iso2Code,iso3Code
    
    35 33
     iso2Code + {*:1} String
    
    36 34
     iso3Code + {*:1} String
    

  • dto/src/main/models/Observe-13-referential-ll-landing.model
    1 1
     package fr.ird.observe.dto.referential.ll.landing | form=self
    
    2 2
     
    
    3
    +referential.ll.landing.Compagnies > referential.I18nReferential
    
    4
    +
    
    3 5
     referential.ll.landing.Conservation > referential.I18nReferential
    
    4 6
     
    
    5 7
     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
    16 16
     startDate + {*:1} Date
    
    17 17
     endDate + {*:1} Date
    
    18 18
     dataSource {*:1} fr.ird.observe.dto.referential.ll.landing.DataSourceReference
    
    19
    -compagnies {*:1} fr.ird.observe.dto.referential.common.CompagniesReference
    
    19
    +compagnies {*:1} fr.ird.observe.dto.referential.ll.landing.CompagniesReference
    
    20 20
     person {*:1} fr.ird.observe.dto.referential.common.PersonReference
    
    21 21
     harbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference
    
    22 22
     vessel {*:0..1} fr.ird.observe.dto.referential.common.VesselReference
    

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    1
    -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date
    
    2 1
     ClientConfig.description=ObServe configuration
    
    3 2
     ObserveWebApplicationConfig.description=ObServe Web configuration
    
    4 3
     observe.TripLongline.action.generateHomeId.tip=Generate a new id
    
    ... ... @@ -3278,6 +3277,7 @@ observe.validation.activity.required.vesselActivity=must be filled.
    3278 3277
     observe.validation.activity.speed.bound=Activity speed is %s nd, which is more than the maximum authorized which is %s nd.
    
    3279 3278
     observe.validation.activity.speed.bound.inter=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s).
    
    3280 3279
     observe.validation.activityLongline.desactivated.fpaZone=Fpa zone is disabled.
    
    3280
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date
    
    3281 3281
     observe.validation.baitsComposition.bound.individualSize=Size must be bound between %s and %s.
    
    3282 3282
     observe.validation.baitsComposition.bound.individualWeight=Weight must be bound between %s and %s.
    
    3283 3283
     observe.validation.baitsComposition.bound.proportion=Proportion must be bound between %s and %s.
    

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    1
    -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date#TODO
    
    2 1
     ClientConfig.description=Configuración de ObServe
    
    3 2
     ObserveWebApplicationConfig.description=Configuración de Observe web
    
    4 3
     observe.TripLongline.action.generateHomeId.tip=Génerer un identifiant \#TODO
    
    ... ... @@ -3278,6 +3277,7 @@ observe.validation.activity.required.vesselActivity=Se debe seleccionar la activ
    3278 3277
     observe.validation.activity.speed.bound=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos.
    
    3279 3278
     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).
    
    3280 3279
     observe.validation.activityLongline.desactivated.fpaZone=La zona FPA seleccionada está desactivada.
    
    3280
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date\#TODO
    
    3281 3281
     observe.validation.baitsComposition.bound.individualSize=El tamaño debe ser entre %s y %s.
    
    3282 3282
     observe.validation.baitsComposition.bound.individualWeight=El peso debe ser entre %s y %s.
    
    3283 3283
     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
    11 11
     observe.action.back.to.list=Retour à la liste
    
    12 12
     observe.action.back.to.list.tip=Retour à la liste des données
    
    13 13
     observe.action.cancel=Annuler
    
    14
    -observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée
    
    15 14
     observe.action.cancel.remote.tip=Annuler la création de la configuration
    
    16 15
     observe.action.cancel.server.tip=Annuler la création de la configuration
    
    17 16
     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
    3278 3277
     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.
    
    3279 3278
     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).
    
    3280 3279
     observe.validation.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée.
    
    3280
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée
    
    3281 3281
     observe.validation.baitsComposition.bound.individualSize=La taille doit être comprise entre %s et %s.
    
    3282 3282
     observe.validation.baitsComposition.bound.individualWeight=Le poids doit être comprise entre %s et %s.
    
    3283 3283
     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.javapersistence/src/main/java/fr/ird/observe/binder/referential/ll/landing/CompagniesEntityDtoBinder.java
    1
    -package fr.ird.observe.binder.referential.common;
    
    1
    +package fr.ird.observe.binder.referential.ll.landing;
    
    2 2
     
    
    3 3
     /*-
    
    4 4
      * #%L
    
    ... ... @@ -23,9 +23,9 @@ package fr.ird.observe.binder.referential.common;
    23 23
      */
    
    24 24
     
    
    25 25
     import fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport;
    
    26
    -import fr.ird.observe.dto.referential.common.CompagniesDto;
    
    26
    +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto;
    
    27 27
     import fr.ird.observe.dto.referential.ReferentialLocale;
    
    28
    -import fr.ird.observe.entities.referential.common.Compagnies;
    
    28
    +import fr.ird.observe.entities.referential.ll.landing.Compagnies;
    
    29 29
     
    
    30 30
     /**
    
    31 31
      * Created on 24/11/15.
    

  • persistence/src/main/java/fr/ird/observe/entities/Entities.java
    ... ... @@ -47,7 +47,6 @@ public class Entities {
    47 47
                 new ObserveEntityEnum[]{
    
    48 48
                         ObserveEntityEnum.common_VesselSizeCategory,
    
    49 49
                         ObserveEntityEnum.common_Country,
    
    50
    -                    ObserveEntityEnum.common_Compagnies,
    
    51 50
                         ObserveEntityEnum.common_LengthMeasureMethod,
    
    52 51
                         ObserveEntityEnum.common_WeightMeasureMethod,
    
    53 52
                         ObserveEntityEnum.common_DataQuality,
    
    ... ... @@ -112,6 +111,7 @@ public class Entities {
    112 111
                         ObserveEntityEnum.ll_common_VesselActivityLongline,
    
    113 112
                         ObserveEntityEnum.ll_common_OnBoardProcessing,
    
    114 113
                         ObserveEntityEnum.ll_common_TripType,
    
    114
    +                    ObserveEntityEnum.ll_landing_Compagnies,
    
    115 115
                         ObserveEntityEnum.ll_landing_Conservation,
    
    116 116
                         ObserveEntityEnum.ll_landing_DataSource,
    
    117 117
                         ObserveEntityEnum.ll_observation_BaitHaulingStatus,
    

  • persistence/src/main/models/Observe-01-referential-common.model
    ... ... @@ -26,8 +26,6 @@ label7 + {*:1} String
    26 26
     label8 + {*:1} String
    
    27 27
     getLabel(referentialLocale !fr.ird.observe.dto.referential.ReferentialLocale) String
    
    28 28
     
    
    29
    -referential.common.Compagnies > referential.I18nReferentialEntity | entity
    
    30
    -
    
    31 29
     referential.common.Country > referential.I18nReferentialEntity | entity
    
    32 30
     iso2Code + {*:1} String
    
    33 31
     iso3Code + {*:1} String
    

  • persistence/src/main/models/Observe-13-referential-ll-landing.model
    1 1
     package fr.ird.observe.entities.referential.ll.landing | dbSchema=ll_landing
    
    2 2
     
    
    3
    +referential.ll.landing.Compagnies > referential.I18nReferentialEntity | entity
    
    4
    +
    
    3 5
     referential.ll.landing.Conservation > referential.I18nReferentialEntity | entity
    
    4 6
     
    
    5 7
     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
    5 5
     startDate + {*:1} Date
    
    6 6
     endDate + {*:1} Date
    
    7 7
     dataSource {*:1} referential.ll.landing.DataSource
    
    8
    -compagnies {*:1} referential.common.Compagnies
    
    8
    +compagnies {*:1} referential.ll.landing.Compagnies
    
    9 9
     person {*:1} referential.common.Person
    
    10 10
     harbour {*:0..1} referential.common.Harbour
    
    11 11
     vessel {*:0..1} referential.common.Vessel
    

  • persistence/src/main/resources/db/migration/7.2/01_create_common_schema-common.sql
    ... ... @@ -22,7 +22,6 @@
    22 22
     
    
    23 23
     CREATE SCHEMA common;
    
    24 24
     
    
    25
    -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));
    
    26 25
     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);
    
    27 26
     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));
    
    28 27
     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
    56 55
     CREATE TABLE common.speciesgroup_speciesgroupreleasemode(speciesgroup VARCHAR(255) NOT NULL, speciesgroupreleasemode VARCHAR(255) NOT NULL);
    
    57 56
     CREATE TABLE common.species_specieslist(specieslist VARCHAR(255) NOT NULL, species VARCHAR(255) NOT NULL);
    
    58 57
     
    
    59
    -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;
    
    60 58
     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;
    
    61 59
     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;
    
    62 60
     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
    91 89
     INSERT INTO common.speciesgroup_speciesgroupreleasemode( speciesgroup, speciesgroupreleasemode) SELECT speciesgroup, speciesgroupreleasemode FROM observe_common.speciesgroup_speciesgroupreleasemode;
    
    92 90
     INSERT INTO common.species_specieslist( specieslist, species) SELECT specieslist, species FROM observe_common.species_specieslist;
    
    93 91
     
    
    94
    -UPDATE common.Compagnies SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1;
    
    95 92
     UPDATE common.Country SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1;
    
    96 93
     UPDATE common.DataQuality SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1;
    
    97 94
     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
    127 124
     UPDATE common.speciesgroup_speciesgroupreleasemode SET speciesgroup = REPLACE(speciesgroup,'observe.entities.referentiel','referential.common'), speciesgroupreleasemode=REPLACE(speciesgroupreleasemode,'observe.entities.referentiel','referential.common');
    
    128 125
     UPDATE common.species_specieslist SET specieslist = REPLACE(specieslist,'observe.entities.referentiel','referential.common'), species=REPLACE(species,'observe.entities.referentiel','referential.common');
    
    129 126
     
    
    130
    -CREATE INDEX idx_common_compagnies_lastupdatedate ON common.compagnies(lastupdatedate);
    
    131 127
     CREATE INDEX idx_common_country_lastupdatedate ON common.country(lastupdatedate);
    
    132 128
     CREATE INDEX idx_common_dataquality_lastupdatedate ON common.dataquality(lastupdatedate);
    
    133 129
     CREATE INDEX idx_common_fpazone_lastupdatedate ON common.fpazone(lastupdatedate);
    
    ... ... @@ -218,7 +214,6 @@ ALTER TABLE common.speciesgroup_speciesgroupreleasemode ADD CONSTRAINT fk_common
    218 214
     ALTER TABLE common.species_specieslist ADD CONSTRAINT fk_common_species_specieslist_specieslist FOREIGN KEY(specieslist) REFERENCES common.specieslist;
    
    219 215
     ALTER TABLE common.species_specieslist ADD CONSTRAINT fk_common_species_specieslist_species FOREIGN KEY(species) REFERENCES common.species;
    
    220 216
     
    
    221
    -UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Compagnies' , 'referential.common.Compagnies');
    
    222 217
     UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Country' , 'referential.common.Country');
    
    223 218
     UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.DataQuality' , 'referential.common.DataQuality');
    
    224 219
     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 @@
    22 22
     
    
    23 23
     CREATE SCHEMA ll_landing;
    
    24 24
     
    
    25
    +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));
    
    25 26
     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));
    
    26 27
     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));
    
    27 28
     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));
    
    28 29
     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));
    
    29 30
     
    
    31
    +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;
    
    30 32
     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;
    
    31 33
     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;
    
    32 34
     
    
    35
    +UPDATE ll_landing.Compagnies SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.ll.landing'), topiaversion = topiaversion + 1;
    
    33 36
     UPDATE ll_landing.conservation SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel.longline', 'referential.ll.landing'), topiaversion = topiaversion + 1;
    
    34 37
     UPDATE ll_landing.datasource SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel.longline', 'referential.ll.landing'), topiaversion = topiaversion + 1;
    
    35 38
     
    
    ... ... @@ -39,7 +42,7 @@ ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_fpaz
    39 42
     ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_onboardprocessing foreign key(onboardprocessing) references ll_common.onboardprocessing;
    
    40 43
     ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_species foreign key(species) references common.species;
    
    41 44
     ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_weightmeasuremethod foreign key(weightmeasuremethod) references common.weightmeasuremethod;
    
    42
    -ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_compagnies foreign key(compagnies) references common.compagnies;
    
    45
    +ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_compagnies foreign key(compagnies) references ll_landing.compagnies;
    
    43 46
     ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_datasource foreign key(datasource) references ll_landing.datasource;
    
    44 47
     ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_harbour foreign key(harbour) references common.harbour;
    
    45 48
     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);
    59 62
     CREATE INDEX idx_ll_landing_landing_trip ON ll_landing.landing(trip);
    
    60 63
     CREATE INDEX idx_ll_landing_landing_vessel ON ll_landing.landing(vessel);
    
    61 64
     
    
    65
    +CREATE INDEX idx_ll_landing_compagnies_lastupdatedate ON ll_landing.compagnies(lastupdatedate);
    
    62 66
     CREATE INDEX idx_ll_landing_conservation_lastupdatedate ON ll_landing.conservation(lastupdatedate);
    
    63 67
     CREATE INDEX idx_ll_landing_datasource_lastupdatedate ON ll_landing.datasource(lastupdatedate);
    
    64 68
     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
    67 71
     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);
    
    68 72
     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);
    
    69 73
     
    
    74
    +UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Compagnies' , 'referential.ll.landing.Compagnies');
    
    70 75
     UPDATE common.LASTUPDATEDATE SET TYPE = replace(TYPE, 'referentiel.longline.Conservation', 'referential.ll.landing.Conservation');
    
    71 76
     UPDATE common.LASTUPDATEDATE SET TYPE = replace(TYPE, 'referentiel.longline.DataSource', 'referential.ll.landing.DataSource');
    
    72 77
     
    

  • persistence/src/main/resources/db/migration/7.2/10_add_home_id-common.sql
    ... ... @@ -20,7 +20,6 @@
    20 20
     -- #L%
    
    21 21
     ---
    
    22 22
     
    
    23
    -ALTER TABLE common.compagnies ADD COLUMN homeId VARCHAR(255);
    
    24 23
     ALTER TABLE common.country ADD COLUMN homeId VARCHAR(255);
    
    25 24
     ALTER TABLE common.dataquality ADD COLUMN homeId VARCHAR(255);
    
    26 25
     ALTER TABLE common.fpazone ADD COLUMN homeId VARCHAR(255);
    
    ... ... @@ -67,6 +66,7 @@ ALTER TABLE ll_common.triptype ADD COLUMN homeId VARCHAR(255);
    67 66
     ALTER TABLE ll_common.vesselactivity ADD COLUMN homeId VARCHAR(255);
    
    68 67
     ALTER TABLE ll_common.weightcategory ADD COLUMN homeId VARCHAR(255);
    
    69 68
     ALTER TABLE ll_common.weightdeterminationmethod ADD COLUMN homeId VARCHAR(255);
    
    69
    +ALTER TABLE ll_landing.compagnies ADD COLUMN homeId VARCHAR(255);
    
    70 70
     ALTER TABLE ll_landing.conservation ADD COLUMN homeId VARCHAR(255);
    
    71 71
     ALTER TABLE ll_landing.datasource ADD COLUMN homeId VARCHAR(255);
    
    72 72
     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 @@
    20 20
     -- #L%
    
    21 21
     ---
    
    22 22
     
    
    23
    -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]');
    
    24
    -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]');
    
    25
    -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]');
    
    26
    -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]');
    
    27
    -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]');
    
    28
    -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]');
    
    29
    -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]');
    
    30
    -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]');
    
    31
    -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]');
    
    32
    -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]');
    
    33
    -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]');
    
    34
    -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]');
    
    35
    -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]');
    
    36
    -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]');
    
    37
    -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]');
    
    38
    -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]');
    
    39
    -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]');
    
    40
    -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]');
    
    41
    -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]');
    
    42
    -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]');
    
    43
    -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]');
    
    44
    -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]');
    
    45
    -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]');
    
    46
    -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]');
    
    47
    -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]');
    
    48
    -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]');
    
    49
    -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]');
    
    50
    -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]');
    
    51
    -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]');
    
    52
    -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]');
    23
    +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]');
    
    24
    +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]');
    
    25
    +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]');
    
    26
    +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]');
    
    27
    +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]');
    
    28
    +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]');
    
    29
    +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]');
    
    30
    +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]');
    
    31
    +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]');
    
    32
    +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]');
    
    33
    +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]');
    
    34
    +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]');
    
    35
    +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]');
    
    36
    +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]');
    
    37
    +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]');
    
    38
    +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]');
    
    39
    +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]');
    
    40
    +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]');
    
    41
    +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]');
    
    42
    +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]');
    
    43
    +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]');
    
    44
    +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]');
    
    45
    +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]');
    
    46
    +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]');
    
    47
    +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]');
    
    48
    +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]');
    
    49
    +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]');
    
    50
    +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]');
    
    51
    +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]');
    
    52
    +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
    No preview for this file type
  • test/src/main/resources/db/7.2/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.2/empty_h2.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.2/empty_pg.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.2/referentiel.sql.gz
    No preview for this file type
  • test/src/main/resources/fixtures/count-referential-common.properties
    ... ... @@ -20,7 +20,6 @@
    20 20
     # #L%
    
    21 21
     ###
    
    22 22
     common.country=72
    
    23
    -common.compagnies=30
    
    24 23
     common.dataquality=5
    
    25 24
     common.fpazone=42
    
    26 25
     common.gear=26
    

  • test/src/main/resources/fixtures/count-referential-longline.properties
    ... ... @@ -43,6 +43,7 @@ ll_common.settingshape=6
    43 43
     ll_observation.stomacfullness=7
    
    44 44
     ll_common.vesselactivity=27
    
    45 45
     ll_common.weightcategory=0
    
    46
    +ll_landing.compagnies=30
    
    46 47
     ll_landing.datasource=20
    
    47 48
     ll_common.triptype=2
    
    48 49
     ll_common.onboardprocessing=5
    

  • validation/src/main/i18n/getters/validation-messages.getter
    1 1
     observe.validation.activity.duplicated.time
    
    2 2
     observe.validation.activity.null.dcp
    
    3
    -observe.validation.activity.required.date
    
    4 3
     observe.validation.activity.required.observedSystem.for.nonTargetCatch
    
    5
    -observe.validation.activity.required.time
    
    6
    -observe.validation.activity.required.vesselActivity
    
    4
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate
    
    7 5
     observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped
    
    8 6
     observe.validation.catchLongline.required.position
    
    9 7
     observe.validation.field.mandatory