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

[Git][ultreiaio/ird-observe][develop] Remove redundant homeId fileds on some dto
by Tony CHEMIT 16 Jan '19

16 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6bf11014 by tchemit at 2019-01-16T18:55:07Z Remove redundant homeId fileds on some dto - - - - - 8 changed files: - dto/src/main/models/Observe-01-referential-common.model - dto/src/main/models/Observe-30-data-ll-observation.model - dto/src/main/models/Observe-31-data-ll-logbook.model - dto/src/main/models/Observe-35-data-ll.model - services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java - services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java - test/src/main/resources/fixtures/validate-service-referential.properties - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== dto/src/main/models/Observe-01-referential-common.model ===================================== @@ -121,7 +121,6 @@ referential.common.SizeMeasureType > referential.I18nReferential referential.common.Species > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=label,uri,faoCode,scientificLabel,homeId,sizeMeasureTypeId,speciesGroupId,homeId,wormsId,faoCode, faoCode + {*:1} String scientificLabel + {*:1} String -homeId + {*:1} String wormsId + {*:1} Long minLength + {*:1} Float maxLength + {*:1} Float ===================================== dto/src/main/models/Observe-30-data-ll-observation.model ===================================== @@ -77,7 +77,6 @@ topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference data.ll.observation.CatchLonglineObs > data.Commentable >> data.ll.observation.LonglinePositionAwareDto | references=homeId -homeId + {*:1} String count + {*:1} Integer totalWeight + {*:1} Float hookWhenDiscarded + {*:1} Boolean @@ -136,7 +135,6 @@ sensorBrand {*:1} fr.ird.observe.dto.referential.ll.observation.SensorBrandRefer data {*:0..1} data.DataFile data.ll.observation.SetLonglineObs > data.Commentable | references=homeId -homeId + {*:1} String number + {*:1} Integer basketsPerSectionCount + {*:1} Integer branchlinesPerBasketCount + {*:1} Integer @@ -202,7 +200,6 @@ mitigationType:set + {*:*} fr.ird.observe.dto.referential.ll.common.MitigationTy branchlinesComposition + {*} data.ll.observation.BranchlinesCompositionObs data.ll.observation.SetLonglineObsStub > data.Data | mainDto=skip -homeId + {*:1} String number + {*:1} Integer activityLongline {*:1} fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsReference | unique @@ -219,7 +216,6 @@ sizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeRefer lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference data.ll.observation.TdrObs > data.Data >> data.ll.observation.LonglinePositionAwareDto | references=homeId -homeId + {*:1} String floatline1Length + {*:1} Float floatline2Length + {*:1} Float serialNo + {*:1} String ===================================== dto/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -46,7 +46,6 @@ vesselActivityLonglineLabel + {*:1} String hasSetLongline + {*:1} Boolean data.ll.logbook.SetLonglineLogbook > data.Commentable | references=homeId -homeId + {*:1} String number + {*:1} Integer basketsPerSectionCount + {*:1} Integer branchlinesPerBasketCount + {*:1} Integer @@ -97,7 +96,6 @@ data.ll.logbook.SetLonglineLogbookCatch > data.Data | form=data.ll.logbook.Catch catchLongline {*} data.ll.logbook.CatchLonglineLogbook | ordered data.ll.logbook.SetLonglineLogbookStub > data.Data | mainDto=skip -homeId + {*:1} String number + {*:1} Integer settingStartTimeStamp + {*:1} Date activityLongline {*:1} fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookReference | unique @@ -135,7 +133,6 @@ hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference data.ll.logbook.CatchLonglineLogbook > data.Commentable | references=homeId -homeId + {*:1} String count + {*:1} Integer totalWeight + {*:1} Float hookWhenDiscarded + {*:1} Boolean ===================================== dto/src/main/models/Observe-35-data-ll.model ===================================== @@ -14,7 +14,6 @@ data.ll.common.TripLongline > data.Openable >> data.TripDto | references=startDa startDate + {*:1} Date endDate + {*:1} Date totalFishingOperationsNumber + {*:1} Integer -homeId + {*:1} String ersId + {*:1} String generalComment + {*:1} String observationsComment + {*:1} String ===================================== services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java ===================================== @@ -26,10 +26,10 @@ import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookReference; import fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookDto; import fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookStubDto; -import fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookStubHelper; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; +import java.util.Objects; import java.util.Optional; /** @@ -50,7 +50,7 @@ public class SetLonglineLogbookUniqueHomeIdDtoValidator extends FieldValidatorSu Optional<SetLonglineLogbookStubDto> sameHomeIdSetLonglineOptional = setLongline.getOtherSets() .stream() - .filter(SetLonglineLogbookStubHelper.newHomeIdPredicate(homeId)) + .filter(t-> Objects.equals(t.getHomeId(), homeId)) .findFirst(); // Iterables.tryFind(setLongline.getOtherSets(), SetLonglineLogbookStubHelper.newHomeIdPredicate(homeId)::test); ===================================== services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java ===================================== @@ -26,10 +26,10 @@ import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsReference; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDto; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsStubDto; -import fr.ird.observe.dto.data.ll.observation.SetLonglineObsStubHelper; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; +import java.util.Objects; import java.util.Optional; /** @@ -47,7 +47,7 @@ public class SetLonglineObsUniqueHomeIdDtoValidator extends FieldValidatorSuppor if (homeId != null) { Optional<SetLonglineObsStubDto> sameHomeIdSetLonglineOptional = setLongline.getOtherSets() .stream() - .filter(SetLonglineObsStubHelper.newHomeIdPredicate(homeId)) + .filter(t-> Objects.equals(t.getHomeId(), homeId)) .findFirst(); // Iterables.tryFind(setLongline.getOtherSets(), SetLonglineObsStubHelper.newHomeIdPredicate(homeId)::test); if (sameHomeIdSetLonglineOptional.isPresent()) { ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -30,7 +30,7 @@ LengthMeasureMethodDto=1 WeightMeasureMethodDto=2 ReasonForNoFishingDto=3 ObservedSystemDto=4 -SpeciesDto=24 +SpeciesDto=20 PersonDto=4 HookPositionDto=1 HookTypeDto=1 ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -21,6 +21,7 @@ observe.validation.lengthWeightParameter.invalid.weightLengthFormula observe.validation.nonTargetCatch.missing.observedSystem observe.validation.nonTargetCatch.required.weightOrNombreEstime observe.validation.nonTargetCatch.required.weightOrTailleMoyen +observe.validation.nonTargetCatch.uniqueKey observe.validation.nonTargetSample.required.weight.or.taille observe.validation.objectMaterial.invalid.validation observe.validation.objectObservedSpecies.positive.count View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6bf1101426574c7f05825bea05b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6bf1101426574c7f05825bea05b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] remove validation from dto module
by Tony CHEMIT 16 Jan '19

16 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f9b772d9 by tchemit at 2019-01-16T15:51:24Z remove validation from dto module - - - - - 21 changed files: - dto/pom.xml - dto/src/main/i18n/getters/java.getter - services/pom.xml - services/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java → services/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java - dto/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java → services/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== dto/pom.xml ===================================== @@ -64,10 +64,6 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> <dependency> <groupId>io.ultreia.java4all.http</groupId> @@ -83,12 +79,6 @@ <artifactId>java-bean</artifactId> </dependency> -  - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> -  <dependency> <groupId>org.apache.logging.log4j</groupId> ===================================== dto/src/main/i18n/getters/java.getter ===================================== @@ -48,5 +48,3 @@ observe.common.nocode observe.common.none observe.common.program observe.common.settingIdentifier -observe.validation.activity.speed.bound -observe.validation.activity.speed.bound.inter ===================================== services/pom.xml ===================================== @@ -68,6 +68,11 @@ </dependency>  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-version</artifactId> ===================================== services/src/main/i18n/getters/java.getter ===================================== @@ -4,4 +4,6 @@ observe.common.ActivityLonglinePairingResultItemDto.computedTime observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue observe.common.ActivityLonglinePairingResultItemDto.observationActivity observe.common.ActivityLonglinePairingResultItemDto.type +observe.validation.activity.speed.bound +observe.validation.activity.speed.bound.inter observe.validation.trip.vessel.overlap ===================================== dto/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java → services/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java → services/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java ===================================== ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -21,7 +21,6 @@ observe.validation.lengthWeightParameter.invalid.weightLengthFormula observe.validation.nonTargetCatch.missing.observedSystem observe.validation.nonTargetCatch.required.weightOrNombreEstime observe.validation.nonTargetCatch.required.weightOrTailleMoyen -observe.validation.nonTargetCatch.uniqueKey observe.validation.nonTargetSample.required.weight.or.taille observe.validation.objectMaterial.invalid.validation observe.validation.objectObservedSpecies.positive.count View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f9b772d932cfec57877d095245e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f9b772d932cfec57877d095245e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Fournir le contenu de la table LL Compagnies destinataires des...
by Tony CHEMIT 16 Jan '19

16 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7afa7c77 by tchemit at 2019-01-16T15:24:34Z [LL] Fournir le contenu de la table LL Compagnies destinataires des débarquements (déplacement dans le bon schema ll_landing) - Closes #1122 - - - - - 29 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIModel.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-01-referential-common.model - dto/src/main/models/Observe-13-referential-ll-landing.model - dto/src/main/models/Observe-32-data-ll-landing.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/CompagniesEntityDtoBinder.java → persistence/src/main/java/fr/ird/observe/binder/referential/ll/landing/CompagniesEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/Entities.java - persistence/src/main/models/Observe-01-referential-common.model - persistence/src/main/models/Observe-13-referential-ll-landing.model - persistence/src/main/models/Observe-32-data-ll-landing.model - persistence/src/main/resources/db/migration/7.2/01_create_common_schema-common.sql - persistence/src/main/resources/db/migration/7.2/07_create_ll_landing_schema-common.sql - persistence/src/main/resources/db/migration/7.2/10_add_home_id-common.sql - persistence/src/main/resources/db/migration/7.2/15_fill_ll_compagnies-common.sql - test/src/main/resources/db/7.2/dataForTestLongline.sql.gz - test/src/main/resources/db/7.2/dataForTestSeine.sql.gz - test/src/main/resources/db/7.2/empty_h2.sql.gz - test/src/main/resources/db/7.2/empty_pg.sql.gz - test/src/main/resources/db/7.2/referentiel.sql.gz - test/src/main/resources/fixtures/count-referential-common.properties - test/src/main/resources/fixtures/count-referential-longline.properties - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx ===================================== @@ -34,7 +34,7 @@ fr.ird.observe.dto.referential.common.SpeciesReference fr.ird.observe.dto.referential.common.VesselReference fr.ird.observe.dto.referential.ll.landing.DataSourceReference - fr.ird.observe.dto.referential.common.CompagniesReference + fr.ird.observe.dto.referential.ll.landing.CompagniesReference fr.ird.observe.client.ui.actions.content.data.ll.delete.DeleteTripLonglineLandingUIAction fr.ird.observe.client.ui.actions.content.data.ll.move.MoveSingleTripLonglineLandingUIAction ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUI.jaxx ===================================== @@ -21,22 +21,22 @@ --> <fr.ird.observe.client.ui.content.api.ref.ContentI18nReferenceUI - i18n="fr.ird.observe.dto.referential.common.CompagniesDto" + i18n="fr.ird.observe.dto.referential.ll.landing.CompagniesDto" superGenericType='CompagniesDto, CompagniesReference, CompagniesUI'> - <style source="../CommonReferential.jcss"/> + <style source="../../CommonReferential.jcss"/> <import> fr.ird.observe.dto.reference.ReferentialDtoReference - fr.ird.observe.dto.referential.common.CompagniesDto - fr.ird.observe.dto.referential.common.CompagniesReference + fr.ird.observe.dto.referential.ll.landing.CompagniesDto + fr.ird.observe.dto.referential.ll.landing.CompagniesReference static fr.ird.observe.client.ui.util.UIHelper.getStringValue fr.ird.observe.dto.referential.ReferenceStatus </import>  - <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.referential.common.CompagniesDto' + <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.referential.ll.landing.CompagniesDto' context='create' errorTableModel='{getErrorTableModel()}'/>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIHandler.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.ref.common; +package fr.ird.observe.client.ui.content.ref.ll.landing; /*- * #%L @@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.content.ref.common; */ import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUIHandler; -import fr.ird.observe.dto.referential.common.CompagniesDto; -import fr.ird.observe.dto.referential.common.CompagniesReference; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesReference; import org.nuiton.jaxx.runtime.spi.UIHandler; /** ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/landing/CompagniesUIModel.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.ref.common; +package fr.ird.observe.client.ui.content.ref.ll.landing; /* * #%L @@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.content.ref.common; */ import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUIModel; -import fr.ird.observe.dto.referential.common.CompagniesDto; -import fr.ird.observe.dto.referential.common.CompagniesReference; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesReference; /** * Created on 9/27/14. ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -133,8 +133,8 @@ import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.common.CompagniesDto; -import fr.ird.observe.dto.referential.common.CompagniesReference; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesReference; import fr.ird.observe.dto.referential.common.CountryDto; import fr.ird.observe.dto.referential.common.CountryReference; import fr.ird.observe.dto.referential.common.DataQualityDto; ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== @@ -93,7 +93,7 @@ import fr.ird.observe.dto.data.ps.observation.TargetSampleDto; import fr.ird.observe.dto.data.ps.observation.TransmittingBuoyDto; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ReferentialDto; -import fr.ird.observe.dto.referential.common.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; import fr.ird.observe.dto.referential.common.CountryDto; import fr.ird.observe.dto.referential.common.DataQualityDto; import fr.ird.observe.dto.referential.common.FpaZoneDto; @@ -191,7 +191,6 @@ public class DtoModelClasses { public static final ImmutableSet<Class<? extends ReferentialDto>> COMMON_REFERENTIAL_TYPES = ImmutableSet.of( VesselSizeCategoryDto.class, CountryDto.class, - CompagniesDto.class, LengthMeasureMethodDto.class, WeightMeasureMethodDto.class, DataQualityDto.class, @@ -267,6 +266,7 @@ public class DtoModelClasses { WeightDeterminationMethodDto.class); public static final ImmutableSet<Class<? extends ReferentialDto>> LONGLINE_LANDING_REFERENTIAL_TYPES = ImmutableSet.of( + CompagniesDto.class, ConservationDto.class, DataSourceDto.class); ===================================== dto/src/main/models/Observe-01-referential-common.model ===================================== @@ -29,8 +29,6 @@ species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference ocean {*:0..1} fr.ird.observe.dto.referential.common.OceanReference sex {*:1} fr.ird.observe.dto.referential.common.SexReference -referential.common.Compagnies > referential.I18nReferential - referential.common.Country > referential.I18nReferential | references=code,label,uri,iso2Code,iso3Code iso2Code + {*:1} String iso3Code + {*:1} String ===================================== dto/src/main/models/Observe-13-referential-ll-landing.model ===================================== @@ -1,5 +1,7 @@ package fr.ird.observe.dto.referential.ll.landing | form=self +referential.ll.landing.Compagnies > referential.I18nReferential + referential.ll.landing.Conservation > referential.I18nReferential referential.ll.landing.DataSource > referential.I18nReferential ===================================== dto/src/main/models/Observe-32-data-ll-landing.model ===================================== @@ -16,7 +16,7 @@ data.ll.landing.LandingLongline > data.Openable | references=startDate,harbourLa startDate + {*:1} Date endDate + {*:1} Date dataSource {*:1} fr.ird.observe.dto.referential.ll.landing.DataSourceReference -compagnies {*:1} fr.ird.observe.dto.referential.common.CompagniesReference +compagnies {*:1} fr.ird.observe.dto.referential.ll.landing.CompagniesReference person {*:1} fr.ird.observe.dto.referential.common.PersonReference harbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference vessel {*:0..1} fr.ird.observe.dto.referential.common.VesselReference ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1,4 +1,3 @@ -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date ClientConfig.description=ObServe configuration ObserveWebApplicationConfig.description=ObServe Web configuration observe.TripLongline.action.generateHomeId.tip=Generate a new id @@ -3278,6 +3277,7 @@ observe.validation.activity.required.vesselActivity=must be filled. observe.validation.activity.speed.bound=Activity speed is %s nd, which is more than the maximum authorized which is %s nd. observe.validation.activity.speed.bound.inter=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s). observe.validation.activityLongline.desactivated.fpaZone=Fpa zone is disabled. +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date observe.validation.baitsComposition.bound.individualSize=Size must be bound between %s and %s. observe.validation.baitsComposition.bound.individualWeight=Weight must be bound between %s and %s. observe.validation.baitsComposition.bound.proportion=Proportion must be bound between %s and %s. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1,4 +1,3 @@ -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date#TODO ClientConfig.description=Configuración de ObServe ObserveWebApplicationConfig.description=Configuración de Observe web observe.TripLongline.action.generateHomeId.tip=Génerer un identifiant \#TODO @@ -3278,6 +3277,7 @@ observe.validation.activity.required.vesselActivity=Se debe seleccionar la activ observe.validation.activity.speed.bound=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos. observe.validation.activity.speed.bound.inter=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd). observe.validation.activityLongline.desactivated.fpaZone=La zona FPA seleccionada está desactivada. +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date\#TODO observe.validation.baitsComposition.bound.individualSize=El tamaño debe ser entre %s y %s. observe.validation.baitsComposition.bound.individualWeight=El peso debe ser entre %s y %s. observe.validation.baitsComposition.bound.proportion=La proporción debe ser entre %s y %s. ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -11,7 +11,6 @@ observe.action.auto.copy.to.clipboard.tip=Mettre à jour automatiquement le cont observe.action.back.to.list=Retour à la liste observe.action.back.to.list.tip=Retour à la liste des données observe.action.cancel=Annuler -observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée observe.action.cancel.remote.tip=Annuler la création de la configuration observe.action.cancel.server.tip=Annuler la création de la configuration observe.action.change.storage=Changer la source de données @@ -3278,6 +3277,7 @@ observe.validation.activity.required.vesselActivity=L'activité du navire est ob observe.validation.activity.speed.bound=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd. observe.validation.activity.speed.bound.inter=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd). observe.validation.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée. +observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée observe.validation.baitsComposition.bound.individualSize=La taille doit être comprise entre %s et %s. observe.validation.baitsComposition.bound.individualWeight=Le poids doit être comprise entre %s et %s. observe.validation.baitsComposition.bound.proportion=La proportion doit être comprise entre %s et %s. ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/CompagniesEntityDtoBinder.java → persistence/src/main/java/fr/ird/observe/binder/referential/ll/landing/CompagniesEntityDtoBinder.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.binder.referential.common; +package fr.ird.observe.binder.referential.ll.landing; /*- * #%L @@ -23,9 +23,9 @@ package fr.ird.observe.binder.referential.common; */ import fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport; -import fr.ird.observe.dto.referential.common.CompagniesDto; +import fr.ird.observe.dto.referential.ll.landing.CompagniesDto; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.entities.referential.common.Compagnies; +import fr.ird.observe.entities.referential.ll.landing.Compagnies; /** * Created on 24/11/15. ===================================== persistence/src/main/java/fr/ird/observe/entities/Entities.java ===================================== @@ -47,7 +47,6 @@ public class Entities { new ObserveEntityEnum[]{ ObserveEntityEnum.common_VesselSizeCategory, ObserveEntityEnum.common_Country, - ObserveEntityEnum.common_Compagnies, ObserveEntityEnum.common_LengthMeasureMethod, ObserveEntityEnum.common_WeightMeasureMethod, ObserveEntityEnum.common_DataQuality, @@ -112,6 +111,7 @@ public class Entities { ObserveEntityEnum.ll_common_VesselActivityLongline, ObserveEntityEnum.ll_common_OnBoardProcessing, ObserveEntityEnum.ll_common_TripType, + ObserveEntityEnum.ll_landing_Compagnies, ObserveEntityEnum.ll_landing_Conservation, ObserveEntityEnum.ll_landing_DataSource, ObserveEntityEnum.ll_observation_BaitHaulingStatus, ===================================== persistence/src/main/models/Observe-01-referential-common.model ===================================== @@ -26,8 +26,6 @@ label7 + {*:1} String label8 + {*:1} String getLabel(referentialLocale !fr.ird.observe.dto.referential.ReferentialLocale) String -referential.common.Compagnies > referential.I18nReferentialEntity | entity - referential.common.Country > referential.I18nReferentialEntity | entity iso2Code + {*:1} String iso3Code + {*:1} String ===================================== persistence/src/main/models/Observe-13-referential-ll-landing.model ===================================== @@ -1,5 +1,7 @@ package fr.ird.observe.entities.referential.ll.landing | dbSchema=ll_landing +referential.ll.landing.Compagnies > referential.I18nReferentialEntity | entity + referential.ll.landing.Conservation > referential.I18nReferentialEntity | entity referential.ll.landing.DataSource > referential.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-32-data-ll-landing.model ===================================== @@ -5,7 +5,7 @@ comment + {*:1} String | hibernateAttributeType=text startDate + {*:1} Date endDate + {*:1} Date dataSource {*:1} referential.ll.landing.DataSource -compagnies {*:1} referential.common.Compagnies +compagnies {*:1} referential.ll.landing.Compagnies person {*:1} referential.common.Person harbour {*:0..1} referential.common.Harbour vessel {*:0..1} referential.common.Vessel ===================================== persistence/src/main/resources/db/migration/7.2/01_create_common_schema-common.sql ===================================== @@ -22,7 +22,6 @@ CREATE SCHEMA common; -CREATE TABLE common.compagnies(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_compagnies 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.country(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_country PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), uri VARCHAR(255), iso2code VARCHAR(255), iso3code 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.dataquality(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_dataquality 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.fpazone(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_fpazone 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), startdate DATE, enddate DATE, needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL); @@ -56,7 +55,6 @@ 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); -INSERT INTO common.compagnies(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.compagnies; 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; @@ -91,7 +89,6 @@ INSERT INTO common.ocean_species( species, ocean) SELECT species, ocean FROM obs INSERT INTO common.speciesgroup_speciesgroupreleasemode( speciesgroup, speciesgroupreleasemode) SELECT speciesgroup, speciesgroupreleasemode FROM observe_common.speciesgroup_speciesgroupreleasemode; INSERT INTO common.species_specieslist( specieslist, species) SELECT specieslist, species FROM observe_common.species_specieslist; -UPDATE common.Compagnies SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1; UPDATE common.Country SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1; UPDATE common.DataQuality SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1; UPDATE common.FpaZone SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.common'), topiaversion = topiaversion+1; @@ -127,7 +124,6 @@ UPDATE common.ocean_species SET species = REPLACE(species,'observe.entities.refe UPDATE common.speciesgroup_speciesgroupreleasemode SET speciesgroup = REPLACE(speciesgroup,'observe.entities.referentiel','referential.common'), speciesgroupreleasemode=REPLACE(speciesgroupreleasemode,'observe.entities.referentiel','referential.common'); UPDATE common.species_specieslist SET specieslist = REPLACE(specieslist,'observe.entities.referentiel','referential.common'), species=REPLACE(species,'observe.entities.referentiel','referential.common'); -CREATE INDEX idx_common_compagnies_lastupdatedate ON common.compagnies(lastupdatedate); CREATE INDEX idx_common_country_lastupdatedate ON common.country(lastupdatedate); CREATE INDEX idx_common_dataquality_lastupdatedate ON common.dataquality(lastupdatedate); CREATE INDEX idx_common_fpazone_lastupdatedate ON common.fpazone(lastupdatedate); @@ -218,7 +214,6 @@ ALTER TABLE common.speciesgroup_speciesgroupreleasemode ADD CONSTRAINT fk_common ALTER TABLE common.species_specieslist ADD CONSTRAINT fk_common_species_specieslist_specieslist FOREIGN KEY(specieslist) REFERENCES common.specieslist; ALTER TABLE common.species_specieslist ADD CONSTRAINT fk_common_species_specieslist_species FOREIGN KEY(species) REFERENCES common.species; -UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Compagnies' , 'referential.common.Compagnies'); UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Country' , 'referential.common.Country'); UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.DataQuality' , 'referential.common.DataQuality'); UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.FpaZone' , 'referential.common.FpaZone'); ===================================== persistence/src/main/resources/db/migration/7.2/07_create_ll_landing_schema-common.sql ===================================== @@ -22,14 +22,17 @@ CREATE SCHEMA ll_landing; +CREATE TABLE ll_landing.compagnies(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_compagnies 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 ll_landing.conservation(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate DATE, 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), CONSTRAINT pk_ll_landing_conservation primary key(topiaid)); CREATE TABLE ll_landing.datasource(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate DATE, 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), CONSTRAINT pk_ll_landing_datasource primary key(topiaid)); CREATE TABLE ll_landing.landingpart(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, lastupdatedate TIMESTAMP NOT NULL, dataquality VARCHAR(255), categorymin NUMERIC, categorymax NUMERIC, count INTEGER, weight NUMERIC, startdate DATE, enddate DATE, species VARCHAR(255), fpazone VARCHAR(255), onboardprocessing VARCHAR(255), conservation VARCHAR(255), landing VARCHAR(255), weightmeasuremethod VARCHAR(255), CONSTRAINT pk_ll_landing_landingpart primary key(topiaid)); CREATE TABLE ll_landing.landing(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, lastupdatedate TIMESTAMP NOT NULL, comment VARCHAR(1025), startdate DATE, enddate DATE, datasource VARCHAR(255), compagnies VARCHAR(255), person VARCHAR(255), harbour VARCHAR(255), vessel VARCHAR(255), trip VARCHAR(255), CONSTRAINT pk_ll_landing_landing primary key(topiaid)); +INSERT INTO ll_landing.compagnies(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.compagnies; INSERT INTO ll_landing.conservation(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_longline.conservation; INSERT INTO ll_landing.datasource(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_longline.datasource; +UPDATE ll_landing.Compagnies SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel', 'referential.ll.landing'), topiaversion = topiaversion + 1; UPDATE ll_landing.conservation SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel.longline', 'referential.ll.landing'), topiaversion = topiaversion + 1; UPDATE ll_landing.datasource SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel.longline', 'referential.ll.landing'), topiaversion = topiaversion + 1; @@ -39,7 +42,7 @@ ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_fpaz ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_onboardprocessing foreign key(onboardprocessing) references ll_common.onboardprocessing; ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_species foreign key(species) references common.species; ALTER TABLE ll_landing.landingpart ADD CONSTRAINT fk_ll_landing_landingpart_weightmeasuremethod foreign key(weightmeasuremethod) references common.weightmeasuremethod; -ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_compagnies foreign key(compagnies) references common.compagnies; +ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_compagnies foreign key(compagnies) references ll_landing.compagnies; ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_datasource foreign key(datasource) references ll_landing.datasource; ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_harbour foreign key(harbour) references common.harbour; ALTER TABLE ll_landing.landing ADD CONSTRAINT fk_ll_landing_landing_person foreign key(person) references common.person; @@ -59,6 +62,7 @@ CREATE INDEX idx_ll_landing_landing_person ON ll_landing.landing(person); CREATE INDEX idx_ll_landing_landing_trip ON ll_landing.landing(trip); CREATE INDEX idx_ll_landing_landing_vessel ON ll_landing.landing(vessel); +CREATE INDEX idx_ll_landing_compagnies_lastupdatedate ON ll_landing.compagnies(lastupdatedate); CREATE INDEX idx_ll_landing_conservation_lastupdatedate ON ll_landing.conservation(lastupdatedate); CREATE INDEX idx_ll_landing_datasource_lastupdatedate ON ll_landing.datasource(lastupdatedate); CREATE INDEX idx_ll_landing_landingpart_lastupdatedate ON ll_landing.landingpart(lastupdatedate); @@ -67,6 +71,7 @@ CREATE INDEX idx_ll_landing_landing_lastupdatedate ON ll_landing.landing(lastupd INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1021', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.landing.LandingLongline', CURRENT_TIMESTAMP); INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1022', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.landing.LandingPartLongline', CURRENT_TIMESTAMP); +UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Compagnies' , 'referential.ll.landing.Compagnies'); UPDATE common.LASTUPDATEDATE SET TYPE = replace(TYPE, 'referentiel.longline.Conservation', 'referential.ll.landing.Conservation'); UPDATE common.LASTUPDATEDATE SET TYPE = replace(TYPE, 'referentiel.longline.DataSource', 'referential.ll.landing.DataSource'); ===================================== persistence/src/main/resources/db/migration/7.2/10_add_home_id-common.sql ===================================== @@ -20,7 +20,6 @@ -- #L% --- -ALTER TABLE common.compagnies ADD COLUMN homeId VARCHAR(255); ALTER TABLE common.country ADD COLUMN homeId VARCHAR(255); ALTER TABLE common.dataquality ADD COLUMN homeId VARCHAR(255); ALTER TABLE common.fpazone ADD COLUMN homeId VARCHAR(255); @@ -67,6 +66,7 @@ ALTER TABLE ll_common.triptype ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_common.vesselactivity ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_common.weightcategory ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_common.weightdeterminationmethod ADD COLUMN homeId VARCHAR(255); +ALTER TABLE ll_landing.compagnies ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_landing.conservation ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_landing.datasource ADD COLUMN homeId VARCHAR(255); ALTER TABLE ll_landing.landing ADD COLUMN homeId VARCHAR(255); ===================================== persistence/src/main/resources/db/migration/7.2/15_fill_ll_compagnies-common.sql ===================================== @@ -20,33 +20,33 @@ -- #L% --- -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.01', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AFM', 'FINSS-00003638', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.02', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMIRANTES', 'FINSS-00003643', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.03', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMO', 'FINSS-00003557', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.04', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'ARC', 'FINSS-00003662', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.05', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'B&E', 'FINSS-00000096', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.06', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'BFR', 'FINSS-00003535', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.07', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'DCE', 'FINSS-00003473', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.08', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'Ephelia', 'FINSS-00003634', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.09', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FSS', 'FINSS-00003651', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.10', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FTE', 'FINSS-00003663', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.11', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GFM', 'FINSS-00003640', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.12', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GPO', 'FINSS-00000098', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.13', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GRA', 'FINSS-00003347', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.14', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'HOTEL&REST', 'FINSS-00003624', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.15', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'IFM', 'FINSS-00003639', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.16', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JAMES LESP', 'FINSS-00000129', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.17', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JHL', 'FINSS-00003652', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.18', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'kalanda', 'FINSS-00000177', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.19', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'LE MURIA', 'FINSS-00003633', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.20', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MARINE INV', 'FINSS-00000099', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.21', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MGE', 'FINSS-00000128', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.22', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN ', 'FINSS-00003629', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.23', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN HARV', 'FINSS-00000065', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.24', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEANA', 'FINSS-00000094', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.25', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SANS SOUCI', 'FINSS-00000100', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.26', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEA HARVES', 'FINSS-00000132', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.27', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEASTAR', 'FINSS-00000511', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.28', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SFA', 'FINSS-00000101', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.29', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'TROPICALTU', 'FINSS-00003654', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]'); -INSERT INTO common.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.common.Compagnies#1464000000000#0.30', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'UNK', 'FINSS-00000000', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.01', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AFM', 'FINSS-00003638', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.02', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMIRANTES', 'FINSS-00003643', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.03', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMO', 'FINSS-00003557', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.04', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'ARC', 'FINSS-00003662', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.05', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'B&E', 'FINSS-00000096', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.06', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'BFR', 'FINSS-00003535', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.07', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'DCE', 'FINSS-00003473', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.08', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'Ephelia', 'FINSS-00003634', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.09', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FSS', 'FINSS-00003651', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.10', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FTE', 'FINSS-00003663', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.11', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GFM', 'FINSS-00003640', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.12', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GPO', 'FINSS-00000098', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.13', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GRA', 'FINSS-00003347', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.14', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'HOTEL&REST', 'FINSS-00003624', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.15', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'IFM', 'FINSS-00003639', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.16', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JAMES LESP', 'FINSS-00000129', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.17', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JHL', 'FINSS-00003652', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.18', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'kalanda', 'FINSS-00000177', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.19', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'LE MURIA', 'FINSS-00003633', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.20', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MARINE INV', 'FINSS-00000099', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.21', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MGE', 'FINSS-00000128', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.22', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN ', 'FINSS-00003629', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.23', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN HARV', 'FINSS-00000065', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.24', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEANA', 'FINSS-00000094', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.25', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SANS SOUCI', 'FINSS-00000100', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.26', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEA HARVES', 'FINSS-00000132', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.27', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEASTAR', 'FINSS-00000511', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.28', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SFA', 'FINSS-00000101', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.29', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'TROPICALTU', 'FINSS-00003654', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.30', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'UNK', 'FINSS-00000000', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]'); ===================================== test/src/main/resources/db/7.2/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.2/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/empty_h2.sql.gz and b/test/src/main/resources/db/7.2/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/empty_pg.sql.gz and b/test/src/main/resources/db/7.2/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.2/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.2/referentiel.sql.gz and b/test/src/main/resources/db/7.2/referentiel.sql.gz differ ===================================== test/src/main/resources/fixtures/count-referential-common.properties ===================================== @@ -20,7 +20,6 @@ # #L% ### common.country=72 -common.compagnies=30 common.dataquality=5 common.fpazone=42 common.gear=26 ===================================== test/src/main/resources/fixtures/count-referential-longline.properties ===================================== @@ -43,6 +43,7 @@ ll_common.settingshape=6 ll_observation.stomacfullness=7 ll_common.vesselactivity=27 ll_common.weightcategory=0 +ll_landing.compagnies=30 ll_landing.datasource=20 ll_common.triptype=2 ll_common.onboardprocessing=5 ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -1,9 +1,7 @@ observe.validation.activity.duplicated.time observe.validation.activity.null.dcp -observe.validation.activity.required.date observe.validation.activity.required.observedSystem.for.nonTargetCatch -observe.validation.activity.required.time -observe.validation.activity.required.vesselActivity +observe.validation.activityLongline.startDate.before.currentTrip.endDate observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped observe.validation.catchLongline.required.position observe.validation.field.mandatory View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7afa7c77100788008ccf15f4d71… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7afa7c77100788008ccf15f4d71… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout de règles de validation de niveau 1 - See #915
by Tony CHEMIT 16 Jan '19

16 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8a75fa39 by tchemit at 2019-01-16T14:01:14Z Ajout de règles de validation de niveau 1 - See #915 - - - - - 7 changed files: - 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 - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1,3 +1,4 @@ +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date ClientConfig.description=ObServe configuration ObserveWebApplicationConfig.description=ObServe Web configuration observe.TripLongline.action.generateHomeId.tip=Generate a new id ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1,3 +1,4 @@ +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date#TODO ClientConfig.description=Configuración de ObServe ObserveWebApplicationConfig.description=Configuración de Observe web observe.TripLongline.action.generateHomeId.tip=Génerer un identifiant \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -11,6 +11,7 @@ observe.action.auto.copy.to.clipboard.tip=Mettre à jour automatiquement le cont observe.action.back.to.list=Retour à la liste observe.action.back.to.list.tip=Retour à la liste des données observe.action.cancel=Annuler +observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée observe.action.cancel.remote.tip=Annuler la création de la configuration observe.action.cancel.server.tip=Annuler la création de la configuration observe.action.change.storage=Changer la source de données ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -25,27 +25,26 @@ <validators> <field name="vesselActivityLongline"> - -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.vesselActivity</message> + <field-validator type="mandatory" short-circuit="true"> + <message/> </field-validator> </field> <field name="startDate"> - -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.date</message> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]> + </param> + <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message> </field-validator> - </field> <field name="startTime"> - -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.time</message> + <field-validator type="mandatory" short-circuit="true"> + <message/> </field-validator>  @@ -67,7 +66,7 @@ <field name="seaSurfaceTemperature"> <field-validator type="temperatureBound" short-circuit="true"> - <param name="min">12.0</param> + <param name="min">15.0</param> <param name="max">35.0</param> <param name="defaultTemperatureFormat">C</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -34,6 +34,12 @@ <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]> + </param> + <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message> + </field-validator> </field> <field name="startTime"> @@ -44,7 +50,7 @@ <field name="seaSurfaceTemperature"> <field-validator type="temperatureBound" short-circuit="true"> - <param name="min">12.0</param> + <param name="min">15.0</param> <param name="max">35.0</param> <param name="defaultTemperatureFormat">C</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">5000.0</param> + <param name="min">500.0</param> + <param name="max">5500.0</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">5000.0</param> + <param name="min">500.0</param> + <param name="max">5500.0</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8a75fa3956a8a0fb3d2636b7828… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8a75fa3956a8a0fb3d2636b7828… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 15 commits: [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements...
by Tony CHEMIT 15 Jan '19

15 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d01861ea by tchemit at 2019-01-15T12:31:49Z [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - Closes #1130 - - - - - 5998edc0 by tchemit at 2019-01-15T12:31:51Z Fix at last tests database generation + try to update a little longline test db :( - - - - - bd7f6b18 by tchemit at 2019-01-15T12:31:51Z There is no more selectable column on ObjectMaterial - - - - - 01ef7a7d by tchemit at 2019-01-15T12:31:51Z Now can really use v7.0 as migration starts + update 7.2 db tests - - - - - 5bfd5466 by tchemit at 2019-01-15T12:31:51Z Ajout de règles de validation de niveau 1 - See #915 - trip date validation - - - - - 49ab1c30 by tchemit at 2019-01-15T12:31:51Z [UI REFERNETIEL] Personne : impossible d'afficher les éléments liés à une personne - Closes #1193 - - - - - 5412c520 by tchemit at 2019-01-15T12:31:51Z Ajout de règles de validation de niveau 1 - See #915 - trip vessel validation - - - - - 4f3b5657 by tchemit at 2019-01-15T12:31:51Z Tentative d'ouverture d'une base avec des droits référentiel échoue - Closes #1196 - - - - - edbae3b4 by tchemit at 2019-01-15T12:31:51Z reformat migration code - - - - - 8079bba0 by tchemit at 2019-01-15T12:31:51Z Impossible de voir les utilisations de référentiel si connecté en mode referentiel - Closes #1197 - - - - - 56bc2258 by tchemit at 2019-01-15T12:31:51Z update changlog - - - - - 20c1d33c by tchemit at 2019-01-15T12:31:51Z Revert referential write service + improve some code - - - - - f35176bd by tchemit at 2019-01-15T12:31:51Z move to old migration package, all before 7.0 - - - - - 3b43a9b1 by tchemit at 2019-01-15T12:33:08Z [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - Closes #1130 Corrections dans le référentiel (requises pour migration FINSS) - Closes #1182 - - - - - 03980965 by tchemit at 2019-01-15T12:33:10Z [LL] Fournir le contenu de la table LL Compagnies destinataires des débarquements - Closes #1122 - - - - - 30 changed files: - .mvn/gitlab-cache/milestones/674086-issues.json - + .mvn/gitlab-cache/milestones/750347-issues.json - + .mvn/gitlab-cache/milestones/750347.json - CHANGELOG.md - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/help/ShowAboutAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/CatchLonglineLogbookUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java - client-core/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.java - dto/src/main/java/fr/ird/observe/dto/SpeciesListConfiguration.java - + dto/src/main/java/fr/ird/observe/dto/data/TripDto.java - + dto/src/main/java/fr/ird/observe/dto/data/TripReference.java - + dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripLonglineReference.java - + dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripSeineReference.java - + dto/src/main/java/fr/ird/observe/dto/referential/common/SpeciesGroupHelper.java - dto/src/main/models/Observe-00-common.model - dto/src/main/models/Observe-25-data-ps.model - dto/src/main/models/Observe-35-data-ll.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/entities/data/ll/common/TripLonglineTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripSeineTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java - persistence/src/main/resources/db/migration/7.2/03_create_ps_observation_schema-common.sql - + persistence/src/main/resources/db/migration/7.2/12_update_ll_speciesList-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/13f45fecb140f1343e0057584c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/13f45fecb140f1343e0057584c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Revert referential write service + improve some code
by Tony CHEMIT 15 Jan '19

15 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 657a6f67 by tchemit at 2019-01-15T10:29:30Z Revert referential write service + improve some code - - - - - f69b1d7e by tchemit at 2019-01-15T10:29:32Z move to old migration package, all before 7.0 - - - - - 13f45fec by tchemit at 2019-01-15T10:29:32Z [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - Closes #1130 Corrections dans le référentiel (requises pour migration FINSS) - Closes #1182 - - - - - 30 changed files: - + dto/src/main/java/fr/ird/observe/dto/referential/common/SpeciesGroupHelper.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java - − persistence/src/main/resources/db/migration/7.2/13_fill_ll_speciesList-common.sql - + persistence/src/main/resources/db/migration/7.2/13_update_common_country-common.sql - + persistence/src/main/resources/db/migration/7.2/14_fill_ll_vessel_activity-common.sql - persistence/src/main/resources/db/migration/5.0/01_remove_open_field-H2.sql → persistence/src/main/resources/db/migration/old/5.0/01_remove_open_field-H2.sql - persistence/src/main/resources/db/migration/5.0/01_remove_open_field-PG.sql → persistence/src/main/resources/db/migration/old/5.0/01_remove_open_field-PG.sql - persistence/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-H2.sql → persistence/src/main/resources/db/migration/old/5.0/02_add_lastUpdateDate_field-H2.sql - persistence/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-PG.sql → persistence/src/main/resources/db/migration/old/5.0/02_add_lastUpdateDate_field-PG.sql - persistence/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-H2.sql → persistence/src/main/resources/db/migration/old/5.0/03_add_lastUpdateDate_table-H2.sql - persistence/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql → persistence/src/main/resources/db/migration/old/5.0/03_add_lastUpdateDate_table-PG.sql - persistence/src/main/resources/db/migration/5.0/04_remove_unit_field-common.sql → persistence/src/main/resources/db/migration/old/5.0/04_remove_unit_field-common.sql - persistence/src/main/resources/db/migration/5.0/05_remove_gender_field-common.sql → persistence/src/main/resources/db/migration/old/5.0/05_remove_gender_field-common.sql - persistence/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-H2.sql → persistence/src/main/resources/db/migration/old/5.0/06_remove_duplicate_rows-H2.sql - persistence/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-PG.sql → persistence/src/main/resources/db/migration/old/5.0/06_remove_duplicate_rows-PG.sql - persistence/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-common.sql → persistence/src/main/resources/db/migration/old/5.0/07_drop_not_null_constraint_gearUseFeatures-common.sql - persistence/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-common.sql → persistence/src/main/resources/db/migration/old/5.0/08_drop_not_null_constraint_hauling_identifier-common.sql - persistence/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-common.sql → persistence/src/main/resources/db/migration/old/5.0/09_add_non_target_length_sex_fk-common.sql - persistence/src/main/resources/db/migration/6.0/00_fix_trigger-PG.sql → persistence/src/main/resources/db/migration/old/6.0/00_fix_trigger-PG.sql - persistence/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-common.sql → persistence/src/main/resources/db/migration/old/6.0/01_evol_8374_delete_sonarUsed-common.sql - persistence/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-common.sql → persistence/src/main/resources/db/migration/old/6.0/02_evol_7886_catch_add_set_idx-common.sql - persistence/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-common.sql → persistence/src/main/resources/db/migration/old/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-common.sql - persistence/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-common.sql → persistence/src/main/resources/db/migration/old/6.0/05_evol_6999_nonTargetCatch_add_well-common.sql - persistence/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-common.sql → persistence/src/main/resources/db/migration/old/6.0/06_evol_8375_setSeine_add_booleans-common.sql - persistence/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-H2.sql → persistence/src/main/resources/db/migration/old/6.0/07_evol_8389_rename_source_columns-H2.sql - persistence/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-PG.sql → persistence/src/main/resources/db/migration/old/6.0/07_evol_8389_rename_source_columns-PG.sql - persistence/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-H2.sql → persistence/src/main/resources/db/migration/old/6.0/08_1_evol_8390_measure_type-H2.sql - persistence/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-PG.sql → persistence/src/main/resources/db/migration/old/6.0/08_1_evol_8390_measure_type-PG.sql - persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql → persistence/src/main/resources/db/migration/old/6.0/08_evol_8390_measure_type-H2.sql - persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql → persistence/src/main/resources/db/migration/old/6.0/08_evol_8390_measure_type-PG.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7930297f00cd0c0af36e4a77c3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7930297f00cd0c0af36e4a77c3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Revert referential write service + improve some code
by Tony CHEMIT 14 Jan '19

14 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 41aadc59 by tchemit at 2019-01-14T16:19:06Z Revert referential write service + improve some code - - - - - 5 changed files: - + dto/src/main/java/fr/ird/observe/dto/referential/SpeciesGroupHelper.java - server-core/src/main/filtered-resources/mapping - services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/NonTargetCatchReleaseServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== dto/src/main/java/fr/ird/observe/dto/referential/SpeciesGroupHelper.java ===================================== @@ -0,0 +1,36 @@ +package fr.ird.observe.dto.referential; + +/*- + * #%L + * ObServe :: Dto + * %% + * 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 java.util.Arrays; +import java.util.List; + +public class SpeciesGroupHelper extends GeneratedSpeciesGroupHelper { + //FIXME PROTECTED-ID + public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( + "fr.ird.referential.common.SpeciesGroup#1445863056144#0.9820877553253712", + "fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461", + "fr.ird.referential.common.SpeciesGroup#1446014286433#0.6480183366605247", + "fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075" + ); +} ===================================== server-core/src/main/filtered-resources/mapping ===================================== @@ -228,6 +228,7 @@ GET /api/v1/referential/ReferentialService/getReferenceSet POST /api/v1/referential/ReferentialService/getReferentialIds v1.referential.ReferentialServiceRestApi.getReferentialIds GET /api/v1/referential/ReferentialService/getReferentialReferenceSets v1.referential.ReferentialServiceRestApi.getReferentialReferenceSets POST /api/v1/referential/ReferentialService/insertMissingReferential v1.referential.ReferentialServiceRestApi.insertMissingReferential +GET /api/v1/referential/ReferentialService/loadDto v1.referential.ReferentialServiceRestApi.loadDto GET /api/v1/referential/ReferentialService/loadForm v1.referential.ReferentialServiceRestApi.loadForm GET /api/v1/referential/ReferentialService/loadObservedSystems v1.referential.ReferentialServiceRestApi.loadObservedSystems GET /api/v1/referential/ReferentialService/loadReference v1.referential.ReferentialServiceRestApi.loadReference ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/NonTargetCatchReleaseServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.data.seine; * 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>. @@ -26,15 +26,16 @@ import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.SpeciesReference; +import fr.ird.observe.dto.referential.SpeciesGroupHelper; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.local.service.ObserveServiceLocal; -import fr.ird.observe.services.local.service.referential.ReferentialServiceLocal; import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; -import java.util.stream.Collectors; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.stream.Collectors; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -54,7 +55,7 @@ public class NonTargetCatchReleaseServiceLocal extends ObserveServiceLocal imple return SPECIES_SPI.toReferentialReferenceSet(setSeine.getNonTargetCatch().stream() .map(NonTargetCatch::getSpecies) .distinct() - .filter(s -> ReferentialServiceLocal.SPECIES_GROUP_IDS.contains(s.getSpeciesGroup().getTopiaId())) + .filter(s -> SpeciesGroupHelper.SPECIES_GROUP_IDS.contains(s.getSpeciesGroup().getTopiaId())) .collect(Collectors.toList()), getReferentialLocale(), null); } @@ -64,7 +65,7 @@ public class NonTargetCatchReleaseServiceLocal extends ObserveServiceLocal imple log.trace("loadForm(" + setSeineId + ")"); } - SetSeine setSeine = SET_SEINE_NON_TARGET_RELEASE_SPI.loadEntity(getTopiaPersistenceContext(),setSeineId); + SetSeine setSeine = SET_SEINE_NON_TARGET_RELEASE_SPI.loadEntity(getTopiaPersistenceContext(), setSeineId); return SET_SEINE_NON_TARGET_RELEASE_SPI.dataEntityToForm(setSeine, getReferentialLocale()); } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.referential; * 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>. @@ -41,6 +41,7 @@ import fr.ird.observe.dto.referential.ReferenceStatus; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.SpeciesDto; import fr.ird.observe.dto.referential.SpeciesGroupDto; +import fr.ird.observe.dto.referential.SpeciesGroupHelper; import fr.ird.observe.dto.referential.seine.ObservedSystemReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.ObserveDataEntity; @@ -82,7 +83,6 @@ import org.nuiton.topia.persistence.script.TopiaSqlScript; import org.nuiton.version.Version; import org.nuiton.version.Versions; -import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.LinkedHashSet; @@ -99,12 +99,6 @@ import java.util.Set; */ public class ReferentialServiceLocal extends ObserveServiceLocal implements ReferentialService { - public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( - "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075" - ); private static final Logger log = LogManager.getLogger(ReferentialServiceLocal.class); @Override @@ -151,12 +145,24 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe @Override public ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup() { ImmutableSet.Builder<SpeciesGroupDto> result = ImmutableSet.builder(); - for (String speciesGroupId : SPECIES_GROUP_IDS) { + for (String speciesGroupId : SpeciesGroupHelper.SPECIES_GROUP_IDS) { result.add(loadSpeciesGroup(speciesGroupId)); } return result.build(); } + @Override + public <D extends ReferentialDto> D loadDto(Class<D> type, String id) { + ReferentialDtoEntityContext<D, ?, ?> spi = DbModelHelper.fromReferentialDto(type); + ObserveReferentialEntity entity = loadEntity(type, id); + D dto = spi.toDto(serviceContext.getReferentialLocale(), entity); + dto.setVersion(entity.getTopiaVersion()); + dto.setCreateDate(entity.getTopiaCreateDate()); + dto.setLastUpdateDate(entity.getLastUpdateDate()); + dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); + return dto; + } + @Override public <D extends ReferentialDto> Form<D> loadForm(Class<D> type, String id) { ReferentialDtoEntityContext<D, ?, ?> spi = DbModelHelper.fromReferentialDto(type); ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.service.referential; * 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>. @@ -87,7 +87,11 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission @Get - <R extends ReferentialDto> Form<R> loadForm(Class<R> type, String id); + <D extends ReferentialDto> D loadDto(Class<D> type, String id); + + @ReadReferentialPermission + @Get + <D extends ReferentialDto> Form<D> loadForm(Class<D> type, String id); @Get @ReadReferentialPermission @@ -95,22 +99,24 @@ public interface ReferentialService extends ObserveService { @Get @WriteReferentialPermission - <R extends ReferentialDto> Form<R> preCreate(Class<R> type); + <D extends ReferentialDto> Form<D> preCreate(Class<D> type); @WriteReferentialPermission @Write @Post - <R extends ReferentialDto> SaveResultDto save(R bean); + <D extends ReferentialDto> SaveResultDto save(D bean); @WriteReferentialPermission + @WriteDataPermission @Write @Delete - <R extends ReferentialDto> void delete(Class<R> type, String id); + <D extends ReferentialDto> void delete(Class<D> type, String id); @Post @WriteReferentialPermission + @WriteDataPermission @Write - <E extends ReferentialDto> void replaceReference(Class<E> beanType, String idToReplace, String replaceId); + <D extends ReferentialDto> void replaceReference(Class<D> beanType, String idToReplace, String replaceId); @Post(useMultiPartForm = true) @ReadReferentialPermission @@ -118,13 +124,12 @@ public interface ReferentialService extends ObserveService { @Get @ReadReferentialPermission - <R extends ReferentialDto> boolean exists(Class<R> type, String id); + <D extends ReferentialDto> boolean exists(Class<D> type, String id); @ReadReferentialPermission @Post ImmutableSetStringMap getReferentialIds(); - @ReadReferentialPermission @ReadDataPermission @Post(useMultiPartForm = true) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/41aadc596cd44e2163941e68397… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/41aadc596cd44e2163941e68397… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Revert referential write service + improve some code
by Tony CHEMIT 14 Jan '19

14 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 829c17d6 by tchemit at 2019-01-14T14:37:28Z Revert referential write service + improve some code - - - - - 4 changed files: - + dto/src/main/java/fr/ird/observe/dto/referential/common/SpeciesGroupHelper.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/NonTargetCatchReleaseServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== dto/src/main/java/fr/ird/observe/dto/referential/common/SpeciesGroupHelper.java ===================================== @@ -0,0 +1,36 @@ +package fr.ird.observe.dto.referential.common; + +/*- + * #%L + * ObServe :: Dto + * %% + * 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 java.util.Arrays; +import java.util.List; + +public class SpeciesGroupHelper extends GeneratedSpeciesGroupHelper { + //FIXME PROTECTED-ID + public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( + "fr.ird.referential.common.SpeciesGroup#1445863056144#0.9820877553253712", + "fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461", + "fr.ird.referential.common.SpeciesGroup#1446014286433#0.6480183366605247", + "fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075" + ); +} ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/NonTargetCatchReleaseServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.data.seine; * 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>. @@ -26,15 +26,16 @@ import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.SpeciesReference; +import fr.ird.observe.dto.referential.common.SpeciesGroupHelper; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.local.service.ObserveServiceLocal; -import fr.ird.observe.services.local.service.referential.ReferentialServiceLocal; import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; -import java.util.stream.Collectors; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.stream.Collectors; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -54,7 +55,7 @@ public class NonTargetCatchReleaseServiceLocal extends ObserveServiceLocal imple return SPECIES_SPI.toReferentialReferenceSet(setSeine.getNonTargetCatch().stream() .map(NonTargetCatch::getSpecies) .distinct() - .filter(s -> ReferentialServiceLocal.SPECIES_GROUP_IDS.contains(s.getSpeciesGroup().getTopiaId())) + .filter(s -> SpeciesGroupHelper.SPECIES_GROUP_IDS.contains(s.getSpeciesGroup().getTopiaId())) .collect(Collectors.toList()), getReferentialLocale(), null); } @@ -64,7 +65,7 @@ public class NonTargetCatchReleaseServiceLocal extends ObserveServiceLocal imple log.trace("loadForm(" + setSeineId + ")"); } - SetSeine setSeine = SET_SEINE_NON_TARGET_RELEASE_SPI.loadEntity(getTopiaPersistenceContext(),setSeineId); + SetSeine setSeine = SET_SEINE_NON_TARGET_RELEASE_SPI.loadEntity(getTopiaPersistenceContext(), setSeineId); return SET_SEINE_NON_TARGET_RELEASE_SPI.dataEntityToForm(setSeine, getReferentialLocale()); } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.referential; * 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>. @@ -41,6 +41,7 @@ import fr.ird.observe.dto.referential.ReferenceStatus; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.SpeciesDto; import fr.ird.observe.dto.referential.SpeciesGroupDto; +import fr.ird.observe.dto.referential.common.SpeciesGroupHelper; import fr.ird.observe.dto.referential.seine.ObservedSystemReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.ObserveDataEntity; @@ -82,7 +83,6 @@ import org.nuiton.topia.persistence.script.TopiaSqlScript; import org.nuiton.version.Version; import org.nuiton.version.Versions; -import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.LinkedHashSet; @@ -99,12 +99,6 @@ import java.util.Set; */ public class ReferentialServiceLocal extends ObserveServiceLocal implements ReferentialService { - public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( - "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075" - ); private static final Logger log = LogManager.getLogger(ReferentialServiceLocal.class); @Override @@ -151,12 +145,24 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe @Override public ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup() { ImmutableSet.Builder<SpeciesGroupDto> result = ImmutableSet.builder(); - for (String speciesGroupId : SPECIES_GROUP_IDS) { + for (String speciesGroupId : SpeciesGroupHelper.SPECIES_GROUP_IDS) { result.add(loadSpeciesGroup(speciesGroupId)); } return result.build(); } + @Override + public <D extends ReferentialDto> D loadDto(Class<D> type, String id) { + ReferentialDtoEntityContext<D, ?, ?> spi = DbModelHelper.fromReferentialDto(type); + ObserveReferentialEntity entity = loadEntity(type, id); + D dto = spi.toDto(serviceContext.getReferentialLocale(), entity); + dto.setVersion(entity.getTopiaVersion()); + dto.setCreateDate(entity.getTopiaCreateDate()); + dto.setLastUpdateDate(entity.getLastUpdateDate()); + dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); + return dto; + } + @Override public <D extends ReferentialDto> Form<D> loadForm(Class<D> type, String id) { ReferentialDtoEntityContext<D, ?, ?> spi = DbModelHelper.fromReferentialDto(type); ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.service.referential; * 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>. @@ -87,7 +87,11 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission @Get - <R extends ReferentialDto> Form<R> loadForm(Class<R> type, String id); + <D extends ReferentialDto> D loadDto(Class<D> type, String id); + + @ReadReferentialPermission + @Get + <D extends ReferentialDto> Form<D> loadForm(Class<D> type, String id); @Get @ReadReferentialPermission @@ -95,22 +99,24 @@ public interface ReferentialService extends ObserveService { @Get @WriteReferentialPermission - <R extends ReferentialDto> Form<R> preCreate(Class<R> type); + <D extends ReferentialDto> Form<D> preCreate(Class<D> type); @WriteReferentialPermission @Write @Post - <R extends ReferentialDto> SaveResultDto save(R bean); + <D extends ReferentialDto> SaveResultDto save(D bean); @WriteReferentialPermission + @WriteDataPermission @Write @Delete - <R extends ReferentialDto> void delete(Class<R> type, String id); + <D extends ReferentialDto> void delete(Class<D> type, String id); @Post @WriteReferentialPermission + @WriteDataPermission @Write - <E extends ReferentialDto> void replaceReference(Class<E> beanType, String idToReplace, String replaceId); + <D extends ReferentialDto> void replaceReference(Class<D> beanType, String idToReplace, String replaceId); @Post(useMultiPartForm = true) @ReadReferentialPermission @@ -118,13 +124,12 @@ public interface ReferentialService extends ObserveService { @Get @ReadReferentialPermission - <R extends ReferentialDto> boolean exists(Class<R> type, String id); + <D extends ReferentialDto> boolean exists(Class<D> type, String id); @ReadReferentialPermission @Post ImmutableSetStringMap getReferentialIds(); - @ReadReferentialPermission @ReadDataPermission @Post(useMultiPartForm = true) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/829c17d6e0d5b3e4317f08de217… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/829c17d6e0d5b3e4317f08de217… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update changlog
by Tony CHEMIT 14 Jan '19

14 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9a7cfe83 by tchemit at 2019-01-14T14:32:19Z update changlog - - - - - 7930297f by tchemit at 2019-01-14T14:33:08Z Revert referential write service + improve some code - - - - - 8 changed files: - .mvn/gitlab-cache/milestones/674086-issues.json - + .mvn/gitlab-cache/milestones/750347-issues.json - + .mvn/gitlab-cache/milestones/750347.json - CHANGELOG.md - + dto/src/main/java/fr/ird/observe/dto/referential/common/SpeciesGroupHelper.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/NonTargetCatchReleaseServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== .mvn/gitlab-cache/milestones/674086-issues.json ===================================== @@ -270,16 +270,16 @@ "state": "active" }, "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", "_state": "active", "_darkScheme": false, "_isAdmin": false, "_canCreateGroup": false, "_canCreateProject": false, "_canCreateTeam": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "author": { "_id": 1111318, @@ -294,7 +294,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, "state": "opened", - "updatedAt": "Dec 4, 2018 1:51:17 PM", + "updatedAt": "Jan 10, 2019 3:07:42 PM", "createdAt": "Oct 5, 2018 9:28:31 PM" }, { @@ -366,16 +366,16 @@ "state": "active" }, "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", "_state": "active", "_darkScheme": false, "_isAdmin": false, "_canCreateGroup": false, "_canCreateProject": false, "_canCreateTeam": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "author": { "_id": 1111318, @@ -390,7 +390,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, "state": "opened", - "updatedAt": "Dec 4, 2018 1:51:16 PM", + "updatedAt": "Jan 8, 2019 3:46:42 PM", "createdAt": "Oct 5, 2018 1:31:54 PM" }, { @@ -587,7 +587,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "state": "opened", - "updatedAt": "Dec 4, 2018 1:50:50 PM", + "updatedAt": "Jan 11, 2019 10:05:19 AM", "createdAt": "Mar 27, 2018 3:13:54 PM" } ] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/750347-issues.json ===================================== @@ -0,0 +1,179 @@ +[ + { + "id": 17290869, + "iid": 1197, + "projectId": 2722779, + "title": "Impossible de voir les utilisations de référentiel si connecté en mode referentiel", + "description": "Le service ``fr.ird.observe.services.service.referential.ReferentialService#findAllUsages`` :\n\n```\n@ReadReferentialPermission\n@ReadDataPermission\n\u003cR extends ReferentialDto\u003e ImmutableSetDtoMap\u003cDtoReference\u003e findAllUsages(Class\u003cR\u003e beanType, String id);\n```\n\nrequière un droit de lecture des données, et donc ne fonctionne pas.\n\nIl y a d\u0027autres cas du même style qui empêche le bon fonctionnement du système.\n\nSe pose la question de savoir si on peut modifier des données métier même en étant connecté référentiel. En effet par exemple lors de la suppression d\u0027un référentiel, il se peut qu\u0027on demande d\u0027effectuer un remplacement ce qui impacte des données métiers.\n\nPour le moment je vais autoriser le cas, à voir si on ne pourrait pas être plus fin en interdisant les actions qui vont modifier des données métier lors d\u0027une modification d\u0027un référentiel.\n\nVoir #1196", + "labels": [ + "Anomalie", + "Contrat AZTI-2017" + ], + "milestone": { + "id": 750347, + "iid": 132, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.2", + "description": "", + "startDate": "Jan 3, 2019 1:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Jan 14, 2019 12:05:39 PM", + "createdAt": "Jan 12, 2019 4:29:22 PM" + }, + { + "id": 17163582, + "iid": 1196, + "projectId": 2722779, + "title": "Tentative d\u0027ouverture d\u0027une base avec des droits \"référentiel\" échoue", + "description": "Les comptes de type \"référentiel\" ne permettent que de lire le référentiel/le mettre à jour dans une base locale.\r\n\r\nDonc lorsqu\u0027on tente d\u0027ouvrir une base locale (en mode serveur par exemple) avec un login référentiel, l\u0027arbre doit montrer les 3 entrées de référentiel (commun, longline, seine).\r\n\r\nOr actuellement en 7.0.1, cela ne s\u0027ouvre pas et provoque une exception :\r\n\r\n![image](/uploads/b483bd000b555002ee7f8128c393f1ab/image.png)\r\n\r\nLog serveur :\r\n\r\n```\r\nINFO 2019-01-08T12:23:43,432 [ajp-nio-8009-exec-103] ObserveDataSourceConfigurationInjector : 71 - Inject dataSourceConfiguration: ObserveDataSourceConfigurationRest{label\u003dServeur Distant, serverUrl\u003dhttps://vmot5-proto.ird.fr/observeweb/api/v1, login\u003dreferentielweb, password\u003d***, optionalDatabaseName\u003dnull, modelVersion\u003d7.0}\r\nINFO 2019-01-08T12:23:43,433 [ajp-nio-8009-exec-103] ObserveDtoInjector : 98 - Inject observeDto: ObserveDataSourceConfigurationRest{label\u003dServeur Distant, serverUrl\u003dhttps://vmot5-proto.ird.fr/observeweb/api/v1, login\u003dreferentielweb, password\u003d***, optionalDatabaseName\u003dnull, modelVersion\u003d7.0}\r\nINFO 2019-01-08T12:23:43,435 [ajp-nio-8009-exec-103] ObserveWebSecurityApplicationContext : 171 - Try to find data source configuration for: referentielweb--production\r\nINFO 2019-01-08T12:23:43,436 [ajp-nio-8009-exec-103] ObserveWebSecurityApplicationContext : 183 - Will use database configuration: ObserveDataSourceConfigurationTopiaPG{label\u003dreferentielweb--production, jdbcUrl\u003djdbc:postgresql:observe, username\u003dreferentiel, password\u003d***, useSsl\u003dtrue}\r\nINFO 2019-01-08T12:23:43,436 [ajp-nio-8009-exec-103] ObserveServiceMainFactory : 107 - New service created: fr.ird.observe.services.local.service.DataSourceServiceLocal@774a2135\r\nINFO 2019-01-08T12:23:44,103 [ajp-nio-8009-exec-105] ObserveDataSourceConfigurationInjector : 71 - Inject dataSourceConfiguration: ObserveDataSourceConfigurationRest{label\u003dServeur Distant, serverUrl\u003dhttps://vmot5-proto.ird.fr/observeweb/api/v1, login\u003dreferentielweb, password\u003d***, optionalDatabaseName\u003dnull, modelVersion\u003d7.0}\r\nINFO 2019-01-08T12:23:44,104 [ajp-nio-8009-exec-105] ObserveDtoInjector : 98 - Inject observeDto: ObserveDataSourceConfigurationRest{label\u003dServeur Distant, serverUrl\u003dhttps://vmot5-proto.ird.fr/observeweb/api/v1, login\u003dreferentielweb, password\u003d***, optionalDatabaseName\u003dnull, modelVersion\u003d7.0}\r\nINFO 2019-01-08T12:23:44,105 [ajp-nio-8009-exec-105] ObserveWebSecurityApplicationContext : 171 - Try to find data source configuration for: referentielweb--production\r\nINFO 2019-01-08T12:23:44,105 [ajp-nio-8009-exec-105] ObserveWebSecurityApplicationContext : 183 - Will use database configuration: ObserveDataSourceConfigurationTopiaPG{label\u003dreferentielweb--production, jdbcUrl\u003djdbc:postgresql:observe, username\u003dreferentiel, password\u003d***, useSsl\u003dtrue}\r\nINFO 2019-01-08T12:23:44,105 [ajp-nio-8009-exec-105] ObserveServiceMainFactory : 107 - New service created: fr.ird.observe.services.local.service.DataSourceServiceLocal@1aa5cfa\r\nINFO 2019-01-08T12:23:44,130 [ajp-nio-8009-exec-105] ObserveTopiaApplicationContextFactory : 156 - Create Postgresql topia application context: ObserveDataSourceConfigurationTopiaPG{label\u003dreferentielweb--production, jdbcUrl\u003djdbc:postgresql:observe, username\u003dreferentiel, password\u003d***, useSsl\u003dtrue}\r\nINFO 2019-01-08T12:23:44,131 [ajp-nio-8009-exec-105] TopiaServiceSupportImpl : 99 - instantiated service migration: org.nuiton.topia.service.migration.TopiaMigrationService@3205cea1\r\nINFO 2019-01-08T12:23:44,132 [ajp-nio-8009-exec-105] TopiaServiceSupportImpl : 99 - instantiated service sqlScriptGenerator: org.nuiton.topia.service.script.TopiaSqlScriptGeneratorServiceImpl@6f0fea0a\r\nINFO 2019-01-08T12:23:44,132 [ajp-nio-8009-exec-105] TopiaServiceSupportImpl : 125 - will init service sqlScriptGenerator with configuration {}\r\nINFO 2019-01-08T12:23:44,132 [ajp-nio-8009-exec-105] TopiaServiceSupportImpl : 125 - will init service migration with configuration {}\r\nINFO 2019-01-08T12:23:44,133 [ajp-nio-8009-exec-105] AbstractTopiaApplicationContext : 148 - Schema initialization disabled\r\nINFO 2019-01-08T12:23:44,315 [ajp-nio-8009-exec-105] HibernateProvider : 168 - will start hibernate with configuration {hibernate.hikari.autoCommit\u003dfalse, hibernate.hikari.minimumIdle\u003d2, hibernate.use_sql_comments\u003dfalse, hibernate.connection.driver_class\u003dorg.postgresql.Driver, hibernate.dialect\u003dorg.hibernate.dialect.PostgreSQL9Dialect, hibernate.format_sql\u003dfalse, hibernate.ejb.naming_strategy\u003dorg.hibernate.cfg.ImprovedNamingStrategy, hibernate.connection.username\u003dreferentiel, hibernate.connection.url\u003djdbc:postgresql:observe, hibernate.connection.provider_class\u003dorg.hibernate.hikaricp.internal.HikariCPConnectionProvider, hibernate.connection.password\u003dref8obstuna, hibernate.bytecode.provider\u003dbytebuddy, hibernate.hikari.maximumPoolSize\u003d20}\r\nINFO 2019-01-08T12:23:44,320 [ajp-nio-8009-exec-105] ObserveWebSecurityAuthenticationTokenCache : 75 - Add authenticationToken: 3c9c306e-faa7-4592-b95c-6702d3164e90 for data source configuration: ObserveDataSourceConfigurationTopiaPG{label\u003dreferentielweb--production, jdbcUrl\u003djdbc:postgresql:observe, username\u003dreferentiel, password\u003d***, useSsl\u003dtrue}\r\nINFO 2019-01-08T12:23:44,490 [ajp-nio-8009-exec-106] ObserveDtoInjector : 98 - Inject observeDto: fr.ird.observe.services.service.data.NavigationRequest@a78a445\r\nINFO 2019-01-08T12:23:44,491 [ajp-nio-8009-exec-106] ObserveServiceMainFactory : 107 - New service created: fr.ird.observe.services.local.service.data.NavigationServiceLocal@59d9e2a6\r\nERROR 2019-01-08T12:23:45,233 [ajp-nio-8009-exec-106] ObserveServiceFactoryLocal$ObserveServiceInvocationHandler : 245 - Error in method getNavigation\r\nfr.ird.observe.services.security.UnauthorizedException: null\r\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:218) ~[ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.class:7.0.1]\r\n\tat com.sun.proxy.$Proxy415.getAllTripSeine(Unknown Source) ~[?:?]\r\n\tat fr.ird.observe.services.local.service.data.NavigationServiceLocal.getNavigation(NavigationServiceLocal.java:70) ~[NavigationServiceLocal.class:7.0.1]\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:1.8.0_71]\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:1.8.0_71]\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_71]\r\n\tat java.lang.reflect.Method.invoke(Method.java:497) ~[?:1.8.0_71]\r\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethod(ObserveServiceFactoryLocal.java:242) [ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.class:7.0.1]\r\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethodWithTransaction(ObserveServiceFactoryLocal.java:263) [ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.class:7.0.1]\r\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:230) [ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.class:7.0.1]\r\n\tat com.sun.proxy.$Proxy405.getNavigation(Unknown Source) [?:?]\r\n\tat fr.ird.observe.server.controller.v1.data.GeneratedNavigationServiceRestApi.getNavigation(GeneratedNavigationServiceRestApi.java:46) [GeneratedNavigationServiceRestApi.class:7.0.1]\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:1.8.0_71]\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:1.8.0_71]\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_71]\r\n\tat java.lang.reflect.Method.invoke(Method.java:497) ~[?:1.8.0_71]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:255) [ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:225) [ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:73) [WebMotionFilter.class:?]\r\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:61) [WebMotionFilter.class:?]\r\n\tat fr.ird.observe.server.ObserveWebMotionFilter.inject(ObserveWebMotionFilter.java:68) [ObserveWebMotionFilter.class:7.0.1]\r\n\tat sun.reflect.GeneratedMethodAccessor2370.invoke(Unknown Source) ~[?:?]\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_71]\r\n\tat java.lang.reflect.Method.invoke(Method.java:497) ~[?:1.8.0_71]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processFilter(ExecutorMethodInvokerHandler.java:310) [ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:222) [ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler.handle(ExecutorMethodInvokerHandler.java:120) [ExecutorMethodInvokerHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionMainHandler.chainHandlers(WebMotionMainHandler.java:270) [WebMotionMainHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionMainHandler.handleExecutors(WebMotionMainHandler.java:260) [WebMotionMainHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionMainHandler.handle(WebMotionMainHandler.java:196) [WebMotionMainHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionServer.doAction(WebMotionServer.java:159) [WebMotionServer.class:?]\r\n\tat org.debux.webmotion.server.WebMotionServer.doFilter(WebMotionServer.java:136) [WebMotionServer.class:?]\r\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:106) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:503) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:136) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:74) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:610) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:526) [catalina.jar:8.0.5]\r\n\tat org.apache.coyote.ajp.AbstractAjpProcessor.process(AbstractAjpProcessor.java:794) [tomcat-coyote.jar:8.0.5]\r\n\tat org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:652) [tomcat-coyote.jar:8.0.5]\r\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1575) [tomcat-coyote.jar:8.0.5]\r\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1533) [tomcat-coyote.jar:8.0.5]\r\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [?:1.8.0_71]\r\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [?:1.8.0_71]\r\n\tat java.lang.Thread.run(Thread.java:745) [?:1.8.0_71]\r\nERROR 2019-01-08T12:23:45,237 [ajp-nio-8009-exec-106] WebMotionMainHandler : 256 - Error 500 : Error during invoke method for action fr.ird.observe.server.controller.v1.data.NavigationServiceRestApi on method getNavigation on /observeweb/api/v1/data/NavigationService/getNavigation\r\norg.debux.webmotion.server.WebMotionException: Error during invoke method for action fr.ird.observe.server.controller.v1.data.NavigationServiceRestApi on method getNavigation\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:283) ~[ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:225) ~[ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:73) ~[WebMotionFilter.class:?]\r\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:61) ~[WebMotionFilter.class:?]\r\n\tat fr.ird.observe.server.ObserveWebMotionFilter.inject(ObserveWebMotionFilter.java:68) ~[ObserveWebMotionFilter.class:7.0.1]\r\n\tat sun.reflect.GeneratedMethodAccessor2370.invoke(Unknown Source) ~[?:?]\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_71]\r\n\tat java.lang.reflect.Method.invoke(Method.java:497) ~[?:1.8.0_71]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processFilter(ExecutorMethodInvokerHandler.java:310) ~[ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:222) ~[ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler.handle(ExecutorMethodInvokerHandler.java:120) ~[ExecutorMethodInvokerHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionMainHandler.chainHandlers(WebMotionMainHandler.java:270) ~[WebMotionMainHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionMainHandler.handleExecutors(WebMotionMainHandler.java:260) ~[WebMotionMainHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionMainHandler.handle(WebMotionMainHandler.java:196) ~[WebMotionMainHandler.class:?]\r\n\tat org.debux.webmotion.server.WebMotionServer.doAction(WebMotionServer.java:159) ~[WebMotionServer.class:?]\r\n\tat org.debux.webmotion.server.WebMotionServer.doFilter(WebMotionServer.java:136) ~[WebMotionServer.class:?]\r\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239) ~[catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) ~[catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219) ~[catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:106) ~[catalina.jar:8.0.5]\r\n\tat org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:503) ~[catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:136) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:74) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:610) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88) [catalina.jar:8.0.5]\r\n\tat org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:526) [catalina.jar:8.0.5]\r\n\tat org.apache.coyote.ajp.AbstractAjpProcessor.process(AbstractAjpProcessor.java:794) [tomcat-coyote.jar:8.0.5]\r\n\tat org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:652) [tomcat-coyote.jar:8.0.5]\r\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1575) [tomcat-coyote.jar:8.0.5]\r\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1533) [tomcat-coyote.jar:8.0.5]\r\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [?:1.8.0_71]\r\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [?:1.8.0_71]\r\n\tat java.lang.Thread.run(Thread.java:745) [?:1.8.0_71]\r\nCaused by: java.lang.reflect.InvocationTargetException\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:1.8.0_71]\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:1.8.0_71]\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_71]\r\n\tat java.lang.reflect.Method.invoke(Method.java:497) ~[?:1.8.0_71]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:255) ~[ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\t... 32 more\r\nCaused by: fr.ird.observe.services.security.UnauthorizedException\r\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:218) ~[ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.class:7.0.1]\r\n\tat com.sun.proxy.$Proxy415.getAllTripSeine(Unknown Source) ~[?:?]\r\n\tat fr.ird.observe.services.local.service.data.NavigationServiceLocal.getNavigation(NavigationServiceLocal.java:70) ~[NavigationServiceLocal.class:7.0.1]\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:1.8.0_71]\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:1.8.0_71]\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_71]\r\n\tat java.lang.reflect.Method.invoke(Method.java:497) ~[?:1.8.0_71]\r\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethod(ObserveServiceFactoryLocal.java:242) ~[ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.class:7.0.1]\r\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethodWithTransaction(ObserveServiceFactoryLocal.java:263) ~[ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.class:7.0.1]\r\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:230) ~[ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.class:7.0.1]\r\n\tat com.sun.proxy.$Proxy405.getNavigation(Unknown Source) ~[?:?]\r\n\tat fr.ird.observe.server.controller.v1.data.GeneratedNavigationServiceRestApi.getNavigation(GeneratedNavigationServiceRestApi.java:46) ~[GeneratedNavigationServiceRestApi.class:7.0.1]\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:1.8.0_71]\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:1.8.0_71]\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_71]\r\n\tat java.lang.reflect.Method.invoke(Method.java:497) ~[?:1.8.0_71]\r\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:255) ~[ExecutorMethodInvokerHandler$RunnableHandler.class:?]\r\n\t... 32 more\r\n```\r\n\r\nL\u0027utilisation de ce même login pour mettre à jour des référentiels locaux, ou pour générer des bases locales vierges, fonctionne très bien par contre.", + "labels": [], + "milestone": { + "id": 750347, + "iid": 132, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.2", + "description": "", + "startDate": "Jan 3, 2019 1:00:00 AM", + "state": "active" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Jan 12, 2019 4:29:22 PM", + "createdAt": "Jan 8, 2019 12:28:18 PM" + }, + { + "id": 17161863, + "iid": 1194, + "projectId": 2722779, + "title": "Nommage des fichier de log du serveur 7.0.1", + "description": "Les fichiers de log de la 7.0.1 continuent d\u0027être suffixés 7.0.0.\n\nServeur : \n![image](/uploads/9592cf6049a04c8e664268b7f5603568/image.png)\n\nLogs :\n![image](/uploads/3bf20641945a6a1091fd71adc8531f4c/image.png)\n\nCôté client, ils sont bien suffixés 7.0.1", + "labels": [ + "Anomalie", + "Contrat AZTI-2017" + ], + "milestone": { + "id": 750347, + "iid": 132, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.2", + "description": "", + "startDate": "Jan 3, 2019 1:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Jan 10, 2019 7:38:48 AM", + "createdAt": "Jan 8, 2019 11:37:49 AM" + }, + { + "id": 17161807, + "iid": 1193, + "projectId": 2722779, + "title": "[UI REFERNETIEL] Personne : impossible d\u0027afficher les éléments liés à une personne", + "description": "UI référence : impossible d\u0027afficher les éléments liés à une personne (en mode serveur)\n\n![image](/uploads/21f59cb20d76b5ee75e8fc532ca9bc04/image.png)\n\nLog client vierge : [observe-7.0.1.log](/uploads/56f9731936f95fa39d68549a24533935/observe-7.0.1.log)\n\nLog serveur (pertinent) : [observeweb-7.0.0.log](/uploads/71e80e3444ece3775a9e03c932387a20/observeweb-7.0.0.log)\n\nNote : les fichiers de log côté serveur de la 7.0.1 semblent continuer à être nommés xxx-7.0.0, mais c\u0027est bien la 7.0.1 qui tourne : \n![image](/uploads/f735b25070824d1bac90a90c0b95d282/image.png)", + "labels": [ + "Anomalie", + "Contrat AZTI-2017" + ], + "milestone": { + "id": 750347, + "iid": 132, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.2", + "description": "", + "startDate": "Jan 3, 2019 1:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Jan 11, 2019 10:05:19 AM", + "createdAt": "Jan 8, 2019 11:35:18 AM" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/750347.json ===================================== @@ -0,0 +1,10 @@ +{ + "id": 750347, + "iid": 132, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.2", + "description": "", + "startDate": "Jan 3, 2019 1:00:00 AM", + "state": "active" +} \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-01-02 15:53. + * Last generated at 2019-01-14 12:20. ## Version [8.0-alpha-4](https://gitlab.com/ultreiaio/ird-observe/milestones/115) Seconde partie du troisième lot du contrat IRD-2018-01-V8.
contient fonctionnalités avancées. ===================================== dto/src/main/java/fr/ird/observe/dto/referential/common/SpeciesGroupHelper.java ===================================== @@ -0,0 +1,36 @@ +package fr.ird.observe.dto.referential.common; + +/*- + * #%L + * ObServe :: Dto + * %% + * 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 java.util.Arrays; +import java.util.List; + +public class SpeciesGroupHelper extends GeneratedSpeciesGroupHelper { + //FIXME PROTECTED-ID + public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( + "fr.ird.referential.common.SpeciesGroup#1445863056144#0.9820877553253712", + "fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461", + "fr.ird.referential.common.SpeciesGroup#1446014286433#0.6480183366605247", + "fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075" + ); +} ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/NonTargetCatchReleaseServiceLocal.java ===================================== @@ -25,12 +25,12 @@ package fr.ird.observe.services.local.service.data.ps.observation; import fr.ird.observe.dto.data.ps.observation.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; +import fr.ird.observe.dto.referential.common.SpeciesGroupHelper; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.data.ps.observation.NonTargetCatch; import fr.ird.observe.entities.data.ps.observation.SetSeine; import fr.ird.observe.services.local.service.ObserveServiceLocal; -import fr.ird.observe.services.local.service.referential.ReferentialServiceLocal; import fr.ird.observe.services.service.data.ps.observation.NonTargetCatchReleaseService; import java.util.stream.Collectors; @@ -46,7 +46,7 @@ public class NonTargetCatchReleaseServiceLocal extends ObserveServiceLocal imple return SPECIES_SPI.toReferentialReferenceSet(setSeine.getNonTargetCatch().stream() .map(NonTargetCatch::getSpecies) .distinct() - .filter(s -> ReferentialServiceLocal.SPECIES_GROUP_IDS.contains(s.getSpeciesGroup().getTopiaId())) + .filter(s -> SpeciesGroupHelper.SPECIES_GROUP_IDS.contains(s.getSpeciesGroup().getTopiaId())) .collect(Collectors.toList()), getReferentialLocale(), null); } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== @@ -41,6 +41,7 @@ import fr.ird.observe.dto.referential.ReferenceStatus; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.common.SpeciesDto; import fr.ird.observe.dto.referential.common.SpeciesGroupDto; +import fr.ird.observe.dto.referential.common.SpeciesGroupHelper; import fr.ird.observe.dto.referential.ps.observation.ObservedSystemReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.Entities; @@ -82,7 +83,6 @@ import org.nuiton.topia.persistence.script.TopiaSqlScript; import org.nuiton.version.Version; import org.nuiton.version.Versions; -import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.LinkedHashSet; @@ -99,13 +99,6 @@ import java.util.Set; */ public class ReferentialServiceLocal extends ObserveServiceLocal implements ReferentialService { - //FIXME PROTECTED-ID - public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( - "fr.ird.referential.common.SpeciesGroup#1445863056144#0.9820877553253712", - "fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461", - "fr.ird.referential.common.SpeciesGroup#1446014286433#0.6480183366605247", - "fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075" - ); private static final Logger log = LogManager.getLogger(ReferentialServiceLocal.class); @Override @@ -152,12 +145,24 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe @Override public ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup() { ImmutableSet.Builder<SpeciesGroupDto> result = ImmutableSet.builder(); - for (String speciesGroupId : SPECIES_GROUP_IDS) { + for (String speciesGroupId : SpeciesGroupHelper.SPECIES_GROUP_IDS) { result.add(loadSpeciesGroup(speciesGroupId)); } return result.build(); } + @Override + public <D extends ReferentialDto> D loadDto(Class<D> type, String id) { + ReferentialDtoEntityContext<D, ?, ?> spi = DbModelHelper.fromReferentialDto(type); + ObserveReferentialEntity entity = loadEntity(type, id); + D dto = spi.toDto(serviceContext.getReferentialLocale(), entity); + dto.setVersion(entity.getTopiaVersion()); + dto.setCreateDate(entity.getTopiaCreateDate()); + dto.setLastUpdateDate(entity.getLastUpdateDate()); + dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); + return dto; + } + @Override public <D extends ReferentialDto> Form<D> loadForm(Class<D> type, String id) { ReferentialDtoEntityContext<D, ?, ?> spi = DbModelHelper.fromReferentialDto(type); ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== @@ -87,7 +87,11 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission @Get - <R extends ReferentialDto> Form<R> loadForm(Class<R> type, String id); + <D extends ReferentialDto> D loadDto(Class<D> type, String id); + + @ReadReferentialPermission + @Get + <D extends ReferentialDto> Form<D> loadForm(Class<D> type, String id); @Get @ReadReferentialPermission @@ -95,36 +99,37 @@ public interface ReferentialService extends ObserveService { @Get @WriteReferentialPermission - <R extends ReferentialDto> Form<R> preCreate(Class<R> type); + <D extends ReferentialDto> Form<D> preCreate(Class<D> type); @WriteReferentialPermission @Write @Post - <R extends ReferentialDto> SaveResultDto save(R bean); + <D extends ReferentialDto> SaveResultDto save(D bean); @WriteReferentialPermission + @WriteDataPermission @Write @Delete - <R extends ReferentialDto> void delete(Class<R> type, String id); + <D extends ReferentialDto> void delete(Class<D> type, String id); @Post @WriteReferentialPermission + @WriteDataPermission @Write - <E extends ReferentialDto> void replaceReference(Class<E> beanType, String idToReplace, String replaceId); + <D extends ReferentialDto> void replaceReference(Class<D> beanType, String idToReplace, String replaceId); @Post(useMultiPartForm = true) @ReadReferentialPermission - <R extends ReferentialDto> ImmutableSetDtoMap<DtoReference> findAllUsages(Class<R> beanType, String id); + <D extends ReferentialDto> ImmutableSetDtoMap<DtoReference> findAllUsages(Class<D> beanType, String id); @Get @ReadReferentialPermission - <R extends ReferentialDto> boolean exists(Class<R> type, String id); + <D extends ReferentialDto> boolean exists(Class<D> type, String id); @ReadReferentialPermission @Post ImmutableSetStringMap getReferentialIds(); - @ReadReferentialPermission @ReadDataPermission @Post(useMultiPartForm = true) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/63d7a5dec79439880408a41567… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/63d7a5dec79439880408a41567… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Impossible de voir les utilisations de référentiel si connecté en mode referentiel - Closes #1197
by Tony CHEMIT 14 Jan '19

14 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 71f0eba9 by tchemit at 2019-01-14T11:05:30Z Impossible de voir les utilisations de référentiel si connecté en mode referentiel - Closes #1197 - - - - - 1 changed file: - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== @@ -80,6 +80,11 @@ public interface ReferentialService extends ObserveService { @Get ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup(); + //FIXME charger cela dans le cache côté applicatif + @ReadReferentialPermission + @Get + List<ObservedSystemReference> loadObservedSystems(); + @ReadReferentialPermission @Get <R extends ReferentialDto> Form<R> loadForm(Class<R> type, String id); @@ -104,18 +109,15 @@ public interface ReferentialService extends ObserveService { @Post @WriteReferentialPermission - @WriteDataPermission @Write <E extends ReferentialDto> void replaceReference(Class<E> beanType, String idToReplace, String replaceId); @Post(useMultiPartForm = true) @ReadReferentialPermission - @ReadDataPermission <R extends ReferentialDto> ImmutableSetDtoMap<DtoReference> findAllUsages(R bean); @Get @ReadReferentialPermission - @ReadDataPermission <R extends ReferentialDto> boolean exists(Class<R> type, String id); @ReadReferentialPermission @@ -133,8 +135,4 @@ public interface ReferentialService extends ObserveService { @Post(useMultiPartForm = true) @Write void insertMissingReferential(TopiaSqlScript sqlContent); - - @ReadReferentialPermission - @Get - List<ObservedSystemReference> loadObservedSystems(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71f0eba930322c2da02b221c020… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71f0eba930322c2da02b221c020… You're receiving this email because of your account on gitlab.com.

1 0