fhir-bridge as CRR fhir server, option for blaze as DIC fhir server

Author: hhund

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

@@ -15,17 +15,18 @@ Add entries to your hosts file
 
 *Start docker-compose commands from sub-folder:* `codex-processes-ap1/codex-processes-ap1-docker-test-setup`
 
-Console 1: Start DIC HAPI FHIR Server
+Console 1: Start DIC HAPI FHIR Server or DIC blaze FHIR Server
 ```sh
-docker-compose up dic-fhir-store
+docker-compose up dic-fhir-store-hapi
+docker-compose up dic-fhir-store-blaze
 ```
-Access at http://localhost:8003/
+Access at http://localhost:8080/fhir/
 
-Console 2: Start CRR HAPI FHIR Server
+Console 2: Start CRR fhir-bridge Server
 ```sh
-docker-compose up crr-fhir-store
+docker-compose up crr-fhir-bridge
 ```
-Access at http://localhost:8005/
+Access at http://localhost:8888/fhir-bridge/fhir/
 
 Console 3: Start DIC DSF FHIR Server and wait till startet
 ```sh
@@ -57,11 +58,40 @@ Console 5: Start CRR DSF BPE Server
 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_psn.json](../codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_psn.json) or
-[dic_fhir_store_demo_bf.json](../codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_bf.json)
+<!--
+Webbrowser at http://localhost:8080/fhir/: Add Demo Data to DIC HAPI FHIR Server via Transaction-Bundle at
+[dic_fhir_store_demo_psn_create.json](../codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_psn_create.json) or
+[dic_fhir_store_demo_bf_create.json](../codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_bf_create.json)
+-->
+
+*Start curl commands from root-folder:* `codex-processes-ap1`
+
+Console 6: Execute Demo Transaction-Bundle for HAPI
+```sh
+curl -H "Accept: application/xml+fhir" -H "Content-Type: application/fhir+json" \
+-d @codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_psn.json \
+http://localhost:8080/fhir
+```
+or
+```sh
+curl -H "Accept: application/xml+fhir" -H "Content-Type: application/fhir+json" \
+-d @codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_bf.json \
+http://localhost:8080/fhir
+```
+
+Console 6: Execute Demo Transaction-Bundle for blaze
+```sh
+curl -H "Accept: application/xml+fhir" -H "Content-Type: application/fhir+json" \
+-d @codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_psn_create.json \
+http://localhost:8080/fhir
+```
+or
+```sh
+curl -H "Accept: application/xml+fhir" -H "Content-Type: application/fhir+json" \
+-d @codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_bf_create.json \
+http://localhost:8080/fhir
+```
 
-*Start curl command from root-folder:* `codex-processes-ap1`
 
 Console 6: Start Data Trigger Process at DIC using the following command
 ```sh
