Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OpenHIM URL pattern for JeMPI and MPI Mediator image version #274

Merged
merged 1 commit into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions client-registry-jempi/importer/openhim/openhim-import.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -21,9 +21,7 @@
"pollingSchedule": null,
"requestBody": true,
"responseBody": true,
"allow": [
"test"
],
"allow": ["instant"],
"whitelist": [],
"authType": "private",
"routes": [
Expand Down
3 changes: 2 additions & 1 deletion mpi-mediator/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
42 changes: 11 additions & 31 deletions mpi-mediator/importer/volume/openhim-import.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"surname": "User",
"email": "[email protected]",
"provider": "token",
"groups": [
"admin"
],
"groups": ["admin"],
"passwordAlgorithm": "sha512",
"passwordHash": "ea3824f17cf1379eb118a36bc7c8cf0f45712e2af7748567fca5313dec6fa66d61064e82a5e5cb88e998486ee3c7d0dac235bbeda8c341d6edc1c77406be2ab6",
"passwordSalt": "d4f622c0404f09bd959bfb263efa3452",
Expand All @@ -21,17 +19,15 @@
{
"clientID": "test",
"name": "Test Client",
"roles": [
"instant"
],
"roles": ["instant"],
"customTokenID": "test"
}
],
"Channels": [
{
"name": "JeMPI Patient endpoints in fhir",
"description": "JeMPI Patient endpoints in fhir format",
"urlPattern": "^/fhir/Patient.*$",
"urlPattern": "^/fhir/Patient/?[^/]*$",
"methods": [
"GET",
"POST",
Expand All @@ -49,9 +45,7 @@
"pollingSchedule": null,
"requestBody": true,
"responseBody": true,
"allow": [
"test"
],
"allow": ["instant"],
"whitelist": [],
"authType": "private",
"routes": [
Expand Down Expand Up @@ -82,7 +76,7 @@
"txViewFullAcl": [],
"txRerunAcl": [],
"alerts": [],
"status": "disabled",
"status": "enabled",
"rewriteUrls": false,
"addAutoRewriteRules": true,
"rewriteUrlsConfig": [],
Expand All @@ -97,20 +91,15 @@
"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,
"tcpHost": null,
"pollingSchedule": null,
"requestBody": true,
"responseBody": true,
"allow": [
"instant"
],
"allow": ["instant"],
"whitelist": [],
"authType": "private",
"routes": [
Expand Down Expand Up @@ -153,19 +142,15 @@
{
"name": "MPI Orchestration for fhir bundles - Asynchronous flow",
"urlPattern": "^/async/fhir/?$",
"methods": [
"POST"
],
"methods": ["POST"],
"type": "http",
"priority": null,
"tcpPort": null,
"tcpHost": null,
"pollingSchedule": null,
"requestBody": true,
"responseBody": true,
"allow": [
"instant"
],
"allow": ["instant"],
"whitelist": [],
"authType": "private",
"routes": [
Expand Down Expand Up @@ -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": [
Expand Down
8 changes: 3 additions & 5 deletions mpi-mediator/package-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": ""
}
}
Loading