Moving TEFCA DB vars to docker compose (#2613)

* Moving TEFCA DB vars to docker compose

* removing root user error message

* removing root user error message

containers/tefca-viewer/docker-compose-dev.yaml

@@ -4,10 +4,12 @@ services:
     image: "postgres:alpine"
     ports:
       - "5432:5432"
-    env_file:
-      - "./tefca.env"
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=pw
+      - POSTGRES_DB=tefca_db
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 2s
       timeout: 5s
       retries: 20

containers/tefca-viewer/docker-compose.yaml

@@ -4,10 +4,12 @@ services:
     image: "postgres:alpine"
     ports:
       - "5432:5432"
-    env_file:
-      - "./tefca.env"
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=pw
+      - POSTGRES_DB=tefca_db
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 2s
       timeout: 5s
       retries: 20
@@ -31,10 +33,9 @@ services:
       dockerfile: ./containers/tefca-viewer/Dockerfile
     ports:
       - "3000:3000"
-    env_file:
-      - "./tefca.env"
     environment:
       - NODE_ENV=production
+      - DATABASE_URL=postgres://postgres:pw@db:5432/tefca_db
     depends_on:
       db:
         condition: service_healthy

containers/tefca-viewer/e2e/query_workflow.spec.ts

@@ -270,7 +270,7 @@ test.describe("Test the user journey of a 'tester'", () => {
     );
 
     // Check that there are multiple rows in the table
-    await expect(page.locator("tbody").locator("tr")).toHaveCount(9);
+    await expect(page.locator("tbody").locator("tr")).toHaveCount(10);
 
     // Click on the first patient's "View Record" button
     await page.locator(':nth-match(:text("View Record"), 1)').click();

containers/tefca-viewer/src/app/database-service.ts

@@ -1,6 +1,6 @@
 "use server";
 import { Pool, PoolConfig, QueryResultRow } from "pg";
-import dotenv from "dotenv";
+// import dotenv from "dotenv";
 import { ValueSetItem, valueSetTypeToClincalServiceTypeMap } from "./constants";
 
 const getQuerybyNameSQL = `
@@ -14,7 +14,7 @@ select q.query_name, q.id, qtv.valueset_id, vs.name as valueset_name, vs.author
 `;
 
 // Load environment variables from tefca.env and establish a Pool configuration
-dotenv.config({ path: "tefca.env" });
+// dotenv.config({ path: "tefca.env" });
 const dbConfig: PoolConfig = {
   connectionString: process.env.DATABASE_URL,
   max: 10, // Maximum # of connections in the pool