From 6ad6ee13a1cae8ed286e80b3a46c458e1052480b Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <volkmer_p@ukw.de>
Date: Tue, 8 Aug 2023 19:16:59 +0200
Subject: [PATCH] Ignore unknown properties in DataQualityResponse

---
 .../etl/processor/monitoring/ReportService.kt |  3 +
 .../processor/services/ReportServiceTest.kt   | 70 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 src/test/kotlin/dev/dnpm/etl/processor/services/ReportServiceTest.kt

diff --git a/src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt b/src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt
index 8c31ede..ae36705 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt
@@ -19,6 +19,7 @@
 
 package dev.dnpm.etl.processor.monitoring
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonValue
 import com.fasterxml.jackson.core.JsonParseException
 import com.fasterxml.jackson.databind.JsonMappingException
@@ -46,8 +47,10 @@ class ReportService(
     }
 
 
+    @JsonIgnoreProperties(ignoreUnknown = true)
     private data class DataQualityReport(val issues: List<Issue>)
 
+    @JsonIgnoreProperties(ignoreUnknown = true)
     data class Issue(val severity: Severity, val message: String)
 
     enum class Severity(@JsonValue val value: String) {
diff --git a/src/test/kotlin/dev/dnpm/etl/processor/services/ReportServiceTest.kt b/src/test/kotlin/dev/dnpm/etl/processor/services/ReportServiceTest.kt
new file mode 100644
index 0000000..70efe2b
--- /dev/null
+++ b/src/test/kotlin/dev/dnpm/etl/processor/services/ReportServiceTest.kt
@@ -0,0 +1,70 @@
+/*
+ * This file is part of ETL-Processor
+ *
+ * Copyright (c) 2023  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.dnpm.etl.processor.services
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.KotlinModule
+import dev.dnpm.etl.processor.monitoring.ReportService
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class ReportServiceTest {
+
+    private lateinit var reportService: ReportService
+
+    @BeforeEach
+    fun setup() {
+        this.reportService = ReportService(ObjectMapper().registerModule(KotlinModule.Builder().build()))
+    }
+
+    @Test
+    fun shouldParseDataQualityReport() {
+        val json = """
+            {
+                "patient": "4711",
+                "issues": [
+                    { "severity": "warning", "message": "Warning Message" },
+                    { "severity": "error", "message": "Error Message" }
+                ]
+            }
+        """.trimIndent()
+
+        val actual = this.reportService.deserialize(json)
+
+        assertThat(actual).hasSize(2)
+        assertThat(actual[0].severity).isEqualTo(ReportService.Severity.WARNING)
+        assertThat(actual[0].message).isEqualTo("Warning Message")
+        assertThat(actual[1].severity).isEqualTo(ReportService.Severity.ERROR)
+        assertThat(actual[1].message).isEqualTo("Error Message")
+    }
+
+    @Test
+    fun shouldReturnSyntheticDataQualityReportOnParserError() {
+        val invalidResponse = "Invalid Response Data"
+
+        val actual = this.reportService.deserialize(invalidResponse)
+
+        assertThat(actual).hasSize(1)
+        assertThat(actual[0].severity).isEqualTo(ReportService.Severity.ERROR)
+        assertThat(actual[0].message).isEqualTo("Not parsable data quality report '$invalidResponse'")
+    }
+
+}
\ No newline at end of file