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

Commits:

29 changed files:

Changes:

  • client-configuration/src/main/config/Client.ini
    ... ... @@ -381,9 +381,9 @@ key = speciesList.longline.obs.encounter
    381 381 
     type = string
    382 382 
     defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.4"
    383 383
    384 
    -[option speciesListLonglineObsDepredatorId]
    385 
    -description = observe.config.speciesList.longline.obs.depredator
    386 
    -key = speciesList.longline.obs.tdr
    384 
    +[option speciesListLonglineDepredatorId]
    385 
    +description = observe.config.speciesList.longline.depredator
    386 
    +key = speciesList.longline.depredator
    387 387 
     type = string
    388 388 
     defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.5"
    389 389
    ... ... @@ -391,19 +391,19 @@ defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.5"
    391 391 
     description = observe.config.speciesList.longline.logbook.catch
    392 392 
     key = speciesList.longline.logbook.catch
    393 393 
     type = string
    394 
    -defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.3"
    394 
    +defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.8"
    395 395
    396 396 
     [option speciesListLonglineLogbookLandingId]
    397 397 
     description = observe.config.speciesList.longline.logbook.landing
    398 398 
     key = speciesList.longline.logbook.landing
    399 399 
     type = string
    400 
    -defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.3"
    400 
    +defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.8"
    401 401
    402 402 
     [option speciesListLonglineLogbookSampleId]
    403 403 
     description = observe.config.speciesList.longline.logbook.sample
    404 404 
     key = speciesList.longline.logbook.sample
    405 405 
     type = string
    406 
    -defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.3"
    406 
    +defaultValue = "fr.ird.referential.common.SpeciesList#1239832675370#0.8"
    407 407
    408 408 
     [option speciesListLonglineTripId]
    409 409 
     description = observe.config.speciesList.longline.trip

  • client-configuration/src/main/i18n/getters/config.getter
    ... ... @@ -71,11 +71,11 @@ observe.config.serverDataSourceConfigurations.description
    71 71 
     observe.config.showMigrationProgression
    72 72 
     observe.config.showMigrationSql
    73 73 
     observe.config.showSql
    74 
    +observe.config.speciesList.longline.depredator
    74 75 
     observe.config.speciesList.longline.logbook.catch
    75 76 
     observe.config.speciesList.longline.logbook.landing
    76 77 
     observe.config.speciesList.longline.logbook.sample
    77 78 
     observe.config.speciesList.longline.obs.catch
    78 
    -observe.config.speciesList.longline.obs.depredator
    79 79 
     observe.config.speciesList.longline.obs.encounter
    80 80 
     observe.config.speciesList.longline.trip
    81 81 
     observe.config.speciesList.seine.nonTargetCatch

  • client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
    ... ... @@ -108,11 +108,12 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre
    108 108 
                 ClientConfigOption.H2_PASSWORD.getKey(),
    109 109 
                 ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey(),
    110 110 
         };
    111 
    -    //FIXME
    111 
    +    //FIXME PROTECTED-ID
    112 112 
         private final ImmutableSet<String> longlineVesselTypeIds = ImmutableSet.copyOf(
    113 113 
                 Sets.newHashSet("'fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505",
    114 114 
                                 "'fr.ird.referential.common.VesselType#1239832675736#0.8708229847859869",
    115 115 
                                 "'fr.ird.referential.common.VesselType#1239832686137#0.1"));
    116 
    +    //FIXME PROTECTED-ID
    116 117 
         private final ImmutableSet<String> seineVesselTypeIds = ImmutableSet.copyOf(
    117 118 
                 Sets.newHashSet("'fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505",
    118 119 
                                 "'fr.ird.referential.common.VesselType#1239832675735#0.307197212385357",

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java
    ... ... @@ -236,8 +236,8 @@ public class ShowConfigAction extends MenuActionSupport {
    236 236 
                                    ObserveUICallback.ui.name());
    237 237
    238 238 
                 helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_TRIP_ID);
    239 
    +            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_DEPREDATOR_ID);
    239 240 
                 helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_CATCH_ID);
    240 
    -            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_DEPREDATOR_ID);
    241 241 
                 helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_ENCOUNTER_ID);
    242 242 
                 helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_CATCH_ID);
    243 243 
                 helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_LANDING_ID);

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/CatchLonglineLogbookUIHandler.java
    ... ... @@ -129,7 +129,7 @@ public class CatchLonglineLogbookUIHandler extends ContentTableUIHandler<SetLong
    129 129 
                 return getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
    130 130 
             });
    131 131 
             referenceCache.addReferentialFilter(CatchLonglineLogbookDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
    132 
    -            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId();
    132 
    +            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId();
    133 133 
                 String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
    134 134 
                 return getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
    135 135 
             });

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java
    ... ... @@ -36,6 +36,7 @@ import fr.ird.observe.client.ui.tree.navigation.NavigationTree;
    36 36 
     import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
    37 37 
     import fr.ird.observe.client.ui.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode;
    38 38 
     import fr.ird.observe.client.ui.util.UIHelper;
    39 
    +import fr.ird.observe.dto.data.ll.common.TripLonglineReference;
    39 40 
     import fr.ird.observe.dto.data.ll.observation.BasketObsReference;
    40 41 
     import fr.ird.observe.dto.data.ll.observation.BranchlineObsDto;
    41 42 
     import fr.ird.observe.dto.data.ll.observation.BranchlineObsHelper;
    ... ... @@ -45,7 +46,6 @@ import fr.ird.observe.dto.data.ll.observation.SectionObsReference;
    45 46 
     import fr.ird.observe.dto.data.ll.observation.SetLonglineObsCatchDto;
    46 47 
     import fr.ird.observe.dto.data.ll.observation.SetLonglineObsCatchHelper;
    47 48 
     import fr.ird.observe.dto.data.ll.observation.SizeMeasureObsDto;
    48 
    -import fr.ird.observe.dto.data.ll.common.TripLonglineReference;
    49 49 
     import fr.ird.observe.dto.data.ll.observation.WeightMeasureObsDto;
    50 50 
     import fr.ird.observe.dto.decoration.DecoratorService;
    51 51 
     import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
    ... ... @@ -170,7 +170,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline
    170 170 
             });
    171 171
    172 172 
             referenceCache.addReferentialFilter(CatchLonglineObsDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
    173 
    -            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId();
    173 
    +            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId();
    174 174 
                 String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
    175 175 
                 return getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
    176 176 
             });

  • dto/src/main/java/fr/ird/observe/dto/SpeciesListConfiguration.java
    ... ... @@ -37,6 +37,11 @@ public interface SpeciesListConfiguration {
    37 37
    38 38 
         void setSpeciesListLonglineTripId(String speciesListLonglineTripId);
    39 39
    40 
    +    String getSpeciesListLonglineDepredatorId();
    41 
    +
    42 
    +    void setSpeciesListLonglineDepredatorId(String speciesListLonglineDepredatorId);
    43 
    +
    44 
    +
    40 45 
         //
    41 46 
         // Longline - Obs
    42 47 
         //
    ... ... @@ -45,10 +50,6 @@ public interface SpeciesListConfiguration {
    45 50
    46 51 
         void setSpeciesListLonglineObsCatchId(String speciesListLonglineObsCatchId);
    47 52
    48 
    -    String getSpeciesListLonglineObsDepredatorId();
    49 
    -
    50 
    -    void setSpeciesListLonglineObsDepredatorId(String speciesListLonglineObsDepredatorId);
    51 
    -
    52 53 
         String getSpeciesListLonglineObsEncounterId();
    53 54
    54 55 
         void setSpeciesListLonglineObsEncounterId(String speciesListLonglineObsEncounterId);

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -2687,11 +2687,11 @@ observe.config.serverDataSourceConfigurations.description=Server data source con
    2687 2687 
     observe.config.showMigrationProgression=Show migration progression
    2688 2688 
     observe.config.showMigrationSql=Show migration sql queries
    2689 2689 
     observe.config.showSql=Show sql
    2690 
    +observe.config.speciesList.longline.depredator=Species for observation depredator
    2690 2691 
     observe.config.speciesList.longline.logbook.catch=Species for logbook catches
    2691 2692 
     observe.config.speciesList.longline.logbook.landing=Species for logbook landings
    2692 2693 
     observe.config.speciesList.longline.logbook.sample=Species for logbook samples
    2693 2694 
     observe.config.speciesList.longline.obs.catch=Species for observation catches
    2694 
    -observe.config.speciesList.longline.obs.depredator=Species for observation depredator
    2695 2695 
     observe.config.speciesList.longline.obs.encounter=Species for encounters
    2696 2696 
     observe.config.speciesList.longline.trip=Species for trip longline
    2697 2697 
     observe.config.speciesList.seine.nonTargetCatch=Species for non target catches

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -2687,11 +2687,11 @@ observe.config.serverDataSourceConfigurations.description=Conexiones a servidore
    2687 2687 
     observe.config.showMigrationProgression=Mostrar los logs de actualización de una base de datos
    2688 2688 
     observe.config.showMigrationSql=Mostrar en los logs las consultas realizadas durante la actualización de una base de datos
    2689 2689 
     observe.config.showSql=Mostrar en todas las consultas sql ejecutadas
    2690 
    +observe.config.speciesList.longline.depredator=Espèces pour les déprédations
    2690 2691 
     observe.config.speciesList.longline.logbook.catch=Espèces pour les captures Logbook
    2691 2692 
     observe.config.speciesList.longline.logbook.landing=Espèces pour les débarquements Logbook
    2692 2693 
     observe.config.speciesList.longline.logbook.sample=Espèces pour les échantillons Logbook
    2693 2694 
     observe.config.speciesList.longline.obs.catch=Especies para las capturas - TDR
    2694 
    -observe.config.speciesList.longline.obs.depredator=Espèces pour les déprédations
    2695 2695 
     observe.config.speciesList.longline.obs.encounter=Especies para los encuentros
    2696 2696 
     observe.config.speciesList.longline.trip=Espèces ciébles pour les marées Palangre
    2697 2697 
     observe.config.speciesList.seine.nonTargetCatch=Especies para las capturas que no forman parte del objetivo

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -2687,11 +2687,11 @@ observe.config.serverDataSourceConfigurations.description=connexions à des serv
    2687 2687 
     observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base
    2688 2688 
     observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base
    2689 2689 
     observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées
    2690 
    +observe.config.speciesList.longline.depredator=Espèces pour les déprédations
    2690 2691 
     observe.config.speciesList.longline.logbook.catch=Espèces pour les captures Logbook
    2691 2692 
     observe.config.speciesList.longline.logbook.landing=Espèces pour les débarquements Logbook
    2692 2693 
     observe.config.speciesList.longline.logbook.sample=Espèces pour les échantillons Logbook
    2693 2694 
     observe.config.speciesList.longline.obs.catch=Espèces pour les captures observation
    2694 
    -observe.config.speciesList.longline.obs.depredator=Espèces pour les déprédations
    2695 2695 
     observe.config.speciesList.longline.obs.encounter=Espèces pour les rencontre
    2696 2696 
     observe.config.speciesList.longline.trip=Espèces ciébles pour les marées Palangre
    2697 2697 
     observe.config.speciesList.seine.nonTargetCatch=Espèces pour les captures non cible

  • persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java
    ... ... @@ -67,6 +67,21 @@ public class DataSourceMigrationForVersion_7_2 extends MigrationVersionResource
    67 67 
             executor.addScript("09", "change_vessel_fleetCountry_field");
    68 68 
             executor.addScript("10", "add_home_id");
    69 69 
             executor.addScript("11", "alter_ll_logbook_activity");
    70 
    +        Boolean withIds = executor.findSingleResult(new TopiaSqlQuery<Boolean>() {
    71 
    +            @Override
    72 
    +            public PreparedStatement prepareQuery(Connection connection) throws SQLException {
    73 
    +                return connection.prepareStatement("SELECT COUNT (*) FROM observe_common.species");
    74 
    +            }
    75 
    +
    76 
    +            @Override
    77 
    +            public Boolean prepareResult(ResultSet resultSet) throws SQLException {
    78 
    +                return resultSet.getInt(1) > 0;
    79 
    +            }
    80 
    +        });
    81 
    +        if (withIds) {
    82 
    +            executor.addScript("12", "update_ll_speciesList");
    83 
    +            executor.addScript("13", "fill_ll_speciesList");
    84 
    +        }
    70 85 
         }
    71 86
    72 87 
         private void fixPostgisTriggers(MigrationVersionResourceExecutor executor) {

  • persistence/src/main/resources/db/migration/7.2/03_create_ps_observation_schema-common.sql
    ... ... @@ -27,7 +27,35 @@ CREATE TABLE ps_observation.nontargetcatchreleaseconformity(topiaid VARCHAR(255)
    27 27 
     CREATE TABLE ps_observation.nontargetcatchreleasestatus(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_nontargetcatchreleasestatus PRIMARY KEY, 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));
    28 28 
     CREATE TABLE ps_observation.nontargetcatchreleasingtime(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_nontargetcatchreleasingtime PRIMARY KEY, 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));
    29 29 
     CREATE TABLE ps_observation.objectmaterialtype(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_object_material_type PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, 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));
    30 
    -CREATE TABLE ps_observation.objectmaterial(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_object_material PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacycode VARCHAR(1025), standardcode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), objectmaterialtype VARCHAR(255), biodegradable BOOLEAN, nonentangling BOOLEAN, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), selectable BOOLEAN, childrenmultiselectable BOOLEAN, childselectionmandatory BOOLEAN, validation VARCHAR(255));
    30 
    +CREATE TABLE ps_observation.objectmaterial
    31 
    +(
    32 
    +  topiaid                 VARCHAR(255) NOT NULL
    33 
    +    CONSTRAINT pk_ps_observation_object_material PRIMARY KEY,
    34 
    +  topiaversion            BIGINT       NOT NULL,
    35 
    +  topiacreatedate         DATE,
    36 
    +  lastupdatedate          TIMESTAMP    NOT NULL,
    37 
    +  code                    VARCHAR(255) NOT NULL,
    38 
    +  legacycode              VARCHAR(1025),
    39 
    +  standardcode            VARCHAR(255),
    40 
    +  parent                  VARCHAR(255),
    41 
    +  status                  INTEGER DEFAULT 1,
    42 
    +  needcomment             BOOLEAN DEFAULT FALSE,
    43 
    +  uri                     VARCHAR(255),
    44 
    +  objectmaterialtype      VARCHAR(255),
    45 
    +  biodegradable           BOOLEAN,
    46 
    +  nonentangling           BOOLEAN,
    47 
    +  label1                  VARCHAR(255),
    48 
    +  label2                  VARCHAR(255),
    49 
    +  label3                  VARCHAR(255),
    50 
    +  label4                  VARCHAR(255),
    51 
    +  label5                  VARCHAR(255),
    52 
    +  label6                  VARCHAR(255),
    53 
    +  label7                  VARCHAR(255),
    54 
    +  label8                  VARCHAR(255),
    55 
    +  childrenmultiselectable BOOLEAN,
    56 
    +  childselectionmandatory BOOLEAN,
    57 
    +  validation              VARCHAR(255)
    58 
    +);
    31 59 
     CREATE TABLE ps_observation.objectoperation(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_objectoperation PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, code VARCHAR(255), uri 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, whenarriving BOOLEAN DEFAULT TRUE, whenleaving BOOLEAN DEFAULT TRUE);
    32 60 
     CREATE TABLE ps_observation.observedsystem(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_observedsystem PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, code VARCHAR(255), needcomment BOOLEAN, uri 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), schooltype INTEGER, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL);
    33 61 
     CREATE TABLE ps_observation.reasonfordiscard(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_reasonfordiscard PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, code VARCHAR(255), needcomment BOOLEAN, uri 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), lastupdatedate TIMESTAMP DEFAULT now() NOT NULL);
    ... ... @@ -60,7 +88,36 @@ INSERT INTO ps_observation.nontargetcatchreleaseconformity(topiaid, topiaversion
    60 88 
     INSERT INTO ps_observation.nontargetcatchreleasestatus(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_seine.nontargetcatchreleasestatus;
    61 89 
     INSERT INTO ps_observation.nontargetcatchreleasingtime(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_seine.nontargetcatchreleasingtime;
    62 90 
     INSERT INTO ps_observation.objectmaterialtype(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_seine.objectmaterialtype;
    63 
    -INSERT INTO ps_observation.objectmaterial(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, selectable, childrenmultiselectable, childselectionmandatory, validation) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, selectable, childrenmultiselectable, childselectionmandatory, validation FROM observe_seine.objectmaterial;
    91 
    +INSERT INTO ps_observation.objectmaterial(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode,
    92 
    +                                          standardcode, parent, status, needcomment, uri, objectmaterialtype,
    93 
    +                                          biodegradable, nonentangling, label1, label2, label3, label4, label5, label6,
    94 
    +                                          label7, label8, childrenmultiselectable, childselectionmandatory, validation)
    95 
    +SELECT topiaid,
    96 
    +       topiaversion,
    97 
    +       topiacreatedate,
    98 
    +       lastupdatedate,
    99 
    +       code,
    100 
    +       legacycode,
    101 
    +       standardcode,
    102 
    +       parent,
    103 
    +       status,
    104 
    +       needcomment,
    105 
    +       uri,
    106 
    +       objectmaterialtype,
    107 
    +       biodegradable,
    108 
    +       nonentangling,
    109 
    +       label1,
    110 
    +       label2,
    111 
    +       label3,
    112 
    +       label4,
    113 
    +       label5,
    114 
    +       label6,
    115 
    +       label7,
    116 
    +       label8,
    117 
    +       childrenmultiselectable,
    118 
    +       childselectionmandatory,
    119 
    +       validation
    120 
    +FROM observe_seine.objectmaterial;
    64 121 
     INSERT INTO ps_observation.objectoperation(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, whenarriving, whenleaving) SELECT topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, whenarriving, whenleaving FROM observe_seine.objectoperation;
    65 122 
     INSERT INTO ps_observation.observedsystem(topiaid, topiaversion, topiacreatedate, code, needcomment, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, schooltype, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, needcomment, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, schooltype, lastupdatedate FROM observe_seine.observedsystem;
    66 123 
     INSERT INTO ps_observation.reasonfordiscard(topiaid, topiaversion, topiacreatedate, code, needcomment, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, needcomment, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, lastupdatedate FROM observe_seine.reasonfordiscard;

  • persistence/src/main/resources/db/migration/7.2/12_update_ll_speciesList-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe :: Persistence
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +
    23 
    +UPDATE common.speciesList SET label1='LL Observation - Catch species', label2='LL Observation - Espèces capturées', label3='LL Observation - Catch species' WHERE topiaId='fr.ird.referential.common.SpeciesList#1433499395455#0.684944737469777';
    24 
    +UPDATE common.speciesList SET code='6' WHERE topiaId='fr.ird.referential.common.SpeciesList#1239832675370#0.7';
    25 
    +INSERT INTO common.speciesList (topiaid, topiaversion, topiacreatedate, code, status, label1, label2, label3, needcomment, lastupdatedate) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 0, '2019-01-04', '7', 1, 'LL Logbook - Catch species', 'LL Logbook - Espèces capturées', 'LL Logbook - Catch species', false, '2019-01-04 00:00:00.0');
    \ No newline at end of file

  • persistence/src/main/resources/db/migration/7.2/13_fill_ll_speciesList-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe :: Persistence
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +
    23 
    +-- FIXME A remplacer par la bonne liste
    24 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499258597#0.544545796932653');
    25 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1265910963905#0.274742122896921');
    26 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684519#0.10519861144934894');
    27 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684971#0.8622121191938249');
    28 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683748#0.9215143239720961');
    29 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1339687473179#0.0836471277685924');
    30 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683737#0.9054429876194163');
    31 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1308747162000#0.64970548903892');
    32 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345248');
    33 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345247');
    34 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684813#0.23032822909041595');
    35 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684819#0.5710822650999473');
    36 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345369');
    37 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685233#0.9753172599708958');
    38 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685113#0.7014499115802707');
    39 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685119#0.05669776907577062');
    40 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685240#0.16727135240325364');
    41 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345371');
    42 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684983#0.38453892687871216');
    43 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683725#0.39445809291491807');
    44 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345601');
    45 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684959#0.8280432216962142');
    46 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684940#0.3941475292396889');
    47 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684953#0.5908437547687754');
    48 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685039#0.9885160092180597');
    49 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685052#0.41637903112663477');
    50 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685107#0.34538015098950847');
    51 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684201#0.30554150296793947');
    52 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685094#0.8862082966884622');
    53 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684861#0.36396067375732244');
    54 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684885#0.5770224986830752');
    55 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684795#0.6053463019344153');
    56 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684946#0.29129778706560716');
    57 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684771#0.9223458397529432');
    58 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684904#0.7999183854146987');
    59 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684928#0.20119509838828453');
    60 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684531#0.01962657179799221');
    61 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684831#0.9665297005737801');
    62 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684549#0.4997270804575126');
    63 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684837#0.36870634574294836');
    64 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684688#0.8193074495746601');
    65 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684327#0.8415482323514992');
    66 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684892#0.9272035028442585');
    67 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684644#0.6230088204735412');
    68 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684807#0.8492371601281514');
    69 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684537#0.2397229787936519');
    70 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684638#0.8261519152704289');
    71 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684332#0.5394989374753841');
    72 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684296#0.3383076607094946');
    73 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683985#0.48335145439788996');
    74 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683991#0.18251172983518738');
    75 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683731#0.3892121873590658');
    76 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683791#0.20975568563021063');
    77 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683785#0.49501050869628815');
    78 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683774#0.3664090332253188');
    79 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683867#0.5251675316716491');
    80 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683996#0.008204938561974351');
    81 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683883#0.6583610159371419');
    82 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1383399210341#0.7324960169421437');
    83 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683921#0.2103636331742268');
    84 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499239128#0.665396141353995');
    85 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499241880#0.899191892240196');
    86 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499238727#0.452269877539948');
    87 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499239536#0.330866874894127');
    88 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499246494#0.0585299937520176');
    89 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499248852#0.334059100132436');
    90 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499256581#0.978984408080578');
    91 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499256876#0.726763370446861');
    92 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499244116#0.263819849817082');
    93 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499249696#0.920608930755407');
    94 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499246929#0.383034072816372');
    95 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499243755#0.461645959643647');
    96 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499244489#0.986759799998254');
    97 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499244884#0.506351491902024');
    98 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499247475#0.928730154642835');
    99 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499249131#0.665475294925272');
    100 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499267203#0.701659282203764');
    101 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499257194#0.127699023578316');
    102 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499258033#0.552436746191233');
    103 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499266257#0.0992674820590764');
    104 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499260045#0.0712781408801675');
    105 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499257718#0.396484187571332');
    106 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499259266#0.48745713243261');
    107 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499259647#0.824619286460802');
    108 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499248540#0.732951018260792');
    109 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499243058#0.63963223923929');
    110 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499245237#0.58819441543892');
    111 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499245598#0.165684843435884');
    112 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499246005#0.946029571583495');
    113 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499252420#0.0952591823879629');
    114 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499256301#0.958709618076682');
    115 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499240431#0.633104688022286');
    116 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499242297#0.261897447984666');
    117 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499242684#0.74281100789085');
    118 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499249440#0.0824802028946579');
    119 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499249945#0.289872533408925');
    120 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499250234#0.266232012072578');
    121 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499250533#0.295620504068211');
    122 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499250836#0.588542830199003');
    123 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499267485#0.782962923869491');
    124 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499252053#0.543697426561266');
    125 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499253401#0.815398659789935');
    126 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499253837#0.98946483922191');
    127 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499260412#0.782278389902785');
    128 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499260828#0.285295381676406');
    129 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499261248#0.86915645818226');
    130 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499261722#0.202710725832731');
    131 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499262792#0.345151128945872');
    132 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499263165#0.897860581753775');
    133 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499263589#0.698522278340533');
    134 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499263954#0.282807369716465');
    135 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499264353#0.645280970726162');
    136 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499264730#0.786850868025795');
    137 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499265493#0.594366625649855');
    138 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499265902#0.337987961713225');
    139 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499266610#0.696541526820511');
    140 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499266912#0.871948149055243');
    141 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1441009702588#0.40917879257817036');
    142 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1441010206207#0.6596599567069653');
    143 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1441009299213#0.02413154397693007');
    144 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684085#0.7869093021514663');
    145 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684036#0.959050780883495');
    146 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683888#0.6223394488789843');
    147 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684213#0.644772725177114');
    148 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684157#0.9835191073325458');
    149 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711');
    150 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685477#0.2673009297087321');
    151 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685474#0.975344121171992');
    152 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499258308#0.886130484519526');
    153 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152');
    154 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569');
    155 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499265113#0.891799515346065');
    156 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1452608644320#0.2661386360079536');
    157 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1437472180346#0.0669468408450484');
    158 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683835#0.03404189793534684');
    159 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683841#0.25560065674558863');
    160 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832683846#0.9864285434180587');
    161 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1459342059807#0.7580852539552073');
    162 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1462887416751#0.8043157184784889');
    163 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684989#0.8258827419292817');
    164 
    +-- INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1478087930936#0.6045894606694016');
    165 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684041#0.017218753201439285');
    166 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#201007241100#0.12345249');
    167 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684279#0.3790726155671563');
    168 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1441287921299#0.016754076421811148');
    169 
    +-- INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1487077692368#0.2801571805347951');
    170 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684694#0.11252990999137946');
    171 
    +-- INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1487325303004#0.4857736650819311');
    172 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684843#0.7390723511555113');
    173 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1239832684207#0.6586381203701787');
    174 
    +-- INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1504021804594#0.14974523666399353');
    175 
    +INSERT INTO common.species_specieslist (specieslist, species) VALUES ('fr.ird.referential.common.SpeciesList#1239832675370#0.8', 'fr.ird.referential.common.Species#1433499243755#0.461645959643647');
    \ No newline at end of file

  • services-local/src/test/java/fr/ird/observe/services/local/service/sql/MigrateTestsDatabases.java
    ... ... @@ -38,12 +38,15 @@ import org.junit.Before;
    38 38 
     import org.junit.BeforeClass;
    39 39 
     import org.junit.Test;
    40 40 
     import org.nuiton.topia.persistence.jdbc.JdbcH2Helper;
    41 
    +import org.nuiton.topia.persistence.script.SqlScriptReader;
    42 
    +import org.nuiton.topia.persistence.script.SqlScriptWriter;
    41 43 
     import org.nuiton.topia.persistence.script.TopiaSqlScript;
    42 44 
     import org.nuiton.version.Version;
    43 45
    44 46 
     import java.io.File;
    45 47 
     import java.io.IOException;
    46 48 
     import java.nio.file.Files;
    49 
    +import java.nio.file.Path;
    47 50
    48 51 
     /**
    49 52 
      * Created on 25/12/15.
    ... ... @@ -154,7 +157,18 @@ public class MigrateTestsDatabases extends ServiceLocalTestSupport {
    154 157 
             }
    155 158
    156 159 
             Files.createDirectories(scriptFile.toPath().getParent());
    157 
    -        dump.copy(scriptFile.toPath());
    160 
    +        copy(dump, scriptFile.toPath());
    161 
    +
    162 
    +    }
    163 
    +
    164 
    +    public void copy(TopiaSqlScript reader, Path target) throws IOException {
    165 
    +        try (SqlScriptWriter scriptWriter = SqlScriptWriter.builder(target).gzip().keepCommentLine().keepEmptyLine().build()) {
    166 
    +            try (SqlScriptReader scriptReader = reader.getLocation()) {
    167 
    +                for (String statement : scriptReader) {
    168 
    +                    scriptWriter.writeSql(statement);
    169 
    +                }
    170 
    +            }
    171 
    +        }
    158 172 
         }
    159 173
    160 174 
     }

  • test/src/main/filtered-resources/observetest.properties
    ... ... @@ -22,7 +22,7 @@
    22 22 
     observetest.devMode=${devMode}
    23 23 
     observetest.build.version=${project.version}
    24 24 
     observetest.model.version=${observe.model.version}
    25 
    -observetest.previous.model.version=6.0
    25 
    +observetest.previous.model.version=7.0
    26 26 
     observetest.first.model.version=5.0
    27 27 
     observetest.first.model.for.ref.synchro.version=5.0
    28 28 
     observetest.h2.login=sa

  • test/src/main/resources/db/6.0/dataForTestLongline.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.0/dataForTestLongline.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.0/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.0/empty_h2.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.0/empty_pg.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.0/referentiel.sql.gz
    No preview for this file type
  • 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
    ... ... @@ -41,11 +41,11 @@ common.shipowner=27
    41 41 
     common.sex=5
    42 42 
     common.sizemeasuretype=16
    43 43 
     common.species=285
    44 
    -common.species_specieslist=401
    44 
    +common.species_specieslist=549
    45 45 
     common.speciesgroup=11
    46 46 
     common.speciesgroupreleasemode=9
    47 47 
     common.speciesgroup_speciesgroupreleasemode=19
    48 
    -common.specieslist=7
    48 
    +common.specieslist=8
    49 49 
     common.vessel=1172
    50 50 
     common.vesselsizecategory=13
    51 51 
     common.vesseltype=16

  • test/src/main/resources/fixtures/validate-service-referential.properties
    ... ... @@ -34,7 +34,7 @@ SpeciesDto=24
    34 34 
     PersonDto=4
    35 35 
     HookPositionDto=1
    36 36 
     HookTypeDto=1
    37 
    -SpeciesListDto=3
    37 
    +SpeciesListDto=2
    38 38 
     LightsticksColorDto=2
    39 39 
     BaitSettingStatusDto=1
    40 40 
     VesselTypeDto=3

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.