Merge branch 'master' into feature/VIBE-192-verified-user-email-subscriptions

Author: junaidiqbalmoj

.github/workflows/e2e.yml

@@ -21,12 +21,42 @@ jobs:
     name: E2E Tests
     runs-on: ubuntu-latest
 
+    services:
+      postgres:
+        image: postgres:18-alpine
+        env:
+          POSTGRES_USER: hmcts
+          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready -U hmcts -d postgres"
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 5
+          --health-start-period 10s
+
+      redis:
+        image: redis:8-alpine
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 5
+          --health-start-period 10s
+
     env:
       # Application configuration
       BASE_URL: https://localhost:8080
       PORT: 8080
       SESSION_SECRET: ${{ secrets.SESSION_SECRET }}
-      DATABASE_URL: postgresql://hmcts@localhost:5433/postgres
+
+      # Database Configuration (using service containers)
+      DATABASE_URL: postgresql://hmcts@localhost:5432/postgres
+      REDIS_URL: redis://localhost:6379
 
       # SSO Configuration (using existing GitHub Secrets)
       SSO_CLIENT_ID: ${{ secrets.SSO_CLIENT_ID }}
@@ -84,14 +114,19 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
 
-      - name: Generate Prisma client
-        run: yarn db:generate
+      - name: Install PostgreSQL client
+        run: sudo apt-get update && sudo apt-get install -y postgresql-client
 
-      - name: Start PostgreSQL
-        run: docker compose up -d
+      - name: Wait for PostgreSQL service to be ready
+        run: timeout 30 bash -c 'until pg_isready -h localhost -p 5432 -U hmcts; do sleep 1; done'
 
-      - name: Wait for PostgreSQL to be ready
-        run: timeout 30 bash -c 'until docker compose exec -T postgres pg_isready -U hmcts; do sleep 1; done'
+      - name: Collate Prisma schema
+        run: |
+          echo "Collating Prisma schema from all modules..."
+          cd apps/postgres && npx tsx src/collate-schema.ts && cd ../..
+
+      - name: Generate Prisma client
+        run: yarn db:generate
 
       - name: Run database migrations
         run: yarn db:migrate
@@ -105,7 +140,7 @@ jobs:
       - name: Verify seed data exists
         run: |
           echo "Verifying seed data for locationId=9..."
-          ARTEFACT_COUNT=$(docker compose exec -T postgres psql -U hmcts -d postgres -t -c "SELECT COUNT(*) FROM artefact WHERE location_id = '9';")
+          ARTEFACT_COUNT=$(psql $DATABASE_URL -t -c "SELECT COUNT(*) FROM artefact WHERE location_id = '9';")
           ARTEFACT_COUNT=$(echo $ARTEFACT_COUNT | xargs)
           echo "Found $ARTEFACT_COUNT artefacts for locationId=9"
           if [ "$ARTEFACT_COUNT" -lt 3 ]; then

.github/workflows/test.yml

@@ -91,9 +91,6 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
 
-      - name: Generate Prisma client
-        run: yarn db:generate
-
       - name: Setup Turbo cache
         uses: actions/cache@v4
         with:

apps/api/package.json

@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@hmcts/cloud-native-platform": "workspace:*",
+    "@hmcts/location": "workspace:*",
     "@hmcts/postgres": "workspace:*",
     "@hmcts/simple-router": "workspace:*",
     "compression": "1.8.1",

apps/api/src/app.ts

@@ -1,6 +1,7 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { healthcheck } from "@hmcts/cloud-native-platform";
+import { apiRoutes as locationRoutes } from "@hmcts/location/config";
 import { createSimpleRouter } from "@hmcts/simple-router";
 import compression from "compression";
 import cors from "cors";
