GitLab

at 2024-12-10T15:57:59+01:00

Rename method ObjectMaterialDto.isCodeValid to ObjectMaterialDto.isCodeCompliantWithParent and improve it

Rename method ObjectMaterialDto.isCodeValid to ObjectMaterialDto.isCodeCompliantWithParent and improve it

Only validate code if material has a parent

Merge branch 'feature/issue_2952' into develop
Problème dans la consultation des données de référence Objet flottant matériel
- Closes #2952

         return objectMaterialType != null && ProtectedIdsPs.PS_COMMON_OBJECT_MATERIAL_TYPE_FLOAT.equals(objectMaterialType.getId());

     }

 

-    public boolean isCodeValid() {

+    /**

+     * @return {@code true} if code is compliant with his associated parent code, {@code false} otherwise.

+     * @see #getParent()

+     * @see #getCode()

+     */

+    public boolean isCodeCompliantWithParent() {

         ObjectMaterialReference parent = getParent();

+        String code = getCode();

         if (parent == null) {

+            // If no parent, then accept anything here

             return true;

         }

+        if (code == null || code.trim().isEmpty()) {

+            // If a parent is defined, code can not be null nor empty

+            return false;

+        }

         String parentCode = parent.getCode();

-        if (parentCode == null || parentCode.isEmpty()) {

+        if (parentCode == null || parentCode.trim().isEmpty()) {

+            // if parent code is null or empty, then accept any code (even if we might only accept code without any «-» inside it)

             return true;

         }

-        String code = getCode();

+        // In any other cases, code must starts with «parentCode-»

         return code.startsWith(parentCode + "-");

     }

 

       "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",

       "comment": "code must be compliant with his parent code",

       "parameters": {

-        "expression": "$o.codeValid"

+        "skip": "$o.parent == null",

+        "expression": "$o.codeCompliantWithParent"

       },

       "message": "observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##$o.parent.code"

     }

       "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",

       "comment": "code must be compliant with his parent code",

       "parameters": {

-        "expression": "$o.codeValid"

+        "skip": "$o.parent == null",

+        "expression": "$o.codeCompliantWithParent"

       },

       "message": "observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##$o.parent.code"

     }

       "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",

       "comment": "code must be compliant with his parent code",

       "parameters": {

-        "expression": "$o.codeValid"

+        "skip" : "$o.parent == null",

+        "expression": "$o.codeCompliantWithParent"

       },

       "message": "observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##$o.parent.code"

     }

       "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",

       "comment": "code must be compliant with his parent code",

       "parameters": {

-        "expression": "$o.codeValid"

+        "skip" : "$o.parent == null",

+        "expression": "$o.codeCompliantWithParent"

       },

       "message": "observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##$o.parent.code"

     }

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

5 changed files:

Changes: