modify pipeline to speed up deployment

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

@@ -1,17 +1,7 @@
-# App
-NODE_ENV=development
+# Copy to .env for local/docker compose (not committed).
 PORT=3001
-
-# Database
 DB_HOST=localhost
 DB_PORT=5433
-DB_NAME=edr_freight
 DB_USER=postgres
 DB_PASSWORD=
-
-# JWT (provided by external auth package — placeholder only)
-JWT_SECRET=
-
-# Redis
-REDIS_HOST=localhost
-REDIS_PORT=6379
+DB_NAME=edr_freight

apps/edr-freight-api/Dockerfile

@@ -0,0 +1,37 @@
+# syntax=docker/dockerfile:1
+# Build from monorepo root: docker build -f apps/edr-freight-api/Dockerfile .
+
+FROM node:22-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/freight-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 \
+    pnpm install --frozen-lockfile
+
+FROM base AS builder
+COPY --from=installer /app/ .
+COPY --from=pruner /app/out/full/ .
+RUN pnpm turbo build --filter="@edr/freight-api..."
+
+FROM base AS deployer
+COPY --from=builder /app/ .
+RUN pnpm deploy --filter="@edr/freight-api" --prod --legacy /deploy
+
+FROM node:22-alpine AS runner
+RUN apk add --no-cache libc6-compat
+ENV NODE_ENV=production
+WORKDIR /app
+RUN addgroup --system --gid 1001 nodejs \
+    && adduser --system --uid 1001 --ingroup nodejs nestjs
+COPY --from=deployer --chown=nestjs:nodejs /deploy .
+USER nestjs
+EXPOSE 3001
+CMD ["node", "dist/main.js"]

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

@@ -1,96 +1,4 @@
-# App
-NODE_ENV=development
+# Copy to .env for local/docker compose (not committed).
 PORT=4000
-
-# Database (Prisma)
-DATABASE_URL=postgresql://edr:edr_secret@localhost:5432/edr_passenger?schema=edr_passenger
-
-# CORS
-FRONTEND_URL=http://localhost:3000
-PORTAL_URL=http://localhost:3001
-
-# JWT
-JWT_SECRET=edr-platform-secret-change-in-production
-JWT_EXPIRES_IN=7d
-
-# SendGrid
-SENDGRID_API_KEY=
-SENDGRID_FROM_EMAIL=noreply@edr-platform.com
-
-# SMS Configuration
-SMS_PROVIDER=twilio
-SMS_API_KEY=
-
-# Twilio (if SMS_PROVIDER=twilio)
-TWILIO_ACCOUNT_SID=
-TWILIO_AUTH_TOKEN=
-TWILIO_FROM_NUMBER=
-
-# Africa's Talking (if SMS_PROVIDER=africastalking)
-AFRICASTALKING_USERNAME=
-AFRICASTALKING_FROM=
-
-# Telebirr
-TELEBIRR_BASE_URL=
-TELEBIRR_WEB_BASE_URL=
-TELEBIRR_FABRIC_APP_ID=
-TELEBIRR_APP_SECRET=
-TELEBIRR_MERCHANT_APP_ID=
-TELEBIRR_MERCHANT_CODE=
-TELEBIRR_NOTIFY_URL=
-TELEBIRR_RETURN_URL=
-TELEBIRR_TIMEOUT_EXPRESS=15m
-TELEBIRR_PRIVATE_KEY=
-TELEBIRR_PUBLIC_KEY=
-TELEBIRR_INSECURE_TLS=false
-
-# CBE Birr
-CBE_BASE_URL=
-CBE_MERCHANT_ID=
-CBE_SECRET_KEY=
-CBE_NOTIFY_URL=
-CBE_RETURN_URL=
-
-# eBirr
-EBIRR_BASE_URL=
-EBIRR_MERCHANT_CODE=
-EBIRR_SECRET_KEY=
-EBIRR_NOTIFY_URL=
-EBIRR_RETURN_URL=
-
-# Card Gateway (Stripe-like)
-CARD_BASE_URL=
-CARD_API_KEY=
-CARD_WEBHOOK_SECRET=
-CARD_WEBHOOK_URL=
-CARD_RETURN_URL=
-
-# Waafi (Djibouti Mobile Money)
-WAAFI_BASE_URL=https://api.waafipay.net
-WAAFI_MERCHANT_UID=
-WAAFI_API_USER_ID=
-WAAFI_API_KEY=
-WAAFI_NOTIFY_URL=
-WAAFI_RETURN_URL=
-
-# Payment Configuration
-PAYMENT_PROVIDERS_ENABLED=TELEBIRR,CBE_BIRR,EBIRR,CARD,WALLET,WAAFI
-
-# Session Configuration
-SESSION_INACTIVITY_MINUTES=30
-
-# i18n Configuration
-DEFAULT_LOCALE=en
-SUPPORTED_LOCALES=en,am,fr,om
-
-# Corporate IAM Configuration (for back-office authentication)
-IAM_ENABLED=false
-IAM_API_URL=https://iam.tria-plc.com/api
-IAM_API_KEY=
-
-# Verifayda 2.0 Configuration (Ethiopian National ID Verification)
-VERIFAYDA_ENABLED=false
-VERIFAYDA_API_URL=https://api.verifayda.gov.et/v2
-VERIFAYDA_API_KEY=
-
-GITHUB_PACKAGE_TOKEN=
+DATABASE_URL=postgresql://user:password@host:5432/edr_passenger
+JWT_SECRET=change-me-in-production

apps/edr-passenger-api/Dockerfile

@@ -0,0 +1,50 @@
+# 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:22-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 \
+    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:22-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

@@ -12,7 +12,8 @@
     "test:e2e": "jest --config ./test/jest-e2e.json",
     "type-check": "tsc --noEmit",
     "prisma:generate": "prisma generate",
-    "prisma:migrate": "prisma migrate dev",
+    "prisma:migrate": "prisma migrate deploy",
+    "prisma:migrate:dev": "prisma migrate dev",
     "prisma:seed": "ts-node prisma/seed.ts",
     "prisma:backfill": "ts-node prisma/backfill-fields.ts",
     "prisma:verify": "ts-node prisma/verify-backfill.ts"
@@ -42,7 +43,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:*",
@@ -50,7 +52,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 });
     }
   }
 
@@ -161,7 +161,7 @@ async function seedSchedules(trains: any[], stations: 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) {
     await prisma.fareRule.deleteMany({ where: { tripId: { in: existingScheduleIds } } });