Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2425906c by Tony Chemit at 2020-12-28T19:48:11+01:00 Peaufinage de la table ll_common.catchefate - Closes #1706 - - - - - a94627d5 by Tony Chemit at 2020-12-28T20:18:51+01:00 Peaufinage de la table ll_common.onboardprocessing - Closes #1705 - - - - - 8 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 - services/local-impl/src/test/resources/fixtures/validate-service-referential.properties - 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/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 ===================================== @@ -52,25 +52,34 @@ INSERT INTO ll_common.vesselActivity(topiaId, topiaVersion, topiaCreateDate, cod INSERT INTO ll_common.vesselActivity(topiaId, topiaVersion, topiaCreateDate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needComment, lastUpdateDate) VALUES ('fr.ird.referential.ll.common.VesselActivity#1464000000000#0.14', 0, '2018-12-12', 'SEARCH', 1, null, 'Search', 'Recherche', 'Search #TODO', null, null, null, null, null, FALSE, '2018-12-12 17:00:00'); INSERT INTO ll_common.vesselActivity(topiaId, topiaVersion, topiaCreateDate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needComment, lastUpdateDate) VALUES ('fr.ird.referential.ll.common.VesselActivity#1464000000000#0.15', 0, '2018-12-12', 'TRANSIT', 1, null, 'Transit', 'Transit', 'Transit #TODO', null, null, null, null, null, FALSE, '2018-12-12 17:00:00'); -INSERT INTO ll_common.TripType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.TripType#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'SC', 'Scientific trip', 'Marée scientifique', 'Marea experimental'); -INSERT INTO ll_common.TripType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.TripType#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'CM', 'Commercial trip', 'Marée de pêche commerciale', 'Marea commercial'); +INSERT INTO ll_common.TripType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.TripType#1464000000000#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'SC', 'Scientific trip', 'Marée scientifique', 'Marea experimental'); +INSERT INTO ll_common.TripType(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.TripType#1464000000000#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'CM', 'Commercial trip', 'Marée de pêche commerciale', 'Marea commercial'); +INSERT INTO ll_common.catchfate(topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid)VALUES ('fr.ird.referential.ll.common.CatchFate#1602461782467#0.352029166184366', 3, '2020-10-12 00:16:22', 'LOST', 0, null, 'Lost (FINSS migration)', 'Perdu (migration FINSS)', 'Lost (FINSS migration) #TODO', null, null, null, null, null, 'f', '2020-10-12 00:16:22', null); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'WL', 'Whole fish', 'Poisson entier', 'Poisson entier #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'H', 'Headed', 'Etêté', 'Etêté #TODO'); -INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#666#03' , 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#666#04' , 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#666#05' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'WL', 'Whole fish', 'Poisson entier', 'Poisson entier #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'H', 'Headed', 'Etêté', 'Etêté #TODO'); +INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#03' , 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#04' , 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#05' , 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.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; -- SC : Sc + Obs -UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#666#01', observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.2' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.3'; +UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#1464000000000#01', observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.2' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.3'; -- OB : Co + Obs -UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#666#02' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.2'; +UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#1464000000000#02' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.2'; -- SR : Com + Auto -UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#666#02' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.1'; +UPDATE ll_common.trip SET tripType ='fr.ird.referential.ll.common.TripType#1464000000000#02' WHERE observationMethod = 'fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.1'; UPDATE ll_common.trip SET topiaVersion = topiaVersion + 1; UPDATE ll_common.observationMethod SET code = 'SR', topiaVersion = topiaVersion + 1 WHERE topiaId='fr.ird.referential.ll.common..ObservationMethod#1239832686136#0.1'; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties ===================================== @@ -23,7 +23,7 @@ ll_observation.baithaulingstatus=5 ll_common.baitsettingstatus=5 ll_common.baittype=16 -ll_common.catchfate=5 +ll_common.catchfate=6 ll_observation.encountertype=12 ll_common.healthstatus=6 ll_observation.hookposition=13 @@ -47,6 +47,6 @@ ll_common.weightcategory=0 ll_landing.company=30 ll_landing.datasource=20 ll_common.triptype=2 -ll_common.onboardprocessing=5 +ll_common.onboardprocessing=13 ll_landing.conservation=3 ll_common.weightdeterminationmethod=0 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -48,7 +48,7 @@ fr.ird.observe.entities.referential.common.WeightMeasureType=3 fr.ird.observe.entities.referential.common.Wind=13 fr.ird.observe.entities.referential.ll.common.BaitSettingStatus=5 fr.ird.observe.entities.referential.ll.common.BaitType=16 -fr.ird.observe.entities.referential.ll.common.CatchFate=5 +fr.ird.observe.entities.referential.ll.common.CatchFate=6 fr.ird.observe.entities.referential.ll.common.HealthStatus=6 fr.ird.observe.entities.referential.ll.common.HookSize=22 fr.ird.observe.entities.referential.ll.common.HookType=13 @@ -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=5 +fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=13 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 ===================================== services/local-impl/src/test/resources/fixtures/validate-service-referential.properties ===================================== @@ -64,7 +64,7 @@ MitigationTypeDto=1 VesselSizeCategoryDto=1 SizeMeasureTypeDto=3 ShipOwnerDto=3 -CatchFateDto=1 +CatchFateDto=2 GearCharacteristicTypeDto=2 GearCharacteristicDto=1 ReasonForDiscardDto=3 ===================================== 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/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=52 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3019 +REFERENTIAL_COUNT=3028 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9157663c0b07dc9aa39f09d0f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9157663c0b07dc9aa39f09d0f... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT