From a3039b4dcad828a67be6a42b5284d7e1b55de289 Mon Sep 17 00:00:00 2001 From: Ryan Crichton Date: Wed, 6 Mar 2024 15:34:46 +0200 Subject: [PATCH] Update OpenHIM URL pattern for JeMPI and MPI Mediator image version --- .../importer/openhim/openhim-import.json | 6 +-- mpi-mediator/docker-compose.yml | 3 +- .../importer/volume/openhim-import.json | 42 +++++-------------- mpi-mediator/package-metadata.json | 8 ++-- 4 files changed, 18 insertions(+), 41 deletions(-) diff --git a/client-registry-jempi/importer/openhim/openhim-import.json b/client-registry-jempi/importer/openhim/openhim-import.json index 7f85e189..7e49269b 100644 --- a/client-registry-jempi/importer/openhim/openhim-import.json +++ b/client-registry-jempi/importer/openhim/openhim-import.json @@ -3,7 +3,7 @@ { "name": "JeMPI Patient endpoints in fhir", "description": "JeMPI Patient endpoints in fhir format", - "urlPattern": "^/fhir/Patient.*$", + "urlPattern": "^/fhir/Patient/?[^/]*$", "methods": [ "GET", "POST", @@ -21,9 +21,7 @@ "pollingSchedule": null, "requestBody": true, "responseBody": true, - "allow": [ - "test" - ], + "allow": ["instant"], "whitelist": [], "authType": "private", "routes": [ diff --git a/mpi-mediator/docker-compose.yml b/mpi-mediator/docker-compose.yml index eef5d44f..7d5a295e 100644 --- a/mpi-mediator/docker-compose.yml +++ b/mpi-mediator/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.9' services: mpi-mediator: - image: jembi/mpi-mediator:v2.0.1 + image: jembi/mpi-mediator:v2.1.0 networks: openhim: kafka: @@ -33,6 +33,7 @@ services: ENABLE_JEMPI_GOLDEN_ID_UPDATE: ${ENABLE_JEMPI_GOLDEN_ID_UPDATE} CLICKHOUSE_HOST: ${CLICKHOUSE_HOST} CLICKHOUSE_PORT: ${CLICKHOUSE_PORT} + PATIENT_PROFILE_FOR_STUB_PATIENT: ${PATIENT_PROFILE_FOR_STUB_PATIENT} deploy: placement: max_replicas_per_node: 1 diff --git a/mpi-mediator/importer/volume/openhim-import.json b/mpi-mediator/importer/volume/openhim-import.json index 0e6aaeb1..9475b1fa 100644 --- a/mpi-mediator/importer/volume/openhim-import.json +++ b/mpi-mediator/importer/volume/openhim-import.json @@ -5,9 +5,7 @@ "surname": "User", "email": "root@openhim.org", "provider": "token", - "groups": [ - "admin" - ], + "groups": ["admin"], "passwordAlgorithm": "sha512", "passwordHash": "ea3824f17cf1379eb118a36bc7c8cf0f45712e2af7748567fca5313dec6fa66d61064e82a5e5cb88e998486ee3c7d0dac235bbeda8c341d6edc1c77406be2ab6", "passwordSalt": "d4f622c0404f09bd959bfb263efa3452", @@ -21,9 +19,7 @@ { "clientID": "test", "name": "Test Client", - "roles": [ - "instant" - ], + "roles": ["instant"], "customTokenID": "test" } ], @@ -31,7 +27,7 @@ { "name": "JeMPI Patient endpoints in fhir", "description": "JeMPI Patient endpoints in fhir format", - "urlPattern": "^/fhir/Patient.*$", + "urlPattern": "^/fhir/Patient/?[^/]*$", "methods": [ "GET", "POST", @@ -49,9 +45,7 @@ "pollingSchedule": null, "requestBody": true, "responseBody": true, - "allow": [ - "test" - ], + "allow": ["instant"], "whitelist": [], "authType": "private", "routes": [ @@ -82,7 +76,7 @@ "txViewFullAcl": [], "txRerunAcl": [], "alerts": [], - "status": "disabled", + "status": "enabled", "rewriteUrls": false, "addAutoRewriteRules": true, "rewriteUrlsConfig": [], @@ -97,10 +91,7 @@ "name": "MPI Orchestrations - Create/Read operations for patients and their clinical data", "description": "", "urlPattern": "^/fhir.*$", - "methods": [ - "GET", - "POST" - ], + "methods": ["GET", "POST"], "type": "http", "priority": null, "tcpPort": null, @@ -108,9 +99,7 @@ "pollingSchedule": null, "requestBody": true, "responseBody": true, - "allow": [ - "instant" - ], + "allow": ["instant"], "whitelist": [], "authType": "private", "routes": [ @@ -153,9 +142,7 @@ { "name": "MPI Orchestration for fhir bundles - Asynchronous flow", "urlPattern": "^/async/fhir/?$", - "methods": [ - "POST" - ], + "methods": ["POST"], "type": "http", "priority": null, "tcpPort": null, @@ -163,9 +150,7 @@ "pollingSchedule": null, "requestBody": true, "responseBody": true, - "allow": [ - "instant" - ], + "allow": ["instant"], "whitelist": [], "authType": "private", "routes": [ @@ -248,14 +233,9 @@ { "name": "MPI mediator", "urlPattern": "^(/async)?/fhir.*$", - "methods": [ - "POST", - "GET" - ], + "methods": ["POST", "GET"], "type": "http", - "allow": [ - "instant" - ], + "allow": ["instant"], "whitelist": [], "authType": "private", "routes": [ diff --git a/mpi-mediator/package-metadata.json b/mpi-mediator/package-metadata.json index 6df3dad4..85c1f07e 100644 --- a/mpi-mediator/package-metadata.json +++ b/mpi-mediator/package-metadata.json @@ -4,10 +4,7 @@ "description": "This package creates a mediator service that is used in facilitating patient creation, updating and reading from the MPI and Hapi-Fhir, from FHIR bundles using Kafka", "type": "infrastructure", "version": "0.0.1", - "dependencies": [ - "fhir-datastore-hapi-fhir", - "client-registry-jempi" - ], + "dependencies": ["fhir-datastore-hapi-fhir", "client-registry-jempi"], "environmentVariables": { "MPI_MEDIATOR_INSTANCES": 1, "OPENHIM_MEDIATOR_URL": "https://openhim-core:8080", @@ -32,6 +29,7 @@ "DISABLE_VALIDATION": "true", "ENABLE_JEMPI_GOLDEN_ID_UPDATE": "true", "CLICKHOUSE_HOST": "analytics-datastore-clickhouse", - "CLICKHOUSE_PORT": "8123" + "CLICKHOUSE_PORT": "8123", + "PATIENT_PROFILE_FOR_STUB_PATIENT": "" } }