Patch: SHR version update and small fixes (#21)

* SHR version update and small fixes

* SHR version bump

* Test fixes

* MLLP fix

.github/workflows/main.yml

@@ -73,6 +73,9 @@ jobs:
         env: 
           POSTMAN_COLLECTION: https://www.getpostman.com/collections/2ee8ebff39c078bac256
         run: docker-compose --profile test -f docker-compose.ci.yml up --exit-code-from newman newman 
+
+      - name: Run MLLP Tests
+        run: docker-compose --profile test -f docker-compose.ci.yml up --exit-code-from mllp_tests mllp_tests
 
       - name: Stop containers
         if: always()

README.md

@@ -21,7 +21,7 @@ git clone https://github.com/B-TECHBW/hie-botswana.git
 ### 4. Start up core containers:
 ```sh
 cd hie-botswana
-docker-compose -f docker-compose.local.yml up -d openhim-core openhim-console mongo-db opencr-fhir shr-fhir opencr-es kafka zookeeper
+docker-compose -f docker-compose.local.yml up -d openhim-core openhim-console mongo-db opencr-fhir shr-fhir opencr-es kafka zookeeper nginx
 ```
 ### 5. OpenHIM Password Setup:
 Open the OpenHIM console in the browser and use default login and password:

configs/opencr/config_port.json

@@ -66,7 +66,7 @@
     }
   },
   "sync": {
-    "lastFHIR2ESSync": "2021-08-10T19:50:14"
+    "lastFHIR2ESSync": "2021-12-03T16:33:53"
   },
   "__comments": {
     "matching.tool": "this tells if the app should use mediator algorithms or elasticsearch algorithms for matching, two options mediator and elasticsearch"

docker-compose.ci.yml

@@ -77,7 +77,7 @@ services:
     profiles: ["mediators"]
     container_name: shr
     hostname: shr
-    image: ghcr.io/i-tech-uw/shared-health-record:v0.4.0
+    image: ghcr.io/i-tech-uw/shared-health-record:v0.4.3
     restart: unless-stopped
     environment:
       - NODE_ENV=docker
@@ -194,17 +194,17 @@ services:
   mllp_tests:
     profiles: ["test"]
     container_name: mllp_tests
-    build: ./test
+    image: ghcr.io/b-techbw/mllp-tester:main
     networks:
       - hie
     volumes:
-      - ./test:/test
+      - ./test/mllp:/test
 
   # OpenHIM Config
   openhim-config:
     profiles: ["support"]
     container_name: openhim-config
-    image: ghcr.io/i-tech-uw/openhim-config:latest
+    image: ghcr.io/i-tech-uw/openhim-config:v0.0.0
     volumes:
       - ./configs/openhim/test-openhim-config.json:/app/test-openhim-config.json
     networks:

docker-compose.local.yml

@@ -1,13 +1,13 @@
-version: '2.4'
+version: "2.4"
 
 ## Port Assignments:
 ##  See .env file
 
-## Container debugging: 
-# 1. append the following lines to desired container 
+## Container debugging:
+# 1. append the following lines to desired container
 # 2. boot up the container using `docker-compose up -d`
 # 3 run `docker exec -it <container-name> bash` to start interactive shell
-# 
+#
 #    tty: true
 #    stdin_open: true
 #    entrypoint: bash
@@ -98,7 +98,7 @@ services:
   shr:
     container_name: shr
     hostname: shr
-    image: ghcr.io/i-tech-uw/shared-health-record:v0.4.0
+    image: ghcr.io/i-tech-uw/shared-health-record:v0.4.3
     restart: unless-stopped
     environment:
       - NODE_ENV=docker
@@ -180,14 +180,14 @@ services:
 
   # Kafka
   zookeeper:
-    image: 'bitnami/zookeeper:latest'
+    image: "bitnami/zookeeper:latest"
     hostname: zookeeper
     environment:
       - ALLOW_ANONYMOUS_LOGIN=yes
     networks:
-    - hie
+      - hie
   kafka:
-    image: 'bitnami/kafka:latest'
+    image: "bitnami/kafka:latest"
     hostname: kafka
     container_name: kafka
     environment:
@@ -202,7 +202,7 @@ services:
     depends_on:
       - zookeeper
     networks:
-    - hie
+      - hie
 
   # Newman Tests
   newman:
@@ -220,9 +220,14 @@ services:
       - hie
     volumes:
       - ./test/mllp:/test
-    tty: true
-    stdin_open: true
-    entrypoint: sh
+
+  openhim-config:
+    container_name: openhim-config
+    image: ghcr.io/i-tech-uw/openhim-config:v0.0.0
+    volumes:
+      - ./configs/openhim/test-openhim-config.json:/app/test-openhim-config.json
+    networks:
+      - hie
 
 volumes:
   es:
@@ -238,6 +243,6 @@ volumes:
   nginx-data:
     driver: local
   kafka-data:
-    driver: local    
+    driver: local
 networks:
   hie:

docker-compose.yml

@@ -16,7 +16,6 @@ services:
   ###
   # nginx reverse proxy
   # TODO: set up to use non-root user. See https://www.rockyourcode.com/run-docker-nginx-as-non-root-user/
-  # TODO: Run letsencrypt as docker container: https://hub.docker.com/r/certbot/certbot/
   ###
   nginx:
     profiles: ["core"]
@@ -112,7 +111,7 @@ services:
     profiles: ["mediator"]
     container_name: shr
     hostname: shr
-    image: ghcr.io/i-tech-uw/shared-health-record:v0.4.0
+    image: ghcr.io/i-tech-uw/shared-health-record:v0.4.3
     restart: unless-stopped
     environment:
       - NODE_ENV=docker

test/mllp/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-hostname="localhost"
-port=2575
+hostname="shr"
+port=3001
 
 for hl7File in messages/*
 do