Implement core metadata schema in the eCR viewer (#2756)

* Starting small tweaks for implementing core schema * WIP * implement core schema * error tweak * add script to update data.sql for cypress testing * [pre-commit.ci] auto fixes from pre-commit hooks * Bring in data.sql gen script and update for new schema to fix cypress tests * test fixture for db cleanup update, maybe this'll do it * change database.one to .none for error, update sql script references * oops I broke cypress again, fixing * rollback test fixture changes * remove borked data.sql path and make new cypress docker compose * remove borked data.sql path and make new cypress docker compose * fix cypress #876234 * cypress fix please * increase cypress timeout * remove duplicate cypress timeout increase * fix borked cypress tests again * fix unit tests * tweak cypress settings, update gitignore * attempt to satisfy fickle cypress gods by changing localhost to 127.0.0.1 in baseUrl * reenable cypress video * Save docker logs * set working directory for logs * set working directory for logs * add space * Remove working directory from push logs * Rename db to postgres * Add a stop docker container step in e2e before getting logs * Change docker compose down to stop to retain logs * get rid of docker compose stop * set base url to localhost again ? * change local cypress script from db to postgres --------- Co-authored-by: Austin Hall <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Boban Ljuljdjurovic <[email protected]> Co-authored-by: Boban <[email protected]>
CDCgov · Oct 23, 2024 · 4225f1d · 4225f1d
1 parent b7b0728
commit 4225f1d
Show file tree

Hide file tree

Showing 23 changed files with 3,085 additions and 1,109 deletions.
diff --git a/.github/workflows/container-ecr-viewer.yaml b/.github/workflows/container-ecr-viewer.yaml
@@ -65,13 +65,9 @@ jobs:
         working-directory: ./containers/${{env.CONTAINER}} # Navigate to your Node.js app directory
         run: npm install
 
-      - name: Copy seed data
-        working-directory: ./containers/${{env.CONTAINER}}
-        run: cp ./cypress/assets/data.sql ./seed-scripts/sql
-
       - name: Start ${{env.CONTAINER}}
-        working-directory: ./containers/${{env.CONTAINER}}
-        run: docker compose --env-file .env.test up -d
+        working-directory: ./containers/${{env.CONTAINER}}/cypress
+        run: docker compose --env-file ../.env.test up -d
 
       - name: Wait for server to be ready
         run: |
@@ -93,6 +89,21 @@ jobs:
             containers/ecr-viewer/cypress/screenshots/*
             containers/ecr-viewer/cypress/videos/*
 
+      - name: Get docker logs
+        if: always()
+        working-directory: ./containers/${{env.CONTAINER}}/cypress
+        shell: bash
+        run: |
+          echo "Saving $container logs"
+          docker compose logs --timestamps >& cypress-run.log
+
+      - name: Archive docker logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: logs
+          path: ./containers/${{env.CONTAINER}}/cypress/cypress-run.log
+
   lighthouse:
     runs-on: ubuntu-latest
     timeout-minutes: 20

diff --git a/containers/ecr-viewer/.gitignore b/containers/ecr-viewer/.gitignore
@@ -3,4 +3,7 @@ node_modules
 .env.local
 
 # localstack data
-volume/
+volume/
+
+cypress/screenshots
+cypress/videos
diff --git a/containers/ecr-viewer/cypress.config.ts b/containers/ecr-viewer/cypress.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
     env: {
       BASE_PATH: `${isDev ? "/" : "/ecr-viewer"}`,
     },
+    defaultCommandTimeout: 120000,
   },
   video: true,
-  defaultCommandTimeout: 120000,
 });
diff --git a/containers/ecr-viewer/cypress/assets/data.sql b/containers/ecr-viewer/cypress/assets/data.sql
diff --git a/containers/ecr-viewer/cypress/docker-compose.yml b/containers/ecr-viewer/cypress/docker-compose.yml
@@ -0,0 +1,32 @@
+services:
+  # PostgreSQL database
+  postgres:
+    image: "postgres:alpine"
+    ports:
+      - "5432:5432"
+    volumes:
+      - ../sql/core.sql:/docker-entrypoint-initdb.d/core.sql
+      - ../seed-scripts/sql/01-init.sql:/docker-entrypoint-initdb.d/01-init.sql
+      - ./assets/data.sql:/docker-entrypoint-initdb.d/data.sql
+      - ../seed-scripts/sql/.pgpass/:/usr/local/lib/.pgpass
+    environment:
+      - POSTGRES_USER=postgres
+      - PGUSER=postgres
+      - POSTGRES_PASSWORD=pw
+      - POSTGRES_DB=ecr_viewer_db
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 2s
+      timeout: 5s
+      retries: 20
+
+  # Next.js app
+  ecr-viewer:
+    build:
+      context: ../../..
+      dockerfile: ./containers/ecr-viewer/Dockerfile
+    ports:
+      - "3000:3000"
+    environment:
+      - DATABASE_URL=${DATABASE_URL:-postgres://postgres:pw@db:5432/ecr_viewer_db}
+      - APP_ENV=${APP_ENV:-prod}
diff --git a/containers/ecr-viewer/cypress/e2e/app.cy.tsx b/containers/ecr-viewer/cypress/e2e/app.cy.tsx
@@ -2,11 +2,13 @@ describe("Happy Path", () => {
   it("Should load the eCR Viewer for a known ID", () => {
     // Visit a valid URL
     const basePath = Cypress.env("BASE_PATH") || "";
-    cy.visit(`${basePath}/view-data?id=6100896d-b520-497c-b2fe-1c111c679274`);
+    cy.visit(
+      `${basePath}/view-data?id=1.2.840.114350.1.13.478.3.7.8.688883.230886`,
+    );
 
     // Gets the expected content
     cy.get("#patient-summary").contains("Patient Summary");
-    cy.contains("VICTORIA HUNTER");
+    cy.contains("APPLE ZTEST");
   });
 });
 

diff --git a/containers/ecr-viewer/docker-compose.yml b/containers/ecr-viewer/docker-compose.yml
@@ -4,7 +4,8 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - ./seed-scripts/sql/:/docker-entrypoint-initdb.d/
+      - ./sql/core.sql:/docker-entrypoint-initdb.d/core.sql
+      - ./seed-scripts/sql/01-init.sql:/docker-entrypoint-initdb.d/01-init.sql
       - ./seed-scripts/sql/.pgpass/:/usr/local/lib/.pgpass
     environment:
       - POSTGRES_USER=postgres

diff --git a/containers/ecr-viewer/next-env.d.ts b/containers/ecr-viewer/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/containers/ecr-viewer/package.json b/containers/ecr-viewer/package.json
@@ -16,7 +16,7 @@
     "update-cypress-data": "docker compose -f ./seed-scripts/docker-compose-create-sql.yml up --build --abort-on-container-exit",
     "cypress:open": "cypress open",
     "cypress:run": "cypress run",
-    "cypress:run-local": "cp ./cypress/assets/data.sql ./seed-scripts/sql && docker compose --env-file .env.test up db -d && concurrently --kill-others 'npm run dev' 'npx wait-on http://localhost:3000 && NODE_ENV=dev cypress run ; docker compose down && rm ./seed-scripts/sql/data.sql'",
+    "cypress:run-local": "docker compose -f cypress/docker-compose.yml --env-file .env.test up postgres -d && concurrently --kill-others 'npm run dev' 'npx wait-on http://localhost:3000 && NODE_ENV=dev cypress run ; docker compose down'",
     "cypress:run-prod": "NODE_ENV=production cypress run"
   },
   "dependencies": {

diff --git a/.../ecr-viewer/seed-scripts/baseECR/cypress/6100896d-b520-497c-b2fe-1c111c679274/CDA_RR.html b/.../ecr-viewer/seed-scripts/baseECR/cypress/6100896d-b520-497c-b2fe-1c111c679274/CDA_RR.html