Merge pull request #274 from jembi/minor-fixes

Update OpenHIM URL pattern for JeMPI and MPI Mediator image version
jembi · Mar 7, 2024 · 963ad8c · 963ad8c
2 parents d3588ec + a3039b4
commit 963ad8c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 41 deletions.
diff --git 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
@@ -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
@@ -5,9 +5,7 @@
       "surname": "User",
       "email": "[email protected]",
       "provider": "token",
-      "groups": [
-        "admin"
-      ],
+      "groups": ["admin"],
       "passwordAlgorithm": "sha512",
       "passwordHash": "ea3824f17cf1379eb118a36bc7c8cf0f45712e2af7748567fca5313dec6fa66d61064e82a5e5cb88e998486ee3c7d0dac235bbeda8c341d6edc1c77406be2ab6",
       "passwordSalt": "d4f622c0404f09bd959bfb263efa3452",
@@ -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",
@@ -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,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": [
@@ -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": [
@@ -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
@@ -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": ""
   }
 }