Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 99b151d1 by Tony CHEMIT at 2017-10-28T22:22:53+02:00 improve replicate tests - - - - - 8 changed files: - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java → services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java - test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json - test/src/main/resources/db/6.904/empty_pg-fixtures.json - test/src/main/resources/db/6.904/referentiel-fixtures.json Changes: ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== --- a/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java +++ b/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java @@ -234,7 +234,7 @@ public class DtoModelClasses { .addAll(LONGLINE_REFERENTIAL_TYPES) .build(); - private static final ImmutableSet<Class<? extends DataDto>> SEINE_ENTITY_DATA_TYPES = ImmutableSet.of( + public static final ImmutableSet<Class<? extends DataDto>> SEINE_ENTITY_DATA_TYPES = ImmutableSet.of( ActivitySeineDto.class, FloatingObjectDto.class, FloatingObjectPartDto.class, @@ -265,7 +265,7 @@ public class DtoModelClasses { SetSeineTargetCatchDto.class, TripSeineGearUseDto.class); - private static final ImmutableSet<Class<? extends DataDto>> LONGLINE_ENTITY_DATA_TYPES = ImmutableSet.of( + public static final ImmutableSet<Class<? extends DataDto>> LONGLINE_ENTITY_DATA_TYPES = ImmutableSet.of( ActivityLonglineObsDto.class, BaitsCompositionObsDto.class, BasketDto.class, ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java → services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java @@ -22,10 +22,15 @@ package fr.ird.observe.entity; * #L% */ +import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; -import fr.ird.observe.test.ObserveFixtures; -import org.junit.Test; +import fr.ird.observe.spi.DtoModelClasses; +import java.io.IOException; import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; @@ -35,20 +40,23 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; * @author Tony Chemit - dev@tchemit.fr */ @DatabaseNameConfiguration(DatabaseName.referentiel) -public class ReplicateReferentialsTest extends ReplicateTestSupport { +public class ReplicateReferentialTest extends ReplicateTestSupport { - @Test - public void testReplicate() throws Exception { + public ReplicateReferentialTest() { + super(DtoModelClasses.REFERENTIAL_TYPES, null); + } - TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getReferentialTables(); + @Override + TopiaSqlTables createTables() { + return getTestMethodResource().getTopiaApplicationContext().getReferentialTables(); + } - ReplicateTablesRequest request - = createReplicateTablesRequest(DatabaseName.empty_h2) + @Override + ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { + return createReplicateTablesRequest(DatabaseName.empty_h2) .setTables(tables) .build(); - testReplicate0(request, ObserveFixtures.REFERENTIAL_TABLES_COUNT); - } } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java @@ -22,8 +22,12 @@ package fr.ird.observe.entity; * #L% */ -import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; +import fr.ird.observe.dto.data.DataDto; +import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.entities.ObserveDataEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.ObserveTopiaApplicationContext; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; @@ -37,17 +41,16 @@ import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.ServiceLocalTestClassResource; import fr.ird.observe.services.test.ServiceLocalTestMethodResource; import fr.ird.observe.services.test.ServiceTestSupport; +import fr.ird.observe.spi.PersistenceModelHelper; import java.io.File; import java.io.IOException; import java.io.Writer; import java.nio.charset.StandardCharsets; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; +import org.junit.Test; import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; -import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; -import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTable; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; import org.nuiton.util.StringUtil; @@ -56,7 +59,7 @@ import org.nuiton.util.StringUtil; * * @author Tony Chemit - dev@tchemit.fr */ -class ReplicateTestSupport extends ServiceTestSupport { +public abstract class ReplicateTestSupport extends ServiceTestSupport { /** * Logger. @@ -64,7 +67,17 @@ class ReplicateTestSupport extends ServiceTestSupport { private static final Log log = LogFactory.getLog(ReplicateTestSupport.class); private File scriptFile; + private final ImmutableSet<Class<? extends ReferentialDto>> referentialTypesToTest; + private final ImmutableSet<Class<? extends DataDto>> dataTypesToTest; + abstract TopiaSqlTables createTables(); + + abstract ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException; + + ReplicateTestSupport(ImmutableSet<Class<? extends ReferentialDto>> referentialTypesToTest, ImmutableSet<Class<? extends DataDto>> dataTypesToTest) { + this.referentialTypesToTest = referentialTypesToTest; + this.dataTypesToTest = dataTypesToTest; + } @Override public ServiceLocalTestClassResource getTestClassResource() { @@ -76,80 +89,60 @@ class ReplicateTestSupport extends ServiceTestSupport { return (ServiceLocalTestMethodResource) super.getTestMethodResource(); } - ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { + @Test + public final void testReplicate() throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { - File targetDatabaseDirectory = new File(getTestMethodResource().getTestDirectory(), "targetReplication"); - ObserveDataSourceConfigurationTopiaH2 targetTopiaConfiguration = getTestClassResource().createDataSourceConfiguration(getTestMethodResource().getDbVersion(), databaseName.name(), targetDatabaseDirectory, getTestMethodResource().getLogin(), getTestMethodResource().getPassword()); - ObserveTopiaApplicationContext targetTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(targetTopiaConfiguration); + TopiaSqlTables tables = createTables(); - scriptFile = new File(getTestMethodResource().getTestDirectory(), "script.sql"); + ReplicateTablesRequest request = createRequest(tables); - Writer writer = Files.newWriter(scriptFile, StandardCharsets.UTF_8); + log.info(String.format("Will replicate using %d tables.", tables.size())); - return getTestMethodResource().getTopiaApplicationContext() + getTestMethodResource().getTopiaApplicationContext() .getSqlBatchService() - .replicateTablesRequestBuilder() - .to(targetTopiaApplicationContext) - .to(writer); - } - - private static void assertReplicateTripResults(ReplicateTablesRequest replicationRequest, ImmutableMap<String, Long> expectedResults) { - - TopiaSqlTables tables = replicationRequest.getTables(); - try (ObserveTopiaPersistenceContext persistenceContext = (ObserveTopiaPersistenceContext) replicationRequest.getTargetTopiaApplicationContext().newPersistenceContext()) { - - for (TopiaSqlTable table : tables) { - - String fullyTableName = table.getFullyTableName(); + .execute(request); - if (!expectedResults.containsKey(fullyTableName.toLowerCase())) { - Long count = persistenceContext.countTable(fullyTableName); - System.out.println(fullyTableName + " , " + count); + try (ObserveTopiaPersistenceContext persistenceContext = (ObserveTopiaPersistenceContext) request.getTargetTopiaApplicationContext().newPersistenceContext()) { + if (referentialTypesToTest != null) { + for (Class<? extends ReferentialDto> aClass : referentialTypesToTest) { + Class<ObserveReferentialEntity> entityType = PersistenceModelHelper.fromReferentialDto(aClass).toEntityType(); + int expectedCount = getTestMethodResource().getDatabaseFixtures().count(aClass); + long actualCount = persistenceContext.getDao(entityType).count(); + Assert.assertEquals("Should have found " + expectedCount + " on " + aClass.getName() + ", but was " + actualCount, expectedCount, actualCount); } - } - - for (Map.Entry<String, Long> entry : expectedResults.entrySet()) { - String fullyTableName = entry.getKey(); - Long expectedCount = entry.getValue(); - Long count = persistenceContext.countTable(fullyTableName); - - log.debug("Found: " + fullyTableName + " , " + count); - Assert.assertEquals("Should have found " + expectedCount + " on " + fullyTableName + ", but was " + count, expectedCount, count); - + if (dataTypesToTest != null) { + for (Class<? extends DataDto> aClass : dataTypesToTest) { + Class<ObserveDataEntity> entityType = PersistenceModelHelper.fromDataDto(aClass).toEntityType(); + int expectedCount = getTestMethodResource().getDatabaseFixtures().count(aClass); + long actualCount = persistenceContext.getDao(entityType).count(); + Assert.assertEquals("Should have found " + expectedCount + " on " + aClass.getName() + ", but was " + actualCount, expectedCount, actualCount); + } } } - } - - void testReplicate0(ReplicateTablesRequest request, ImmutableMap<String, Long> expectedTablesCount) { - - TopiaSqlTables tables = request.getTables(); - log.info(String.format("Will replicate using %d tables.", tables.size())); - - getTestMethodResource().getTopiaApplicationContext() - .getSqlBatchService() - .execute(request); - - - assertReplicateTripResults(request, expectedTablesCount); - log.debug(String.format("Replicate to script (length: %s) :\n%s", StringUtil.convertMemory(scriptFile.length()), scriptFile)); } - protected void testReplicate(TopiaSqlTables tables, ImmutableMap<String, Long> expectedTablesCount, Iterable<String> tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { + ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - ReplicateTablesRequest request - = createReplicateTablesRequest(DatabaseName.referentiel) - .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds)) - .setTables(tables) - .build(); + File targetDatabaseDirectory = new File(getTestMethodResource().getTestDirectory(), "targetReplication"); + ObserveDataSourceConfigurationTopiaH2 targetTopiaConfiguration = getTestClassResource().createDataSourceConfiguration(getTestMethodResource().getDbVersion(), databaseName.name(), targetDatabaseDirectory, getTestMethodResource().getLogin(), getTestMethodResource().getPassword()); + ObserveTopiaApplicationContext targetTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(targetTopiaConfiguration); - testReplicate0(request, expectedTablesCount); + scriptFile = new File(getTestMethodResource().getTestDirectory(), "script.sql"); + + Writer writer = Files.newWriter(scriptFile, StandardCharsets.UTF_8); + return getTestMethodResource().getTopiaApplicationContext() + .getSqlBatchService() + .replicateTablesRequestBuilder() + .to(targetTopiaApplicationContext) + .to(writer); } + } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java @@ -23,13 +23,21 @@ package fr.ird.observe.entity; */ import fr.ird.observe.dto.data.longline.TripLonglineDto; +import fr.ird.observe.dto.data.seine.TripSeineDto; +import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; -import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.spi.DtoModelClasses; +import java.io.IOException; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Test; +import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; +import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; /** @@ -43,27 +51,25 @@ public class ReplicateTripLonglineTest extends ReplicateTestSupport { /** Logger. */ private static final Log log = LogFactory.getLog(ReplicateTripLonglineTest.class); - @Test - public void testReplicate() throws Exception { + public ReplicateTripLonglineTest() { + super(null, DtoModelClasses.LONGLINE_ENTITY_DATA_TYPES); + } + + + @Override + TopiaSqlTables createTables() { + return getTestMethodResource().getTopiaApplicationContext().getTripLonglineTables(); + } + + @Override + protected ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); log.info(String.format("will replicate %d trip(s).", ids.size())); - TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripLonglineTables(); - testReplicate(tables, ObserveFixtures.ALL_TRIP_LONGLINE_COUNT, ids); - } -// @Test -// public void testReplicateTripLonline1() throws Exception { -// testReplicate(ObserveFixtures.TRIP_LONGLINE_1_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_1); -// } -// -// @Test -// public void testReplicateTripLonline2() throws Exception { -// testReplicate(ObserveFixtures.TRIP_LONGLINE_2_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_2); -// } -// -// @Test -// public void testReplicateTripLonline3() throws Exception { -// testReplicate(ObserveFixtures.TRIP_LONGLINE_3_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_3); -// } + return createReplicateTablesRequest(DatabaseName.referentiel) + .setSelectArgument(TopiaSqlTableSelectArgument.of(ids)) + .setTables(tables) + .build(); + } } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java @@ -22,14 +22,22 @@ package fr.ird.observe.entity; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.data.seine.TripSeineDto; +import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; -import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.spi.DtoModelClasses; +import java.io.IOException; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Test; +import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; +import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; /** @@ -39,30 +47,28 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; */ @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class ReplicateTripSeineTest extends ReplicateTestSupport { + /** Logger. */ private static final Log log = LogFactory.getLog(ReplicateTripSeineTest.class); - @Test - public void testReplicate() throws Exception { + public ReplicateTripSeineTest() { + super(null, DtoModelClasses.SEINE_ENTITY_DATA_TYPES); + } + + @Override + TopiaSqlTables createTables() { + return getTestMethodResource().getTopiaApplicationContext().getTripSeineTables(); + } + + @Override + protected ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); log.info(String.format("will replicate %d trip(s).", ids.size())); - TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripSeineTables(); - testReplicate(tables, ObserveFixtures.ALL_TRIP_SEINE_COUNT, ids); - } -// @Test -// public void testReplicateTripSeine1() throws Exception { -// testReplicate(ObserveFixtures.TRIP_SEINE_1_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_1); -// } -// -// @Test -// public void testReplicateTripSeine2() throws Exception { -// testReplicate(ObserveFixtures.TRIP_SEINE_2_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_2); -// } -// -// @Test -// public void testReplicateTripSeine3() throws Exception { -// testReplicate(ObserveFixtures.TRIP_SEINE_3_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_3); -// } + return createReplicateTablesRequest(DatabaseName.referentiel) + .setSelectArgument(TopiaSqlTableSelectArgument.of(ids)) + .setTables(tables) + .build(); + } } ===================================== test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json ===================================== --- a/test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json +++ b/test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json @@ -10134,4 +10134,4 @@ }, "types": {} } -} +} \ No newline at end of file ===================================== test/src/main/resources/db/6.904/empty_pg-fixtures.json ===================================== --- a/test/src/main/resources/db/6.904/empty_pg-fixtures.json +++ b/test/src/main/resources/db/6.904/empty_pg-fixtures.json @@ -121,4 +121,4 @@ }, "types": {} } -} +} \ No newline at end of file ===================================== test/src/main/resources/db/6.904/referentiel-fixtures.json ===================================== --- a/test/src/main/resources/db/6.904/referentiel-fixtures.json +++ b/test/src/main/resources/db/6.904/referentiel-fixtures.json @@ -1080,6 +1080,8 @@ "fr.ird.observe.entities.referentiel.Person#1428578953995#0.8402597879270977", "fr.ird.observe.entities.referentiel.Person#1428578984404#0.1624818954985996", "fr.ird.observe.entities.referentiel.Person#1428579047136#0.28582733330602794", + "fr.ird.observe.entities.referentiel.Person#1429515754811#0.0860557500272989", + "fr.ird.observe.entities.referentiel.Person#1429515754847#0.704271007329226", "fr.ird.observe.entities.referentiel.Person#1432805038273#0.5664302448691187", "fr.ird.observe.entities.referentiel.Person#1433499200854#0.615648015402257", "fr.ird.observe.entities.referentiel.Person#1433499201263#0.745114278979599", @@ -1274,6 +1276,13 @@ "fr.ird.observe.entities.referentiel.ShipOwner#0#9" ], "referential.SizeMeasureType": [ + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949422#0.323839171556756", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949444#0.180838016327471", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949471#0.763535852311179", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949556#0.658470877679065", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949576#0.370653854450211", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949617#0.259305257815868", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949639#0.329839885467663", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465999#0.707568018231541", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466255#0.444246932631359", @@ -1485,6 +1494,15 @@ "fr.ird.observe.entities.referentiel.Species#1365776436586#0.42584811850930293", "fr.ird.observe.entities.referentiel.Species#1383399210341#0.7324960169421437", "fr.ird.observe.entities.referentiel.Species#1383400882289#0.9275723384489454", + "fr.ird.observe.entities.referentiel.Species#1429515782578#0.57668571616523", + "fr.ird.observe.entities.referentiel.Species#1429515783191#0.301721239695325", + "fr.ird.observe.entities.referentiel.Species#1429515783493#0.271485573379323", + "fr.ird.observe.entities.referentiel.Species#1429515783680#0.0288836669642478", + "fr.ird.observe.entities.referentiel.Species#1429515783742#0.596136273350567", + "fr.ird.observe.entities.referentiel.Species#1429515783863#0.310130815720186", + "fr.ird.observe.entities.referentiel.Species#1429515784177#0.217057247878984", + "fr.ird.observe.entities.referentiel.Species#1429515784214#0.543130560778081", + "fr.ird.observe.entities.referentiel.Species#1429515784335#0.773490378633141", "fr.ird.observe.entities.referentiel.Species#1433499238727#0.452269877539948", "fr.ird.observe.entities.referentiel.Species#1433499239128#0.665396141353995", "fr.ird.observe.entities.referentiel.Species#1433499239536#0.330866874894127", @@ -2526,6 +2544,9 @@ "fr.ird.observe.entities.referentiel.Vessel#1418400134914#0.7508690402739512", "fr.ird.observe.entities.referentiel.Vessel#1418400258815#0.12569862197124138", "fr.ird.observe.entities.referentiel.Vessel#1418400345435#0.5664364147475593", + "fr.ird.observe.entities.referentiel.Vessel#1429515780666#0.496382233686745", + "fr.ird.observe.entities.referentiel.Vessel#1429515780701#0.825504872016609", + "fr.ird.observe.entities.referentiel.Vessel#1429515781376#0.949138431344181", "fr.ird.observe.entities.referentiel.Vessel#1433148953942#0.24272879354646504", "fr.ird.observe.entities.referentiel.Vessel#1433499209711#0.316791892750189", "fr.ird.observe.entities.referentiel.Vessel#1433499210648#0.808905522339046", @@ -2849,6 +2870,7 @@ "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.2", "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.3", "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.4", + "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1429515949203#0.00216103950515389", "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1433499460626#0.465611247578636" ], "referential.longline.BaitType": [ @@ -2862,6 +2884,7 @@ "fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#0.8", "fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#0.9", "fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#1.0", + "fr.ird.observe.entities.referentiel.longline.BaitType#1429515949067#0.955311801983044", "fr.ird.observe.entities.referentiel.longline.BaitType#1433499457783#0.290097113000229", "fr.ird.observe.entities.referentiel.longline.BaitType#1433499458077#0.820353789720684", "fr.ird.observe.entities.referentiel.longline.BaitType#1433499458372#0.785577602451667", @@ -2874,6 +2897,7 @@ "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.2", "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.3", "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.4", + "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1429515949274#0.952565349172801", "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1433499462055#0.71151070506312" ], "referential.longline.EncounterType": [ @@ -2935,6 +2959,7 @@ "fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.7", "fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.8", "fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.9", + "fr.ird.observe.entities.referentiel.longline.HookSize#1429515948468#0.511942049022764", "fr.ird.observe.entities.referentiel.longline.HookSize#1433499436918#0.552373287733644" ], "referential.longline.HookType": [ @@ -3038,6 +3063,7 @@ "fr.ird.observe.entities.referentiel.longline.SettingShape#1239832686128#0.3", "fr.ird.observe.entities.referentiel.longline.SettingShape#1239832686128#0.4", "fr.ird.observe.entities.referentiel.longline.SettingShape#1239832686128#0.5", + "fr.ird.observe.entities.referentiel.longline.SettingShape#1429515949392#0.162451097276062", "fr.ird.observe.entities.referentiel.longline.SettingShape#1433499465088#0.892811479745433" ], "referential.longline.StomacFullness": [ @@ -3047,6 +3073,7 @@ "fr.ird.observe.entities.referentiel.longline.StomacFullness#1239832686135#0.4", "fr.ird.observe.entities.referentiel.longline.StomacFullness#1239832686135#0.5", "fr.ird.observe.entities.referentiel.longline.StomacFullness#1239832686135#0.6", + "fr.ird.observe.entities.referentiel.longline.StomacFullness#1429515949368#0.204060212243348", "fr.ird.observe.entities.referentiel.longline.StomacFullness#1433499464733#0.548250555759296" ], "referential.longline.TripType": [ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/99b151d16bccca979fc97b3cf5ae... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/99b151d16bccca979fc97b3cf5ae... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT