Tony CHEMIT pushed to branch feature/issue-2594 at ultreiaio / ird-observe Commits: 44334251 by Tony Chemit at 2024-02-03T12:51:37+01:00 stash - - - - - 8 changed files: - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SchoolEstimateDto-create-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SchoolEstimateDto-update-error-validation.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/SchoolEstimate/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/SchoolEstimate/validation-update.json - model/src/main/models/Observe/dto/attribute/notNullIf.properties - server/runner/src/main/webResources/doc/api/public/data/ps/observation/SchoolEstimate/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/observation/SchoolEstimate/validation-update.json Changes: ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -14664,7 +14664,7 @@ "comments": [ "check species weight bound on meanWeight if $o.meanWeight != null", "meanWeight is a positive number", - "meanWeight is mandatory except if $o.totalWeight !=null && $o.totalWeight > 0" + "meanWeight is mandatory except if $o.totalWeight != null && $o.totalWeight > 0" ] }, { @@ -14678,7 +14678,7 @@ "name": "totalWeight", "comments": [ "totalWeight is a positive number", - "totalWeight is mandatory except if $o.meanWeight !=null && $o.meanWeight > 0" + "totalWeight is mandatory except if $o.meanWeight != null && $o.meanWeight > 0" ] }, { @@ -14724,7 +14724,7 @@ "comments": [ "check species weight bound on meanWeight if $o.meanWeight != null", "meanWeight is a positive number", - "meanWeight is mandatory except if $o.totalWeight !=null && $o.totalWeight > 0" + "meanWeight is mandatory except if $o.totalWeight != null && $o.totalWeight > 0" ] }, { @@ -14738,7 +14738,7 @@ "name": "totalWeight", "comments": [ "totalWeight is a positive number", - "totalWeight is mandatory except if $o.meanWeight !=null && $o.meanWeight > 0" + "totalWeight is mandatory except if $o.meanWeight != null && $o.meanWeight > 0" ] }, { ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SchoolEstimateDto-create-error-validation.json ===================================== @@ -8,9 +8,9 @@ "meanWeight": [ { "validator": "fr.ird.observe.validation.validator.MandatoryFieldValidator", - "comment": "meanWeight is mandatory except if $o.totalWeight !=null && $o.totalWeight > 0", + "comment": "meanWeight is mandatory except if $o.totalWeight != null && $o.totalWeight > 0", "parameters": { - "skip": "$o.totalWeight !=null && $o.totalWeight > 0" + "skip": "$o.totalWeight != null && $o.totalWeight > 0" }, "message": "observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required" }, @@ -41,9 +41,9 @@ "totalWeight": [ { "validator": "fr.ird.observe.validation.validator.MandatoryFieldValidator", - "comment": "totalWeight is mandatory except if $o.meanWeight !=null && $o.meanWeight > 0", + "comment": "totalWeight is mandatory except if $o.meanWeight != null && $o.meanWeight > 0", "parameters": { - "skip": "$o.meanWeight !=null && $o.meanWeight > 0" + "skip": "$o.meanWeight != null && $o.meanWeight > 0" }, "message": "observe.data.ps.observation.SchoolEstimate.totalWeight.validation.required" }, ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SchoolEstimateDto-update-error-validation.json ===================================== @@ -8,9 +8,9 @@ "meanWeight": [ { "validator": "fr.ird.observe.validation.validator.MandatoryFieldValidator", - "comment": "meanWeight is mandatory except if $o.totalWeight !=null && $o.totalWeight > 0", + "comment": "meanWeight is mandatory except if $o.totalWeight != null && $o.totalWeight > 0", "parameters": { - "skip": "$o.totalWeight !=null && $o.totalWeight > 0" + "skip": "$o.totalWeight != null && $o.totalWeight > 0" }, "message": "observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required" }, @@ -41,9 +41,9 @@ "totalWeight": [ { "validator": "fr.ird.observe.validation.validator.MandatoryFieldValidator", - "comment": "totalWeight is mandatory except if $o.meanWeight !=null && $o.meanWeight > 0", + "comment": "totalWeight is mandatory except if $o.meanWeight != null && $o.meanWeight > 0", "parameters": { - "skip": "$o.meanWeight !=null && $o.meanWeight > 0" + "skip": "$o.meanWeight != null && $o.meanWeight > 0" }, "message": "observe.data.ps.observation.SchoolEstimate.totalWeight.validation.required" }, ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/SchoolEstimate/validation-create.json ===================================== @@ -8,7 +8,7 @@ "errors": [ "check species weight bound on meanWeight if meanWeight != null", "meanWeight is a positive number", - "meanWeight is mandatory except if totalWeight !=null && totalWeight > 0" + "meanWeight is mandatory except if totalWeight != null && totalWeight > 0" ] }, "species": { @@ -23,7 +23,7 @@ "totalWeight": { "errors": [ "totalWeight is a positive number", - "totalWeight is mandatory except if meanWeight !=null && meanWeight > 0" + "totalWeight is mandatory except if meanWeight != null && meanWeight > 0" ] }, "weightMeasureMethod": { ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/SchoolEstimate/validation-update.json ===================================== @@ -8,7 +8,7 @@ "errors": [ "check species weight bound on meanWeight if meanWeight != null", "meanWeight is a positive number", - "meanWeight is mandatory except if totalWeight !=null && totalWeight > 0" + "meanWeight is mandatory except if totalWeight != null && totalWeight > 0" ] }, "species": { @@ -23,7 +23,7 @@ "totalWeight": { "errors": [ "totalWeight is a positive number", - "totalWeight is mandatory except if meanWeight !=null && meanWeight > 0" + "totalWeight is mandatory except if meanWeight != null && meanWeight > 0" ] }, "weightMeasureMethod": { ===================================== model/src/main/models/Observe/dto/attribute/notNullIf.properties ===================================== @@ -58,5 +58,5 @@ data.ps.observation.Catch.attribute.catchWeight=$o.totalCount != null data.ps.observation.Catch.attribute.totalCount=$o.catchWeight != null data.ps.observation.SampleMeasure.attribute.length=$o.acquisitionMode == 1 && $o.weight != null data.ps.observation.SampleMeasure.attribute.weight=$o.acquisitionMode == 0 || $o.length != null -data.ps.observation.SchoolEstimate.attribute.meanWeight=$o.totalWeight !=null && $o.totalWeight > 0 -data.ps.observation.SchoolEstimate.attribute.totalWeight=$o.meanWeight !=null && $o.meanWeight > 0 +data.ps.observation.SchoolEstimate.attribute.meanWeight=$o.totalWeight != null && $o.totalWeight > 0 +data.ps.observation.SchoolEstimate.attribute.totalWeight=$o.meanWeight != null && $o.meanWeight > 0 ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/SchoolEstimate/validation-create.json ===================================== @@ -8,7 +8,7 @@ "errors": [ "check species weight bound on meanWeight if meanWeight != null", "meanWeight is a positive number", - "meanWeight is mandatory except if totalWeight !=null && totalWeight > 0" + "meanWeight is mandatory except if totalWeight != null && totalWeight > 0" ] }, "species": { @@ -23,7 +23,7 @@ "totalWeight": { "errors": [ "totalWeight is a positive number", - "totalWeight is mandatory except if meanWeight !=null && meanWeight > 0" + "totalWeight is mandatory except if meanWeight != null && meanWeight > 0" ] }, "weightMeasureMethod": { ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/SchoolEstimate/validation-update.json ===================================== @@ -8,7 +8,7 @@ "errors": [ "check species weight bound on meanWeight if meanWeight != null", "meanWeight is a positive number", - "meanWeight is mandatory except if totalWeight !=null && totalWeight > 0" + "meanWeight is mandatory except if totalWeight != null && totalWeight > 0" ] }, "species": { @@ -23,7 +23,7 @@ "totalWeight": { "errors": [ "totalWeight is a positive number", - "totalWeight is mandatory except if meanWeight !=null && meanWeight > 0" + "totalWeight is mandatory except if meanWeight != null && meanWeight > 0" ] }, "weightMeasureMethod": { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4433425140124109df9fbb2984... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4433425140124109df9fbb2984... You're receiving this email because of your account on gitlab.com.