Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 64781e1d by Tony Chemit at 2020-09-12T13:26:33+02:00 Lors de l'ouverture de l'application, si la base locale est déjà occupée par une autre application, message erroné - Closes #1598 - - - - - afaf0e4f by Tony Chemit at 2020-09-12T13:26:33+02:00 Insertion des lots de débarquements - See #1259 Ajout des référentiels - - - - - 30 changed files: - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl - client-datasource-editor-api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl - client-datasource-editor-api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHelper.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/open/OpenLocalDataSourceFeedBackModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/landing/LandingUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/landing/WeightCategoryUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/landing/WeightCategoryUI.jcss - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/models/Observe-05-referential-ps-landing.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java - persistence/src/main/models/Observe-05-referential-ps-landing.model - persistence/src/main/resources/db/migration/8.1/11_ps_landing_create_data_model-common.sql → persistence/src/main/resources/db/migration/8.1/10_ps_landing_create_data_model-common.sql - persistence/src/main/resources/db/migration/8.1/10_ps_landing_create_referential_model-common.sql - + persistence/src/main/resources/db/migration/8.1/10_ps_landing_fill_referential-common.sql - test/src/main/resources/db/8.1/dataForTestLongline.sql.gz - test/src/main/resources/db/8.1/dataForTestSeine.sql.gz - test/src/main/resources/db/8.1/empty_h2.sql.gz - test/src/main/resources/db/8.1/empty_pg.sql.gz - test/src/main/resources/db/8.1/referentiel.sql.gz - test/src/main/resources/fixtures/count-referential-seine.properties - test/src/main/resources/fixtures/global.properties - test/src/main/resources/fixtures/validate-service-referential.properties - validation/src/main/i18n/getters/validation-fields.getter Changes: ===================================== client-datasource-editor-api/src/main/i18n/getters/java.getter ===================================== @@ -84,6 +84,7 @@ observe.runner.initStorage.choice.useRemoteStorage observe.runner.initStorage.done observe.runner.initStorage.label.local observe.runner.initStorage.local.db.error +observe.runner.initStorage.local.db.error.notAuthorized observe.runner.initStorage.title.create.local.db observe.runner.initStorage.title.load.remote.db observe.runner.initStorage.title.no.local.db.found ===================================== client-datasource-editor-api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl ===================================== @@ -21,6 +21,12 @@ <body> <h3>${errorTitle}</h3> <p><b>${error.message!""}</b></p> +<#if databaseLocked> +<p style="color: red;font-style: italic;font-weight: bold"> + Local database seems to be locked by another application, please check this before continue... +</p> +</#if> + <hr/> <p>At this point, we can produce a feed back archive with the local data source and any stuff to be able to fix the problem.</p> ===================================== client-datasource-editor-api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl ===================================== @@ -22,6 +22,11 @@ #TODO <h3>${errorTitle}</h3> <p><b>${error.message!""}</b></p> +<#if databaseLocked> +<p style="color: red;font-style: italic;font-weight: bold"> + Local database seems to be locked by another application, please check this before continue... +</p> +</#if> <hr/> <p>At this point, we can produce a feed back archive with the local data source and any stuff to be able to fix the ===================================== client-datasource-editor-api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl ===================================== @@ -22,6 +22,12 @@ <h3>${errorTitle}</h3> <p><b>${error.message!""}</b></p> +<#if databaseLocked> + <p style="color: red;font-style: italic;font-weight: bold"> + La base locale semble utilisée par une autre application, vérifier cela avant de continuer... + </p> + +</#if> <hr/> <br/> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHelper.java ===================================== @@ -37,6 +37,7 @@ import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -93,6 +94,16 @@ public class DataSourceEditorHelper { mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, dataSource); askToCreate = false; + } catch (DatabaseConnexionNotAuthorizedException e) { + // May be data source is locked + log.error("Could not load local database", e); + JOptionPane.showMessageDialog( + mainUI, + t("observe.runner.initStorage.local.db.error.notAuthorized"), + t("observe.runner.title.error.dialog"), + JOptionPane.WARNING_MESSAGE + ); + return; } catch (Exception e) { if (lastAutomaticBackup != null) { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/open/OpenLocalDataSourceFeedBackModel.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.action.api.ActionStep; import fr.ird.observe.client.action.api.FeedBackBuilder; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.editor.loading.LoadingDataSourceContext; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import io.ultreia.java4all.application.template.spi.GenerateTemplate; import java.util.List; @@ -37,7 +38,7 @@ import static io.ultreia.java4all.i18n.I18n.t; public class OpenLocalDataSourceFeedBackModel extends FeedBackBuilder.FeedBackBuilderModel { public OpenLocalDataSourceFeedBackModel(ClientConfig config, List<ActionStep<LoadingDataSourceContext>> stepsFailed) { - super(config, stepsFailed,t("observe.error.storage.could.not.open.data.source.title")); + super(config, stepsFailed, t("observe.error.storage.could.not.open.data.source.title")); } @Override @@ -45,5 +46,8 @@ public class OpenLocalDataSourceFeedBackModel extends FeedBackBuilder.FeedBackBu return OpenLocalDataSourceFeedBackModelTemplate.generate(this); } + public boolean isDatabaseLocked() { + return getError() instanceof DatabaseConnexionNotAuthorizedException; + } } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java ===================================== @@ -184,6 +184,10 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie * Connexion status error (if any!). */ protected String connexionStatusError; + /** + * Connexion status error (if any!). + */ + protected Throwable connexionError; /** * Can use local data source? */ @@ -1876,6 +1880,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie if (e instanceof UndeclaredThrowableException) { e = ((UndeclaredThrowableException) e).getUndeclaredThrowable(); } + connexionError = e; connexionStatusError = e.getMessage(); log.error("Error in test remote", e); setConnexionStatus(ConnexionStatus.FAILED); @@ -1921,6 +1926,10 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie return connexionStatusError; } + public Throwable getConnexionError() { + return connexionError; + } + public boolean isShowMigrationSql() { return pgConfig.isShowMigrationSql(); } ===================================== client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -401,6 +401,8 @@ observe.referential.Referential.validityDateRange observe.referential.ps.common.SpeciesFate.discard observe.referential.ps.common.TransmittingBuoyType.technology observe.referential.ps.common.VesselActivity.allowFad +observe.referential.ps.landing.WeightCategory.sovLabel +observe.referential.ps.landing.WeightCategory.starLabel observe.referential.ps.localmarket.Packaging.harbour observe.referential.ps.localmarket.Packaging.weight observe.referential.ps.logbook.ObjectMaterial.biodegradable ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/landing/LandingUIHandler.java ===================================== @@ -37,6 +37,7 @@ import java.awt.Component; import java.beans.PropertyChangeListener; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -109,7 +110,7 @@ class LandingUIHandler extends ContentTableUIHandler<TripLandingDto, LandingDto, newCategories = Collections.emptyList(); } else { List<WeightCategoryReference> referentialReferences = getModel().getReferenceCache().getReferentialReferences(LandingDto.PROPERTY_WEIGHT_CATEGORY); - newCategories = referentialReferences.stream().filter(r -> r.getSpecies().equals(species)).collect(Collectors.toList()); + newCategories = referentialReferences.stream().filter(r -> Objects.equals(species, r.getSpecies())).collect(Collectors.toList()); WeightCategoryReference weightCategory = getModel().getTableEditBean().getWeightCategory(); if (weightCategory != null && newCategories.contains(weightCategory)) { newCategory = weightCategory; ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/landing/WeightCategoryUI.jaxx ===================================== @@ -81,6 +81,25 @@ </cell> </row> + <!-- sovLabel --> + <row> + <cell anchor="west"> + <JLabel id='sovLabelLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NormalTextEditor id='sovLabel'/> + </cell> + </row> + <!-- starLabel --> + <row> + <cell anchor="west"> + <JLabel id='starLabelLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NormalTextEditor id='starLabel'/> + </cell> + </row> + <!-- needComment --> <row> <cell anchor='east' weightx="1" fill="both" columns="2"> ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/landing/WeightCategoryUI.jcss ===================================== @@ -24,8 +24,3 @@ font-style:"italic"; } -#species { - property:{WeightCategoryDto.PROPERTY_SPECIES}; - selectedItem:{bean.getSpecies()}; -} - ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -29,6 +29,9 @@ import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.referential.I18nReferentialDto; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.WithFormula; +import fr.ird.observe.dto.referential.common.SpeciesDto; +import fr.ird.observe.dto.referential.common.VesselSizeCategoryDto; +import fr.ird.observe.dto.referential.ps.landing.WeightCategoryDto; import fr.ird.observe.spi.type.TypeTranslators; import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport; import org.apache.commons.lang3.StringUtils; @@ -216,9 +219,11 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport private static final ImmutableSet<String> SKIP_LABEL = ImmutableSet.of( "speciesLabel", - "scientificLabel", - "capacityLabel", - "gaugeLabel", + SpeciesDto.PROPERTY_SCIENTIFIC_LABEL, + VesselSizeCategoryDto.PROPERTY_CAPACITY_LABEL, + VesselSizeCategoryDto.PROPERTY_GAUGE_LABEL, + WeightCategoryDto.PROPERTY_SOV_LABEL, + WeightCategoryDto.PROPERTY_STAR_LABEL, WithStartEndDate.PROPERTY_VALIDITY_RANGE_LABEL, WithStartEndDate.PROPERTY_START_END_DATE_LABEL ); ===================================== dto/src/main/models/Observe-05-referential-ps-landing.model ===================================== @@ -4,3 +4,5 @@ referential.ps.landing.Fate > referential.I18nReferential referential.ps.landing.WeightCategory > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=code,label,uri,species species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference +sovLabel + {*:1} String | notNull +starLabel + {*:1} String | notNull ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -2195,6 +2195,8 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too. observe.referential.ps.common.VesselActivity.allowFad=Allow Fad ? observe.referential.ps.common.VesselActivity.type=Vessel activity (Seine) observe.referential.ps.landing.Fate.type=Fate +observe.referential.ps.landing.WeightCategory.sovLabel=Sov label +observe.referential.ps.landing.WeightCategory.starLabel=Star label observe.referential.ps.landing.WeightCategory.type=Weight category observe.referential.ps.localmarket.Packaging.harbour=Harbour observe.referential.ps.localmarket.Packaging.packagingType=Packaging type @@ -2265,6 +2267,7 @@ observe.runner.initStorage.choice.useRemoteStorage=Use a remote storage observe.runner.initStorage.done=Init of Persistent Service done. observe.runner.initStorage.label.local=Local database observe.runner.initStorage.local.db.error=Could not find local database, will load last backup (%s) +observe.runner.initStorage.local.db.error.notAuthorized=Could not find local database, maybe it is locked. Please check. observe.runner.initStorage.title.create.local.db=Loading local database observe.runner.initStorage.title.load.remote.db=Load remote database observe.runner.initStorage.title.no.local.db.found=No local database found. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2195,6 +2195,8 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too. observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ? \#TODO observe.referential.ps.common.VesselActivity.type=Actividad buque \#TODO-SP observe.referential.ps.landing.Fate.type=Fate \#TODO +observe.referential.ps.landing.WeightCategory.sovLabel=Sov label \#TODO +observe.referential.ps.landing.WeightCategory.starLabel=Star label \#TODO observe.referential.ps.landing.WeightCategory.type=Weight category \# observe.referential.ps.localmarket.Packaging.harbour=Harbour observe.referential.ps.localmarket.Packaging.packagingType=Packaging type @@ -2265,6 +2267,7 @@ observe.runner.initStorage.choice.useRemoteStorage=Usar la base de datos remota observe.runner.initStorage.done=Inicialización del servicio de persistencia terminado. observe.runner.initStorage.label.local=Base local observe.runner.initStorage.local.db.error=Imposible cargar la base local, se cargará el último backup +observe.runner.initStorage.local.db.error.notAuthorized=Could not find local database, maybe it is locked. Please check. \#TODO observe.runner.initStorage.title.create.local.db=Cargando una base local observe.runner.initStorage.title.load.remote.db=Cargando una base remota observe.runner.initStorage.title.no.local.db.found=Ninguna base local fue encontrada ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2195,6 +2195,8 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too. observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ? observe.referential.ps.common.VesselActivity.type=Activité bateau (Senne) observe.referential.ps.landing.Fate.type=Devenir +observe.referential.ps.landing.WeightCategory.sovLabel=Sov libellé +observe.referential.ps.landing.WeightCategory.starLabel=Star libellé observe.referential.ps.landing.WeightCategory.type=Catégorie de poids observe.referential.ps.localmarket.Packaging.harbour=Port observe.referential.ps.localmarket.Packaging.packagingType=Type de conditionnement @@ -2265,6 +2267,7 @@ observe.runner.initStorage.choice.useRemoteStorage=Utiliser une base distante observe.runner.initStorage.done=Initialisation du service de persistance terminé. observe.runner.initStorage.label.local=Base locale observe.runner.initStorage.local.db.error=Impossible de charger la base locale, la dernière sauvegarde (du %s) va être utilisée +observe.runner.initStorage.local.db.error.notAuthorized=Impossible de charger la base locale, elle semble etre déjà utilisée par une autre application. observe.runner.initStorage.title.create.local.db=Chargement d'une base locale observe.runner.initStorage.title.load.remote.db=Chargement d'une base distante observe.runner.initStorage.title.no.local.db.found=Aucune base locale trouvée ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java ===================================== @@ -69,8 +69,13 @@ public class DataSourceMigrationForVersion_8_1 extends MigrationVersionResource executor.addScript("07", "ps_common_adapt_trip"); executor.addScript("08", "ps_logbook_create_data_model"); executor.executeForPG(this::fixPostgisTriggers); + executor.addScript("10", "ps_landing_create_referential_model"); - executor.addScript("11", "ps_landing_create_data_model"); + executor.addScript("10", "ps_landing_create_data_model"); + if (withIds) { + executor.addScript("10", "ps_landing_fill_referential"); + } + executor.addScript("12", "ps_wellplan_create_referential_model"); executor.addScript("13", "ps_wellplan_create_data_model"); executor.addScript("14", "ps_logbook_create_sample_referential_model"); ===================================== persistence/src/main/models/Observe-05-referential-ps-landing.model ===================================== @@ -4,3 +4,5 @@ referential.ps.landing.Fate > referential.I18nReferentialEntity | entity referential.ps.landing.WeightCategory > referential.I18nReferentialEntity | entity species {*:1} referential.common.Species | lazy=false +sovLabel + {*:1} String +starLabel + {*:1} String ===================================== persistence/src/main/resources/db/migration/8.1/11_ps_landing_create_data_model-common.sql → persistence/src/main/resources/db/migration/8.1/10_ps_landing_create_data_model-common.sql ===================================== ===================================== persistence/src/main/resources/db/migration/8.1/10_ps_landing_create_referential_model-common.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ps_landing; CREATE TABLE ps_landing.Fate(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_landing_Fate PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate DATE, code VARCHAR(255) NOT NULL, uri VARCHAR(255), homeId VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT FALSE,lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)); -CREATE TABLE ps_landing.weightCategory(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_landing_weightCategory PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP, code VARCHAR(255), uri VARCHAR(255), homeId VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT FALSE, lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), species VARCHAR(255)); +CREATE TABLE ps_landing.weightCategory(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_landing_weightCategory PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP, code VARCHAR(255), uri VARCHAR(255), homeId VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT FALSE, lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), sovLabel VARCHAR(255) NOT NULL, starLabel VARCHAR(255) NOT NULL, species VARCHAR(255)); ALTER TABLE ps_landing.weightCategory ADD CONSTRAINT fk_ps_landing_weightCategory_species FOREIGN KEY(species) REFERENCES common.species; ===================================== persistence/src/main/resources/db/migration/8.1/10_ps_landing_fill_referential-common.sql ===================================== @@ -0,0 +1,102 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.9849989043584604', 0, 1, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.279'::timestamp, 'Albacore -10', 'Yellowfin R1 + R2+ R3'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.37431829932158744', 0, 2, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Albacore +10', 'GG'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.5314676874701734', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Albacore ?', 'Yellowfin ?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.12396399303506567', 0, 10, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Albacore frais (canneurs)', 'Albacore frais (canneurs)'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.9880486795552492', 0, 50, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Inconnu', 'GG + 13.6 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.846209974442883', 0, 51, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Inconnu', 'R1 entre 13.6 et 3.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.7042864703615278', 0, 52, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Inconnu', 'R2 entre 3.4 et 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.49007162713264407', 0, 53, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Inconnu', 'R3 moins de 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.6025938943078754', 0, 70, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp , 'Inconnu', 'GG + 13.6 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.7173389548457879', 0, 71, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Inconnu', 'R1 entre 13.6 et 3.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.5739515277681424', 0, 72, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Inconnu', 'R2 entre 3.4 et 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.9007932955815551', 0, 73, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.288'::timestamp, 'Inconnu', 'R3 moins de 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.9187448106864885', 0, 1, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.289'::timestamp, 'Listao - 1.8', 'Skipjack R2 + R3'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.25771673830083053', 0, 2, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.289'::timestamp, 'Listao + 1.8', 'Skipjack R1 + Jumbo'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.9366187356366772', 0, 3, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.289'::timestamp, 'Listao -1.5', 'Skipjack ?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.45933952568779757', 0, 4, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.289'::timestamp, 'Listao 1.5 à 1.8', 'Skipjack ?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.984474862871156', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.29'::timestamp, 'Listao ?', 'Skipjack ?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.682911685142915', 0, 50, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.29'::timestamp, '+3.4 Kg', 'JUMBO + 3.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.7220987469827985', 0, 51, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.29'::timestamp, '+1.8 Kg à +3.4 Kg', 'R1 entre 3.4 et 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.04293797444920311', 0, 52, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.29'::timestamp, '-1.8 Kg', 'R2 entre 1.8 et 1.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.9216790161293088', 0, 53, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.29'::timestamp, '-1.5 Kg', 'R3 moins de 1.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.6371301485277248', 0, 70, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.29'::timestamp, 'Inconnu', 'JUMBO + 3.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.09257426517648015', 0, 71, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.29'::timestamp, 'Inconnu', 'R1 entre 3.4 et 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.5717845604984648', 0, 72, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.29'::timestamp, 'Inconnu', 'R2 entre 1.8 et 1.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.3686414703255526', 0, 73, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.29'::timestamp, 'Inconnu', 'R3 moins de 1.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.55718847508238', 0, 1, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.29'::timestamp, 'Patudo - 10', 'Bigeye?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.1154225150942314', 0, 2, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.29'::timestamp, 'Patudo + 10', 'Bigeye?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.2685200181978007', 0, 3, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.29'::timestamp, 'Patudo - 15', 'Bigeye?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.6722831615934043', 0, 4, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Patudo + 15', 'Bigeye?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.19938872094926574', 0, 5, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Patudo + 35', 'Bigeye?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.5746266936785298', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Patudo ?', 'Bigeye ?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.25713892292707874', 0, 10, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Patudo frais (canneurs)', 'Patudo frais (canneurs)'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.6685982018841194', 0, 50, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu', 'GG + 13.6 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.6904127607618373', 0, 51, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu', 'R1 entre 13.6 et 3.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.2909239953543622', 0, 52, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu', 'R2 entre 3.4 et 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.9449657799790759', 0, 53, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu', 'R3 moins de 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.33597810152594676', 0, 70, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu', 'GG + 13.6 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.8237006835612211', 0, 71, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu', 'R1 entre 13.6 et 3.4 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.657751933189818', 0, 72, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu', 'R2 entre 3.4 et 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.5073081843096476', 0, 73, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu', 'R3 moins de 1.8 kg'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.0836610498990451', 0, 2, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711', '2011-02-13 08:02:06.291'::timestamp, 'Germon ', 'Albacora'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.9643811025507996', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711', '2011-02-13 08:02:06.291'::timestamp, 'Germon ?', 'Abacora ?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.9682190838497855', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615', '2011-02-13 08:02:06.291'::timestamp, 'Thonine ', 'undefined'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.45162453191323304', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058', '2011-02-13 08:02:06.291'::timestamp, 'Auxide ', 'undefined'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.9463330829438842', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832684157#0.9835191073325458', '2011-02-13 08:02:06.291'::timestamp, 'Requins ', 'undefined'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.8486727929567192', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.291'::timestamp, 'Rejets', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.5077396278663612', 0, 1, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.291'::timestamp, 'Thonidés - 10 Kg', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.676520211264963', 0, 2, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.291'::timestamp, 'Thonidés +10 Kg', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.4959464977070138', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.291'::timestamp, 'Thonidés', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.76777812435383', 0, 10, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.292'::timestamp, 'Albacore et Patudo frais (canneurs)', 'Albacore et Patudo frais (canneurs)'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.3176362508792657', 0, 50, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE 3.4-10', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.6606118784093948', 0, 51, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE 1.8-3.4', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.8531106782664439', 0, 52, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE 1.5-1.8', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.1116407842625079', 0, 53, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE 1-1.5', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.9969288992557673', 0, 54, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511', '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE under 1', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.41727746602759885', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685477#0.2673009297087321', '2011-02-13 08:02:06.292'::timestamp, 'Thonine orientale', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.7829486684431057', 0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685478#0.7676744877900202', '2011-02-13 08:02:06.292'::timestamp, 'Thon mignon', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.014541584988570166',0, 9, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685477#0.2908846499255108', '2011-02-13 08:02:06.292'::timestamp, 'Thon à nageoires noires', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.902691806614427', 0, 54, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569', '2011-02-13 08:02:06.292'::timestamp, 'YFT -3.4 Kg', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.6335347201678889', 0, 54, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992', '2011-02-13 08:02:06.292'::timestamp, 'SKJ -3.4 Kg', '?'); +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion, code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528903#0.49410286646783097', 0, 54, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.292'::timestamp, 'BET -3.4 Kg', '?'); +UPDATE ps_landing.WeightCategory SET label2 = sovLabel, label1 = sovLabel || ' #TODO', label3 = sovLabel || ' #TODO'; + +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.1', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 1, 'Castelli'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.2', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 2, 'SCODI'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.3', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 3, 'PFCI'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.4', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 4, 'Cargo'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.5', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 5, 'Conteneur'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.6', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 6, 'SOGEF'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.7', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 7, 'IOT'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.8', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 8, 'PFOI'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.9', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 9, 'SENEMER'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.10', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 10, 'PIONNER FOOD CANNERY LTD'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.11', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 11, 'SOCOFROID'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.12', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 12, 'PFC TEMA'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.13', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 13, 'AIRONE CI'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.14', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 14, 'SCASA'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.15', 0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 15, 'SOCEF'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1464000000000#0.0001616', 0, 1, '2018-03-09 21:57:34'::timestamp, ${CURRENT_TIMESTAMP}, 16, 'PRINCES TUNA LIMITED'); +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.16', 1, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 999, 'Autre'); +UPDATE ps_landing.Fate SET label2 = label1, label3 = label1; ===================================== test/src/main/resources/db/8.1/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/dataForTestLongline.sql.gz and b/test/src/main/resources/db/8.1/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/8.1/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/dataForTestSeine.sql.gz and b/test/src/main/resources/db/8.1/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/8.1/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/empty_h2.sql.gz and b/test/src/main/resources/db/8.1/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/8.1/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/empty_pg.sql.gz and b/test/src/main/resources/db/8.1/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/8.1/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/referentiel.sql.gz and b/test/src/main/resources/db/8.1/referentiel.sql.gz differ ===================================== test/src/main/resources/fixtures/count-referential-seine.properties ===================================== @@ -46,7 +46,7 @@ ps_logbook.objectmaterial=80 ps_logbook.observedsystem=24 ps_logbook.samplequality=5 ps_logbook.sampletype=6 -ps_landing.fate=0 -ps_landing.weightcategory=0 +ps_landing.fate=17 +ps_landing.weightcategory=61 ps_localmarket.packaging=49 ps_localmarket.packagingtype=4 ===================================== test/src/main/resources/fixtures/global.properties ===================================== @@ -38,7 +38,7 @@ DATA_FORM_COUNT=55 ENTITY_BINDER_REFERENTIAL_COUNT=87 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3194 +REFERENTIAL_COUNT=3272 # for fr.ird.observe.validation.BeanValidatorDetectorTest VALIDATORS_COUNT=92 ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -94,6 +94,9 @@ ps.logbook.SampleTypeDto=3 ps.logbook.WeightCategoryDto=3 #FIXME Should be 0 when I18n will be ok ps.logbook.WellsStateDto=1 +ps.landing.FateDto=3 +#FIXME Should be 0 when I18n will be ok +ps.landing.WeightCategoryDto=3 ps.observation.DetectionModeDto=3 #FIXME Should be 0 when I18n will be ok ps.observation.InformationSourceDto=1 ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -459,6 +459,8 @@ observe.referential.common.Wind.speedRange observe.referential.common.Wind.waveHeight observe.referential.ll.observation.SensorBrand.brandName observe.referential.ps.common.TransmittingBuoyType.technology +observe.referential.ps.landing.WeightCategory.sovLabel +observe.referential.ps.landing.WeightCategory.starLabel observe.referential.ps.localmarket.Packaging.harbour observe.referential.ps.localmarket.Packaging.packagingType observe.referential.ps.logbook.ObjectMaterial.legacyCode View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/37d8e4d41891e14e748fbaf47... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/37d8e4d41891e14e748fbaf47... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT