jembi · bradsawadye · May 21, 2024 · May 15, 2024 · May 16, 2024 · May 16, 2024
diff --git a/client-registry-jempi/importer/mapping-mediator/searchAll.json b/client-registry-jempi/importer/mapping-mediator/searchAll.json
@@ -9,7 +9,7 @@
   },
   "inputTransforms": {
     "total": "$count(lookupRequests.jempiSearchAll.data.goldenRecords)",
-    "entry": "$map(lookupRequests.jempiSearchAll.data.goldenRecords, function($v) {{'fullUrl': 'Patient/' & $v.goldenId, 'resource': {'resourceType': 'Patient','id': $v.goldenId,'name': {'given': [$v.demographicData.givenName],'family': $v.demographicData.familyName},'address': [{'city': $v.demographicData.city}],'birthDate': $v.demographicData.dob,'telecom': [{'value': $v.demographicData.phoneNumber,'system': 'phone'}],'identifier': [{'system': $v.sourceId.facility,'value': $v.sourceId.patient},{'system': 'NationalID','value': $v.demographicData.nationalId}],'gender': $v.demographicData.gender}}})"
+    "entry": "$append([], $map(lookupRequests.jempiSearchAll.data.goldenRecords, function($v) {{'fullUrl': 'Patient/' & $v.goldenId, 'resource': {'resourceType': 'Patient','id': $v.goldenId,'name': {'given': [$v.demographicData.givenName],'family': $v.demographicData.familyName},'address': [{'city': $v.demographicData.city}],'birthDate': $v.demographicData.dob,'telecom': [{'value': $v.demographicData.phoneNumber,'system': 'phone'}],'identifier': [{'system': $v.sourceId.facility,'value': $v.sourceId.patient},{'system': 'NationalID','value': $v.demographicData.nationalId}],'gender': $v.demographicData.gender}}}))"
   },
   "inputMapping": {
     "constants.resourceType": "resourceType",

diff --git a/config.yaml b/config.yaml
@@ -44,6 +44,8 @@ profiles:
       - openhim-mapping-mediator
       - kafka-mapper-consumer
       - kafka-unbundler-consumer
+      - fhir-ig-importer
+      - reprocess-mediator
     envFiles:
       - cdr-dw.env
 
@@ -75,4 +77,3 @@ profiles:
       - openhim-mapping-mediator
     envFiles:
       - mpi.env
-
diff --git a/fhir-ig-importer/docker-compose.dev.yml b/fhir-ig-importer/docker-compose.dev.yml
@@ -10,5 +10,5 @@ services:
   fhir-ig-importer-ui:
     ports:
       - target: 8080
-        published: 3000
+        published: 3334
         mode: host
diff --git a/fhir-ig-importer/docker-compose.yml b/fhir-ig-importer/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     networks:
       hapi-fhir:
       openhim:
+      default:
     environment:
       HAPI_FHIR_BASE_URL: ${HAPI_FHIR_BASE_URL}
       HAPI_FHIR_INSTANCES: ${HAPI_FHIR_INSTANCES}
@@ -27,4 +28,5 @@ networks:
   openhim:
     name: openhim_public
     external: true
+  default:
 
diff --git a/fhir-ig-importer/importer/docker-compose.config.yml b/fhir-ig-importer/importer/docker-compose.config.yml
@@ -46,3 +46,4 @@ networks:
   openhim:
     name: openhim_public
     external: true
+  default:
diff --git a/fhir-ig-importer/importer/volume/ig-importer-app.json b/fhir-ig-importer/importer/volume/ig-importer-app.json
@@ -3,7 +3,7 @@
   "description": "FHIR IG microfrontend app",
   "category": "HIE Configuration",
   "type": "esmodule",
-  "url": "http://localhost:3000/jembi-fhir-ig-importer.js",
+  "url": "http://localhost:3334/jembi-fhir-ig-importer.js",
   "showInPortal": true,
   "showInSideBar": true,
   "access_roles": ["admin"],

diff --git a/fhir-ig-importer/package-metadata.json b/fhir-ig-importer/package-metadata.json
@@ -14,7 +14,7 @@
     "FHIR_IG_IMPORTER_CORE_PORT": 3001,
     "FHIR_IG_IMPORTER_CORE_HOST": "0.0.0.0",
     "FHIR_IG_IMPORTER_CORE_URL": "http://0.0.0.0:3001/fhir/ig/v1.0",
-    "FHIR_IG_IMPORTER_UI_VERSION": "0.1.0",
-    "FHIR_IG_IMPORTER_CORE_VERSION": "1.0.0"
+    "FHIR_IG_IMPORTER_UI_VERSION": "v1.0.0",
+    "FHIR_IG_IMPORTER_CORE_VERSION": "v1.0.0"
   }
 }
diff --git a/interoperability-layer-openhim/package-metadata.json b/interoperability-layer-openhim/package-metadata.json
@@ -6,8 +6,8 @@
   "type": "infrastructure",
   "dependencies": [],
   "environmentVariables": {
-    "OPENHIM_CORE_IMAGE": "jembi/openhim-core:microfrontends-3.0.0-beta",
-    "OPENHIM_CONSOLE_IMAGE": "jembi/openhim-console:v1.18.2",
+    "OPENHIM_CORE_IMAGE": "jembi/openhim-core:v8.4.3",
+    "OPENHIM_CONSOLE_IMAGE": "jembi/openhim-console:poc-microfrontend",
     "MONGO_IMAGE": "mongo:4.2",
     "AWAIT_HELPER_IMAGE": "jembi/await-helper:1.0.1",
     "MONGO_1_PLACEMENT": "node-1",

diff --git a/kafka-mapper-consumer/docker-compose.config.yml b/kafka-mapper-consumer/docker-compose.config.yml
@@ -39,3 +39,4 @@ networks:
   openhim:
     name: openhim_public
     external: true
+  default:
diff --git a/kafka-mapper-consumer/docker-compose.yml b/kafka-mapper-consumer/docker-compose.yml
@@ -21,7 +21,8 @@ services:
     networks:
       clickhouse:
       kafka:
-
+      openhim:
+      default:
   kafka-mapper-consumer-ui:
     image: ${KAFKA_CONSUMER_MAPPER_UI_VERSION}
     networks:
@@ -41,3 +42,7 @@ networks:
   kafka:
     name: kafka_public
     external: true
+  openhim:
+    name: openhim_public
+    external: true
+  default:
diff --git a/kafka-mapper-consumer/package-metadata.json b/kafka-mapper-consumer/package-metadata.json
@@ -17,7 +17,7 @@
     "REGISTER_MEDIATOR": "true",
     "CLICKHOUSE_HOST": "analytics-datastore-clickhouse",
     "CLICKHOUSE_PORT": "8123",
-    "KAFKA_CONSUMER_MAPPER_MEDIATOR_VERSION": "jembi/kafka-mapper-consumer:0.1.0",
-    "KAFKA_CONSUMER_MAPPER_UI_VERSION": "jembi/kafka-mapper-consumer-ui:0.1.1-alpha"
+    "KAFKA_CONSUMER_MAPPER_MEDIATOR_VERSION": "jembi/kafka-mapper-consumer:v0.0.1",
+    "KAFKA_CONSUMER_MAPPER_UI_VERSION": "jembi/kafka-mapper-consumer-ui:v0.0.1"
   }
 }
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.1.1
+    image: jembi/mpi-mediator:v2.2.0
     networks:
       openhim:
       kafka:

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,9 +19,7 @@
     {
       "clientID": "test",
       "name": "Test Client",
-      "roles": [
-        "instant"
-      ],
+      "roles": ["instant"],
       "customTokenID": "test"
     }
   ],
@@ -98,7 +94,7 @@
       "urlPattern": "^/fhir.*$",
       "methods": ["GET", "POST"],
       "type": "http",
-      "priority": null,
+      "priority": 2,
       "tcpPort": null,
       "tcpHost": null,
       "pollingSchedule": null,
@@ -147,19 +143,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": [
@@ -240,9 +232,7 @@
       "pollingSchedule": null,
       "requestBody": true,
       "responseBody": true,
-      "allow": [
-        "instant"
-      ],
+      "allow": ["instant"],
       "whitelist": [],
       "authType": "private",
       "routes": [
@@ -328,14 +318,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/reprocess-mediator/docker-compose.dev.yml b/reprocess-mediator/docker-compose.dev.yml
@@ -4,7 +4,7 @@ services:
   reprocess-mediator:
     ports:
       - target: 3000
-        published: 3000
+        published: 3335
         mode: host
 
   reprocess-mediator-ui:

diff --git a/reprocess-mediator/package-metadata.json b/reprocess-mediator/package-metadata.json
@@ -1,18 +1,18 @@
 {
-    "id": "reprocess-mediator",
-    "name": "Reprocess Mediator",
-    "description": "A mediator that allows for configuring and reprocessing of transactions",
-    "type": "use-case",
-    "version": "1.4.2",
-    "dependencies": ["interoperability-layer-openhim"],
-    "environmentVariables": {
-      "TRUST_SELF_SIGNED": "true",
-      "OPENHIM_MEDIATOR_URL": "https://openhim-core:8080",
-      "OPENHIM_USERNAME": "[email protected]",
-      "OPENHIM_PASSWORD": "instant101",
-      "REGISTER_MEDIATOR": "true",
-      "REPROCESSOR_API_BASE_URL": "http://reprocess-mediator:3000",
-      "REPROCESS_CORE_VERSION": "latest",
-      "REPROCESS_UI_VERSION": "latest"
-    }
+  "id": "reprocess-mediator",
+  "name": "Reprocess Mediator",
+  "description": "A mediator that allows for configuring and reprocessing of transactions",
+  "type": "use-case",
+  "version": "1.4.2",
+  "dependencies": ["interoperability-layer-openhim"],
+  "environmentVariables": {
+    "TRUST_SELF_SIGNED": "true",
+    "OPENHIM_MEDIATOR_URL": "https://openhim-core:8080",
+    "OPENHIM_USERNAME": "[email protected]",
+    "OPENHIM_PASSWORD": "instant101",
+    "REGISTER_MEDIATOR": "true",
+    "REPROCESSOR_API_BASE_URL": "http://reprocess-mediator:3000",
+    "REPROCESS_CORE_VERSION": "v0.1.0",
+    "REPROCESS_UI_VERSION": "v0.1.0"
   }
+}
diff --git a/test/cucumber/features/single-mode/kafka-packages.feature b/test/cucumber/features/single-mode/kafka-packages.feature
@@ -18,11 +18,11 @@ Feature: Kafka and its dependent packages?
     And There should be 1 volumes
 
   Scenario: Init Kafka Mapper Consumer
-    Given I use parameters "package init -n=kafka-mapper-consumer --only --dev --env-file=.env.local"
+    Given I use parameters "package init -n=interoperability-layer-openhim,kafka-mapper-consumer --only --dev --env-file=.env.local"
     When I launch the platform with params
     Then The service "kafka-mapper-consumer" should be started with 1 replica
     And The service "kafka-mapper-consumer" should be connected to the networks
-      | clickhouse_public | kafka_public |
+      | clickhouse_public | kafka_public | openhim_public |
 
   Scenario: Init Message Bus Kafka
     Given I use parameters "package init -n=kafka-unbundler-consumer --only --dev --env-file=.env.local"
@@ -32,7 +32,7 @@ Feature: Kafka and its dependent packages?
       | kafka_public |
 
   Scenario: Destroy Kafka and its dependent packages
-    Given I use parameters "package destroy -n=kafka-mapper-consumer,kafka-unbundler-consumer --dev --env-file=.env.local"
+    Given I use parameters "package destroy -n=kafka-mapper-consumer,kafka-unbundler-consumer,interoperability-layer-openhim --dev --env-file=.env.local"
     When I launch the platform with params
     And The service "kafka-01" should be removed
     And The service "kafdrop" should be removed
@@ -43,4 +43,4 @@ Feature: Kafka and its dependent packages?
     And There should be 0 volume
     And There should be 0 config
     And There should not be network
-      | kafka_public  | clickhouse_public | prometheus_public |
+      | kafka_public | clickhouse_public | prometheus_public | openhim_public |