Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b4f6d4f9 by tchemit at 2019-07-16T17:13:11Z Renommer champs vessel.iattcid et vessel.ctoiid - Closes #1349 - - - - - 1d53b191 by tchemit at 2019-07-16T17:13:12Z [REF] Consolidation du réferentiel common.LengthWeightParameter - Closes #1350 [REF] Consolidation du réferentiel common.LengthLengthParameter - Closes #1351 - - - - - 19 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUIModel.java - dto/src/main/models/Observe-01-referential-common.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/binder/referential/common/VesselEntityDtoBinder.java - persistence/src/main/models/Observe-01-referential-common.model - persistence/src/main/resources/db/migration/8.0/101_create_common_schema-common.sql - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - services-local/src/test/java/fr/ird/observe/services/local/entity/LengthWeightParemetersTest.java - test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - test/src/main/resources/db/8.0/empty_h2.sql.gz - test/src/main/resources/db/8.0/empty_pg.sql.gz - test/src/main/resources/db/8.0/referentiel.sql.gz - test/src/main/resources/fixtures/count-referential-common.properties - test/src/main/resources/fixtures/validate-service-referential.properties Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -876,11 +876,11 @@ observe.common.VesselActivitySeineDto.allowFad observe.common.VesselDto.capacity observe.common.VesselDto.changeDate observe.common.VesselDto.comId -observe.common.VesselDto.ctoiId observe.common.VesselDto.flagCountry observe.common.VesselDto.generalTab -observe.common.VesselDto.iattcId +observe.common.VesselDto.iccat observe.common.VesselDto.imoId +observe.common.VesselDto.iotcId observe.common.VesselDto.keelCodeFlotte observe.common.VesselDto.length observe.common.VesselDto.lloydId ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUI.jaxx ===================================== @@ -220,13 +220,13 @@ fr.ird.observe.client.ui.util.BeanCheckBox </cell> </row> - <!-- ctoiId --> + <!-- iotcId --> <row> <cell anchor="west"> - <JLabel id='ctoiIdLabel'/> + <JLabel id='iotcIdLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='ctoiId'/> + <NormalTextEditor id='iotcId'/> </cell> </row> @@ -240,13 +240,13 @@ fr.ird.observe.client.ui.util.BeanCheckBox </cell> </row> - <!-- iattcId --> + <!-- iccat --> <row> <cell anchor="west"> - <JLabel id='iattcIdLabel'/> + <JLabel id='iccatLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='iattcId'/> + <NormalTextEditor id='iccat'/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUIModel.java ===================================== @@ -52,8 +52,8 @@ public class VesselUIModel extends ContentReferenceUIModel<VesselDto, VesselRefe VesselDto.PROPERTY_SEARCH_MAXIMUM, VesselDto.PROPERTY_CHANGE_DATE, VesselDto.PROPERTY_COM_ID, - VesselDto.PROPERTY_CTOI_ID, - VesselDto.PROPERTY_IATTC_ID, + VesselDto.PROPERTY_IOTC_ID, + VesselDto.PROPERTY_ICCAT, VesselDto.PROPERTY_IMO_ID, VesselDto.PROPERTY_NATIONAL_ID, VesselDto.PROPERTY_RADIO_CALL_SIGN_ID, ===================================== dto/src/main/models/Observe-01-referential-common.model ===================================== @@ -148,8 +148,8 @@ capacity + {*:1} Float power + {*:1} Integer searchMaximum + {*:1} Float comment + {*:1} String -iattcId + {*:1} String -ctoiId + {*:1} String +iccat + {*:1} String +iotcId + {*:1} String nationalId + {*:1} String comId + {*:1} String tuviId + {*:1} String ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -2500,12 +2500,12 @@ observe.common.VesselActivitySeineDto.types=Vessel activities (Seine) observe.common.VesselDto.capacity=Capacity observe.common.VesselDto.changeDate=Change date observe.common.VesselDto.comId=EU Id -observe.common.VesselDto.ctoiId=IOTC id observe.common.VesselDto.flagCountry=Flag country observe.common.VesselDto.fleetCountry=Fleet country observe.common.VesselDto.generalTab=General caracteristics -observe.common.VesselDto.iattcId=ICCAT Id +observe.common.VesselDto.iccat=ICCAT Id observe.common.VesselDto.imoId=IMO Id +observe.common.VesselDto.iotcId=IOTC id observe.common.VesselDto.keelCode=Keel code observe.common.VesselDto.keelCodeFlotte=Keel / Flotte observe.common.VesselDto.length=Length ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2500,12 +2500,12 @@ observe.common.VesselActivitySeineDto.types=Actividades buque \#TODO-SP observe.common.VesselDto.capacity=Capacidad de transporte observe.common.VesselDto.changeDate=Fecha de carga observe.common.VesselDto.comId=Id EU -observe.common.VesselDto.ctoiId=Id IOTC observe.common.VesselDto.flagCountry=Bandera observe.common.VesselDto.fleetCountry=País observe.common.VesselDto.generalTab=Características generales -observe.common.VesselDto.iattcId=Id CICAA +observe.common.VesselDto.iccat=Id CICAA observe.common.VesselDto.imoId=Id IMO +observe.common.VesselDto.iotcId=Id IOTC observe.common.VesselDto.keelCode=Código de Quilla observe.common.VesselDto.keelCodeFlotte=Código de Quilla / Flota observe.common.VesselDto.length=Longitud eslora total ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2500,12 +2500,12 @@ observe.common.VesselActivitySeineDto.types=Activités bateau (Senne) observe.common.VesselDto.capacity=Capacité transport (m³) observe.common.VesselDto.changeDate=Date changement pavillon observe.common.VesselDto.comId=Id EU -observe.common.VesselDto.ctoiId=Id CTOI observe.common.VesselDto.flagCountry=Pavillon observe.common.VesselDto.fleetCountry=Flotte observe.common.VesselDto.generalTab=Caractéristiques générales -observe.common.VesselDto.iattcId=Id CICTA +observe.common.VesselDto.iccat=Id CICTA observe.common.VesselDto.imoId=Id IMO +observe.common.VesselDto.iotcId=Id CTOI observe.common.VesselDto.keelCode=Code quille observe.common.VesselDto.keelCodeFlotte=Code quille /Code flotte observe.common.VesselDto.length=Longueur hors tout ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/VesselEntityDtoBinder.java ===================================== @@ -56,8 +56,8 @@ public class VesselEntityDtoBinder extends ReferentialEntityDtoBinderSupport<Ves entity.setSearchMaximum(dto.getSearchMaximum()); entity.setComment(dto.getComment()); entity.setComId(dto.getComId()); - entity.setCtoiId(dto.getCtoiId()); - entity.setIattcId(dto.getIattcId()); + entity.setIotcId(dto.getIotcId()); + entity.setIccat(dto.getIccat()); entity.setImoId(dto.getImoId()); entity.setNationalId(dto.getNationalId()); entity.setRadioCallSignId(dto.getRadioCallSignId()); @@ -83,8 +83,8 @@ public class VesselEntityDtoBinder extends ReferentialEntityDtoBinderSupport<Ves dto.setSearchMaximum(entity.getSearchMaximum()); dto.setComment(entity.getComment()); dto.setComId(entity.getComId()); - dto.setCtoiId(entity.getCtoiId()); - dto.setIattcId(entity.getIattcId()); + dto.setIotcId(entity.getIotcId()); + dto.setIccat(entity.getIccat()); dto.setImoId(entity.getImoId()); dto.setNationalId(entity.getNationalId()); dto.setRadioCallSignId(entity.getRadioCallSignId()); ===================================== persistence/src/main/models/Observe-01-referential-common.model ===================================== @@ -38,7 +38,7 @@ species {*:1} referential.common.Species | notNull lazy=false sex {*:1} referential.common.Sex | notNull lazy=false startDate + {*:1} Date endDate + {*:1} Date -coefficients + {*:1} String +coefficients + {*:1} String | notNull source + {*:1} String | hibernateAttributeType=text computeFromFormulaOne(data float) Float computeFromFormulaTwo(data float) Float @@ -65,19 +65,19 @@ getQuadrant() Integer setQuadrant(quadrant Integer) referential.common.LengthLengthParameter > referential.common.FormulaSupport | entity -inputOutputFormula + {*:1} String -outputInputFormula + {*:1} String -inputSizeMeasureType {*:1} referential.common.SizeMeasureType | lazy=false -outputSizeMeasureType {*:1} referential.common.SizeMeasureType | lazy=false +inputOutputFormula + {*:1} String | notNull +outputInputFormula + {*:1} String | notNull +inputSizeMeasureType {*:1} referential.common.SizeMeasureType | lazy=false notNull +outputSizeMeasureType {*:1} referential.common.SizeMeasureType | lazy=false notNull abstract referential.common.LengthWeightAble referential.common.LengthWeightParameter > referential.common.FormulaSupport | entity -lengthWeightFormula + {*:1} String -weightLengthFormula + {*:1} String +lengthWeightFormula + {*:1} String | notNull +weightLengthFormula + {*:1} String | notNull meanLength + {*:1} Float meanWeight + {*:1} Float -sizeMeasureType {*:0..1} referential.common.SizeMeasureType | lazy=false +sizeMeasureType {*:0..1} referential.common.SizeMeasureType | lazy=false notNull referential.common.LengthMeasureMethod > referential.I18nReferentialEntity | entity @@ -163,8 +163,8 @@ capacity + {*:1} Float | sqlType=numeric power + {*:1} Integer searchMaximum + {*:1} Float | sqlType=numeric comment + {*:1} String | hibernateAttributeType=text -iattcId + {*:1} String -ctoiId + {*:1} String +iccat + {*:1} String +iotcId + {*:1} String nationalId + {*:1} String comId + {*:1} String tuviId + {*:1} String ===================================== persistence/src/main/resources/db/migration/8.0/101_create_common_schema-common.sql ===================================== @@ -40,13 +40,13 @@ CREATE TABLE common.shipowner(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_ship_o CREATE TABLE common.sizemeasuretype(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_sizemeasuretype PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), 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 common.speciesgroup(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_speciesgroup PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); CREATE TABLE common.species(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_species PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), homeid VARCHAR(255), wormsid BIGINT, uri VARCHAR(255), status INTEGER DEFAULT 1, faocode VARCHAR(255), needcomment BOOLEAN, scientificlabel VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), minlength NUMERIC, maxlength NUMERIC, minweight NUMERIC, maxweight NUMERIC, speciesgroup VARCHAR(255), lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, sizemeasuretype VARCHAR(255)); -CREATE TABLE common.lengthlengthparameter(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_lengthlengthparameter PRIMARY KEY, topiaversion BIGINT NOT NULL, inputsizemeasuretype VARCHAR(255) NOT NULL, outputsizemeasuretype VARCHAR(255) NOT NULL, topiacreatedate DATE NOT NULL, uri VARCHAR(255), status INTEGER DEFAULT 1, coefficients VARCHAR(255), inputoutputformula VARCHAR(255), outputinputformula VARCHAR(255), code VARCHAR(255) DEFAULT 0, needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, source VARCHAR(1025), species VARCHAR(255), ocean VARCHAR(255), sex VARCHAR(255), startdate DATE, enddate DATE); -CREATE TABLE common.lengthweightparameter(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_lengthweightparameter PRIMARY KEY, topiaversion BIGINT NOT NULL, ocean VARCHAR(255), species VARCHAR(255) NOT NULL, topiacreatedate DATE NOT NULL, uri VARCHAR(255), status INTEGER DEFAULT 1, startdate TIMESTAMP, enddate TIMESTAMP, coefficients VARCHAR(255), lengthweightformula VARCHAR(255), weightlengthformula VARCHAR(255), meanlength NUMERIC, meanweight NUMERIC, sex VARCHAR(255), code VARCHAR(255) DEFAULT 0, needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, source VARCHAR(1025), sizemeasuretype VARCHAR(255)); +CREATE TABLE common.lengthlengthparameter(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_lengthlengthparameter PRIMARY KEY, topiaversion BIGINT NOT NULL, inputsizemeasuretype VARCHAR(255) NOT NULL, outputsizemeasuretype VARCHAR(255) NOT NULL, topiacreatedate DATE NOT NULL, uri VARCHAR(255), status INTEGER DEFAULT 1, coefficients VARCHAR(255) NOT NULL, inputoutputformula VARCHAR(255) NOT NULL, outputinputformula VARCHAR(255) NOT NULL, code VARCHAR(255) DEFAULT 0, needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, source VARCHAR(1025), species VARCHAR(255) NOT NULL, ocean VARCHAR(255) NOT NULL, sex VARCHAR(255) NOT NULL, startdate DATE, enddate DATE); +CREATE TABLE common.lengthweightparameter(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_lengthweightparameter PRIMARY KEY, topiaversion BIGINT NOT NULL, ocean VARCHAR(255) NOT NULL, species VARCHAR(255) NOT NULL, topiacreatedate DATE NOT NULL, uri VARCHAR(255), status INTEGER DEFAULT 1, startdate TIMESTAMP, enddate TIMESTAMP, coefficients VARCHAR(255) NOT NULL, lengthweightformula VARCHAR(255) NOT NULL, weightlengthformula VARCHAR(255) NOT NULL, meanlength NUMERIC, meanweight NUMERIC, sex VARCHAR(255) NOT NULL, code VARCHAR(255) DEFAULT 0, needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, source VARCHAR(1025), sizemeasuretype VARCHAR(255) NOT NULL); CREATE TABLE common.speciesgroupreleasemode(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_species_group_release_mode PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), 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 common.specieslist(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_specieslist PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); CREATE TABLE common.vesselsizecategory(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_vesselsizecategory PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, capacitylabel VARCHAR(255), gaugelabel VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); CREATE TABLE common.vesseltype(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_vesseltype PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); -CREATE TABLE common.vessel(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_vessel PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), keelcode INTEGER, fleetcountry INTEGER, changedate TIMESTAMP, yearservice INTEGER, length NUMERIC, capacity NUMERIC, power INTEGER, searchmaximum NUMERIC, uri VARCHAR(255), status INTEGER DEFAULT 1, comment VARCHAR(1025), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), flagcountry VARCHAR(255), vesseltype VARCHAR(255), vesselsizecategory VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, comid VARCHAR(255), ctoiid VARCHAR(255), iattcid VARCHAR(255), imoid VARCHAR(255), nationalid VARCHAR(255), radiocallsignid VARCHAR(255), tuviid VARCHAR(255), shipowner VARCHAR(255)); +CREATE TABLE common.vessel(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_vessel PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), keelcode INTEGER, fleetcountry INTEGER, changedate TIMESTAMP, yearservice INTEGER, length NUMERIC, capacity NUMERIC, power INTEGER, searchmaximum NUMERIC, uri VARCHAR(255), status INTEGER DEFAULT 1, comment VARCHAR(1025), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), flagcountry VARCHAR(255), vesseltype VARCHAR(255), vesselsizecategory VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, comid VARCHAR(255), iotcId VARCHAR(255), iccat VARCHAR(255), imoid VARCHAR(255), nationalid VARCHAR(255), radiocallsignid VARCHAR(255), tuviid VARCHAR(255), shipowner VARCHAR(255)); CREATE TABLE common.weightmeasuremethod(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_weightmeasuremethod PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), 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 common.weightmeasuretype(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_weightmeasuretype PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), 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 common.wind(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_wind PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), speedrange VARCHAR(255), waveheight VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); @@ -55,6 +55,14 @@ CREATE TABLE common.ocean_species(species VARCHAR(255) NOT NULL, ocean VARCHAR(2 CREATE TABLE common.speciesgroup_speciesgroupreleasemode(speciesgroup VARCHAR(255) NOT NULL, speciesgroupreleasemode VARCHAR(255) NOT NULL); CREATE TABLE common.species_specieslist(specieslist VARCHAR(255) NOT NULL, species VARCHAR(255) NOT NULL); + +DELETE FROM observe_common.LengthWeightParameter WHERE topiaId = 'fr.ird.observe.entities.referentiel.LengthWeightParameter#201008191245#0.299'; +DELETE FROM observe_common.LengthWeightParameter WHERE topiaId = 'fr.ird.observe.entities.referentiel.LengthWeightParameter#201008191245#0.158'; +DELETE FROM observe_common.LengthWeightParameter WHERE topiaId = 'fr.ird.observe.entities.referentiel.LengthWeightParameter#201008191245#0.157'; +DELETE FROM observe_common.LengthWeightParameter WHERE topiaId = 'fr.ird.observe.entities.referentiel.LengthWeightParameter#201008191245#0.298'; +UPDATE observe_common.LengthWeightParameter SET sizeMeasureType = 'fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336' WHERE sizeMeasureType IS NULL; +UPDATE observe_common.LengthWeightParameter SET coefficients = 'a=0.5:b=0.0' WHERE coefficients IS NULL; + INSERT INTO common.country(topiaid, topiaversion, topiacreatedate, code, uri, iso2code, iso3code, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, uri, iso2code, iso3code, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate FROM observe_common.country; INSERT INTO common.dataquality(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_common.dataquality; INSERT INTO common.fpazone(topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, startdate, enddate, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, startdate, enddate, needcomment, lastupdatedate FROM observe_common.fpazone; @@ -79,7 +87,7 @@ INSERT INTO common.speciesgroupreleasemode(topiaid, topiaversion, topiacreatedat INSERT INTO common.specieslist(topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate FROM observe_common.specieslist; INSERT INTO common.vesselsizecategory(topiaid, topiaversion, topiacreatedate, code, uri, status, capacitylabel, gaugelabel, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, uri, status, capacitylabel, gaugelabel, needcomment, lastupdatedate FROM observe_common.vesselsizecategory; INSERT INTO common.vesseltype(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate FROM observe_common.vesseltype; -INSERT INTO common.vessel(topiaid, topiaversion, topiacreatedate, code, keelcode, fleetcountry, changedate, yearservice, length, capacity, power, searchmaximum, uri, status, comment, label1, label2, label3, label4, label5, label6, label7, label8, flagcountry, vesseltype, vesselsizecategory, needcomment, lastupdatedate, comid, ctoiid, iattcid, imoid, nationalid, radiocallsignid, tuviid, shipowner) SELECT topiaid, topiaversion, topiacreatedate, code, keelcode, fleetcountry, changedate, yearservice, length, capacity, power, searchmaximum, uri, status, comment, label1, label2, label3, label4, label5, label6, label7, label8, flagcountry, vesseltype, vesselsizecategory, needcomment, lastupdatedate, comid, ctoiid, iattcid, imoid, nationalid, radiocallsignid, tuviid, shipowner FROM observe_common.vessel; +INSERT INTO common.vessel(topiaid, topiaversion, topiacreatedate, code, keelcode, fleetcountry, changedate, yearservice, length, capacity, power, searchmaximum, uri, status, comment, label1, label2, label3, label4, label5, label6, label7, label8, flagcountry, vesseltype, vesselsizecategory, needcomment, lastupdatedate, comid, iotcId, iccat, imoid, nationalid, radiocallsignid, tuviid, shipowner) SELECT topiaid, topiaversion, topiacreatedate, code, keelcode, fleetcountry, changedate, yearservice, length, capacity, power, searchmaximum, uri, status, comment, label1, label2, label3, label4, label5, label6, label7, label8, flagcountry, vesseltype, vesselsizecategory, needcomment, lastupdatedate, comid, ctoiid, iattcid, imoid, nationalid, radiocallsignid, tuviid, shipowner FROM observe_common.vessel; INSERT INTO common.weightmeasuremethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_common.weightmeasuremethod; INSERT INTO common.weightmeasuretype(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_common.weightmeasuretype; INSERT INTO common.wind(topiaid, topiaversion, topiacreatedate, code, speedrange, waveheight, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, speedrange, waveheight, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate FROM observe_common.wind; ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -668,6 +668,12 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements log.error(String.format("No size measure type found for TargetLength (%s) will use the one of the species", lengthWeightComputable.getTopiaId())); inputSizeMeasureType = species.getSizeMeasureType(); } + + if (inputSizeMeasureType == null) { + log.error(String.format("No size measure type found for Species (%s), can't continue!", species.getTopiaId())); + return; + } + Optional<LengthWeightParameter> optionalLengthWeightParameter = activityContext.findLengthWeightParameter(species, sex, inputSizeMeasureType); if (!optionalLengthWeightParameter.isPresent()) { ===================================== services-local/src/test/java/fr/ird/observe/services/local/entity/LengthWeightParemetersTest.java ===================================== @@ -8,12 +8,12 @@ * 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>. @@ -23,22 +23,24 @@ package fr.ird.observe.services.local.entity; import com.opensymphony.xwork2.interceptor.annotations.After; import fr.ird.observe.dto.referential.ReferenceStatus; -import fr.ird.observe.entities.referential.common.LengthWeightParameter; +import fr.ird.observe.entities.ObserveTopiaDaoSupplier; +import fr.ird.observe.entities.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referential.LengthWeightParameterNotFoundException; +import fr.ird.observe.entities.referential.common.LengthWeightParameter; import fr.ird.observe.entities.referential.common.LengthWeightParameterTopiaDao; import fr.ird.observe.entities.referential.common.LengthWeightParameters; import fr.ird.observe.entities.referential.common.Ocean; import fr.ird.observe.entities.referential.common.OceanTopiaDao; import fr.ird.observe.entities.referential.common.Sex; import fr.ird.observe.entities.referential.common.SexTopiaDao; +import fr.ird.observe.entities.referential.common.SizeMeasureType; +import fr.ird.observe.entities.referential.common.SizeMeasureTypeTopiaDao; import fr.ird.observe.entities.referential.common.Species; import fr.ird.observe.entities.referential.common.SpeciesTopiaDao; -import fr.ird.observe.entities.ObserveTopiaDaoSupplier; -import fr.ird.observe.entities.ObserveTopiaPersistenceContext; import fr.ird.observe.services.local.service.ServiceLocalTestSupport; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -64,6 +66,7 @@ public class LengthWeightParemetersTest extends ServiceLocalTestSupport { Species species, Ocean ocean, Sex sex, + SizeMeasureType sizeMeasureType, Date startDate, Date endDate) { @@ -72,6 +75,7 @@ public class LengthWeightParemetersTest extends ServiceLocalTestSupport { entity.setSpecies(species); entity.setSex(sex); entity.setOcean(ocean); + entity.setSizeMeasureType(sizeMeasureType); entity.setStartDate(startDate); entity.setEndDate(endDate); entity.setStatus(ReferenceStatus.enabled); @@ -92,6 +96,7 @@ public class LengthWeightParemetersTest extends ServiceLocalTestSupport { SpeciesTopiaDao speciesDAO = persistenceContext.getCommonSpeciesDao(); OceanTopiaDao oceanDAO = persistenceContext.getCommonOceanDao(); SexTopiaDao sexDao = persistenceContext.getCommonSexDao(); + SizeMeasureTypeTopiaDao sizeMeasureTypeDao = persistenceContext.getCommonSizeMeasureTypeDao(); Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("ALB").tryFindUnique().orNull()); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); @@ -105,6 +110,10 @@ public class LengthWeightParemetersTest extends ServiceLocalTestSupport { Optional<Sex> optionalFemaleSex = Optional.ofNullable(sexDao.forCodeEquals("2").tryFindUnique().orNull()); Assert.assertTrue("Could not find sex with code 2 (female)", optionalFemaleSex.isPresent()); + Optional<SizeMeasureType> optionalSizeMeasureType = Optional.ofNullable(sizeMeasureTypeDao.forCodeEquals("FL").tryFindUnique().orNull()); + Assert.assertTrue("Could not find sizeMeasureType with code FL", optionalSizeMeasureType.isPresent()); + SizeMeasureType sizeMeasureType = optionalSizeMeasureType.get(); + Date firstStartDate = DateUtil.createDate(1, 1, 2010); Date firstEndDate = DateUtil.createDate(31, 12, 2010); Date secondStartDate = DateUtil.createDate(1, 1, 2011); @@ -123,13 +132,13 @@ public class LengthWeightParemetersTest extends ServiceLocalTestSupport { Ocean indianOcean = optionalIndianOcean.orElse(null); // Ajout parametrage Male / Atlantique (2010) - createLengthWeightParameter(lengthWeightParameterDao, species, atlanticOcean, maleSex, firstStartDate, firstEndDate); + createLengthWeightParameter(lengthWeightParameterDao, species, atlanticOcean, maleSex, sizeMeasureType, firstStartDate, firstEndDate); // Ajout parametrage Male / Atlantique (après 2010) - createLengthWeightParameter(lengthWeightParameterDao, species, atlanticOcean, maleSex, secondStartDate, null); + createLengthWeightParameter(lengthWeightParameterDao, species, atlanticOcean, maleSex, sizeMeasureType, secondStartDate, null); // Ajout parametrage Male / Indien (2010) - createLengthWeightParameter(lengthWeightParameterDao, species, indianOcean, maleSex, firstStartDate, firstEndDate); + createLengthWeightParameter(lengthWeightParameterDao, species, indianOcean, maleSex, sizeMeasureType, firstStartDate, firstEndDate); // Ajout parametrage Male / Indien (Après 2010) - createLengthWeightParameter(lengthWeightParameterDao, species, indianOcean, maleSex, secondStartDate, null); + createLengthWeightParameter(lengthWeightParameterDao, species, indianOcean, maleSex, sizeMeasureType, secondStartDate, null); } @@ -149,6 +158,7 @@ public class LengthWeightParemetersTest extends ServiceLocalTestSupport { SpeciesTopiaDao speciesDAO = persistenceContext.getCommonSpeciesDao(); OceanTopiaDao oceanDAO = persistenceContext.getCommonOceanDao(); SexTopiaDao sexDao = persistenceContext.getCommonSexDao(); + SizeMeasureTypeTopiaDao sizeMeasureTypeDao = persistenceContext.getCommonSizeMeasureTypeDao(); Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("ALB").tryFindUnique().orNull()); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); @@ -184,47 +194,52 @@ public class LengthWeightParemetersTest extends ServiceLocalTestSupport { Ocean indianOcean = optionalIndianOcean.orElse(null); Ocean pacificOcean = optionalPacificOcean.orElse(null); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, null, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, undeterminedSex, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, maleSex, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, femaleSex, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, null, undeterminedSex, date2010, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, undeterminedSex, undeterminedSex, date2010, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, maleSex, maleSex, date2010, date2010); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, femaleSex, undeterminedSex, date2010, date1970); + Optional<SizeMeasureType> optionalSizeMeasureType = Optional.ofNullable(sizeMeasureTypeDao.forCodeEquals("FL").tryFindUnique().orNull()); + Assert.assertTrue("Could not find sizeMeasureType with code FL", optionalSizeMeasureType.isPresent()); + SizeMeasureType sizeMeasureType = optionalSizeMeasureType.get(); + + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, null, undeterminedSex, date2009, date1970, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, undeterminedSex, undeterminedSex, date2009, date1970, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, maleSex, undeterminedSex, date2009, date1970, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, femaleSex, undeterminedSex, date2009, date1970, sizeMeasureType); + + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, null, undeterminedSex, date2010, date1970, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, undeterminedSex, undeterminedSex, date2010, date1970, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, maleSex, maleSex, date2010, date2010, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, femaleSex, undeterminedSex, date2010, date1970, sizeMeasureType); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, null, undeterminedSex, date2011, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, undeterminedSex, undeterminedSex, date2011, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, maleSex, maleSex, date2011, date2011); - assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, femaleSex, undeterminedSex, date2011, date1970); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, null, undeterminedSex, date2011, date1970, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, undeterminedSex, undeterminedSex, date2011, date1970, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, maleSex, maleSex, date2011, date2011, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, femaleSex, undeterminedSex, date2011, date1970, sizeMeasureType); // this test is now working!!! since we manage now perfectly null-null date range - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2009, null); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2009, null); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, undeterminedSex, date2009, null); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2009, null); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2009, null, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2009, null, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, undeterminedSex, date2009, null, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2009, null, sizeMeasureType); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2010, null); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2010, date2010); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2010, null); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2010, null, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2010, date2010, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2010, null, sizeMeasureType); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2011, null); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2011, date2011); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2011, null); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2011, null, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2011, date2011, sizeMeasureType); + assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2011, null, sizeMeasureType); - assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, undeterminedSex, date2010); - assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, maleSex, date2010); - assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, femaleSex, date2010); + assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, undeterminedSex, date2010, sizeMeasureType); + assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, maleSex, date2010, sizeMeasureType); + assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, femaleSex, date2010, sizeMeasureType); } - protected void assertFoundLengthWeightParameter(ObserveTopiaDaoSupplier supplier, Species species, Ocean ocean, Sex sex, Sex expectedSex, Date date, Date expectedStartDate) { + protected void assertFoundLengthWeightParameter(ObserveTopiaDaoSupplier supplier, Species species, Ocean ocean, Sex sex, Sex expectedSex, Date date, Date expectedStartDate, SizeMeasureType expectedSizeMeasureType) { if (log.isInfoEnabled()) { log.info("Try to find length weith parameter for species " + species.getFaoCode() + " - ocean " + ocean.getLabel1() + " - sex " + (sex == null ? "null" : sex.getLabel1()) + " at " + date); } - LengthWeightParameter lengthWeightParameter = LengthWeightParameters.findLengthWeightParameter(supplier, species, sex, ocean, date, null); + LengthWeightParameter lengthWeightParameter = LengthWeightParameters.findLengthWeightParameter(supplier, species, sex, ocean, date, expectedSizeMeasureType); Assert.assertNotNull("length weith parameter not found for species " + species.getFaoCode() + " - ocean " + ocean.getLabel1() + " - sex " + (sex == null ? "null" : sex.getLabel1()) + " at " + date, lengthWeightParameter); Assert.assertEquals("Expected sex is " + expectedSex.getLabel1() + " but the one found was " + lengthWeightParameter.getSex().getLabel1(), expectedSex, lengthWeightParameter.getSex()); @@ -234,13 +249,13 @@ public class LengthWeightParemetersTest extends ServiceLocalTestSupport { } } - protected void assertNotFoundLengthWeightParameter(ObserveTopiaDaoSupplier supplier, Species species, Ocean ocean, Sex sex, Date date) { + protected void assertNotFoundLengthWeightParameter(ObserveTopiaDaoSupplier supplier, Species species, Ocean ocean, Sex sex, Date date, SizeMeasureType expectedSizeMeasureType) { if (log.isInfoEnabled()) { log.info("Try to find length weith parameter for species " + species.getFaoCode() + " - ocean " + ocean.getLabel1() + " - sex " + (sex == null ? "null" : sex.getLabel1()) + " at " + date); } try { - LengthWeightParameters.findLengthWeightParameter(supplier, species, sex, ocean, date, null); + LengthWeightParameters.findLengthWeightParameter(supplier, species, sex, ocean, date, expectedSizeMeasureType); Assert.fail(); } catch (LengthWeightParameterNotFoundException e) { ===================================== test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/empty_h2.sql.gz and b/test/src/main/resources/db/8.0/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/empty_pg.sql.gz and b/test/src/main/resources/db/8.0/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/referentiel.sql.gz and b/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== test/src/main/resources/fixtures/count-referential-common.properties ===================================== @@ -30,7 +30,7 @@ common.harbour=74 common.lastupdatedate=125 common.lengthlengthparameter=0 common.lengthmeasuremethod=4 -common.lengthweightparameter=365 +common.lengthweightparameter=361 common.ocean=3 common.ocean_species=500 common.organism=9 ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -41,7 +41,7 @@ VesselTypeDto=3 SexDto=2 NonTargetCatchReleaseConformityDto=2 MaturityStatusDto=3 -LengthWeightParameterDto=4 +LengthWeightParameterDto=3 NonTargetCatchReleaseStatusDto=2 SurroundingActivityDto=3 ItemVerticalPositionDto=1 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/39a2588a7c1e3cbc9c71f334a44... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/39a2588a7c1e3cbc9c71f334a44... You're receiving this email because of your account on gitlab.com.