feat!: change data model librarychange-data-model

Since DNPM Datenmodell 2.1 changes from time to time,
use a (mostly) autogenerated library based on JSON schema.

3 files changed, 41 insertions, 23 deletions

diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt
index 248f889..9f1e183 100644
--- a/src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt
+++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt
@@ -24,7 +24,16 @@ import dev.dnpm.etl.processor.monitoring.RequestRepository
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import dev.dnpm.etl.processor.output.DnpmV2MtbFileRequest
 import dev.dnpm.etl.processor.output.MtbFileSender
-import dev.pcvolkmer.mv64e.mtb.*
+import dev.pcvolkmer.mv64e.model.Coding
+import dev.pcvolkmer.mv64e.model.ConsentProvisionType
+import dev.pcvolkmer.mv64e.model.ModelProjectConsentPurpose
+import dev.pcvolkmer.mv64e.model.MtbDiagnosis
+import dev.pcvolkmer.mv64e.model.MvhMetadata
+import dev.pcvolkmer.mv64e.model.MvhMetadataModelProjectConsent
+import dev.pcvolkmer.mv64e.model.MvhMetadataModelProjectConsentProvisionsInner
+import dev.pcvolkmer.mv64e.model.Patient
+import dev.pcvolkmer.mv64e.model.PatientRecord
+import dev.pcvolkmer.mv64e.model.Reference
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Nested
@@ -105,16 +114,16 @@ class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
           .send(any<DnpmV2MtbFileRequest>())
 
       val mtbFile =
