diff options
| -rw-r--r-- | build.gradle.kts | 2 | ||||
| -rw-r--r-- | src/main/kotlin/dev/dnpm/etl/processor/services/ConsentProcessor.kt | 6 | ||||
| -rw-r--r-- | src/test/kotlin/dev/dnpm/etl/processor/services/TransformationServiceTest.kt | 11 |
3 files changed, 11 insertions, 8 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 7a7ce8b..234dc02 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ group = "dev.dnpm" version = "0.12.6" // x-release-please-version var versions = mapOf( - "mtb-dto" to "0.1.2", + "mtb-dto" to "0.2.0", "hapi-fhir" to "8.4.0", "apache-cxf" to "4.1.3", "mockito-kotlin" to "6.1.0", diff --git a/src/main/kotlin/dev/dnpm/etl/processor/services/ConsentProcessor.kt b/src/main/kotlin/dev/dnpm/etl/processor/services/ConsentProcessor.kt index 8437962..6b8ae89 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/services/ConsentProcessor.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/services/ConsentProcessor.kt @@ -114,10 +114,10 @@ class ConsentProcessor( // we need another step to back to string, before we convert to object map val asJsonString = fhirContext.newJsonParser().encodeResourceToString(resource) try { - val mapOfJson: HashMap<String?, Any?>? = - objectMapper.readValue<HashMap<String?, Any?>?>( + val mapOfJson: MvhMetadata.ResearchConsent? = + objectMapper.readValue<MvhMetadata.ResearchConsent?>( asJsonString, - object : TypeReference<HashMap<String?, Any?>?>() {}, + object : TypeReference<MvhMetadata.ResearchConsent?>() {}, ) mtbFile.metadata.researchConsents.add(mapOfJson) } catch (e: JsonProcessingException) { diff --git a/src/test/kotlin/dev/dnpm/etl/processor/services/TransformationServiceTest.kt b/src/test/kotlin/dev/dnpm/etl/processor/services/TransformationServiceTest.kt index c6438e8..a4af214 100644 --- a/src/test/kotlin/dev/dnpm/etl/processor/services/TransformationServiceTest.kt +++ b/src/test/kotlin/dev/dnpm/etl/processor/services/TransformationServiceTest.kt @@ -19,14 +19,16 @@ package dev.dnpm.etl.processor.services +import ca.uhn.fhir.context.FhirContext +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.node.ObjectNode import dev.dnpm.etl.processor.config.JacksonConfig import dev.pcvolkmer.mv64e.mtb.* -import java.time.Instant -import java.util.Date import org.assertj.core.api.Assertions.assertThat -import org.hl7.fhir.instance.model.api.IBaseResource import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test +import java.time.Instant +import java.util.* class TransformationServiceTest { @@ -147,9 +149,10 @@ class TransformationServiceTest { ) .build() val consent = ConsentProcessorTest.getDummyGenomDeConsent() + val jsonNode = ObjectMapper().readValue(FhirContext.forR4().newJsonParser().encodeToString(consent), ObjectNode::class.java) mvhMetadata.researchConsents = mutableListOf() - mvhMetadata.researchConsents.add(mapOf(consent.id to consent as IBaseResource)) + mvhMetadata.researchConsents.add(MvhMetadata.ResearchConsent.from(jsonNode)) val mtbFile = Mtb.builder().metadata(mvhMetadata).build() |