summaryrefslogtreecommitdiff
path: root/src/integrationTest/kotlin/dev/dnpm/etl/processor
diff options
context:
space:
mode:
Diffstat (limited to 'src/integrationTest/kotlin/dev/dnpm/etl/processor')
-rw-r--r--src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt45
-rw-r--r--src/integrationTest/kotlin/dev/dnpm/etl/processor/input/MtbFileRestControllerTest.kt45
2 files changed, 35 insertions, 55 deletions
diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt
index 7e48e62..130fea7 100644
--- a/src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt
+++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt
@@ -20,11 +20,11 @@
package dev.dnpm.etl.processor
import com.fasterxml.jackson.databind.ObjectMapper
-import de.ukw.ccc.bwhc.dto.*
import dev.dnpm.etl.processor.monitoring.RequestRepository
import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.dnpm.etl.processor.output.BwhcV1MtbFileRequest
+import dev.dnpm.etl.processor.output.DnpmV2MtbFileRequest
import dev.dnpm.etl.processor.output.MtbFileSender
+import dev.pcvolkmer.mv64e.mtb.*
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Nested
@@ -69,7 +69,7 @@ class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
properties = [
"app.pseudonymize.generator=buildin",
"app.consent.service=none",
- "app.transformations[0].path=diagnoses[*].icd10.version",
+ "app.transformations[0].path=diagnoses[*].code.version",
"app.transformations[0].from=2013",
"app.transformations[0].to=2014",
]
@@ -94,36 +94,21 @@ class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
fun mtbFileIsTransformed() {
doAnswer {
MtbFileSender.Response(RequestStatus.SUCCESS)
- }.whenever(mtbFileSender).send(any<BwhcV1MtbFileRequest>())
+ }.whenever(mtbFileSender).send(any<DnpmV2MtbFileRequest>())
- val mtbFile = MtbFile.builder()
- .withPatient(
+ val mtbFile = Mtb.builder()
+ .patient(
Patient.builder()
- .withId("TEST_12345678")
- .withBirthDate("2000-08-08")
- .withGender(Patient.Gender.MALE)
+ .id("TEST_12345678")
.build()
)
- .withConsent(
- Consent.builder()
- .withId("1")
- .withStatus(Consent.Status.ACTIVE)
- .withPatient("TEST_12345678")
- .build()
- )
- .withEpisode(
- Episode.builder()
- .withId("1")
- .withPatient("TEST_12345678")
- .withPeriod(PeriodStart("2023-08-08"))
- .build()
- )
- .withDiagnoses(
+ .diagnoses(
listOf(
- Diagnosis.builder()
- .withId("1234")
- .withIcd10(Icd10.builder().withCode("F79.9").withVersion("2013").build())
- .build()
+ MtbDiagnosis.builder()
+ .id("1234")
+ .patient(Reference.builder().id("TEST_12345678").build())
+ .code(Coding.builder().code("F79.9").version("2013").build())
+ .build(),
)
)
.build()
@@ -137,10 +122,10 @@ class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
}
}
- val captor = argumentCaptor<BwhcV1MtbFileRequest>()
+ val captor = argumentCaptor<DnpmV2MtbFileRequest>()
verify(mtbFileSender).send(captor.capture())
assertThat(captor.firstValue.content.diagnoses).hasSize(1).allMatch { diagnosis ->
- diagnosis.icd10.version == "2014"
+ diagnosis.code.version == "2014"
}
}
}
diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/input/MtbFileRestControllerTest.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/input/MtbFileRestControllerTest.kt
index 8aa8ba0..78bdc8f 100644
--- a/src/integrationTest/kotlin/dev/dnpm/etl/processor/input/MtbFileRestControllerTest.kt
+++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/input/MtbFileRestControllerTest.kt
@@ -20,7 +20,6 @@
package dev.dnpm.etl.processor.input
import com.fasterxml.jackson.databind.ObjectMapper
-import de.ukw.ccc.bwhc.dto.*
import dev.dnpm.etl.processor.anyValueClass
import dev.dnpm.etl.processor.config.AppSecurityConfiguration
import dev.dnpm.etl.processor.consent.ConsentByMtbFile
@@ -29,6 +28,7 @@ import dev.dnpm.etl.processor.consent.IGetConsent
import dev.dnpm.etl.processor.security.TokenRepository
import dev.dnpm.etl.processor.security.UserRoleRepository
import dev.dnpm.etl.processor.services.RequestProcessor
+import dev.pcvolkmer.mv64e.mtb.*
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Test
@@ -48,6 +48,8 @@ import org.springframework.test.context.junit.jupiter.SpringExtension
import org.springframework.test.web.servlet.MockMvc
import org.springframework.test.web.servlet.delete
import org.springframework.test.web.servlet.post
+import java.time.Instant
+import java.util.*
@WebMvcTest(controllers = [MtbFileRestController::class])
@ExtendWith(value = [MockitoExtension::class, SpringExtension::class])
@@ -93,7 +95,7 @@ class MtbFileRestControllerTest {
status { isAccepted() }
}
- verify(requestProcessor, times(1)).processMtbFile(any<MtbFile>())
+ verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
}
@Test
@@ -106,7 +108,7 @@ class MtbFileRestControllerTest {
status { isAccepted() }
}
- verify(requestProcessor, times(1)).processMtbFile(any<MtbFile>())
+ verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
}
@Test
@@ -119,7 +121,7 @@ class MtbFileRestControllerTest {
status { isUnauthorized() }
}
- verify(requestProcessor, never()).processMtbFile(any<MtbFile>())
+ verify(requestProcessor, never()).processMtbFile(any<Mtb>())
}
@Test
@@ -132,7 +134,7 @@ class MtbFileRestControllerTest {
status { isForbidden() }
}
- verify(requestProcessor, never()).processMtbFile(any<MtbFile>())
+ verify(requestProcessor, never()).processMtbFile(any<Mtb>())
}
@Test
@@ -180,7 +182,7 @@ class MtbFileRestControllerTest {
status { isAccepted() }
}
- verify(requestProcessor, times(1)).processMtbFile(any<MtbFile>())
+ verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
}
@Test
@@ -193,33 +195,26 @@ class MtbFileRestControllerTest {
status { isAccepted() }
}
- verify(requestProcessor, times(1)).processMtbFile(any<MtbFile>())
+ verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
}
}
companion object {
- val mtbFile: MtbFile = MtbFile.builder()
- .withPatient(
+ val mtbFile = Mtb.builder()
+ .patient(
Patient.builder()
- .withId("PID")
- .withBirthDate("2000-08-08")
- .withGender(Patient.Gender.MALE)
+ .id("PID")
.build()
)
- .withConsent(
- Consent.builder()
- .withId("1")
- .withStatus(Consent.Status.ACTIVE)
- .withPatient("PID")
- .build()
- )
- .withEpisode(
- Episode.builder()
- .withId("1")
- .withPatient("PID")
- .withPeriod(PeriodStart("2023-08-08"))
- .build()
+ .episodesOfCare(
+ listOf(
+ MtbEpisodeOfCare.builder()
+ .id("1")
+ .patient(Reference.builder().id("PID").build())
+ .period(PeriodDate.builder().start(Date.from(Instant.parse("2023-08-08T02:00:00.00Z"))).build())
+ .build()
+ )
)
.build()
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-01 04:40:05 +0000