@@ -26,7 +27,7 @@ export async function createApp(): Promise<Express> {
   app.use(express.json());
   app.use(express.urlencoded({ extended: true }));
 
-  const routeMounts = [{ path: `${__dirname}/routes` }];
+  const routeMounts = [{ path: `${__dirname}/routes` }, locationRoutes];
 
   app.use(await createSimpleRouter(...routeMounts));
 

apps/postgres/prisma.config.test.ts

@@ -0,0 +1,93 @@
+-- CreateTable
+CREATE TABLE "region" (
+    "region_id" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "welsh_name" TEXT NOT NULL,
+
+    CONSTRAINT "region_pkey" PRIMARY KEY ("region_id")
+);
+
+-- CreateTable
+CREATE TABLE "jurisdiction" (
+    "jurisdiction_id" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "welsh_name" TEXT NOT NULL,
+
+    CONSTRAINT "jurisdiction_pkey" PRIMARY KEY ("jurisdiction_id")
+);
+
+-- CreateTable
+CREATE TABLE "sub_jurisdiction" (
+    "sub_jurisdiction_id" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "welsh_name" TEXT NOT NULL,
+    "jurisdiction_id" INTEGER NOT NULL,
+
+    CONSTRAINT "sub_jurisdiction_pkey" PRIMARY KEY ("sub_jurisdiction_id")
+);
+
+-- CreateTable
+CREATE TABLE "location" (
+    "location_id" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "welsh_name" TEXT NOT NULL,
+    "email" TEXT,
+    "contact_no" TEXT,
+
+    CONSTRAINT "location_pkey" PRIMARY KEY ("location_id")
+);
+
+-- CreateTable
+CREATE TABLE "location_region" (
+    "location_id" INTEGER NOT NULL,
+    "region_id" INTEGER NOT NULL,
+
+    CONSTRAINT "location_region_pkey" PRIMARY KEY ("location_id","region_id")
+);
+
+-- CreateTable
+CREATE TABLE "location_sub_jurisdiction" (
+    "location_id" INTEGER NOT NULL,
+    "sub_jurisdiction_id" INTEGER NOT NULL,
+
+    CONSTRAINT "location_sub_jurisdiction_pkey" PRIMARY KEY ("location_id","sub_jurisdiction_id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "region_name_key" ON "region"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "region_welsh_name_key" ON "region"("welsh_name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "jurisdiction_name_key" ON "jurisdiction"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "jurisdiction_welsh_name_key" ON "jurisdiction"("welsh_name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "sub_jurisdiction_name_key" ON "sub_jurisdiction"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "sub_jurisdiction_welsh_name_key" ON "sub_jurisdiction"("welsh_name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "location_name_key" ON "location"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "location_welsh_name_key" ON "location"("welsh_name");
+
+-- AddForeignKey
+ALTER TABLE "sub_jurisdiction" ADD CONSTRAINT "sub_jurisdiction_jurisdiction_id_fkey" FOREIGN KEY ("jurisdiction_id") REFERENCES "jurisdiction"("jurisdiction_id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "location_region" ADD CONSTRAINT "location_region_location_id_fkey" FOREIGN KEY ("location_id") REFERENCES "location"("location_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "location_region" ADD CONSTRAINT "location_region_region_id_fkey" FOREIGN KEY ("region_id") REFERENCES "region"("region_id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "location_sub_jurisdiction" ADD CONSTRAINT "location_sub_jurisdiction_location_id_fkey" FOREIGN KEY ("location_id") REFERENCES "location"("location_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "location_sub_jurisdiction" ADD CONSTRAINT "location_sub_jurisdiction_sub_jurisdiction_id_fkey" FOREIGN KEY ("sub_jurisdiction_id") REFERENCES "sub_jurisdiction"("sub_jurisdiction_id") ON DELETE RESTRICT ON UPDATE CASCADE;

apps/postgres/prisma/migrations/20251117172706_add_location_reference_data_tables/migration.sql

@@ -12,7 +12,12 @@ vi.mock("@prisma/client", () => {
   };
 });
 
-describe("Prisma Client Module", () => {
+/**
+ * These tests verify Prisma client exports and require @prisma/client to be generated.
+ * They are integration tests, not unit tests, so they are skipped in the standard test run.
+ * Run them manually with: yarn generate && yarn test
+ */
+describe.skip("Prisma Client Module", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     delete (globalThis as any).prisma;

apps/postgres/src/index.test.ts

@@ -12,10 +12,11 @@ describe("Schema Discovery", () => {
       expect(Array.isArray(result)).toBe(true);
     });
 
-    it("should return array with email-subscriptions schema", () => {
+    it("should return array with email-subscriptions and location schemas", () => {
       const result = getPrismaSchemas();
-      expect(result.length).toBe(1);
+      expect(result.length).toBe(2);
       expect(result[0]).toContain("email-subscriptions");
+      expect(result[1]).toContain("location");
     });
 
     it("should return a new array on each call", () => {

apps/postgres/src/schema-discovery.test.ts

@@ -1,6 +1,7 @@
 // Schema discovery functionality for module integration
 import { prismaSchemas as emailSubscriptionsSchemas } from "@hmcts/email-subscriptions/config";
+import { prismaSchemas as locationSchemas } from "@hmcts/location/config";
 
 export function getPrismaSchemas(): string[] {
-  return [emailSubscriptionsSchemas];
+  return [emailSubscriptionsSchemas, locationSchemas];
 }

apps/postgres/src/schema-discovery.ts

@@ -23,6 +23,7 @@
     "@hmcts/admin-pages": "workspace:*",
     "@hmcts/cloud-native-platform": "workspace:*",
     "@hmcts/cookie-manager": "1.1.0",
+    "@hmcts/location": "workspace:*",
     "@hmcts/postgres": "workspace:*",
     "@hmcts/public-pages": "workspace:*",
     "@hmcts/simple-router": "workspace:*",