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

Commits:

8 changed files:

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
    52 52 
     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');
    53 53 
     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');
    54 54
    55 
    -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');
    56 
    -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');
    55 
    +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');
    56 
    +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');
    57 57
    58 
    +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);
    58 59
    59 
    -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');
    60 
    -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');
    61 
    -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');
    62 
    -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');
    63 
    -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');
    60 
    +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');
    61 
    +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');
    62 
    +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');
    63 
    +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');
    64 
    +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');
    65 
    +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);
    66 
    +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);
    67 
    +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);
    68 
    +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);
    69 
    +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);
    70 
    +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);
    71 
    +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);
    72 
    +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);
    64 73
    65 74 
     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');
    66 75
    67 76 
     UPDATE ll_common.trip SET observationsAvailability = TRUE;
    68 77 
     -- SC : Sc + Obs
    69 
    -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';
    78 
    +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';
    70 79 
     -- OB : Co + Obs
    71 
    -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';
    80 
    +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';
    72 81 
     -- SR : Com + Auto
    73 
    -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';
    82 
    +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';
    74 83 
     UPDATE ll_common.trip SET topiaVersion = topiaVersion + 1;
    75 84
    76 85 
     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 @@
    23 23 
     ll_observation.baithaulingstatus=5
    24 24 
     ll_common.baitsettingstatus=5
    25 25 
     ll_common.baittype=16
    26 
    -ll_common.catchfate=5
    26 
    +ll_common.catchfate=6
    27 27 
     ll_observation.encountertype=12
    28 28 
     ll_common.healthstatus=6
    29 29 
     ll_observation.hookposition=13
    ... ... @@ -47,6 +47,6 @@ ll_common.weightcategory=0
    47 47 
     ll_landing.company=30
    48 48 
     ll_landing.datasource=20
    49 49 
     ll_common.triptype=2
    50 
    -ll_common.onboardprocessing=5
    50 
    +ll_common.onboardprocessing=13
    51 51 
     ll_landing.conservation=3
    52 52 
     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
    48 48 
     fr.ird.observe.entities.referential.common.Wind=13
    49 49 
     fr.ird.observe.entities.referential.ll.common.BaitSettingStatus=5
    50 50 
     fr.ird.observe.entities.referential.ll.common.BaitType=16
    51 
    -fr.ird.observe.entities.referential.ll.common.CatchFate=5
    51 
    +fr.ird.observe.entities.referential.ll.common.CatchFate=6
    52 52 
     fr.ird.observe.entities.referential.ll.common.HealthStatus=6
    53 53 
     fr.ird.observe.entities.referential.ll.common.HookSize=22
    54 54 
     fr.ird.observe.entities.referential.ll.common.HookType=13
    ... ... @@ -57,7 +57,7 @@ fr.ird.observe.entities.referential.ll.common.LightsticksType=2
    57 57 
     fr.ird.observe.entities.referential.ll.common.LineType=9
    58 58 
     fr.ird.observe.entities.referential.ll.common.MitigationType=15
    59 59 
     fr.ird.observe.entities.referential.ll.common.ObservationMethod=2
    60 
    -fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=5
    60 
    +fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=13
    61 61 
     fr.ird.observe.entities.referential.ll.common.SettingShape=6
    62 62 
     fr.ird.observe.entities.referential.ll.common.TripType=2
    63 63 
     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
    64 64 
     VesselSizeCategoryDto=1
    65 65 
     SizeMeasureTypeDto=3
    66 66 
     ShipOwnerDto=3
    67 
    -CatchFateDto=1
    67 
    +CatchFateDto=2
    68 68 
     GearCharacteristicTypeDto=2
    69 69 
     GearCharacteristicDto=1
    70 70 
     ReasonForDiscardDto=3

  • tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz
    No preview for this file type
  • tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz
    No preview for this file type
  • tests/test/src/main/resources/db/8.0/referentiel.sql.gz
    No preview for this file type
  • tests/test/src/main/resources/fixtures/global.properties
    ... ... @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161
    35 35 
     # for fr.ird.observe.spi.DbModelHelperTest
    36 36 
     REFERENCE_DATA_COUNT=52
    37 37 
     # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest
    38 
    -REFERENTIAL_COUNT=3019
    38 
    +REFERENTIAL_COUNT=3028
    39 39 
     ENTITIES_LIMIT_SIZE=100

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