Merge pull request #334 from nl-portal/feature/change-dmn-to-support-static-variables

change in the dmn flow to support static variable which can be used i…

Author: flinden68

gradle.properties

@@ -14,4 +14,4 @@ dokkaVersion=1.9.20
 
 org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2048m
 org.gradle.workers.max=10
-version=1.4.32-SNAPSHOT
+version=1.4.33-SNAPSHOT

product/src/main/kotlin/nl/nlportal/product/domain/BeslisTabelVariable.kt

@@ -19,6 +19,7 @@ data class BeslisTabelVariable(
     val name: String,
     val classType: DmnVariableType,
     val regex: String?,
+    val value: String?,
 )
 
 data class BeslisTabelConfiguration(

product/src/main/kotlin/nl/nlportal/product/service/DmnService.kt

@@ -95,16 +95,25 @@ class DmnService(
             )
 
         sources?.forEach {
-            if (beslisTabelConfiguration.variabelen.containsKey(it.key)) {
-                variablesMapping.putAll(
-                    mapBeslisTabelVariablesWithSource(
-                        beslisTabelConfiguration.variabelen[it.key]!!,
-                        it.value,
-                    ),
-                )
-            } else {
-                logger.warn(BESLISTABLE_NOT_FOUND_BY_KEY, it.key)
-            }
+            beslisTabelConfiguration.variabelen[it.key]?.let { variable ->
+                {
+                    variablesMapping.putAll(
+                        mapBeslisTabelVariablesWithSource(
+                            variable,
+                            it.value,
+                        ),
+                    )
+                }
+            } ?: logger.warn(BESLISTABLE_NOT_FOUND_BY_KEY, it.key)
+        }
+
+        // handle the configured static variables
+        beslisTabelConfiguration.variabelen[BESLISTABLE_KEY_STATIC]?.let {
+            variablesMapping.putAll(
+                mapBeslisTabelStaticVariables(
+                    it,
+                ),
+            )
         }
 
         if (variablesMapping.isEmpty()) {
@@ -148,35 +157,40 @@ class DmnService(
 
         // loop through the sources and get the Object as Json and map with the variables
         sources?.forEach {
-            val source = productService.getSourceAsJson(it.key, it.value)
-
-            if (source == null) {
-                logger.warn("Could not find objects for key {} with uuid {}", it.key, it.value)
-            } else {
-                if (beslisTabelVariables.containsKey(it.key)) {
-                    variablesMapping.putAll(
-                        mapBeslisTabelVariablesWithSource(
-                            beslisTabelVariables[it.key]!!,
-                            source,
-                        ),
-                    )
-                } else {
-                    logger.warn(BESLISTABLE_NOT_FOUND_BY_KEY, it.key)
-                }
-            }
+            productService.getSourceAsJson(it.key, it.value)?.let { source ->
+                beslisTabelVariables[it.key]?.let { variable ->
+                    {
+                        variablesMapping.putAll(
+                            mapBeslisTabelVariablesWithSource(
+                                variable,
+                                source,
+                            ),
+                        )
+                    }
+                } ?: logger.warn(BESLISTABLE_NOT_FOUND_BY_KEY, it.key)
+            } ?: logger.warn("Could not find objects for key {} with uuid {}", it.key, it.value)
         }
 
         // check if the beslisTabelVariables contains a producttype configuration,
         // if yes map the variables with the json of the productType
-        if (beslisTabelVariables.containsKey("producttype")) {
+        beslisTabelVariables[BESLISTABLE_KEY_PRODUCT_TYPE]?.let {
             variablesMapping.putAll(
                 mapBeslisTabelVariablesWithSource(
-                    beslisTabelVariables["producttype"]!!,
+                    it,
                     Mapper.get().writeValueAsString(productType),
                 ),
             )
         }
 
+        // handle the configured static variables
+        beslisTabelVariables[BESLISTABLE_KEY_STATIC]?.let {
+            variablesMapping.putAll(
+                mapBeslisTabelStaticVariables(
+                    it,
+                ),
+            )
+        }
+
         if (variablesMapping.isEmpty()) {
             throw ResponseStatusException(HttpStatus.BAD_REQUEST, SOURCE_MAPPING_FAILED + productType?.naam)
         }
@@ -211,6 +225,23 @@ class DmnService(
         )
     }
 
+    private fun mapBeslisTabelStaticVariables(beslisTabelVariables: List<BeslisTabelVariable>): Map<String, DmnVariable> {
+        val variablesMapping = mutableMapOf<String, DmnVariable>()
+        beslisTabelVariables.forEach {
+            if (it.value != null) {
+                variablesMapping.put(
+                    it.name,
+                    DmnVariable(
+                        it.value,
+                        it.classType,
+                    ),
+                )
+            }
+        }
+
+        return variablesMapping
+    }
+
     private fun mapBeslisTabelVariablesWithSource(
         beslisTabelVariables: List<BeslisTabelVariable>,
         source: String,
@@ -259,5 +290,7 @@ class DmnService(
         val logger = KotlinLogging.logger {}
         const val SOURCE_MAPPING_FAILED: String = "Source mapping failed for DMN, check beslistabelmapping of productType: "
         const val BESLISTABLE_NOT_FOUND_BY_KEY: String = "Could not find beslisTabel variables for key {}"
+        const val BESLISTABLE_KEY_STATIC: String = "static"
+        const val BESLISTABLE_KEY_PRODUCT_TYPE: String = "producttype"
     }
 }

product/src/test/resources/product/data/get-product-type.json

@@ -57,6 +57,13 @@
                 "regex":"$.data.beschikbareDagdelen",
                 "classType":"Integer"
               }
+            ],
+            "static": [
+              {
+                "name":"formulieren",
+                "classType":"String",
+                "value":"https://openformulieren-zgw.test.denhaag.nl"
+              }
             ]
           }
         }

product/src/test/resources/product/data/get-product-types.json

@@ -55,6 +55,13 @@
                     "classType":"String",
                     "regex":"$.parameters.contractnummer"
                   }
+                ],
+                "static": [
+                  {
+                    "name":"formulieren",
+                    "classType":"String",
+                    "value":"https://openformulieren-zgw.test.denhaag.nl"
+                  }
                 ]
               }
             }