From 760d599b7cd40f657ecbbe73aa43000ceef6d81c Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Thu, 10 Oct 2024 12:56:36 +0200 Subject: [PATCH 1/5] Add CCP-PPI --- ccp/docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index fcabc9b..01b5aad 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -57,6 +57,11 @@ services: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro + ccp-patient-project-identificator: + image: samply/ccp-patient-project-identificator + environment: + MAINZELLISTE_APIKEY: ${MAINZELLISTE_APIKEY} + SITE_NAME: ${SITE_NAME} volumes: blaze-data: From 8e7fe6851eefa3407d045d9d77cc666a651204ca Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Thu, 10 Oct 2024 13:11:43 +0200 Subject: [PATCH 2/5] fix: use correct mainzelliste api key --- ccp/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 01b5aad..7318942 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -59,8 +59,9 @@ services: ccp-patient-project-identificator: image: samply/ccp-patient-project-identificator + container_name: bridgehead-ccp-patient-project-identificator environment: - MAINZELLISTE_APIKEY: ${MAINZELLISTE_APIKEY} + MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY} SITE_NAME: ${SITE_NAME} volumes: From 23981062bb44c6f2b84d90809e88f4b50e382c1e Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Thu, 10 Oct 2024 13:27:24 +0200 Subject: [PATCH 3/5] Move ppi to id-management --- ccp/docker-compose.yml | 7 ------- ccp/modules/id-management-compose.yml | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 7318942..f46615d 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -57,13 +57,6 @@ services: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro - ccp-patient-project-identificator: - image: samply/ccp-patient-project-identificator - container_name: bridgehead-ccp-patient-project-identificator - environment: - MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY} - SITE_NAME: ${SITE_NAME} - volumes: blaze-data: diff --git a/ccp/modules/id-management-compose.yml b/ccp/modules/id-management-compose.yml index ce0a58a..704646d 100644 --- a/ccp/modules/id-management-compose.yml +++ b/ccp/modules/id-management-compose.yml @@ -101,5 +101,12 @@ services: forward_proxy: condition: service_healthy + ccp-patient-project-identificator: + image: samply/ccp-patient-project-identificator + container_name: bridgehead-ccp-patient-project-identificator + environment: + MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY} + SITE_NAME: ${SITE_NAME} + volumes: patientlist-db-data: From 26712d3567225e8c5071456f7120ca94b326d7d0 Mon Sep 17 00:00:00 2001 From: davidmscholz <130749829+davidmscholz@users.noreply.github.com> Date: Wed, 30 Oct 2024 15:21:15 +0100 Subject: [PATCH 4/5] feat: add and set FOCUS_ENDPOINT_TYPE to support fhir2sql (#244) * add and set FOCUS_ENDPOINT_TYPE Co-authored-by: Jan <59206115+Threated@users.noreply.github.com> --------- Co-authored-by: davidmscholz Co-authored-by: Jan <59206115+Threated@users.noreply.github.com> --- ccp/docker-compose.yml | 1 + ccp/modules/fhir2sql-setup.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 2e4e139..e63f5a5 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -33,6 +33,7 @@ services: RETRY_COUNT: ${FOCUS_RETRY_COUNT} EPSILON: 0.28 QUERIES_TO_CACHE: '/queries_to_cache.conf' + ENDPOINT_TYPE: ${FOCUS_ENDPOINT_TYPE:-blaze} volumes: - /srv/docker/bridgehead/ccp/queries_to_cache.conf:/queries_to_cache.conf depends_on: diff --git a/ccp/modules/fhir2sql-setup.sh b/ccp/modules/fhir2sql-setup.sh index 64fa7c0..8c9a72b 100644 --- a/ccp/modules/fhir2sql-setup.sh +++ b/ccp/modules/fhir2sql-setup.sh @@ -4,4 +4,5 @@ if [ "$ENABLE_FHIR2SQL" == true ]; then log INFO "Dashboard setup detected -- will start Dashboard backend and FHIR2SQL service." OVERRIDE+=" -f ./$PROJECT/modules/fhir2sql-compose.yml" DASHBOARD_DB_PASSWORD="$(generate_simple_password 'fhir2sql')" + FOCUS_ENDPOINT_TYPE="blaze-and-sql" fi From 52c24ee6faa9d02c36aa838fb636c2dca2f6b1e9 Mon Sep 17 00:00:00 2001 From: Jan <59206115+Threated@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:34:36 +0100 Subject: [PATCH 5/5] fix(fhir2sql): add the postgres connection string to focus (#245) --- ccp/modules/fhir2sql-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ccp/modules/fhir2sql-compose.yml b/ccp/modules/fhir2sql-compose.yml index 7733787..1230e89 100644 --- a/ccp/modules/fhir2sql-compose.yml +++ b/ccp/modules/fhir2sql-compose.yml @@ -23,3 +23,7 @@ services: POSTGRES_DB: "dashboard" volumes: - "/var/cache/bridgehead/ccp/dashboard-db:/var/lib/postgresql/data" + + focus: + environment: + POSTGRES_CONNECTION_STRING: "postgresql://dashboard:${DASHBOARD_DB_PASSWORD}@dashboard-db/dashboard" \ No newline at end of file