Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 16e80c82 by Tony CHEMIT at 2018-07-03T10:32:58Z Revoir la clé d'unicité sur le référentiel taille-taille - See #992 - - - - - c7a6c10a by Tony CHEMIT at 2018-07-03T10:33:28Z Fix consolidation code - - - - - 11 changed files: - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java @@ -686,16 +686,14 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // on doit effectuer une conversion taille - taille avant de convertir en poids Optional<LengthLengthParameter> optionalLengthLengthParameter = activityContext.findLengthLengthParameter(species, sex, inputSizeMeasureType, outputSizeMeasureType); - if (optionalLengthLengthParameter == null) { + if (optionalLengthLengthParameter.isPresent()) { + length = optionalLengthLengthParameter.get().computeFromFormulaOne(length); + } else { if (log.isWarnEnabled()) { log.warn("Could not find lengLengthParameter for input: " + inputSizeMeasureType + " - output: " + outputSizeMeasureType); } return; - } else { - - length = optionalLengthLengthParameter.get().computeFromFormulaOne(length); - } } ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-error-validation.xml @@ -42,6 +42,11 @@ </field> <field name="ocean"> + <!-- pas de ocean selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.ocean</message> + </field-validator> + <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -52,6 +57,11 @@ </field> <field name="sex"> + <!-- pas de sex selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.sex</message> + </field-validator> + <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -73,6 +83,11 @@ <field name="inputSizeMeasureType"> + <!-- pas de inputSizeMeasureType selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.inputSizeMeasureType</message> + </field-validator> + <!-- intputSizeMeasureType desactive --> <field-validator type="fieldexpression"> <param name="expression"> @@ -85,6 +100,11 @@ <field name="outputSizeMeasureType"> + <!-- pas de outputSizeMeasureType selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.outputSizeMeasureType</message> + </field-validator> + <!-- outputSizeMeasureType desactive --> <field-validator type="fieldexpression"> <param name="expression"> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-warning-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-warning-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-warning-validation.xml @@ -43,27 +43,6 @@ </field-validator> </field> - <field name="inputSizeMeasureType"> - <!-- pas de inputSizeMeasureType renseigne --> - <field-validator type="required"> - <message>observe.validation.lengthLengthParameter.null.inputSizeMeasureType</message> - </field-validator> - </field> - - <field name="outputSizeMeasureType"> - <!-- pas de outputSizeMeasureType renseigne --> - <field-validator type="required"> - <message>observe.validation.lengthLengthParameter.null.outputSizeMeasureType</message> - </field-validator> - </field> - - <field name="ocean"> - <!-- pas de ocean renseigne --> - <field-validator type="required"> - <message>observe.validation.lengthWeightParameter.null.ocean</message> - </field-validator> - </field> - <field name="startDate"> <!-- pas de startDate renseigne --> <field-validator type="required"> @@ -80,5 +59,4 @@ </field-validator> </field> - </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-error-validation.xml @@ -41,6 +41,11 @@ </field> <field name="ocean"> + <!-- pas de ocean selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.ocean</message> + </field-validator> + <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -53,7 +58,7 @@ <field name="sex"> <!-- pas de sex selectionne --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.lengthLengthParameter.required.sex</message> + <message>observe.validation.lengthLengthParameter.null.sex</message> </field-validator> <!-- clef unique species - gender - ocean - startDate --> @@ -74,6 +79,38 @@ </field-validator> </field> + <field name="inputSizeMeasureType"> + + <!-- pas de inputSizeMeasureType selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.inputSizeMeasureType</message> + </field-validator> + + <!-- intputSizeMeasureType desactive --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ intputSizeMeasureType == null || intputSizeMeasureType.enabled ]]> + </param> + <message>observe.validation.lengthLengthParameter.disabled.inputSizeMeasureType</message> + </field-validator> + </field> + + + <field name="outputSizeMeasureType"> + + <!-- pas de outputSizeMeasureType selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.outputSizeMeasureType</message> + </field-validator> + + <!-- outputSizeMeasureType desactive --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ outputSizeMeasureType == null || outputSizeMeasureType.enabled ]]> + </param> + <message>observe.validation.lengthLengthParameter.disabled.inputSizeMeasureType</message> + </field-validator> + </field> <field name="inputOutputFormula"> <!-- pas de relation inputOutputFormula renseignee --> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-warning-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-warning-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-warning-validation.xml @@ -59,5 +59,4 @@ </field-validator> </field> - </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-error-validation.xml @@ -41,18 +41,12 @@ </field-validator> </field> - <field name="sizeMeasureType"> - - <!-- sizeMeasureType desactive --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]> - </param> - <message>observe.validation.lengthWeightParameter.disabled.sizeMeasureType</message> + <field name="ocean"> + <!-- pas de ocean selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthWeightParameter.null.ocean</message> </field-validator> - </field> - <field name="ocean"> <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -63,6 +57,11 @@ </field> <field name="sex"> + <!-- pas de sex selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthWeightParameter.null.sex</message> + </field-validator> + <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -82,6 +81,21 @@ </field-validator> </field> + <field name="sizeMeasureType"> + <!-- pas de sizeMeasureType renseigne --> + <field-validator type="required"> + <message>observe.validation.lengthWeightParameter.null.sizeMeasureType</message> + </field-validator> + + <!-- sizeMeasureType desactive --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]> + </param> + <message>observe.validation.lengthWeightParameter.disabled.sizeMeasureType</message> + </field-validator> + </field> + <field name="lengthWeightFormula"> <!-- pas de relation weight renseignee --> <field-validator type="requiredstring" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-warning-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-warning-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-warning-validation.xml @@ -43,21 +43,6 @@ </field-validator> </field> - <field name="ocean"> - <!-- pas de ocean renseigne --> - <field-validator type="required"> - <message>observe.validation.lengthWeightParameter.null.ocean</message> - </field-validator> - </field> - - <field name="sizeMeasureType"> - <!-- pas de sizeMeasureType renseigne --> - <field-validator type="required"> - <message>observe.validation.lengthWeightParameter.null.sizeMeasureType</message> - </field-validator> - </field> - - <field name="startDate"> <!-- pas de startDate renseigne --> <field-validator type="required"> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-update-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-update-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-update-error-validation.xml @@ -51,6 +51,11 @@ </field> <field name="ocean"> + <!-- pas de ocean renseigne --> + <field-validator type="required"> + <message>observe.validation.lengthWeightParameter.null.ocean</message> + </field-validator> + <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -61,6 +66,11 @@ </field> <field name="sex"> + <!-- pas de sex selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthWeightParameter.null.sex</message> + </field-validator> + <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -80,6 +90,21 @@ </field-validator> </field> + <field name="sizeMeasureType"> + <!-- pas de sizeMeasureType renseigne --> + <field-validator type="required"> + <message>observe.validation.lengthWeightParameter.null.sizeMeasureType</message> + </field-validator> + + <!-- sizeMeasureType desactive --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]> + </param> + <message>observe.validation.lengthWeightParameter.disabled.sizeMeasureType</message> + </field-validator> + </field> + <field name="lengthWeightFormula"> <!-- pas de relation weight renseignee --> <field-validator type="requiredstring" short-circuit="true"> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== --- a/validation/src/main/resources/i18n/validation_en_GB.properties +++ b/validation/src/main/resources/i18n/validation_en_GB.properties @@ -458,6 +458,7 @@ observe.validation.lengthLengthParameter.invalid.uniqueKey=Tuple (gender/ocean/s observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Input size measure type is not filled. observe.validation.lengthLengthParameter.null.ocean=Ocean is not filled. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled. +observe.validation.lengthLengthParameter.null.sex=Sex must be filled. observe.validation.lengthLengthParameter.required.coefficients=Coefficients are required. observe.validation.lengthLengthParameter.required.endDate=End date must be filled. observe.validation.lengthLengthParameter.required.inputOutputFormula=Formula is required. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== --- a/validation/src/main/resources/i18n/validation_es_ES.properties +++ b/validation/src/main/resources/i18n/validation_es_ES.properties @@ -460,6 +460,7 @@ observe.validation.lengthLengthParameter.invalid.uniqueKey=Tupla (sexo/océano/e observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné. \#TODO observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO +observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. \#TODO observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO observe.validation.lengthLengthParameter.required.endDate=Fecha de fin de validez debe ser especificada. observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== --- a/validation/src/main/resources/i18n/validation_fr_FR.properties +++ b/validation/src/main/resources/i18n/validation_fr_FR.properties @@ -458,6 +458,7 @@ observe.validation.lengthLengthParameter.invalid.uniqueKey=Le tuple (sexe/océan observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné. observe.validation.lengthLengthParameter.null.ocean=Aucun océan sélectionné. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. +observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. observe.validation.lengthLengthParameter.required.endDate=Date de fin de validité non renseignée. observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2829316f729129bede28934ea99... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2829316f729129bede28934ea99... You're receiving this email because of your account on gitlab.com.