- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Problème synchro avancée référentiel - Closes #1352
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 11392cc4 by tchemit at 2019-07-16T18:26:15Z Problème synchro avancée référentiel - Closes #1352 - - - - - 2 changed files: - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java ===================================== @@ -22,8 +22,10 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.ng; * #L% */ +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multimap; import fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; @@ -90,14 +92,17 @@ public class ReferentialSynchronizeSqlsRequestBuilder { ImmutableSet<Class<? extends ReferentialDtoReference>> types = request.getTypes(); + + Multimap<Class<? extends ReferentialDtoReference>, String> newIds = request.getNewIds(); + for (Class<? extends ReferentialDto> dtoType : DtoModelClasses.REFERENTIAL_TYPES) { - build0(dtoType, types); + build0(dtoType, types, newIds); } return resultBuilder.build(); } - private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void build0(Class<D> dtoType, ImmutableSet<Class<? extends ReferentialDtoReference>> types) { + private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void build0(Class<D> dtoType, ImmutableSet<Class<? extends ReferentialDtoReference>> types, Multimap<Class<? extends ReferentialDtoReference>, String> newIds) { ReferentialDtoEntityContext<D, R, E> modelContext = DbModelHelper.fromReferentialDto(dtoType); Class<R> referenceType = modelContext.toReferenceType(); @@ -117,13 +122,13 @@ public class ReferentialSynchronizeSqlsRequestBuilder { if (log.isInfoEnabled()) { log.info("Add: " + addTasks.size()); } - onAdd(referentialName, referenceType, addTasks, binder); + onAdd(referentialName, referenceType, addTasks, binder, newIds); Set<ReferentialSynchronizeTask<R>> updateTasks = request.getUpdateTasks(referenceType); if (log.isInfoEnabled()) { log.info("Update: " + updateTasks.size()); } - onUpdate(referentialName, referenceType, updateTasks, binder); + onUpdate(referentialName, referenceType, updateTasks, binder, newIds); Set<ReferentialSynchronizeTask<R>> revertTasks = request.getRevertTasks(referenceType); if (log.isInfoEnabled()) { @@ -145,7 +150,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { } - private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onAdd(String referentialName, Class<R> referenceType, Set<ReferentialSynchronizeTask<R>> tasks, ReferentialEntityDtoBinderSupport<D, E> binder) { + private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onAdd(String referentialName, Class<R> referenceType, Set<ReferentialSynchronizeTask<R>> tasks, ReferentialEntityDtoBinderSupport<D, E> binder, Multimap<Class<? extends ReferentialDtoReference>, String> newIds) { Class<E> entityType = binder.getEntityType(); Class<D> dtoType = binder.getDtoType(); @@ -153,7 +158,9 @@ public class ReferentialSynchronizeSqlsRequestBuilder { List<E> insertEntities = loadEntities(entityType, tasks); if (metadata.withEntities()) { - InsertSqlWithCascadeStatementGenerator<D> insertGenerator = new InsertSqlWithCascadeStatementGenerator<D>(metadataModel, metadata, dtoType, request.getIdsOnlyExistingOnThisSide()) { + Multimap<Class<? extends ReferentialDtoReference>, String> allIds = ArrayListMultimap.create(request.getIdsOnlyExistingOnThisSide()); + allIds.putAll(newIds); + InsertSqlWithCascadeStatementGenerator<D> insertGenerator = new InsertSqlWithCascadeStatementGenerator<D>(metadataModel, metadata, dtoType, allIds) { @Override protected <DD extends ReferentialDto> ImmutableList<String> insertMissingReferential(Class<DD> referentialType, String id) { @@ -188,7 +195,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { } - private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onUpdate(String referentialName, Class<R> referenceType, Set<ReferentialSynchronizeTask<R>> tasks, ReferentialEntityDtoBinderSupport<D, E> binder) { + private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onUpdate(String referentialName, Class<R> referenceType, Set<ReferentialSynchronizeTask<R>> tasks, ReferentialEntityDtoBinderSupport<D, E> binder, Multimap<Class<? extends ReferentialDtoReference>, String> newIds) { Class<D> dtoType = binder.getDtoType(); TopiaMetadataEntity metadata = metadataModel.getEntity(referentialName); @@ -197,6 +204,10 @@ public class ReferentialSynchronizeSqlsRequestBuilder { if (metadata.withEntities()) { + + Multimap<Class<? extends ReferentialDtoReference>, String> allIds = ArrayListMultimap.create(request.getIdsOnlyExistingOnThisSide()); + allIds.putAll(newIds); + UpdateSqlWithCascadeStatementGenerator<D> updateGenerator = new UpdateSqlWithCascadeStatementGenerator<D>(metadataModel, metadata, dtoType, request.getIdsOnlyExistingOnThisSide()) { @Override ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java ===================================== @@ -71,6 +71,14 @@ public class ReferentialSynchronizeRequest implements ObserveDto { return idsOnlyExistingOnThisSide; } + public Multimap<Class<? extends ReferentialDtoReference>, String> getNewIds() { + Multimap<Class<? extends ReferentialDtoReference>, String> result = ArrayListMultimap.create(); + for (ReferentialSynchronizeTask<?> task : tasks.get(ReferentialSynchronizeTaskType.ADD)) { + result.put(task.getReferentialType(), task.getReferentialId()); + } + return result; + } + public ImmutableMultimap<ReferentialSynchronizeTaskType, ReferentialSynchronizeTask<?>> getTasks() { return tasks; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/11392cc4e11628577527b4fe6b9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/11392cc4e11628577527b4fe6b9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Renommer champs vessel.iattcid et vessel.ctoiid - Closes #1349
by Tony CHEMIT 16 Jul '19

