Tony CHEMIT pushed to branch develop-9.3.x at ultreiaio / ird-observe Commits: 8ee1a1b4 by Tony Chemit at 2024-09-27T11:38:02+02:00 Problème de validation sur le formulaire Échantillon (PS - Marché local) - Closes #2944 - - - - - 12 changed files: - core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-create-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-update-error-validation.json - core/api/validation/src/main/validation/META-INF/validation/model-default.json - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-create-error-validation.json - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-update-error-validation.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SampleSpecies/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SampleSpecies/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-create-error.json - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-update-error.json - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-update.json Changes: ===================================== core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json ===================================== @@ -5343,7 +5343,7 @@ ], "measuredCount": [ "measuredCount is mandatory", - "measuredCount equals sum of count on sampleSpeciesMeasure" + "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)" ], "sampleSpeciesMeasure": [ "sampleSpeciesMeasure is a mandatory collection", @@ -5381,7 +5381,7 @@ ], "measuredCount": [ "measuredCount is mandatory", - "measuredCount equals sum of count on sampleSpeciesMeasure" + "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)" ], "sampleSpeciesMeasure": [ "sampleSpeciesMeasure is a mandatory collection", ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-create-error-validation.json ===================================== @@ -32,8 +32,9 @@ }, { "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", - "comment": "measuredCount equals sum of count on sampleSpeciesMeasure", + "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "parameters": { + "skip": "$o.measuredCount == null", "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount" }, "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount" ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-update-error-validation.json ===================================== @@ -32,8 +32,9 @@ }, { "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", - "comment": "measuredCount equals sum of count on sampleSpeciesMeasure", + "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "parameters": { + "skip": "$o.measuredCount == null", "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount" }, "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount" ===================================== core/api/validation/src/main/validation/META-INF/validation/model-default.json ===================================== @@ -378,7 +378,7 @@ "context": "create", "ERROR": { "measuredCount": [ - "measuredCount equals sum of count on sampleSpeciesMeasure" + "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)" ] } }, @@ -387,7 +387,7 @@ "context": "update", "ERROR": { "measuredCount": [ - "measuredCount equals sum of count on sampleSpeciesMeasure" + "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)" ] } }, ===================================== core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-create-error-validation.json ===================================== @@ -2,8 +2,9 @@ "measuredCount": [ { "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", - "comment": "measuredCount equals sum of count on sampleSpeciesMeasure", + "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "parameters": { + "skip": "$o.measuredCount == null", "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount" }, "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount" ===================================== core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-update-error-validation.json ===================================== @@ -2,8 +2,9 @@ "measuredCount": [ { "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", - "comment": "measuredCount equals sum of count on sampleSpeciesMeasure", + "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "parameters": { + "skip": "$o.measuredCount == null", "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount" }, "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SampleSpecies/validation-create.json ===================================== @@ -13,7 +13,7 @@ }, "measuredCount": { "errors": [ - "measuredCount equals sum of count on sampleSpeciesMeasure", + "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "measuredCount is mandatory" ] }, ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SampleSpecies/validation-update.json ===================================== @@ -13,7 +13,7 @@ }, "measuredCount": { "errors": [ - "measuredCount equals sum of count on sampleSpeciesMeasure", + "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "measuredCount is mandatory" ] }, ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-create-error.json ===================================== @@ -32,8 +32,9 @@ }, { "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", - "comment": "measuredCount equals sum of count on sampleSpeciesMeasure", + "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "parameters": { + "skip": "$o.measuredCount == null", "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount" }, "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-create.json ===================================== @@ -13,7 +13,7 @@ }, "measuredCount": { "errors": [ - "measuredCount equals sum of count on sampleSpeciesMeasure", + "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "measuredCount is mandatory" ] }, ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-update-error.json ===================================== @@ -32,8 +32,9 @@ }, { "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", - "comment": "measuredCount equals sum of count on sampleSpeciesMeasure", + "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "parameters": { + "skip": "$o.measuredCount == null", "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount" }, "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-update.json ===================================== @@ -13,7 +13,7 @@ }, "measuredCount": { "errors": [ - "measuredCount equals sum of count on sampleSpeciesMeasure", + "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)", "measuredCount is mandatory" ] }, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8ee1a1b4ecf81b058824e7355a... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8ee1a1b4ecf81b058824e7355a... You're receiving this email because of your account on gitlab.com.