This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 76ebec9a3adf965e93b48ab6617631a47d7529f9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:16:57 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (service) --- .../observe/services/dto/AbstractReference.java | 2 +- .../ReferentialReferenceSetDefinitions.java | 4 +- .../request/ReferenceSetRequestDefinitions.java | 7 +-- .../dto/referential/ReferentialHelper.java | 8 ++- .../dto/referential/SizeMeasureTypeHelper.java | 58 +++++++++++++++++++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 41934 -> 42563 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67604 -> 67880 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59419 -> 59655 bytes services-dto/src/main/xmi/observe-services-dto.ini | 5 +- .../actions/validate/ValidateServiceRestTest.java | 4 +- .../SizeMeasureType-service-error-validation.xml | 0 .../SizeMeasureType-service-warning-validation.xml | 0 .../WeightMeasureType-service-error-validation.xml | 0 ...eightMeasureType-service-warning-validation.xml | 0 .../TargetLength-service-error-validation.xml | 17 ++++++ .../services-topia-validation_en_GB.properties | 3 ++ .../services-topia-validation_es_ES.properties | 3 ++ .../services-topia-validation_fr_FR.properties | 3 ++ .../validation/BeanValidatorDetectorTest.java | 4 +- .../topia/binder/BinderEngineInitializer.java | 8 +-- .../topia/binder/data/SizeMeasureBinder.java | 4 +- .../topia/binder/data/TargetLengthBinder.java | 6 ++- .../topia/binder/data/WeightMeasureBinder.java | 4 +- .../binder/referential/SizeMeasureTypeBinder.java | 4 +- .../referential/WeightMeasureTypeBinder.java | 4 +- .../services/topia/binder/BinderEngineTest.java | 4 +- .../actions/validate/ValidateServiceTopiaTest.java | 4 +- .../src/main/filters/observe-reports.properties | 16 +++--- 28 files changed, 129 insertions(+), 43 deletions(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java b/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java index e27db6a..d6bac4a 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java @@ -158,7 +158,7 @@ public abstract class AbstractReference<D extends IdDto> implements ObserveDto, return labelPropertyNames; } - protected int getPropertyIndex(String propertyName) { + public int getPropertyIndex(String propertyName) { int index = labelPropertyNames.indexOf(propertyName); if (index == -1) { throw new ReferenceValueNotFoundException(type, propertyName); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index 31e9a49..98d93cc 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -37,12 +37,14 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.referential.VesselTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; @@ -63,11 +65,9 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java index 76876da..9140968 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java @@ -55,12 +55,14 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.referential.VesselTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; @@ -81,11 +83,9 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; @@ -335,7 +335,8 @@ public enum ReferenceSetRequestDefinitions { TARGET_SAMPLE_FORM( newBuilder(TargetLengthDto.class) - .addKey(TargetLengthDto.PROPERTY_SPECIES, SPECIES)), + .addKey(TargetLengthDto.PROPERTY_SPECIES, SPECIES) + .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, SIZE_MEASURE_TYPE)), NON_TARGET_SAMPLE_FORM( newBuilder(NonTargetLengthDto.class) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java index 9167511..66c5482 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java @@ -43,11 +43,9 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; @@ -78,6 +76,8 @@ public class ReferentialHelper extends GeneratedReferentialHelper { SexDto.class, FpaZoneDto.class, SpeciesListDto.class, + SizeMeasureTypeDto.class, + WeightMeasureTypeDto.class, PersonDto.class, OceanDto.class, OrganismDto.class, @@ -126,11 +126,9 @@ public class ReferentialHelper extends GeneratedReferentialHelper { SensorDataFormatDto.class, SensorTypeDto.class, SettingShapeDto.class, - SizeMeasureTypeDto.class, StomacFullnessDto.class, TripTypeDto.class, - VesselActivityLonglineDto.class, - WeightMeasureTypeDto.class); + VesselActivityLonglineDto.class); public static final ImmutableSet<Class<? extends ReferentialDto>> REFERENCE_DTOS = ImmutableSet.<Class<? extends ReferentialDto>>builder() .addAll(REFERENCE_COMMON_DTOS) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java new file mode 100644 index 0000000..db06793 --- /dev/null +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java @@ -0,0 +1,58 @@ +package fr.ird.observe.services.dto.referential; + +import com.google.common.collect.ImmutableSet; + +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; + +public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { + + public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("PDL","LD1"); + public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("LF", "FL"); + + public static List<ReferentialReference<SizeMeasureTypeDto>> filterForSeine(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { + return incoming.stream() + .filter(d -> isLd1(d) || isLf(d)) + .map(SizeMeasureTypeHelper::filterForSeine) + .collect(Collectors.toList()); + + } + + public static ReferentialReference<SizeMeasureTypeDto> filterForSeine(ReferentialReference<SizeMeasureTypeDto> incoming) { + int index = incoming.getPropertyIndex(SizeMeasureTypeDto.PROPERTY_LABEL); + String value; + if (isLd1(incoming)) { + value = "LD1"; + } else if (isLf(incoming)) { + value = "LF"; + } else { + throw new IllegalStateException("Can't manage with code: " + incoming); + } + incoming.getLabelPropertyValues()[index] = value; + return incoming; + } + + + public static boolean isLd1(ReferentialReference<SizeMeasureTypeDto> incoming) { + return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getPropertyValue(SizeMeasureTypeDto.PROPERTY_LABEL)); + } + + public static boolean isLf(ReferentialReference<SizeMeasureTypeDto> incoming) { + return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getPropertyValue(SizeMeasureTypeDto.PROPERTY_LABEL)); + } + + public static ReferentialReference<SizeMeasureTypeDto> getLd1(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { + return incoming.stream() + .filter(SizeMeasureTypeHelper::isLd1) + .findAny().get(); + + } + + public static ReferentialReference<SizeMeasureTypeDto> getLf(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { + return incoming.stream() + .filter(SizeMeasureTypeHelper::isLf) + .findAny().get(); + + } +} diff --git a/services-dto/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo index 2df0f74..33bb2d0 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-common.zargo and b/services-dto/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/services-dto/src/main/xmi/observe-services-dto-longline.zargo b/services-dto/src/main/xmi/observe-services-dto-longline.zargo index 4d91b77..561096d 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-longline.zargo and b/services-dto/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index 2c55ad2..a4dbe6c 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-dto/src/main/xmi/observe-services-dto.ini b/services-dto/src/main/xmi/observe-services-dto.ini index 836c60d..0652591 100644 --- a/services-dto/src/main/xmi/observe-services-dto.ini +++ b/services-dto/src/main/xmi/observe-services-dto.ini @@ -108,7 +108,7 @@ branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDt sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto [class fr.ird.observe.services.dto.longline.SizeMeasure] -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto +sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto [class fr.ird.observe.services.dto.longline.Tdr] basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto @@ -137,7 +137,7 @@ gearUseFeaturesLongline.ordered = true gearUseFeaturesLongline.unique = true [class fr.ird.observe.services.dto.longline.WeightMeasure] -weightMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto +weightMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.WeightMeasureTypeDto [class fr.ird.observe.services.dto.referential.Gear] gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristic @@ -240,6 +240,7 @@ weightCategory.attributeGeneric = fr.ird.observe.services.dto.referential.seine. [class fr.ird.observe.services.dto.seine.TargetLength] species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto +sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto [class fr.ird.observe.services.dto.seine.TargetSample] targetLength.unique = true diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java index 1b600dd..1acef05 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java @@ -64,11 +64,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-error-validation.xml similarity index 100% rename from services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-error-validation.xml diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-warning-validation.xml similarity index 100% rename from services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-warning-validation.xml diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-error-validation.xml similarity index 100% rename from services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-error-validation.xml diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-warning-validation.xml similarity index 100% rename from services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-warning-validation.xml diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml index 459ac5e..266addf 100644 --- a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml @@ -26,6 +26,23 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="sizeMeasureType"> + + <!-- pas de sizeMeasureType selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.service.targetLength.required.sizeMeasureType</message> + </field-validator> + + <!-- sizeMeasureType desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ sizeMeasureType.enabled ]]> + </param> + <message>validator.service.targetLength.desactivated.sizeMeasureType</message> + </field-validator> + + </field> + <field name="species"> <!-- pas de species selectionnee --> diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties index 7f81582..90a272e 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties @@ -147,6 +147,7 @@ observe.common.settingStartTimeStamp=Setting start timeStamp observe.common.settingVesselSpeed=Setting vessel speed observe.common.sex=Sex observe.common.shooterSpeed=Shooter speed +observe.common.sizeMeasureType=Size measure type observe.common.snapWeight=Snap weight observe.common.species=Species observe.common.speciesCatch=Species @@ -518,10 +519,12 @@ validator.service.targetDiscarded.required.weightCategory=Weight category must b validator.service.targetDiscarded.uniqueKey=Tuple (category - reasonForDiscard) must be unique. validator.service.targetLength.bound.length=Length must be bound between %s and %s. validator.service.targetLength.bound.weight=Weight must be bound between %s and %s. +validator.service.targetLength.desactivated.sizeMeasureType=Selected size measure type is disabled. validator.service.targetLength.desactivated.species=Selected species is disabled. validator.service.targetLength.positive.length=Must be a positive number. validator.service.targetLength.positive.weight=Must be a positive number. validator.service.targetLength.required.count=Count must be filled. +validator.service.targetLength.required.sizeMeasureType=Size measure type is mandatory. validator.service.targetLength.required.species=Species must be filled. validator.service.targetLength.required.taille=Size must be filled. validator.service.targetLength.required.weight.or.taille=Weight or size must be filled. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties index 7337bc0..217ae20 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties @@ -147,6 +147,7 @@ observe.common.settingStartTimeStamp=Timestamp de inicio observe.common.settingVesselSpeed=Velocidad del barco (nd) observe.common.sex=Sexo observe.common.shooterSpeed=Velocidad shooter (nd) +observe.common.sizeMeasureType=Type de mesure de taille \#TODO observe.common.snapWeight=Peso snap (kg) observe.common.species=Especie observe.common.speciesCatch=Especie @@ -518,10 +519,12 @@ validator.service.targetDiscarded.required.weightCategory=Es obligatorio selecci validator.service.targetDiscarded.uniqueKey=El par (categoria - causa del descarte) debe ser única. validator.service.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. validator.service.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. +validator.service.targetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. \#TODO validator.service.targetLength.desactivated.species=La especie seleccionada está desactivada. validator.service.targetLength.positive.length=La talla debe ser un entero positivo. validator.service.targetLength.positive.weight=El peso debe ser un entero positivo. validator.service.targetLength.required.count=Es obligatoria especificar el número de grupo de talla. +validator.service.targetLength.required.sizeMeasureType=Le type de mesure est obligatoire. \#TODO validator.service.targetLength.required.species=Es obligatoria seleccionar una especie de atún. validator.service.targetLength.required.taille=Es obligatoria especificar el talla. validator.service.targetLength.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties index aca144e..f8a91a5 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties @@ -147,6 +147,7 @@ observe.common.settingStartTimeStamp=Horodatage début observe.common.settingVesselSpeed=Vitesse bateau (nd) observe.common.sex=Sexe observe.common.shooterSpeed=Vitesse shooter (nd) +observe.common.sizeMeasureType=Type de mesure de taille observe.common.snapWeight=Poids snap (kg) observe.common.species=Espèces observe.common.speciesCatch=Espèce @@ -518,10 +519,12 @@ validator.service.targetDiscarded.required.weightCategory=La sélection d'une ca validator.service.targetDiscarded.uniqueKey=Le couple (catégorie - raison rejet) doit être unique. validator.service.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s. validator.service.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s. +validator.service.targetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. validator.service.targetLength.desactivated.species=L'espèce sélectionnée est désactivée. validator.service.targetLength.positive.length=La longueur est un entier strictement positif. validator.service.targetLength.positive.weight=Le poids est un entier strictement positif. validator.service.targetLength.required.count=Le nombre effectif est obligatoire. +validator.service.targetLength.required.sizeMeasureType=Le type de mesure est obligatoire. validator.service.targetLength.required.species=La sélection d'une espèce de thon est obligatoire. validator.service.targetLength.required.taille=La taille est obligatoire. validator.service.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. diff --git a/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java index cc228de..a8adba7 100644 --- a/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java +++ b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java @@ -75,11 +75,11 @@ import fr.ird.observe.entities.referentiel.longline.SensorBrand; import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; import fr.ird.observe.entities.referentiel.longline.SensorType; import fr.ird.observe.entities.referentiel.longline.SettingShape; -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.longline.StomacFullness; import fr.ird.observe.entities.referentiel.longline.TripType; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.entities.referentiel.seine.DetectionMode; import fr.ird.observe.entities.referentiel.seine.ObjectFate; import fr.ird.observe.entities.referentiel.seine.ObjectOperation; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java index 41c624a..5a499e5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java @@ -82,11 +82,11 @@ import fr.ird.observe.entities.referentiel.longline.SensorBrand; import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; import fr.ird.observe.entities.referentiel.longline.SensorType; import fr.ird.observe.entities.referentiel.longline.SettingShape; -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.longline.StomacFullness; import fr.ird.observe.entities.referentiel.longline.TripType; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.entities.referentiel.seine.DetectionMode; import fr.ird.observe.entities.referentiel.seine.ObjectFate; import fr.ird.observe.entities.referentiel.seine.ObjectOperation; @@ -191,11 +191,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java index 6b184af..08d607c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java @@ -23,10 +23,10 @@ package fr.ird.observe.services.topia.binder.data; */ import fr.ird.observe.entities.longline.SizeMeasure; -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SizeMeasureDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; /** * Created on 24/11/15. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java index 2b90249..9d081e8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java @@ -22,10 +22,12 @@ package fr.ird.observe.services.topia.binder.data; * #L% */ +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; @@ -46,7 +48,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe copyDtoDataFieldsToEntity(dto, entity); entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); - entity.setMeasureType(dto.getMeasureType()); + entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType(), SizeMeasureType.class)); entity.setLength(dto.getLength()); entity.setIsLengthComputed(dto.isIsLengthComputed()); entity.setCount(dto.getCount()); @@ -62,7 +64,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe copyEntityDataFieldsToDto(entity, dto); dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); - dto.setMeasureType(entity.getMeasureType()); + dto.setSizeMeasureType(toReferentialReference(referentialLocale,entity.getSizeMeasureType(), SizeMeasureTypeDto.class)); dto.setLength(entity.getLength()); dto.setIsLengthComputed(entity.isIsLengthComputed()); dto.setCount(entity.getCount()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java index 27d1c0c..1f02b74 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java @@ -23,10 +23,10 @@ package fr.ird.observe.services.topia.binder.data; */ import fr.ird.observe.entities.longline.WeightMeasure; -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; /** * Created on 24/11/15. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java index bc6edb7..f61dc9c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java @@ -22,10 +22,10 @@ package fr.ird.observe.services.topia.binder.referential; * #L% */ -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; /** * Created on 24/11/15. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java index 50cbe95..3fa1178 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java @@ -22,10 +22,10 @@ package fr.ird.observe.services.topia.binder.referential; * #L% */ -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; /** * Created on 24/11/15. diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java index d954003..7d8a1e1 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java @@ -94,11 +94,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java index 1458bbf..f805b5b 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java @@ -72,11 +72,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services/src/main/filters/observe-reports.properties b/services/src/main/filters/observe-reports.properties index 1ea6616..c03d06d 100644 --- a/services/src/main/filters/observe-reports.properties +++ b/services/src/main/filters/observe-reports.properties @@ -717,7 +717,7 @@ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ -And tl.measureType = 1 \ +And tl.sizeMeasureType = 1 \ And ts.discarded = false report.targetStoredDistributionLengthsLD1.request.1=0,0|row| \ Select tl.length , Sum(tl.count) \ @@ -728,7 +728,7 @@ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ And tl.species.id = :speciesId \ - And tl.measureType = 1 \ + And tl.sizeMeasureType = 1 \ And ts.discarded = false \ Group By tl.length \ Order By tl.length @@ -749,7 +749,7 @@ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ -And tl.measureType = 1 \ +And tl.sizeMeasureType = 1 \ And ts.discarded = true report.targetDiscardedDistributionLengthsLD1.request.1=0,0|row| \ Select tl.length , Sum(tl.count) \ @@ -760,7 +760,7 @@ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ And tl.species.id = :speciesId \ - And tl.measureType = 1\ + And tl.sizeMeasureType = 1\ And ts.discarded = true \ Group By tl.length \ Order By tl.length @@ -781,7 +781,7 @@ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ -And tl.measureType = 2 \ +And tl.sizeMeasureType = 2 \ And ts.discarded = false report.targetStoredDistributionLengthsLF.request.1=0,0|row| \ Select tl.length , Sum(tl.count) \ @@ -792,7 +792,7 @@ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ And tl.species.id = :speciesId \ - And tl.measureType = 2 \ + And tl.sizeMeasureType = 2 \ And ts.discarded = false \ Group By tl.length \ Order By tl.length @@ -813,7 +813,7 @@ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ -And tl.measureType = 2 \ +And tl.sizeMeasureType = 2 \ And ts.discarded = true report.targetDiscardedDistributionLengthsLF.request.1=0,0|row| \ Select tl.length , Sum(tl.count) \ @@ -824,7 +824,7 @@ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ And tl.species.id = :speciesId \ - And tl.measureType = 2 \ + And tl.sizeMeasureType = 2 \ And ts.discarded = true \ Group By tl.length \ Order By tl.length -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.