16 Jul '19

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> -  +  <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> -  +  <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/39a2588a7c1e3cbc9c71f334a4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/39a2588a7c1e3cbc9c71f334a4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Revert "[PS][CALCUL] Problèmes de calcul avec quelques marées...
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5d4a5e91 by tchemit at 2019-07-16T13:20:55Z Revert "[PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350" This reverts commit 7f2e5857fb9b409b169c1f782ac90238adcfb87a. - - - - - 39a2588a by tchemit at 2019-07-16T16:41:17Z Renommer champs vessel.iattcid et vessel.ctoiid - Closes #1349 - - - - - 15 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 - 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 - 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 Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -876,10 +876,10 @@ observe.common.VesselActivitySeineDto.allowFad observe.common.VesselDto.capacity observe.common.VesselDto.changeDate observe.common.VesselDto.comId -observe.common.VesselDto.ctoiId +observe.common.VesselDto.iotcId observe.common.VesselDto.flagCountry observe.common.VesselDto.generalTab -observe.common.VesselDto.iattcId +observe.common.VesselDto.iccat observe.common.VesselDto.imoId observe.common.VesselDto.keelCodeFlotte observe.common.VesselDto.length ===================================== 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> -  +  <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> -  +  <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> ===================================== 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,11 +2500,11 @@ 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.iotcId=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.keelCode=Keel code observe.common.VesselDto.keelCodeFlotte=Keel / Flotte ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2500,11 +2500,11 @@ 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.iotcId=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.keelCode=Código de Quilla observe.common.VesselDto.keelCodeFlotte=Código de Quilla / Flota ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2500,11 +2500,11 @@ 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.iotcId=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.keelCode=Code quille observe.common.VesselDto.keelCodeFlotte=Code quille /Code flotte ===================================== 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 ===================================== @@ -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 ===================================== @@ -46,7 +46,7 @@ CREATE TABLE common.speciesgroupreleasemode(topiaid VARCHAR(255) NOT NULL CONSTR 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); @@ -79,7 +79,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 ===================================== @@ -695,10 +695,6 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements } SizeMeasureType outputSizeMeasureType = lengthWeightParameter.getSizeMeasureType(); - if (outputSizeMeasureType == null) { - log.error(String.format("No size measure type found for LengthWeightParameter (%s) will use the one of the species", lengthWeightParameter.getTopiaId())); - outputSizeMeasureType = lengthWeightParameter.getSpecies().getSizeMeasureType(); - } if (!Objects.equals(inputSizeMeasureType, outputSizeMeasureType)) { // on doit effectuer une conversion taille - taille avant de convertir en poids ===================================== 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 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7f2e5857fb9b409b169c1f782a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7f2e5857fb9b409b169c1f782a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Consolidation des champs techniques en base - closes #1353
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: c1536213 by tchemit at 2019-07-16T15:51:56Z Consolidation des champs techniques en base - closes #1353 - - - - - 38f8daf4 by tchemit at 2019-07-16T16:32:33Z Problème synchro avancée référentiel - Closes #1352 - - - - - 11 changed files: - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java - + persistence/src/main/resources/db/migration/7.1/03_add_not_null_on_technical_fields-common.sql - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java - test/src/main/resources/db/7.1/dataForTestLongline.sql.gz - test/src/main/resources/db/7.1/dataForTestSeine.sql.gz - test/src/main/resources/db/7.1/empty_h2.sql.gz - test/src/main/resources/db/7.1/empty_pg.sql.gz - test/src/main/resources/db/7.1/referentiel.sql.gz Changes: ===================================== persistence/pom.xml ===================================== @@ -274,6 +274,7 @@ </inputs> <templates> org.nuiton.topia.templates.TopiaEntityDaoTransformer, + org.nuiton.topia.templates.TopiaEntityHibernateMappingGenerator, org.nuiton.topia.templates.TopiaMetaTransformer, org.nuiton.topia.templates.TopiaMetadataModelGenerator </templates> ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java ===================================== @@ -44,6 +44,7 @@ public class DataSourceMigrationForVersion_7_1 extends MigrationVersionResource public void generateSqlScript(MigrationVersionResourceExecutor executor) { executor.addScript("01", "add_not_null_on_length_weight_parameters"); executor.addScript("02", "add_not_null_on_length_length_parameters"); + executor.addScript("03", "add_not_null_on_technical_fields"); } } ===================================== persistence/src/main/resources/db/migration/7.1/03_add_not_null_on_technical_fields-common.sql ===================================== @@ -0,0 +1,126 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- 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>. +-- #L% +--- +ALTER TABLE observe_longline.Activity ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.BaitsComposition ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.Basket ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.Branchline ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.BranchlinesComposition ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.Catch ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.Encounter ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.FloatlinesComposition ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.GearUseFeatures ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.GearUseFeaturesMeasurement ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.HooksComposition ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.Section ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.SensorUsed ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.Set ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.SizeMeasure ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.Tdr ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.TdrRecord ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.Trip ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.WeightMeasure ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Country ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.DataQuality ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.FpaZone ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Gear ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.GearCaracteristic ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.GearCaracteristicType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Harbour ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.LastUpdateDate ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.LengthLengthParameter ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.LengthWeightParameter ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Ocean ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Organism ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Person ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Program ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Sex ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.ShipOwner ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.SizeMeasureType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Species ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.SpeciesGroup ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.SpeciesGroupReleaseMode ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.SpeciesList ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.Vessel ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.VesselSizeCategory ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.VesselType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_common.WeightMeasureType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.BaitHaulingStatus ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.BaitSettingStatus ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.BaitType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.CatchFate ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.EncounterType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.Healthness ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.HookPosition ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.HookSize ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.HookType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.ItemHorizontalPosition ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.ItemVerticalPosition ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.LightsticksColor ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.LightsticksType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.LineType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.MaturityStatus ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.MitigationType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.SensorBrand ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.SensorDataFormat ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.SensorType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.SettingShape ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.StomacFullness ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.TripType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_longline.VesselActivity ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.DetectionMode ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.NonTargetCatchReleaseConformity ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.NonTargetCatchReleaseStatus ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.NonTargetCatchReleasingTime ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.ObjectMaterial ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.ObjectMaterialType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.ObjectOperation ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.ObservedSystem ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.ReasonForDiscard ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.ReasonForNoFishing ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.ReasonForNullSet ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.SpeciesFate ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.SpeciesStatus ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.SurroundingActivity ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.TransmittingBuoyOperation ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.TransmittingBuoyType ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.VesselActivity ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.WeightCategory ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.Wind ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.Activity ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.FloatingObject ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.FloatingObjectPart ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.GearUseFeaturesMeasurement ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.GearUseFeatures ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.NonTargetCatch ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.NonTargetCatchRelease ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.NonTargetLength ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.NonTargetSample ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.ObjectObservedSpecies ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.ObjectSchoolEstimate ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.Route ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.SchoolEstimate ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.Set ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.TargetCatch ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.TargetLength ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.TargetSample ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.TransmittingBuoy ALTER COLUMN topiaCreateDate SET NOT NULL; +ALTER TABLE observe_seine.Trip ALTER COLUMN topiaCreateDate SET NOT NULL; ===================================== pom.xml ===================================== @@ -165,7 +165,7 @@ <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene>   - <lib.version.java4all.topia>1.1.15</lib.version.java4all.topia> + <lib.version.java4all.topia>1.1.16</lib.version.java4all.topia>   ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java ===================================== @@ -22,8 +22,10 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.ng; * #L% */ +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multimap; import fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; @@ -90,14 +92,17 @@ public class ReferentialSynchronizeSqlsRequestBuilder { ImmutableSet<Class<? extends ReferentialDtoReference>> types = request.getTypes(); + + Multimap<Class<? extends ReferentialDtoReference>, String> newIds = request.getNewIds(); + for (Class<? extends ReferentialDto> dtoType : DtoModelClasses.REFERENTIAL_TYPES) { - build0(dtoType, types); + build0(dtoType, types, newIds); } return resultBuilder.build(); } - private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void build0(Class<D> dtoType, ImmutableSet<Class<? extends ReferentialDtoReference>> types) { + private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void build0(Class<D> dtoType, ImmutableSet<Class<? extends ReferentialDtoReference>> types, Multimap<Class<? extends ReferentialDtoReference>, String> newIds) { ReferentialDtoEntityContext<D, R, E> modelContext = DbModelHelper.fromReferentialDto(dtoType); Class<R> referenceType = modelContext.toReferenceType(); @@ -117,13 +122,13 @@ public class ReferentialSynchronizeSqlsRequestBuilder { if (log.isInfoEnabled()) { log.info("Add: " + addTasks.size()); } - onAdd(referentialName, referenceType, addTasks, binder); + onAdd(referentialName, referenceType, addTasks, binder, newIds); Set<ReferentialSynchronizeTask<R>> updateTasks = request.getUpdateTasks(referenceType); if (log.isInfoEnabled()) { log.info("Update: " + updateTasks.size()); } - onUpdate(referentialName, referenceType, updateTasks, binder); + onUpdate(referentialName, referenceType, updateTasks, binder, newIds); Set<ReferentialSynchronizeTask<R>> revertTasks = request.getRevertTasks(referenceType); if (log.isInfoEnabled()) { @@ -145,7 +150,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { } - private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onAdd(String referentialName, Class<R> referenceType, Set<ReferentialSynchronizeTask<R>> tasks, ReferentialEntityDtoBinderSupport<D, E> binder) { + private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onAdd(String referentialName, Class<R> referenceType, Set<ReferentialSynchronizeTask<R>> tasks, ReferentialEntityDtoBinderSupport<D, E> binder, Multimap<Class<? extends ReferentialDtoReference>, String> newIds) { Class<E> entityType = binder.getEntityType(); Class<D> dtoType = binder.getDtoType(); @@ -153,7 +158,9 @@ public class ReferentialSynchronizeSqlsRequestBuilder { List<E> insertEntities = loadEntities(entityType, tasks); if (metadata.withEntities()) { - InsertSqlWithCascadeStatementGenerator<D> insertGenerator = new InsertSqlWithCascadeStatementGenerator<D>(metadataModel, metadata, dtoType, request.getIdsOnlyExistingOnThisSide()) { + Multimap<Class<? extends ReferentialDtoReference>, String> allIds = ArrayListMultimap.create(request.getIdsOnlyExistingOnThisSide()); + allIds.putAll(newIds); + InsertSqlWithCascadeStatementGenerator<D> insertGenerator = new InsertSqlWithCascadeStatementGenerator<D>(metadataModel, metadata, dtoType, allIds) { @Override protected <DD extends ReferentialDto> ImmutableList<String> insertMissingReferential(Class<DD> referentialType, String id) { @@ -188,7 +195,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { } - private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onUpdate(String referentialName, Class<R> referenceType, Set<ReferentialSynchronizeTask<R>> tasks, ReferentialEntityDtoBinderSupport<D, E> binder) { + private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onUpdate(String referentialName, Class<R> referenceType, Set<ReferentialSynchronizeTask<R>> tasks, ReferentialEntityDtoBinderSupport<D, E> binder, Multimap<Class<? extends ReferentialDtoReference>, String> newIds) { Class<D> dtoType = binder.getDtoType(); TopiaMetadataEntity metadata = metadataModel.getEntity(referentialName); @@ -197,6 +204,10 @@ public class ReferentialSynchronizeSqlsRequestBuilder { if (metadata.withEntities()) { + + Multimap<Class<? extends ReferentialDtoReference>, String> allIds = ArrayListMultimap.create(request.getIdsOnlyExistingOnThisSide()); + allIds.putAll(newIds); + UpdateSqlWithCascadeStatementGenerator<D> updateGenerator = new UpdateSqlWithCascadeStatementGenerator<D>(metadataModel, metadata, dtoType, request.getIdsOnlyExistingOnThisSide()) { @Override ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java ===================================== @@ -71,6 +71,14 @@ public class ReferentialSynchronizeRequest implements ObserveDto { return idsOnlyExistingOnThisSide; } + public Multimap<Class<? extends ReferentialDtoReference>, String> getNewIds() { + Multimap<Class<? extends ReferentialDtoReference>, String> result = ArrayListMultimap.create(); + for (ReferentialSynchronizeTask<?> task : tasks.get(ReferentialSynchronizeTaskType.ADD)) { + result.put(task.getReferentialType(), task.getReferentialId()); + } + return result; + } + public ImmutableMultimap<ReferentialSynchronizeTaskType, ReferentialSynchronizeTask<?>> getTasks() { return tasks; } ===================================== test/src/main/resources/db/7.1/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.1/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.1/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.1/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.1/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.1/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.1/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.1/empty_h2.sql.gz and b/test/src/main/resources/db/7.1/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.1/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.1/empty_pg.sql.gz and b/test/src/main/resources/db/7.1/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.1/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.1/referentiel.sql.gz and b/test/src/main/resources/db/7.1/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/35286e05f0d60e0e89bf4b10ae… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/35286e05f0d60e0e89bf4b10ae… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: move to version 7.1.0 [skip ci]
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: b89ed2cb by tchemit at 2019-07-16T13:37:58Z move to version 7.1.0 [skip ci] - - - - - 35286e05 by tchemit at 2019-07-16T14:58:30Z [REF] Consolidation du réferentiel common.LengthWeightParameter - Closes #1350 [REF] Consolidation du réferentiel common.LengthLengthParameter - Closes #1351 - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - observe/pom.xml - persistence/pom.xml - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java - persistence/src/main/models/Observe.model - + persistence/src/main/resources/db/migration/7.1/01_add_not_null_on_length_weight_parameters-common.sql - + persistence/src/main/resources/db/migration/7.1/02_add_not_null_on_length_length_parameters-common.sql - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - 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 - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java - services/pom.xml - test/pom.xml - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - + test/src/main/resources/db/7.1/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.1/dataForTestSeine.sql.gz - + test/src/main/resources/db/7.1/empty_h2.sql.gz - + test/src/main/resources/db/7.1/empty_pg.sql.gz - + test/src/main/resources/db/7.1/referentiel.sql.gz - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -824,7 +824,7 @@ observe.common.LengthLengthParameterDto.types=Relations Taille-Taille observe.common.LengthWeightParameterDto.coefficients=Coefficients observe.common.LengthWeightParameterDto.generalTab=Caractéristiques générales observe.common.LengthWeightParameterDto.lengthWeightFormula=Relation Poids -observe.common.LengthWeightParameterDto.lengthWeightFormulaInformation=La relation poids permet de calculer le poids à partir de la taille +observe.common.LengthWeightParameterDto.lengthWeightFormulaInformation=La relation poids permet de calculer le poids à partir de la taille, elle doit contenir la variable L (length) qui représente la taille d'entrée observe.common.LengthWeightParameterDto.meanLength=Taille moyenne (en cm) observe.common.LengthWeightParameterDto.meanValues=Valeurs moyennes observe.common.LengthWeightParameterDto.meanWeight=Poids moyen (en Kg) @@ -832,7 +832,7 @@ observe.common.LengthWeightParameterDto.otherTab=Autres caractéristiques observe.common.LengthWeightParameterDto.type=Relation Taille-Poids observe.common.LengthWeightParameterDto.types=Relations Taille-Poids observe.common.LengthWeightParameterDto.weightLengthFormula=Relation Taille -observe.common.LengthWeightParameterDto.weightLengthFormulaInformation=La relation taille permet de calculer la taille à partir du poids +observe.common.LengthWeightParameterDto.weightLengthFormulaInformation=La relation taille permet de calculer la taille à partir du poids, elle doit contenir la variable P (poids) qui représente le poids d'entrée observe.common.LightsticksColorDto.type=Couleur de cyalumes observe.common.LightsticksColorDto.types=Couleurs de cyalumes observe.common.LightsticksTypeDto.type=Type de cyalumes ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java ===================================== @@ -0,0 +1,50 @@ +package fr.ird.observe.persistence.migration; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ + +import com.google.auto.service.AutoService; +import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.nuiton.version.Versions; + +/** + * Created on 16/07/19. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since ? + */ +(a)AutoService(MigrationVersionResource.class) +public class DataSourceMigrationForVersion_7_1 extends MigrationVersionResource { + + public DataSourceMigrationForVersion_7_1() { + super(Versions.valueOf("7.1")); + } + + @Override + public void generateSqlScript(MigrationVersionResourceExecutor executor) { + executor.addScript("01", "add_not_null_on_length_weight_parameters"); + executor.addScript("02", "add_not_null_on_length_length_parameters"); + } + +} + ===================================== persistence/src/main/models/Observe.model ===================================== @@ -416,19 +416,19 @@ label8 + {*:1} String getLabel(referentialLocale !fr.ird.observe.dto.referential.ReferentialLocale) String referentiel.LengthLengthParameter > referentiel.FormulaSupport | entity -inputOutputFormula + {*:1} String -outputInputFormula + {*:1} String -inputSizeMeasureType {*:1} referentiel.SizeMeasureType | lazy=false -outputSizeMeasureType {*:1} referentiel.SizeMeasureType | lazy=false +inputOutputFormula + {*:1} String | notNull +outputInputFormula + {*:1} String | notNull +inputSizeMeasureType {*:1} referentiel.SizeMeasureType | lazy=false notNull +outputSizeMeasureType {*:1} referentiel.SizeMeasureType | lazy=false notNull abstract referentiel.LengthWeightAble referentiel.LengthWeightParameter > referentiel.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} referentiel.SizeMeasureType | lazy=false +sizeMeasureType {*:0..1} referentiel.SizeMeasureType | lazy=false notNull abstract referentiel.ObserveReferentialEntity > ObserveEntity >> fr.ird.observe.dto.reference.ReferentialDtoReferenceAware | entity code + {*:1} String ===================================== persistence/src/main/resources/db/migration/7.1/01_add_not_null_on_length_weight_parameters-common.sql ===================================== @@ -0,0 +1,35 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- 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>. +-- #L% +--- +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; + +ALTER TABLE observe_common.LengthWeightParameter ALTER COLUMN sizeMeasureType SET NOT NULL; +ALTER TABLE observe_common.LengthWeightParameter ALTER COLUMN lengthWeightFormula SET NOT NULL; +ALTER TABLE observe_common.LengthWeightParameter ALTER COLUMN weightLengthFormula SET NOT NULL; +ALTER TABLE observe_common.LengthWeightParameter ALTER COLUMN coefficients SET NOT NULL; +ALTER TABLE observe_common.LengthWeightParameter ALTER COLUMN ocean SET NOT NULL; +ALTER TABLE observe_common.LengthWeightParameter ALTER COLUMN sex SET NOT NULL; +ALTER TABLE observe_common.LengthWeightParameter ALTER COLUMN species SET NOT NULL; ===================================== persistence/src/main/resources/db/migration/7.1/02_add_not_null_on_length_length_parameters-common.sql ===================================== @@ -0,0 +1,30 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- 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>. +-- #L% +--- + +ALTER TABLE observe_common.LengthLengthParameter ALTER COLUMN inputOutputFormula SET NOT NULL; +ALTER TABLE observe_common.LengthLengthParameter ALTER COLUMN outputInputFormula SET NOT NULL; +ALTER TABLE observe_common.LengthLengthParameter ALTER COLUMN inputSizeMeasureType SET NOT NULL; +ALTER TABLE observe_common.LengthLengthParameter ALTER COLUMN outputSizeMeasureType SET NOT NULL; +ALTER TABLE observe_common.LengthLengthParameter ALTER COLUMN coefficients SET NOT NULL; +ALTER TABLE observe_common.LengthLengthParameter ALTER COLUMN species SET NOT NULL; +ALTER TABLE observe_common.LengthLengthParameter ALTER COLUMN ocean SET NOT NULL; +ALTER TABLE observe_common.LengthLengthParameter ALTER COLUMN sex SET NOT NULL; ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> @@ -149,7 +149,7 @@ <devMode>true</devMode>  - <observe.model.version>7.0</observe.model.version> + <observe.model.version>7.1</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -665,6 +665,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 ===================================== @@ -31,14 +31,16 @@ import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.OceanTopiaDao; import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.entities.referentiel.SexTopiaDao; +import fr.ird.observe.entities.referentiel.SizeMeasureType; +import fr.ird.observe.entities.referentiel.SizeMeasureTypeTopiaDao; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesTopiaDao; import fr.ird.observe.persistence.ObserveTopiaDaoSupplier; import fr.ird.observe.persistence.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.getSpeciesDao(); OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); + SizeMeasureTypeTopiaDao sizeMeasureTypeDao = persistenceContext.getSizeMeasureTypeDao(); 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.getSpeciesDao(); OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); + SizeMeasureTypeTopiaDao sizeMeasureTypeDao = persistenceContext.getSizeMeasureTypeDao(); 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) { ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== @@ -178,7 +178,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { assertValidateResult(result, SexDto.class, 2); assertValidateResult(result, SensorBrandDto.class, 1); assertValidateResult(result, LightsticksColorDto.class, 2); - assertValidateResult(result, LengthWeightParameterDto.class, 4); + assertValidateResult(result, LengthWeightParameterDto.class, 3); assertValidateResult(result, LengthLengthParameterDto.class, 0); assertValidateResult(result, GearCaracteristicTypeDto.class, 2); assertValidateResult(result, ObjectOperationDto.class, 2); ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== @@ -253,7 +253,7 @@ public class ObserveFixtures { .put("observe_common.harbour", 74L) .put("observe_common.lastupdatedate", 104L) .put("observe_common.lengthlengthparameter", 0L) - .put("observe_common.lengthweightparameter", 365L) + .put("observe_common.lengthweightparameter", 361L) .put("observe_common.ocean", 3L) .put("observe_common.ocean_species", 500L) .put("observe_common.organism", 9L) ===================================== test/src/main/resources/db/7.1/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.1/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.1/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.1/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.1/empty_h2.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.1/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.1/empty_pg.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.1/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.1/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.1/referentiel.sql.gz differ ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.9-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb723884522d89fc9414d96c57… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb723884522d89fc9414d96c57… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 73b9506c by tchemit at 2019-07-14T14:22:39Z update pom - - - - - 7f2e5857 by tchemit at 2019-07-16T11:02:35Z [PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350 - - - - - 2 changed files: - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.23</version> + <version>2019.8.24</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -695,6 +695,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements } SizeMeasureType outputSizeMeasureType = lengthWeightParameter.getSizeMeasureType(); + if (outputSizeMeasureType == null) { + log.error(String.format("No size measure type found for LengthWeightParameter (%s) will use the one of the species", lengthWeightParameter.getTopiaId())); + outputSizeMeasureType = lengthWeightParameter.getSpecies().getSizeMeasureType(); + } if (!Objects.equals(inputSizeMeasureType, outputSizeMeasureType)) { // on doit effectuer une conversion taille - taille avant de convertir en poids View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/59ddc8b286d5a16b2cfa7664a6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/59ddc8b286d5a16b2cfa7664a6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 11 commits: [PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 7f2e5857 by tchemit at 2019-07-16T11:02:35Z [PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350 - - - - - eef0ed93 by tchemit at 2019-07-16T11:02:43Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 2f46e27c by tchemit at 2019-07-16T11:02:43Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - f5363a05 by tchemit at 2019-07-16T11:02:43Z Move to new version 9.0-alpha-1 - - - - - 98fbcc9b by tchemit at 2019-07-16T11:02:43Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 3662771b by tchemit at 2019-07-16T11:02:44Z Module 2 (first flush) - - - - - 55958234 by tchemit at 2019-07-16T11:02:44Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 81376301 by tchemit at 2019-07-16T11:02:44Z Module 2 - second flush - - - - - 11dd3fe2 by tchemit at 2019-07-16T11:02:45Z Report from v8 for ps logbook model - - - - - f76bb03c by tchemit at 2019-07-16T11:02:45Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 87d0b899 by tchemit at 2019-07-16T11:02:45Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToLeftAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToRightAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/68f70e493b59d1a868db6ee208… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/68f70e493b59d1a868db6ee208… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: update pom
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5971fd79 by tchemit at 2019-07-16T10:33:56Z update pom - - - - - cb723884 by tchemit at 2019-07-16T10:34:16Z [PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350 - - - - - 2 changed files: - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.23</version> + <version>2019.8.24</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -692,6 +692,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements } SizeMeasureType outputSizeMeasureType = lengthWeightParameter.getSizeMeasureType(); + if (outputSizeMeasureType == null) { + log.error(String.format("No size measure type found for LengthWeightParameter (%s) will use the one of the species", lengthWeightParameter.getTopiaId())); + outputSizeMeasureType = lengthWeightParameter.getSpecies().getSizeMeasureType(); + } if (!Objects.equals(inputSizeMeasureType, outputSizeMeasureType)) { // on doit effectuer une conversion taille - taille avant de convertir en poids View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ae2bfff91e79a423f67ce04e54… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ae2bfff91e79a423f67ce04e54… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 14 Jul '19

14 Jul '19

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 329f37d0 by 166231 at 2019-07-14T14:49:06Z Site checkin for project ObServe :: Pom - - - - - 8 changed files: - administration-web.html - architecture-logicielle.html - − img/logo-small.png - img/logo.png - img/logo_ird.png - index.html - install-serverPG.html - install.html Changes: ===================================== administration-web.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,8 +101,8 @@ <pre class="source"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.0.8.log # logs de l'application - |-- observeweb-log4j2.xml # configuration des logs + | `-- observeweb-8.0-RC-3.log # logs de l'application + |-- observeweb-log4j.conf # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs </pre></div></div> @@ -196,6 +196,14 @@ <div> <div> <pre class="source"> http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKe… (ou la clef que vous avez configuré) +</pre></div></div> + +<p>Par défaut le proxy_ajp a un timeout de 5 minutes, il faut augmenter cette valeur sinon les appels dépassant ce temps seront rejettés.</p> +<p>Dans le fichier de configuration <tt>httpd.conf</tt> ajouter la ligne : (timeout de 1200 secondes = 20 minutes)</p> + +<div> +<div> +<pre class="source">ProxyTimeout 1200 </pre></div></div> </div> </div> ===================================== architecture-logicielle.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== img/logo-small.png deleted ===================================== Binary files a/img/logo-small.png and /dev/null differ ===================================== img/logo.png ===================================== Binary files a/img/logo.png and b/img/logo.png differ ===================================== img/logo_ird.png ===================================== Binary files a/img/logo_ird.png and b/img/logo_ird.png differ ===================================== index.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/329f37d08057770c4316c4c5b01… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/329f37d08057770c4316c4c5b01… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 17 commits: [jgitflow-maven-plugin]updating poms for 8.0-RC-4-SNAPSHOT development[skip ci]
by Tony CHEMIT 14 Jul '19

14 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: a019da5b by tchemit at 2019-07-14T13:54:37Z [jgitflow-maven-plugin]updating poms for 8.0-RC-4-SNAPSHOT development[skip ci] - - - - - e5835ad0 by tchemit at 2019-07-14T13:55:09Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-3' with non-snapshot versions[skip ci] - - - - - 373ec662 by tchemit at 2019-07-14T14:02:34Z [jgitflow-maven-plugin]merging 'release/8.0-RC-3' into 'master' - - - - - 5fecf74a by tchemit at 2019-07-14T14:02:37Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 7669bc80 by tchemit at 2019-07-14T14:02:37Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 59ddc8b2 by tchemit at 2019-07-14T14:02:38Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 73b9506c by tchemit at 2019-07-14T14:22:39Z update pom - - - - - 5c66c3c0 by tchemit at 2019-07-14T14:22:49Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 055ea07d by tchemit at 2019-07-14T14:22:49Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 67a9d2d8 by tchemit at 2019-07-14T14:22:49Z Move to new version 9.0-alpha-1 - - - - - 57cedbbf by tchemit at 2019-07-14T14:22:50Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - bd332824 by tchemit at 2019-07-14T14:22:50Z Module 2 (first flush) - - - - - 2b469c02 by tchemit at 2019-07-14T14:22:51Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 28c26074 by tchemit at 2019-07-14T14:22:51Z Module 2 - second flush - - - - - f771007a by tchemit at 2019-07-14T14:40:29Z Report from v8 for ps logbook model - - - - - 60b96735 by tchemit at 2019-07-14T14:40:32Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 68f70e49 by tchemit at 2019-07-14T14:40:32Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToLeftAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToRightAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/26ec02fbebb37bfeed06a4c5cb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/26ec02fbebb37bfeed06a4c5cb… You're receiving this email because of your account on gitlab.com.

1 0