Merge pull request #10 from num-codex/test_data_cleanup_docs

Test Data Cleanup, Documentation, 0.2.2 fixes

Author: hhund

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java

@@ -20,7 +20,7 @@
 
 public class DataTransferProcessPluginDefinition implements ProcessPluginDefinition
 {
-	public static final String VERSION = "0.2.1";
+	public static final String VERSION = "0.2.2";
 
 	@Override
 	public String getName()

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FhirClientFactory.java

@@ -3,7 +3,6 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 import java.util.UUID;
 import java.util.stream.Stream;
 
@@ -70,16 +69,7 @@ public void storeBundle(Bundle bundle)
 			public PseudonymList getPseudonymsWithNewData(DateWithPrecision exportFrom, Date exportTo)
 			{
 				logger.warn("Returning demo pseudonyms for {}", localIdentifierValue);
-
-				List<String> pseudonyms;
-				if ("charite-tmptst.de".equals(localIdentifierValue))
-					pseudonyms = Arrays.asList("dic_berlin/dic_CT6E6", "dic_berlin/dic_9LDA5");
-				else if ("klinikum.uni-heidelberg.de".equals(localIdentifierValue))
-					pseudonyms = Arrays.asList("dic_heidelberg/dic_3YKQW", "dic_heidelberg/dic_RPRM3");
-				else
-					pseudonyms = Arrays.asList("foo/bar", "baz/qux");
-
-				return new PseudonymList(pseudonyms);
+				return new PseudonymList(Arrays.asList("dic_foo/bar", "dic_foo/baz"));
 			}
 
 			@Override

codex-processes-ap1-docker-test-setup/README.md

@@ -0,0 +1,76 @@
+# Testing using Docker Setup
+
+Build the project from the root directory of this repository by executing the following command.
+
+```sh
+mvn clean package
+```
+
+Add entries to your hosts file
+```
+127.0.0.1	dic
+127.0.0.1	gth
+127.0.0.1	crr
+```
+
+Console 1: Start DIC HAPI FHIR Server
+```sh
+docker-compose up dic-fhir-store
+```
+Access at http://localhost:8003/
+
+Console 2: Start CRR HAPI FHIR Server
+```sh
+docker-compose up crr-fhir-store
+```
+Access at http://localhost:8005/
+
+Console 3: Start DIC DSF FHIR Server and wait till startet
+```sh
+docker-compose up -d dic-fhir-proxy dic-fhir-app dic-fhir-db && docker-compose logs -f dic-fhir-app
+```
+Console 3: Dicconnect from log output (Ctrl-C) if Server startet
+Console 3: Start DIC DSF BPE Server
+```sh
+docker-compose up -d dic-bpe-app dic-bpe-db && docker-compose logs -f dic-fhir-app dic-bpe-app
+````
+
+Console 4: Start GTH DSF FHIR Server and wait till startet
+```sh
+docker-compose up -d gth-fhir-proxy gth-fhir-app gth-fhir-db && docker-compose logs -f gth-fhir-app
+```
+Console 4: Dicconnect from log output (Ctrl-C) if Server startet
+Console 4: Start GTH DSF BPE Server
+```sh
+docker-compose up -d gth-bpe-app gth-bpe-db && docker-compose logs -f gth-fhir-app gth-bpe-app
+````
+
+Console 5: Start CRR DSF FHIR Server and wait till startet
+```sh
+docker-compose up -d crr-fhir-proxy crr-fhir-app crr-fhir-db && docker-compose logs -f crr-fhir-app
+```
+Console 5: Dicconnect from log output (Ctrl-C) if Server startet
+Console 5: Start CRR DSF BPE Server
+```sh
+docker-compose up -d crr-bpe-app crr-bpe-db && docker-compose logs -f crr-fhir-app crr-bpe-app
+````
+
+Webbrowser at http://localhost:8003/: Add Demo Data to DIC HAPI FHIR Server via Transaction-Bundle at
+[dic_fhir_store_demo.json](codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo.json)
+
+Console 6: Start Data Trigger Process at DIC using the following command
+```sh
+curl -H "Accept: application/xml+fhir" -H "Content-Type: application/fhir+xml" \
+-d @codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataTrigger.xml \
+--ssl-no-revoke --cacert codex-processes-ap1-test-data-generator/cert/ca/testca_certificate.pem \
+--cert codex-processes-ap1-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.pem \
+--key codex-processes-ap1-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_private-key.pem \
+https://dic/fhir/Task
+```
+
+Webbrowser at http://localhost:8005/: Check data transfered CRR HAPI FHIR Server
+
+Console X: Stop everything
+```sh
+docker-compose down -v
+```

codex-processes-ap1-docker-test-setup/crr/bpe/app/conf/config.properties

@@ -57,7 +57,7 @@ org.highmed.dsf.bpe.fhir.task.subscription.lastEventTimeFile=last_event/time.fil
 #org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.namespaceId=
 #org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.universalId=
 
-org.highmed.dsf.bpe.process.excluded=dataTrigger/0.2.1,dataSend/0.2.1,dataTranslate/0.2.1
+org.highmed.dsf.bpe.process.excluded=dataTrigger/0.2.2,dataSend/0.2.2,dataTranslate/0.2.2
 #org.highmed.dsf.bpe.process.retired=
 #org.highmed.dsf.bpe.process_plugin_directroy=process
 

codex-processes-ap1-docker-test-setup/dic/bpe/app/conf/config.properties

@@ -57,7 +57,7 @@ org.highmed.dsf.bpe.fhir.task.subscription.lastEventTimeFile=last_event/time.fil
 #org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.namespaceId=
 #org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.universalId=
 
-org.highmed.dsf.bpe.process.excluded=dataTranslate/0.2.1,dataReceive/0.2.1
+org.highmed.dsf.bpe.process.excluded=dataTranslate/0.2.2,dataReceive/0.2.2
 #org.highmed.dsf.bpe.process.retired=
 #org.highmed.dsf.bpe.process_plugin_directroy=process
 

codex-processes-ap1-docker-test-setup/gth/bpe/app/conf/config.properties

@@ -57,7 +57,7 @@ org.highmed.dsf.bpe.fhir.task.subscription.lastEventTimeFile=last_event/time.fil
 #org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.namespaceId=
 #org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.universalId=
 
-org.highmed.dsf.bpe.process.excluded=dataTrigger/0.2.1,dataSend/0.2.1,dataReceive/0.2.1
+org.highmed.dsf.bpe.process.excluded=dataTrigger/0.2.2,dataSend/0.2.2,dataReceive/0.2.2
 #org.highmed.dsf.bpe.process.retired=
 #org.highmed.dsf.bpe.process_plugin_directroy=process