@@ -73,7 +103,12 @@ curl -H "Accept: application/xml+fhir" -H "Content-Type: application/fhir+xml" \
 https://dic/fhir/Task
 ```
 
-Webbrowser at http://localhost:8005/: Check data transfered CRR HAPI FHIR Server
+Console 6: Check data transfered to CRR fhir-bridge
+````sh
+curl http://localhost:8888/fhir-bridge/fhir/Patient
+curl http://localhost:8888/fhir-bridge/fhir/Condition
+curl http://localhost:8888/fhir-bridge/fhir/Observation
+```
 
 Console X: Stop everything
 ```sh

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

@@ -62,4 +62,4 @@ org.highmed.dsf.bpe.process.excluded=dataTrigger/0.3.3,dataSend/0.3.3,dataTransl
 #org.highmed.dsf.bpe.process_plugin_directroy=process
 
 de.netzwerk_universitaetsmedizin.codex.crr.privateKey=conf/crr_private-key.pem
-de.netzwerk_universitaetsmedizin.codex.fhir.serverBase=http://crr-fhir-store:8080/fhir
+de.netzwerk_universitaetsmedizin.codex.fhir.serverBase=http://crr-fhir-bridge:8888/fhir-bridge/fhir

codex-processes-ap1-docker-test-setup/docker-compose.yml

@@ -109,7 +109,7 @@ services:
     depends_on:
       - dic-bpe-db
       - dic-fhir-proxy
-      - dic-fhir-store
+    # - dic-fhir-store not defining a dependency here, dic-fhir-store* needs to be started manually
   dic-bpe-db:
     image: postgres:13
     restart: on-failure
@@ -130,15 +130,27 @@ services:
         target: /var/lib/postgresql/data
     secrets:
       - dic-bpe-postgres_password
-  dic-fhir-store:
+  dic-fhir-store-hapi:
     build: ./dic/hapi
     restart: on-failure
     ports:
-      - 127.0.0.1:8003:8080
+      - 127.0.0.1:8080:8080
     environment:
       TZ: Europe/Berlin
     networks:
-      - dic-bpe-backend
+      dic-bpe-backend:
+        aliases:
+          - dic-fhir-store
+  dic-fhir-store-blaze:
+    image: ghcr.io/num-codex/blaze
+    ports:
+      - 127.0.0.1:8080:8080
+    environment:
+      TZ: Europe/Berlin
+    networks:
+      dic-bpe-backend:
+        aliases:
+          - dic-fhir-store
 
 
   gth-fhir-proxy:
@@ -349,8 +361,7 @@ services:
     depends_on:
       - crr-bpe-db
       - crr-fhir-proxy
-      - crr-fhir-store
-#      - crr-fhir-bridge
+    # - crr-fhir-bridge not defining a dependency here, crr-fhir-bridge* needs to be started manually
   crr-bpe-db:
     image: postgres:13
     restart: on-failure
@@ -371,55 +382,50 @@ services:
         target: /var/lib/postgresql/data
     secrets:
       - crr-bpe-postgres_password
-  crr-fhir-store:
-    build: ./crr/hapi
-    restart: on-failure
-    ports:
-      - 127.0.0.1:8005:8080
+  crr-ehrbase-db:
+    image: ehrbase/ehrbase-postgres:latest
+    networks:
+      - crr-ehrbase-network
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      EHRBASE_USER: ehrbase
+      EHRBASE_PASSWORD: ehrbase
+      TZ: Europe/Berlin
+  crr-ehrbase:
+    image: ehrbase/ehrbase:next
+    networks:
+      - crr-ehrbase-network
     environment:
+      DB_URL: jdbc:postgresql://crr-ehrbase-db:5432/ehrbase
+      DB_USER: ehrbase
+      DB_PASS: ehrbase
+      SECURITY_AUTHTYPE: BASIC
+      SECURITY_AUTHUSER: myuser
+      SECURITY_AUTHPASSWORD: myPassword432
+      SECURITY_AUTHADMINUSER: myadmin
+      SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
+      SYSTEM_NAME: local.ehrbase.org
+      ADMIN_API_ACTIVE: 'true'
       TZ: Europe/Berlin
+    depends_on:
+      - crr-ehrbase-db
+  crr-fhir-bridge:
+    image: ehrbase/fhir-bridge:next 
+    ports:
+      - 127.0.0.1:8888:8888
+      - 127.0.0.1:5006:5006
     networks:
+      - crr-ehrbase-network
       - crr-bpe-backend
-#   crr-ehrbase-db:
-#     image: ehrbase/ehrbase-postgres:latest
-#     networks:
-#       - crr-ehrbase-network
-#     environment:
-#       POSTGRES_USER: postgres
-#       POSTGRES_PASSWORD: postgres
-#       EHRBASE_USER: ehrbase
-#       EHRBASE_PASSWORD: ehrbase
-#   crr-ehrbase:
-#     image: ehrbase/ehrbase:next
-#     networks:
-#       - crr-ehrbase-network
-#     environment:
-#       DB_URL: jdbc:postgresql://crr-ehrbase-db:5432/ehrbase
-#       DB_USER: ehrbase
-#       DB_PASS: ehrbase
-#       SECURITY_AUTHTYPE: BASIC
-#       SECURITY_AUTHUSER: myuser
-#       SECURITY_AUTHPASSWORD: myPassword432
-#       SECURITY_AUTHADMINUSER: myadmin
-#       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
-#       SYSTEM_NAME: local.ehrbase.org
-#       ADMIN_API_ACTIVE: 'true'
-#     depends_on:
-#       - crr-ehrbase-db
-#   crr-fhir-bridge:
-#     image: ehrbase/fhir-bridge
-#     ports:
-#       - 127.0.0.1:8888:8888
-#       - 127.0.0.1:5006:5006
-#     networks:
-#       - crr-ehrbase-network
-#       - crr-bpe-backend
-#     environment:
-#       FHIR_BRIDGE_EHRBASE_BASE_URL: http://crr-ehrbase:8080/ehrbase/rest/openehr/v1/
-##     SPRING_PROFILES_ACTIVE: dev
-#       JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006
-#     depends_on:
-#       - crr-ehrbase
+    environment:
+      FHIR_BRIDGE_EHRBASE_BASE_URL: http://crr-ehrbase:8080/ehrbase/rest/openehr/v1/
+      FHIR_BRIDGE_FHIR_VALIDATION_OPTIONAL_IDENTIFIER: 'true'
+      TZ: Europe/Berlin
+#     SPRING_PROFILES_ACTIVE: dev
+      JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006
+    depends_on:
+      - crr-ehrbase
 
 
 secrets:
@@ -457,7 +463,7 @@ networks:
   crr-fhir-backend:
   crr-bpe-frontend:
   crr-bpe-backend:
-#  crr-ehrbase-network:
+  crr-ehrbase-network:
 
 
 volumes: