Ensure we have consistent env vars for database paths

We share the database between docker containers at /var/lib/pacs and this is a shared volume mounted on the docker host.
Make it consistent and add the relevant env vars consistently.

Author: steventux

.env.development

@@ -3,7 +3,11 @@ AZURE_RELAY_NAMESPACE=manbrs-gateway-dev.servicebus.windows.net
 AZURE_RELAY_HYBRID_CONNECTION=name-of-your-choice-relay-test-hc
 AZURE_RELAY_KEY_NAME=RootManageSharedAccessKey
 AZURE_RELAY_SHARED_ACCESS_KEY=YOUR_SHARED_ACCESS_KEY_HERE
-DB_PATH=/var/lib/worklist/worklist.db
+
+# MWL Server Configuration
+MWL_AET=SCREENING_MWL
+MWL_PORT=4243
+MWL_DB_PATH=/var/lib/pacs/worklist.db
 
 # PACS Server Configuration
 PACS_AET=SCREENING_PACS

compose.yml

@@ -58,11 +58,11 @@ services:
       - AZURE_RELAY_HYBRID_CONNECTION=${AZURE_RELAY_HYBRID_CONNECTION}
       - AZURE_RELAY_KEY_NAME=${AZURE_RELAY_KEY_NAME}
       - AZURE_RELAY_SHARED_ACCESS_KEY=${AZURE_RELAY_SHARED_ACCESS_KEY}
-      - DB_PATH=${DB_PATH:-/var/lib/worklist/worklist.db}
+      - DB_PATH=${DB_PATH:-/var/lib/pacs/worklist.db}
       - LOG_LEVEL=INFO
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "sqlite3", "/var/lib/worklist/worklist.db", "SELECT 1"]
+      test: ["CMD", "sqlite3", "/var/lib/pacs/worklist.db", "SELECT 1"]
       interval: 30s
       timeout: 5s
       retries: 3

src/relay_listener.py

@@ -21,7 +21,7 @@
 
 logger = logging.getLogger(__name__)
 
-DB_PATH = os.getenv("WORKLIST_DB_PATH", "/var/lib/worklist/worklist.db")
+DB_PATH = os.getenv("MWL_DB_PATH", "/var/lib/pacs/worklist.db")
 SAS_TOKEN_EXPIRY_SECONDS = 3600
 
 ACTIONS = {

tests/test_relay_listener.py

@@ -10,7 +10,7 @@
 class TestRelayListener:
     @pytest.fixture(autouse=True)
     def setup(self, monkeypatch):
-        monkeypatch.setenv("WORKLIST_DB_PATH", "/tmp/test_worklist.db")
+        monkeypatch.setenv("MWL_DB_PATH", "/tmp/test_worklist.db")
         monkeypatch.setenv("AZURE_RELAY_NAMESPACE", "test-namespace")
         monkeypatch.setenv("AZURE_RELAY_HYBRID_CONNECTION", "test-connection")
         monkeypatch.setenv("AZURE_RELAY_KEY_NAME", "test-key-name")