Merge branch 'dev' into alpha

apps/edr-passenger-api/.env.example

@@ -103,4 +103,4 @@ FAYDA_ACR_VALUES=mosip:idp:acr:generated-code
 FAYDA_CLAIMS_LOCALES=en am
 FAYDA_SESSION_TTL_MINUTES=10
 
-GITHUB_PACKAGE_TOKEN=
+GITHUB_PACKAGE_TOKEN=

apps/edr-passenger-api/Dockerfile

@@ -0,0 +1,51 @@
+# syntax=docker/dockerfile:1
+# Build from monorepo root: docker build -f apps/edr-passenger-api/Dockerfile .
+# On start: runs prisma migrate deploy + seed, then the API.
+
+FROM node:24.15.0-alpine AS base
+RUN apk add --no-cache libc6-compat
+RUN corepack enable
+WORKDIR /app
+
+FROM base AS pruner
+COPY . .
+RUN pnpm dlx turbo prune "@edr/passenger-api" --docker
+
+FROM base AS installer
+COPY --from=pruner /app/out/json/ .
+COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
+RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
+    --mount=type=cache,id=pnpm,target=/pnpm/store \
+    pnpm install --frozen-lockfile
+
+FROM base AS builder
+COPY --from=installer /app/ .
+COPY --from=pruner /app/out/full/ .
+RUN pnpm --filter "@edr/passenger-api" exec prisma generate
+RUN pnpm turbo build --filter="@edr/passenger-api..."
+
+FROM base AS deployer
+COPY --from=builder /app/ .
+RUN pnpm deploy --filter="@edr/passenger-api" --legacy /deploy
+RUN if [ -d node_modules/.prisma ]; then \
+      mkdir -p /deploy/node_modules && \
+      cp -r node_modules/.prisma /deploy/node_modules/.prisma; \
+    fi
+
+FROM node:24.15.0-alpine AS runner
+RUN apk add --no-cache libc6-compat
+RUN corepack enable && corepack prepare pnpm@11.1.1 --activate
+ENV NODE_ENV=production
+WORKDIR /app
+RUN addgroup --system --gid 1001 nodejs \
+    && adduser --system --uid 1001 --ingroup nodejs nestjs
+COPY --from=deployer /deploy .
+COPY apps/edr-passenger-api/docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh \
+    && chown -R nestjs:nodejs /app
+USER nestjs
+ENV CI=true
+ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+EXPOSE 4000
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["node", "dist/main.js"]

apps/edr-passenger-api/docker-entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+cd /app
+
+# npm run executes the same package.json scripts as pnpm run (pnpm reinstalls in deploy layout)
+npm run prisma:generate
+npm run prisma:migrate
+npm run prisma:seed
+
+exec "$@"

apps/edr-passenger-api/package.json

@@ -44,7 +44,8 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "swagger-ui-express": "^5.0.0",
-    "tsconfig-paths": "^4.2.0"
+    "tsconfig-paths": "^4.2.0",
+    "@prisma/client": "^6.19.3"
   },
   "devDependencies": {
     "@edr/eslint-config": "workspace:*",
@@ -52,7 +53,6 @@
     "@nestjs/cli": "^11.0.21",
     "@nestjs/schematics": "^11.1.0",
     "@nestjs/testing": "^11.1.19",
-    "@prisma/client": "^6.19.3",
     "@types/bcrypt": "^5.0.2",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.10.6",

apps/edr-passenger-api/prisma/seed.ts

@@ -1,4 +1,4 @@
-import { PrismaClient, SeatKind } from '@prisma/client';
+import { PrismaClient } from '@prisma/client';
 import * as bcrypt from 'bcrypt';
 
 const prisma = new PrismaClient();
@@ -136,11 +136,11 @@ async function seedCoachesAndSeats(seatClasses: any[]) {
             col,
             label: `${row}${col}`,
             seatNumber: `${config.label}${row}${col}`,
-            kind: (row === 1 && col === 'A' ? 'ACCESSIBLE' : 'STANDARD') as SeatKind,
+            kind: row === 1 && col === 'A' ? 'ACCESSIBLE' : 'STANDARD',
           });
         }
       }
-      await prisma.seat.createMany({ data: seats });
+      await prisma.seat.createMany({ data: seats as any });
     }
   }
 
@@ -162,7 +162,7 @@ async function seedSchedules(trains: any[], stations: any[], routes: any[]) {
   const existingScheduleIds = (await prisma.trainSchedule.findMany({
     where: { trainId: { in: [train301.id, train302.id, train303.id] } },
     select: { id: true },
-  })).map((s) => s.id);
+  })).map((s: { id: string }) => s.id);
 
   if (existingScheduleIds.length > 0) {
     // Delete in correct order to avoid foreign key constraints