Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f661eff4 by Tony Chemit at 2021-01-05T13:58:42+01:00 Peaufinage de la table ll_common.onboardprocessing - Closes #1733 - - - - - 95738c12 by Tony Chemit at 2021-01-05T14:00:16+01:00 Gestion du champ 'numéro au virage' - Closes #1729 Erreur sur validateur 'numéro au virage' - Closes #1730 - - - - - 10 changed files: - models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql - models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - pom.xml - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/empty_h2.sql.gz - tests/test/src/main/resources/db/8.0/empty_pg.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql ===================================== @@ -62,15 +62,17 @@ INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.3' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'HG', 'Headed and gutted', 'Etêté et vidé', 'Etêté et vidé #TODO'); INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.4' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'GG', 'Gilled and gutted', 'Vidé et sans branchies', 'Vidé et sans branchies #TODO'); INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.5' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.16', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'UNK', 1, 'f', null, 'Unknown', 'Inconnu', 'Unknown #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.17', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GUT', 1, 'f', null, 'Gutted', 'Vidé', 'Gutted #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.18', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FIN', 1, 'f', null, 'Finned', 'Aileron coupé', 'Finned #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.19', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'SUMMEAT', 1, 'f', null, 'Total Meat Retained for all species', 'Chair conservée pour toutes les espèces', 'Total Meat Retained for all species #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.20', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DOGFD', 1, 'f', null, 'Fish used for animal feed', 'Alimentation pour animal', 'Fish used for animal feed #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.21', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DR', 1, 'f', null, 'Dried', 'Séché', 'Dried #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.22', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FILLET', 1, 'f', null, 'Filleted', 'Filet', 'Filleted #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.23', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GIL', 1, 'f', null, 'Gilled', 'Sans branchies', 'Gilled #TODO', null, null, null, null, null, null); - +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid)VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.16', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'UNK', 1, false, null, 'Unknown', 'Inconnu', 'Unknown #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.17', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GUT', 1, false, null, 'Gutted', 'Vidé', 'Gutted #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.18', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FIN', 1, false, null, 'Finned', 'Aileron coupé', 'Finned #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.19', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'SUMMEAT', 1, false, null, 'Total Meat Retained for all species', 'Chair conservée pour toutes les espèces', 'Total Meat Retained for all species #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.20', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DOGFD', 1, false, null, 'Fish used for animal feed', 'Alimentation pour animal', 'Fish used for animal feed #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.21', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DR', 1, false, null, 'Dried', 'Séché', 'Dried #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.22', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FILLET', 1, false, null, 'Filleted', 'Filet', 'Filleted #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.23', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GIL', 1, false, null, 'Gilled', 'Sans branchies', 'Gilled #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609847952719#0.41927756421927587', 1, '2021-01-05 11:57:13.019', '2021-01-05 11:59:12.746', 'SALT', null, null, FALSE, 1, 'Salted', 'Salé', 'Salado', null, null, null, null, null); +INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848016239#0.8310203513100917', 1, '2021-01-05 11:59:25.268', '2021-01-05 12:00:16.241', 'LIVE', null, null, FALSE, 1, 'Kept alive', 'Gardé vivant', 'Mantenido vivo', null, null, null, null, null); +INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848457257#0.12756593660166082', 1, '2021-01-05 12:00:19.234', '2021-01-05 12:07:37.259', 'DEAD', null, null, FALSE, 1, 'Kept dead', 'Conservé mort', 'Mantenido muerto', null, null, null, null, null); INSERT INTO ll_common.linetype (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.LineType#1239832686157#0.9', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido'); UPDATE ll_common.trip SET observationsAvailability = TRUE; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties ===================================== @@ -47,6 +47,6 @@ ll_common.weightcategory=0 ll_landing.company=30 ll_landing.datasource=20 ll_common.triptype=2 -ll_common.onboardprocessing=13 +ll_common.onboardprocessing=16 ll_landing.conservation=3 ll_common.weightdeterminationmethod=0 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -57,7 +57,7 @@ fr.ird.observe.entities.referential.ll.common.LightsticksType=2 fr.ird.observe.entities.referential.ll.common.LineType=9 fr.ird.observe.entities.referential.ll.common.MitigationType=15 fr.ird.observe.entities.referential.ll.common.ObservationMethod=2 -fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=13 +fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=16 fr.ird.observe.entities.referential.ll.common.SettingShape=6 fr.ird.observe.entities.referential.ll.common.TripType=2 fr.ird.observe.entities.referential.ll.common.VesselActivity=27 ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@ <!-- <lib.version.java4all.topia>1.36-SNAPSHOT</lib.version.java4all.topia>--> <!-- <lib.version.java4all.eugene>3.0-alpha-38</lib.version.java4all.eugene>--> - <!-- <lib.version.java4all.jaxx>3.0-alpha-87</lib.version.java4all.jaxx>--> + <lib.version.java4all.jaxx>3.0-alpha-88</lib.version.java4all.jaxx> <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>--> <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>--> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161 # for fr.ird.observe.spi.DbModelHelperTest REFERENCE_DATA_COUNT=53 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3031 +REFERENTIAL_COUNT=3034 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5cc43cee176f684d39c56877d... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5cc43cee176f684d39c56877d... You're receiving this email because of your account on gitlab.com.