Updated affected fields fetching logic

[oleksandrsarapulovgl]

No description provided.

[d4rken]

Could we use trimIdent() here to improve readability and make it easier to adapt the json if it changes?

    private val RULE = """
        {
            "Identifier": "VR-DE-0001",
            "Type": "Acceptance",
            "Country": "DE",
            "Version": "1.0.0",
            "SchemaVersion": "1.0.0",
            "Engine": "CERTLOGIC",
            "EngineVersion": "0.7.5",
            "CertificateType": "Vaccination",
            "Description": [
                {
                    "lang": "en",
                    "desc": "The vaccination schedule must be complete (e.g., 1/1, 2/2)."
                },
                {
                    "lang": "de",
                    "desc": "Die Impfreihe muss vollständig sein (z.B. 1/1, 2/2)."
                },
                {
                    "lang": "fr",
                    "desc": "La série vaccinale doit être complète (p. ex. 1/1, 2/2)."
                },
                {
                    "lang": "es",
                    "desc": "La pauta de vacunación debe estar completa (por ejemplo, 1/1, 2/2)."
                },
                {
                    "lang": "it",
                    "desc": "Il ciclo di vaccinazione deve essere stato completato (ad es. 1/1, 2/2)."
                }
            ],
            "ValidFrom": "2021-07-03T00:00:00Z",
            "ValidTo": "2030-06-01T00:00:00Z",
            "AffectedFields": [
                "v.0",
                "v.0.dn",
                "v.0.sd"
            ],
            "Logic": {
                "if": [
                    {
                        "var": "payload.v.0"
                    },
                    {
                        ">=": [
                            {
                                "var": "payload.v.0.dn"
                            },
                            {
                                "var": "payload.v.0.sd"
                            }
                        ]
                    },
                    true
                ]
            }
        }
    """.trimIndent()

[d4rken]

trimIdent() could also work here, what do you think?

        assertEquals(
            """
                "Dose Number": 1
                "Total Series of Doses": 2
                
            """.trimIndent(),
            affectedFieldsString
        )

[d4rken]

An early return could remove a full level of nesting and make this unwieldy indentation a bit easier to read.

override fun validate(
    certificateType: CertificateType,
    hcertVersionString: String,
    rules: List<Rule>,
    externalParameter: ExternalParameter,
    payload: String
): List<ValidationResult> {
    if (rules.isEmpty()) return emptyList()

    val validationResults = mutableListOf<ValidationResult>()
    val dataJsonNode = prepareData(externalParameter, payload)
    val hcertVersion = hcertVersionString.toVersion()
    rules.forEach { rule ->
        val ruleVersion = rule.version.toVersion()
        val res = when {
            hcertVersion == null || ruleVersion == null || hcertVersion.first != ruleVersion.first -> Result.OPEN
            hcertVersion.isGreaterOrEqualThan(ruleVersion) &&
                    jsonLogicValidator.isDataValid(
                        rule.logic,
                        dataJsonNode
                    ) -> Result.PASSED
            else -> Result.FAIL
        }
        val cur: String = affectedFieldsDataRetriever.getAffectedFieldsData(
            rule,
            dataJsonNode,
            certificateType
        )
        validationResults.add(
            ValidationResult(
                rule,
                res,
                cur,
                null
            )
        )
    }
    return validationResults
}