fix tests

medizininformatik-initiative · Oct 18, 2024 · 36b5209 · 36b5209
1 parent 145a980
commit 36b5209
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/test/java/de/medizininformatikinitiative/torch/AbstractIT.java b/src/test/java/de/medizininformatikinitiative/torch/AbstractIT.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.medizininformatikinitiative.torch.cql.CqlClient;
 import de.medizininformatikinitiative.torch.exceptions.PatientIdNotFoundException;
+import de.medizininformatikinitiative.torch.model.mapping.DseMappingTreeBase;
 import de.medizininformatikinitiative.torch.service.DataStore;
 import de.medizininformatikinitiative.torch.util.ResourceReader;
 import de.medizininformatikinitiative.torch.util.ResourceUtils;
@@ -74,6 +75,8 @@ public abstract class AbstractIT {
     private String testPopulationPath;
     protected final FhirContext fhirContext;
 
+    protected final DseMappingTreeBase dseMappingTreeBase;
+
     @Bean
     @Autowired
     @Qualifier("fhirClient")
@@ -104,7 +107,8 @@ public AbstractIT(@Qualifier("fhirClient") WebClient webClient,
             BundleCreator bundleCreator,
             ObjectMapper objectMapper,
             CqlClient cqlClient,
-            Translator cqlQueryTranslator) {
+            Translator cqlQueryTranslator,
+                      DseMappingTreeBase dseMappingTreeBase) {
         this.webClient = webClient;
         this.flareClient = flareClient;
         this.transformer = transformer;
@@ -115,6 +119,7 @@ public AbstractIT(@Qualifier("fhirClient") WebClient webClient,
         this.objectMapper = objectMapper;
         this.cqlClient = cqlClient;
         this.cqlQueryTranslator = cqlQueryTranslator;
+        this.dseMappingTreeBase = dseMappingTreeBase;
 
     }
 

diff --git a/src/test/java/de/medizininformatikinitiative/torch/FhirControllerIT.java b/src/test/java/de/medizininformatikinitiative/torch/FhirControllerIT.java
@@ -6,6 +6,7 @@
 import de.medizininformatikinitiative.torch.cql.CqlClient;
 import de.medizininformatikinitiative.torch.exceptions.PatientIdNotFoundException;
 import de.medizininformatikinitiative.torch.model.Crtdl;
+import de.medizininformatikinitiative.torch.model.mapping.DseMappingTreeBase;
 import de.medizininformatikinitiative.torch.rest.FhirController;
 import de.medizininformatikinitiative.torch.util.ResourceReader;
 import org.hl7.fhir.r4.model.*;
@@ -54,8 +55,8 @@ public class FhirControllerIT extends AbstractIT {
     @Autowired
     public FhirControllerIT(@Qualifier("fhirClient") WebClient webClient,
                             @Qualifier("flareClient") WebClient flareClient, ResourceTransformer transformer, DataStore dataStore, CdsStructureDefinitionHandler cds, FhirContext context, BundleCreator bundleCreator, ObjectMapper objectMapper, CqlClient cqlClient,
-                            Translator cqlQueryTranslator) {
-        super(webClient, flareClient, transformer, dataStore, cds, context, bundleCreator, objectMapper, cqlClient, cqlQueryTranslator);
+                            Translator cqlQueryTranslator, DseMappingTreeBase dseMappingTreeBase) {
+        super(webClient, flareClient, transformer, dataStore, cds, context, bundleCreator, objectMapper, cqlClient, cqlQueryTranslator, dseMappingTreeBase);
     }
 
     @Test

diff --git a/src/test/java/de/medizininformatikinitiative/torch/config/TestConfig.java b/src/test/java/de/medizininformatikinitiative/torch/config/TestConfig.java
@@ -10,6 +10,8 @@
 import de.medizininformatikinitiative.torch.cql.FhirConnector;
 import de.medizininformatikinitiative.torch.cql.FhirHelper;
 import de.medizininformatikinitiative.torch.*;
+import de.medizininformatikinitiative.torch.model.mapping.DseMappingTreeBase;
+import de.medizininformatikinitiative.torch.model.mapping.DseTreeRoot;
 import de.medizininformatikinitiative.torch.rest.CapabilityStatementController;
 import de.medizininformatikinitiative.torch.util.ConsentCodeMapper;
 import de.medizininformatikinitiative.torch.service.DataStore;
@@ -65,6 +67,8 @@ public class TestConfig {
     private String mappingsFile;
     @Value("${torch.conceptTreeFile}")
     private String conceptTreeFile;
+    @Value("${torch.dseMappingTreeFile}")
+    private String dseMappingTreeFile;
 
 
     @Bean
@@ -121,6 +125,11 @@ public DataStore dataStore(@Qualifier("fhirClient") WebClient client, FhirContex
         return new DataStore(client, context, clock, pageCount);
     }
 
+    @Bean
+    public DseMappingTreeBase dseMappingTreeBase(ObjectMapper jsonUtil) throws IOException {
+        return new DseMappingTreeBase(Arrays.stream(jsonUtil.readValue(new File(dseMappingTreeFile), DseTreeRoot[].class)).toList());
+    }
+
     @Lazy
     @Bean
     Translator createCqlTranslator( ObjectMapper jsonUtil) throws IOException {