Merge pull request #16 from medizininformatik-initiative/feature/move…

…_namespace_to_mii Move Namespace to MII
medizininformatik-initiative · Jun 2, 2022 · 05bf8c0 · 05bf8c0
2 parents df8016a + 3f3e412
commit 05bf8c0
Show file tree

Hide file tree

Showing 24 changed files with 103 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,16 @@
 /feasibility-dsf-process-docker-test-setup/dic-2/fhir/log/*.log
 /feasibility-dsf-process-docker-test-setup/dic-2/fhir/log/*.log.gz
 
+/feasibility-dsf-process-docker-test-setup/dic-3/bpe/last_event/time.file
+/feasibility-dsf-process-docker-test-setup/dic-3/bpe/log/*.log
+/feasibility-dsf-process-docker-test-setup/dic-3/bpe/log/*.log.gz
+/feasibility-dsf-process-docker-test-setup/dic-3/bpe/plugin/*.jar
+/feasibility-dsf-process-docker-test-setup/dic-3/bpe/process/*.jar
+/feasibility-dsf-process-docker-test-setup/dic-3/fhir/conf/bundle.xml
+/feasibility-dsf-process-docker-test-setup/dic-3/fhir/conf/config.properties
+/feasibility-dsf-process-docker-test-setup/dic-3/fhir/log/*.log
+/feasibility-dsf-process-docker-test-setup/dic-3/fhir/log/*.log.gz
+
 /feasibility-dsf-process-docker-test-setup/zars/bpe/last_event/time.file
 /feasibility-dsf-process-docker-test-setup/zars/bpe/log/*.log
 /feasibility-dsf-process-docker-test-setup/zars/bpe/log/*.log.gz

diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Netzwerk Universitätsmedizin
+   Copyright 2021 Medizininformatik Initiative
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/feasibility-dsf-process-docker-test-setup/data/feasibility-bundle.json b/feasibility-dsf-process-docker-test-setup/data/feasibility-bundle.json
@@ -8,10 +8,10 @@
         "resourceType": "Task",
         "meta": {
           "profile": [
-            "https://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/codex-task-request-simple-feasibility"
+            "http://medizininformatik-initiative.de/fhir/StructureDefinition/codex-task-request-simple-feasibility"
           ]
         },
-        "instantiatesUri": "http://www.netzwerk-universitaetsmedizin.de/bpe/Process/requestSimpleFeasibility/0.2.0",
+        "instantiatesUri": "http://medizininformatik-initiative.de/bpe/Process/requestSimpleFeasibility/0.2.0",
         "status": "requested",
         "intent": "order",
         "authoredOn": "2021",
@@ -60,7 +60,7 @@
             "type": {
               "coding": [
                 {
-                  "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/feasibility",
+                  "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/feasibility",
                   "code": "measure-reference"
                 }
               ]
@@ -88,7 +88,7 @@
             }
           ],
           "profile": [
-            "https://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/codex-measure"
+            "http://medizininformatik-initiative.de/fhir/StructureDefinition/codex-measure"
           ]
         },
         "url": "https://zars/Measure/7a142223-616f-41a1-97da-2ae726031b71",
@@ -142,7 +142,7 @@
             }
           ],
           "profile": [
-            "https://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/codex-library"
+            "http://medizininformatik-initiative.de/fhir/StructureDefinition/codex-library"
           ]
         },
         "url": "urn:uuid:30561ba6-106f-4d52-bb8d-e49e20a40d40",

diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/flare/feasibility-code-tree.json b/feasibility-dsf-process-docker-test-setup/dic-1/flare/feasibility-code-tree.json
@@ -17857,71 +17857,71 @@
           "termCode": {
             "code": "1",
             "display": "Very Fit",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/frailty-score"
           }
         },
         {
           "children": [],
           "termCode": {
             "code": "2",
             "display": "Well",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/frailty-score"
           }
         },
         {
           "children": [],
           "termCode": {
             "code": "3",
             "display": "Managing Well",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/frailty-score"
           }
         },
         {
           "children": [],
           "termCode": {
             "code": "4",
             "display": "Vulnerable",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/frailty-score"
           }
         },
         {
           "children": [],
           "termCode": {
             "code": "5",
             "display": "Mildly Frail",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/frailty-score"
           }
         },
         {
           "children": [],
           "termCode": {
             "code": "6",
             "display": "Moderately Frail",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/frailty-score"
           }
         },
         {
           "children": [],
           "termCode": {
             "code": "7",
             "display": "Severely Frail",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/frailty-score"
           }
         },
         {
           "children": [],
           "termCode": {
             "code": "8",
             "display": "Very Severely Frail",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/frailty-score"
           }
         },
         {
           "children": [],
           "termCode": {
             "code": "9",
             "display": "Terminally Ill",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/frailty-score"
           }
         },
         {
@@ -23075,15 +23075,15 @@
           "termCode": {
             "code": "02",
             "display": "Study enrolment due to Covid-19",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/ecrf-parameter-codes"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/ecrf-parameter-codes"
           }
         },
         {
           "children": [],
           "termCode": {
             "code": "03",
             "display": "Interventional studies participation",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/ecrf-parameter-codes"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/ecrf-parameter-codes"
           }
         }
       ],
@@ -23574,7 +23574,7 @@
           "termCode": {
             "code": "06",
             "display": "SOFA-Score",
-            "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/ecrf-parameter-codes"
+            "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/ecrf-parameter-codes"
           }
         },
         {

diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/flare/feasibility-mapping.json b/feasibility-dsf-process-docker-test-setup/dic-1/flare/feasibility-mapping.json
@@ -28258,7 +28258,7 @@
     "key": {
       "code": "02",
       "display": "Study enrolment due to Covid-19",
-      "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/ecrf-parameter-codes"
+      "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/ecrf-parameter-codes"
     },
     "termCodeSearchParameter": "code",
     "valueSearchParameter": "value-concept"
@@ -31464,7 +31464,7 @@
     "key": {
       "code": "03",
       "display": "Interventional studies participation",
-      "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/ecrf-parameter-codes"
+      "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/ecrf-parameter-codes"
     },
     "termCodeSearchParameter": "code",
     "valueSearchParameter": "value-concept"
@@ -52883,7 +52883,7 @@
     "key": {
       "code": "06",
       "display": "SOFA-Score",
-      "system": "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/ecrf-parameter-codes"
+      "system": "http://medizininformatik-initiative.de/fhir/CodeSystem/ecrf-parameter-codes"
     },
     "termCodeSearchParameter": "code",
     "valueSearchParameter": "value-quantity"

diff --git a/...lity-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-1-bundle.xml b/...lity-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-1-bundle.xml
@@ -174,17 +174,17 @@
                 </meta>
                 <identifier>
                     <system value="http://highmed.org/sid/organization-identifier"/>
-                    <value value="netzwerk-universitaetsmedizin.de"/>
+                    <value value="medizininformatik-initiative.de"/>
                 </identifier>
                 <active value="true"/>
-                <name value="Netzwerk Universitätsmedizin"/>
+                <name value="Medizininformatik Initiative"/>
             </Organization>
         </resource>
         <request>
             <method value="POST"/>
             <url value="Organization"/>
             <ifNoneExist
-                    value="identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de"/>
+                    value="identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de"/>
         </request>
     </entry>
 
@@ -224,7 +224,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_ZARS"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_ZARS"/>
         </request>
     </entry>
 
@@ -264,7 +264,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_1"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_1"/>
         </request>
     </entry>
 </Bundle>
diff --git a/...lity-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-2-bundle.xml b/...lity-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-2-bundle.xml
@@ -176,17 +176,17 @@
                 </meta>
                 <identifier>
                     <system value="http://highmed.org/sid/organization-identifier"/>
-                    <value value="netzwerk-universitaetsmedizin.de"/>
+                    <value value="medizininformatik-initiative.de"/>
                 </identifier>
                 <active value="true"/>
-                <name value="Netzwerk Universitätsmedizin"/>
+                <name value="Medizininformatik Initiative"/>
             </Organization>
         </resource>
         <request>
             <method value="POST"/>
             <url value="Organization"/>
             <ifNoneExist
-                    value="identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de"/>
+                    value="identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de"/>
         </request>
     </entry>
 
@@ -226,7 +226,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_ZARS"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_ZARS"/>
         </request>
     </entry>
 
@@ -266,7 +266,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_2"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_2"/>
         </request>
     </entry>
 </Bundle>
diff --git a/...lity-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-3-bundle.xml b/...lity-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-3-bundle.xml
@@ -176,17 +176,17 @@
                 </meta>
                 <identifier>
                     <system value="http://highmed.org/sid/organization-identifier"/>
-                    <value value="netzwerk-universitaetsmedizin.de"/>
+                    <value value="medizininformatik-initiative.de"/>
                 </identifier>
                 <active value="true"/>
-                <name value="Netzwerk Universitätsmedizin"/>
+                <name value="Medizininformatik Initiative"/>
             </Organization>
         </resource>
         <request>
             <method value="POST"/>
             <url value="Organization"/>
             <ifNoneExist
-                    value="identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de"/>
+                    value="identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de"/>
         </request>
     </entry>
 
@@ -226,7 +226,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_ZARS"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_ZARS"/>
         </request>
     </entry>
 
@@ -266,7 +266,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_3"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_3"/>
         </request>
     </entry>
 </Bundle>
diff --git a/...ility-dsf-process-test-data-generator/src/main/resources/bundle-templates/zars-bundle.xml b/...ility-dsf-process-test-data-generator/src/main/resources/bundle-templates/zars-bundle.xml
@@ -338,17 +338,17 @@
                 </meta>
                 <identifier>
                     <system value="http://highmed.org/sid/organization-identifier"/>
-                    <value value="netzwerk-universitaetsmedizin.de"/>
+                    <value value="medizininformatik-initiative.de"/>
                 </identifier>
                 <active value="true"/>
-                <name value="Netzwerk Universitätsmedizin"/>
+                <name value="Medizininformatik Initiative"/>
             </Organization>
         </resource>
         <request>
             <method value="POST"/>
             <url value="Organization"/>
             <ifNoneExist
-                    value="identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de"/>
+                    value="identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de"/>
         </request>
     </entry>
     <entry>
@@ -387,7 +387,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_ZARS"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_ZARS"/>
         </request>
     </entry>
 
@@ -427,7 +427,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_1"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_1"/>
         </request>
     </entry>
 
@@ -467,7 +467,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_2"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_2"/>
         </request>
     </entry>
 
@@ -507,7 +507,7 @@
             <method value="POST"/>
             <url value="OrganizationAffiliation"/>
             <ifNoneExist
-                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|netzwerk-universitaetsmedizin.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_3"/>
+                    value="primary-organization:identifier=http://highmed.org/sid/organization-identifier|medizininformatik-initiative.de&amp;participating-organization:identifier=http://highmed.org/sid/organization-identifier|Test_DIC_3"/>
         </request>
     </entry>
 </Bundle>
diff --git a/...izininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDefinition.java b/...izininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDefinition.java
@@ -27,7 +27,7 @@ public class FeasibilityProcessPluginDefinition implements ProcessPluginDefiniti
 
     @Override
     public String getName() {
-        return "feasibility-dsf-process";
+        return "mii-process-feasibility";
     }
 
     @Override
@@ -75,9 +75,9 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader
         var vF = ValueSetResource.file("fhir/ValueSet/feasibility.xml");
 
         Map<String, List<AbstractResource>> resourcesByProcessKeyAndVersion = Map.of(
-                "wwwnetzwerk-universitaetsmedizinde_executeSimpleFeasibility/" + VERSION,
+                "medizininformatik-initiativede_executeSimpleFeasibility/" + VERSION,
                 Arrays.asList(aExe, sTExe, sTResS, vF, cF, sMeasure, sMeasureReport, sLibrary),
-                "wwwnetzwerk-universitaetsmedizinde_requestSimpleFeasibility/" + VERSION,
+                "medizininformatik-initiativede_requestSimpleFeasibility/" + VERSION,
                 Arrays.asList(aReq, sTReq, sExtDic, vF, cF, sMeasure, sMeasureReport, sLibrary));
 
         return ResourceProvider.read(VERSION,