Merge pull request #335 from nl-portal/feature/fix-dmn-flow-from-external

revert a part of the dmn changesm because it failed to map from source

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.33-SNAPSHOT
+version=1.4.34-SNAPSHOT

product/src/main/kotlin/nl/nlportal/product/graphql/ProductQuery.kt

@@ -173,6 +173,37 @@ class ProductQuery(
         return Mapper.get().convertValue(result, object : TypeReference<List<ObjectNode>>() {})
     }
 
+    @GraphQLDescription(
+        """
+        Get Decision by key and json as source
+        Don't use it directly but via custom queries
+        """,
+    )
+    suspend fun getDecision(
+        sources: ObjectNode? = null,
+        key: String,
+        productTypeId: UUID? = null,
+        productName: String,
+        dmnVariables: ObjectNode? = null,
+    ): List<ObjectNode> {
+        val result =
+            dmnService.getDecision(
+                sources = sources?.let { Mapper.get().convertValue(it, object : TypeReference<Map<String, String>>() {}) },
+                key = key,
+                productTypeId = productTypeId,
+                productName = productName,
+                dmnVariables =
+                    dmnVariables?.let {
+                        Mapper.get().convertValue(
+                            dmnVariables,
+                            object : TypeReference<Map<String, DmnVariable>>() {},
+                        )
+                    },
+            )
+
+        return Mapper.get().convertValue(result, object : TypeReference<List<ObjectNode>>() {})
+    }
+
     @GraphQLDescription(
         """
         Prefill data to start a form.

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

@@ -95,16 +95,16 @@ class DmnService(
             )
 
         sources?.forEach {
-            beslisTabelConfiguration.variabelen[it.key]?.let { variable ->
-                {
-                    variablesMapping.putAll(
-                        mapBeslisTabelVariablesWithSource(
-                            variable,
-                            it.value,
-                        ),
-                    )
-                }
-            } ?: logger.warn(BESLISTABLE_NOT_FOUND_BY_KEY, it.key)
+            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)
+            }
         }
 
         // handle the configured static variables
@@ -157,18 +157,20 @@ class DmnService(
 
         // loop through the sources and get the Object as Json and map with the variables
         sources?.forEach {
-            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)
+            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,
+                        ),
+                    )
+                }
+            }
         }
 
         // check if the beslisTabelVariables contains a producttype configuration,

product/src/test/kotlin/nl/nlportal/product/ProductTestConfiguration.kt

@@ -60,6 +60,9 @@ class ProductTestConfiguration {
     @Value("classpath:product/graphql/getProductDecision.graphql")
     private lateinit var getProductDecision: Resource
 
+    @Value("classpath:product/graphql/getDecision.graphql")
+    private lateinit var getDecision: Resource
+
     @Bean
     fun graphqlGetProducten(): String {
         return StreamUtils.copyToString(
@@ -155,4 +158,12 @@ class ProductTestConfiguration {
             StandardCharsets.UTF_8,
         )
     }
+
+    @Bean
+    fun graphqlGetDecision(): String {
+        return StreamUtils.copyToString(
+            getDecision.inputStream,
+            StandardCharsets.UTF_8,
+        )
+    }
 }

product/src/test/kotlin/nl/nlportal/product/graphql/ProductQueryIT.kt

@@ -61,6 +61,7 @@ internal class ProductQueryIT(
     @Autowired private val graphqlGetProductType: String,
     @Autowired private val graphqlGetProductTypes: String,
     @Autowired private val graphqlGetProductDecision: String,
+    @Autowired private val graphqlGetDecision: String,
     @Autowired private val graphqlProductPrefill: String,
 ) {
     companion object {
@@ -324,6 +325,23 @@ internal class ProductQueryIT(
             ).isEqualTo("https://formulier.denhaag.nl/Tripleforms/formulier/nl-NL/DefaultEnvironment/scNaheffingsAanslagParkeren.aspx")
     }
 
+    @Test
+    @WithBurgerUser("569312864")
+    fun getDescisionTest() {
+        val basePath = "$.data.getDecision"
+
+        testClient.post()
+            .uri("/graphql")
+            .accept(MediaType.APPLICATION_JSON)
+            .contentType(MediaType("application", "graphql"))
+            .bodyValue(graphqlGetDecision)
+            .exchange()
+            .verifyOnlyDataExists(basePath)
+            .jsonPath(
+                "$basePath[0].action.value",
+            ).isEqualTo("https://formulier.denhaag.nl/Tripleforms/formulier/nl-NL/DefaultEnvironment/scNaheffingsAanslagParkeren.aspx")
+    }
+
     @Test
     @WithBurgerUser("569312863")
     fun productPrefillTestBurger() {

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

@@ -58,6 +58,18 @@
                 "classType":"Integer"
               }
             ],
+            "belastingzakenaanslag": [
+              {
+                "name":"jaar",
+                "classType":"Double",
+                "regex":"$.aanslagBiljet.belastingjaar"
+              },
+              {
+                "name":"saldo",
+                "classType":"Double",
+                "regex":"$.aanslagBiljetTotaal"
+              }
+            ],
             "static": [
               {
                 "name":"formulieren",

product/src/test/resources/product/graphql/getDecision.graphql

@@ -0,0 +1,10 @@
+query {
+    getDecision(
+        sources: {
+           belastingzakenaanslag:"{aanslagBiljetTotaal: 79.3}",
+        },
+        key: "watkanikregelen",
+        productTypeId: "7d9cd6c2-8147-46f2-9ae9-c67e8213c200",
+        productName: "erfpacht"
+    )
+}

product/src/test/resources/product/graphql/getProductDecision.graphql

@@ -2,7 +2,7 @@ query {
     getProductDecision(
         sources: {
            product:"2d725c07-2f26-4705-8637-438a42b5ac2d",
-           productverbruiksobject: "2d725c07-2f26-4705-8637-438a42b5a800"
+           productverbruiksobject: "2d725c07-2f26-4705-8637-438a42b5a800",
         },
         key: "watkanikregelen",
         productTypeId: "7d9cd6c2-8147-46f2-9ae9-c67e8213c200",