-          Mtb.builder()
+          PatientRecord.builder()
               .patient(Patient.builder().id("TEST_12345678").build())
               .metadata(
                   MvhMetadata.builder()
                       .modelProjectConsent(
-                          ModelProjectConsent.builder()
+                          MvhMetadataModelProjectConsent.builder()
                               .provisions(
                                   listOf(
-                                      Provision.builder()
-                                          .type(ConsentProvision.PERMIT)
+                                      MvhMetadataModelProjectConsentProvisionsInner.builder()
+                                          .type(ConsentProvisionType.PERMIT)
                                           .purpose(ModelProjectConsentPurpose.SEQUENCING)
                                           .build()
                                   )
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 ba793f2..a9427b7 100644
--- a/src/integrationTest/kotlin/dev/dnpm/etl/processor/input/MtbFileRestControllerTest.kt
+++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/input/MtbFileRestControllerTest.kt
@@ -29,7 +29,11 @@ import dev.dnpm.etl.processor.consent.TtpConsentStatus
 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 dev.pcvolkmer.mv64e.model.MtbEpisodeOfCare
+import dev.pcvolkmer.mv64e.model.Patient
+import dev.pcvolkmer.mv64e.model.PatientRecord
+import dev.pcvolkmer.mv64e.model.PeriodDate
+import dev.pcvolkmer.mv64e.model.Reference
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Nested
@@ -112,7 +116,7 @@ class MtbFileRestControllerTest {
             ]
     )
     fun testShouldGrantPermissionToSendMtbFile(url: String) {
-        whenever { requestProcessor.processMtbFile(any<Mtb>()) }.thenReturn(true)
+        whenever { requestProcessor.processMtbFile(any<PatientRecord>()) }.thenReturn(true)
 
         mockMvc
             .post(url) {
@@ -122,7 +126,7 @@ class MtbFileRestControllerTest {
             }
             .andExpect { status { isAccepted() } }
 
-        verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
+        verify(requestProcessor, times(1)).processMtbFile(any<PatientRecord>())
     }
 
     @ParameterizedTest
@@ -140,7 +144,7 @@ class MtbFileRestControllerTest {
             ]
     )
     fun testShouldGrantPermissionToSendMtbFileToAdminUser(url: String) {
-        whenever { requestProcessor.processMtbFile(any<Mtb>()) }.thenReturn(true)
+        whenever { requestProcessor.processMtbFile(any<PatientRecord>()) }.thenReturn(true)
 
         mockMvc
             .post(url) {
@@ -150,7 +154,7 @@ class MtbFileRestControllerTest {
             }
             .andExpect { status { isAccepted() } }
 
-        verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
+        verify(requestProcessor, times(1)).processMtbFile(any<PatientRecord>())
     }
 
     @ParameterizedTest
@@ -168,7 +172,7 @@ class MtbFileRestControllerTest {
             ]
     )
     fun testShouldGrantPermissionToSendMtbFileToUser(url: String) {
-        whenever { requestProcessor.processMtbFile(any<Mtb>()) }.thenReturn(true)
+        whenever { requestProcessor.processMtbFile(any<PatientRecord>()) }.thenReturn(true)
 
         mockMvc
             .post(url) {
@@ -178,7 +182,7 @@ class MtbFileRestControllerTest {
             }
             .andExpect { status { isAccepted() } }
 
-        verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
+        verify(requestProcessor, times(1)).processMtbFile(any<PatientRecord>())
     }
 
     @ParameterizedTest
@@ -203,7 +207,7 @@ class MtbFileRestControllerTest {
             }
             .andExpect { status { isUnauthorized() } }
 
-        verify(requestProcessor, never()).processMtbFile(any<Mtb>())
+        verify(requestProcessor, never()).processMtbFile(any<PatientRecord>())
     }
 
     @ParameterizedTest
@@ -269,7 +273,7 @@ class MtbFileRestControllerTest {
             }
             .andExpect { status { isBadRequest() } }
 
-        val result = verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
+        val result = verify(requestProcessor, times(1)).processMtbFile(any<PatientRecord>())
         assertThat(result).isFalse()
     }
 
@@ -301,7 +305,7 @@ class MtbFileRestControllerTest {
                 ]
         )
         fun testShouldGrantPermissionToSendMtbFileToAdminUser(url: String) {
-            whenever { requestProcessor.processMtbFile(any<Mtb>()) }.thenReturn(true)
+            whenever { requestProcessor.processMtbFile(any<PatientRecord>()) }.thenReturn(true)
 
             mockMvc
                 .post(url) {
@@ -311,7 +315,7 @@ class MtbFileRestControllerTest {
                 }
                 .andExpect { status { isAccepted() } }
 
-            verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
+            verify(requestProcessor, times(1)).processMtbFile(any<PatientRecord>())
         }
 
         @ParameterizedTest
@@ -329,7 +333,7 @@ class MtbFileRestControllerTest {
                 ]
         )
         fun testShouldGrantPermissionToSendMtbFileToUser(url: String) {
-            whenever { requestProcessor.processMtbFile(any<Mtb>()) }.thenReturn(true)
+            whenever { requestProcessor.processMtbFile(any<PatientRecord>()) }.thenReturn(true)
 
             mockMvc
                 .post(url) {
@@ -339,14 +343,14 @@ class MtbFileRestControllerTest {
                 }
                 .andExpect { status { isAccepted() } }
 
-            verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
+            verify(requestProcessor, times(1)).processMtbFile(any<PatientRecord>())
         }
     }
 
     companion object {
 
         val mtbFile =
-            Mtb.builder()
+            PatientRecord.builder()
                 .patient(Patient.builder().id("PID").build())
                 .episodesOfCare(
                     listOf(
diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/output/RestDipMtbFileSenderTest.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/output/RestDipMtbFileSenderTest.kt
index 9c94c4a..2e42174 100644
--- a/src/integrationTest/kotlin/dev/dnpm/etl/processor/output/RestDipMtbFileSenderTest.kt
+++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/output/RestDipMtbFileSenderTest.kt
@@ -25,7 +25,12 @@ import dev.dnpm.etl.processor.config.*
 import dev.dnpm.etl.processor.consent.ConsentEvaluator
 import dev.dnpm.etl.processor.monitoring.ReportService
 import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.pcvolkmer.mv64e.mtb.*
+import dev.pcvolkmer.mv64e.model.GenderCoding
+import dev.pcvolkmer.mv64e.model.MtbEpisodeOfCare
+import dev.pcvolkmer.mv64e.model.Patient
+import dev.pcvolkmer.mv64e.model.PatientRecord
+import dev.pcvolkmer.mv64e.model.PeriodDate
+import dev.pcvolkmer.mv64e.model.Reference
 import org.assertj.core.api.Assertions.assertThat
 import org.hamcrest.CoreMatchers.not
 import org.hamcrest.Matchers.containsString
@@ -121,13 +126,13 @@ class RestDipMtbFileSenderTest {
   }
 
   companion object {
-    fun dnpmV2MtbFile(): Mtb {
-      return Mtb().apply {
+    fun dnpmV2MtbFile(): PatientRecord {
+      return PatientRecord().apply {
         this.patient =
             Patient().apply {
               this.id = "PID"
               this.birthDate = Date.from(Instant.now())
-              this.gender = GenderCoding().apply { this.code = GenderCodingCode.MALE }
+              this.gender = GenderCoding().apply { this.code = GenderCoding.CodeEnum.MALE }
             }
         this.episodesOfCare =
             listOf(