Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 00:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into freight/nati-2

Browse Source
This commit is contained in:
Nathnael
2026-08-07 11:33:35 +00:00
parent da08a9b085 eb40bdb6f6
commit 6e99db374b
18 changed files with 469 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/malware-scan.yml vendored
View File

@@ -35,7 +35,7 @@ jobs:
# Plain `self-hosted` — GitHub applies this label to every self-hosted
# runner automatically. The scan is host-agnostic, unlike the deploy jobs
# which pin to a branch-specific runner.
runs-on: self-hosted
runs-on: [self-hosted, dev]
outputs:
infected: ${{ steps.scan.outputs.infected }}
steps:

4
apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts
View File

@@ -279,7 +279,9 @@ export class BookingPricingService {
return {
lineItems,
totalAmount: total,
// Grand total is billed in whole currency units — fractional line sums
// (rate × tons can yield e.g. 260519.2) round to the nearest whole birr/USD.
totalAmount: Math.round(total),
currency: booking.paymentCurrency,
usedRates: [...usedRatesMap.values()],
appliedModifiers: ruleResult.appliedModifiers,

41
apps/edr-freight-api/src/modules/contracts/contracts.controller.ts
View File

@@ -1074,16 +1074,23 @@ export class ContractsController {
// ── Booking under contract (Path A customer / Path B GL ET) ────────────────
@Post(':id/bookings')
@BookingStaff(FREIGHT_PERMS.contracts.createBooking)
// Path A is a customer flow — both audiences must reach the service, whose
// assertGate decides per role. Staff still need contracts:create_booking.
@MixedAudience(FREIGHT_PERMS.contracts.createBooking)
@ApiOperation({
summary:
'Create a shipment booking under a contract — Path A (customer) or Path B (GL Ethiopia).',
})
createBooking(
async createBooking(
@Param('id', ParseUUIDPipe) id: string,
@Body() dto: CreateBookingUnderContractDto,
@CurrentUser() user: AuthUserPayload,
@CurrentUser() user: TCurrentUser & { sub?: string },
) {
// Customer callers may only book on their own contract.
if (!hasFreightPermission(user, FREIGHT_PERMS.contracts.createBooking)) {
const contract = await this.contractsService.findById(id);
await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
}
// The service decides the execution path from the contract:
// Path A (customs disabled) → customer/staff create; status checks apply.
// Path B (customs enabled) → GL Ethiopia only, once clearance is ready.
@@ -1096,16 +1103,25 @@ export class ContractsController {
}
@Post(':id/bookings/initiate')
@BookingStaff(FREIGHT_PERMS.contracts.createBooking)
// Customer initiates their own ONE_TIME instance; GL initiates on customs
// contracts — the service's assertGate decides per role, so both audiences
// must reach it. Staff still need contracts:create_booking.
@MixedAudience(FREIGHT_PERMS.contracts.createBooking)
@ApiOperation({
summary:
'Initiate a bare booking instance under an import/export contract (ONE_TIME or GENERAL) — no cargo, no date; enters per-booking clearance (AWAITING_DOCUMENTS). ONE_TIME customs instances are opened by the customer (or GL); GENERAL customs comes from a shipment request.',
})
initiateBooking(
async initiateBooking(
@Param('id', ParseUUIDPipe) id: string,
@Body() dto: CreateBookingUnderContractDto,
@CurrentUser() user: AuthUserPayload,
@CurrentUser() user: TCurrentUser & { sub?: string },
) {
// Customer callers may only initiate on their own contract; the service's
// assertGate then decides what a customer may do on it.
if (!hasFreightPermission(user, FREIGHT_PERMS.contracts.createBooking)) {
const contract = await this.contractsService.findById(id);
await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
}
return this.contractBookingService.initiateUnderContract(
id,
{ contractRouteId: dto?.contractRouteId },
@@ -1115,17 +1131,24 @@ export class ContractsController {
}
@Post(':id/bookings/:bookingId/complete')
@BookingStaff(FREIGHT_PERMS.contracts.createBooking)
// Customers complete their own initiated (non-customs) instances; the
// service keeps customs completion GL-only via the actor's permissions.
@MixedAudience(FREIGHT_PERMS.contracts.createBooking)
@ApiOperation({
summary:
'Complete an initiated booking after Operations finalized its clearance — cargo + binding day, window and departure checks, pricing and invoicing.',
})
completeBooking(
async completeBooking(
@Param('id', ParseUUIDPipe) id: string,
@Param('bookingId', ParseUUIDPipe) bookingId: string,
@Body() dto: CreateBookingUnderContractDto,
@CurrentUser() user: AuthUserPayload,
@CurrentUser() user: TCurrentUser & { sub?: string },
) {
// Customer callers may only complete bookings on their own contract.
if (!hasFreightPermission(user, FREIGHT_PERMS.contracts.createBooking)) {
const contract = await this.contractsService.findById(id);
await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
}
// Customs (Path B) instances may only be completed by GL Ethiopia — the
// service checks the actor's contracts:create_booking permission.
return this.contractBookingService.completeUnderContract(

8
apps/edr-freight-web/backoffice/src/pages/contracts/ClearanceDocumentsPage.tsx
View File

@@ -161,10 +161,10 @@ export default function ClearanceDocumentsPage() {
<User className="size-4" strokeWidth={1.75} />
</div>
<div className="min-w-0">
<p className="truncate font-medium text-foreground">
<p className="font-medium text-foreground">
{customer}
</p>
<p className="mt-0.5 flex items-center gap-1 truncate text-xs text-muted-foreground">
<p className="mt-0.5 flex items-center gap-1 text-xs text-muted-foreground">
<FileText className="size-3 shrink-0 opacity-70" />
{b.reference}
</p>
@@ -182,7 +182,7 @@ export default function ClearanceDocumentsPage() {
<ContractReferenceLink
contractId={b.contractId}
contractReference={b.contractReference}
className="block truncate text-sm text-foreground underline underline-offset-2 hover:text-muted-foreground"
className="block text-sm text-foreground underline underline-offset-2 hover:text-muted-foreground"
/>
) : (
<Text size="sm">—</Text>
@@ -409,7 +409,7 @@ export default function ClearanceDocumentsPage() {
manualPagination: true,
pageCount,
}}
containerClassName="border-0 shadow-none bg-transparent"
containerClassName="border-0 shadow-none bg-transparent [&_th]:max-w-[100px] [&_td]:max-w-[100px] [&_td]:break-words"
footer={DataTableFooter}
/>
</Box>

16
apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx
View File

@@ -393,10 +393,10 @@ function ShipmentBookingsTable({
<PackageCheck className="size-4" strokeWidth={1.75} />
</div>
<div className="min-w-0">
<p className="truncate font-medium text-foreground">
<p className="font-medium text-foreground">
{row.original.reference}
</p>
<p className="mt-0.5 flex items-center gap-1 truncate text-xs text-muted-foreground">
<p className="mt-0.5 flex items-center gap-1 text-xs text-muted-foreground">
<User className="size-3 shrink-0 opacity-70" />
{row.original.customerLabel}
</p>
@@ -413,7 +413,7 @@ function ShipmentBookingsTable({
<Stack gap={4} py={2}>
<Group gap={6} wrap="nowrap">
<FileText size={13} className="shrink-0 text-muted-foreground" />
<Text size="sm" fw={500} truncate maw={150}>
<Text size="sm" fw={500}>
{r.contractReference ?? "—"}
</Text>
</Group>
@@ -431,13 +431,9 @@ function ShipmentBookingsTable({
header: () => <span className={bookingTable.headerCell}>Route</span>,
cell: ({ row }) => (
<Group gap={6} wrap="nowrap">
<Text size="sm" className="truncate">
{row.original.originLabel}
</Text>
<Text size="sm">{row.original.originLabel}</Text>
<ArrowRight size={13} className="shrink-0 text-muted-foreground" />
<Text size="sm" className="truncate">
{row.original.destinationLabel}
</Text>
<Text size="sm">{row.original.destinationLabel}</Text>
</Group>
),
},
@@ -610,7 +606,7 @@ function ShipmentBookingsTable({
data={rows}
status={loading ? "loading" : error ? "error" : "success"}
onRowClick={(row) => onOpen(row.id)}
containerClassName="border-0 shadow-none bg-transparent"
containerClassName="border-0 shadow-none bg-transparent [&_th]:max-w-[100px] [&_td]:max-w-[100px] [&_td]:break-words"
/>
</Box>
);

14
apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx
View File

@@ -226,11 +226,11 @@ function RouteCell({
return (
<Stack gap={4} py={2}>
<Group gap={6} wrap="nowrap">
<Text size="sm" fw={500} truncate maw={120}>
<Text size="sm" fw={500}>
{origin}
</Text>
<ArrowRight size={14} className="shrink-0 text-muted-foreground" />
<Text size="sm" fw={500} truncate maw={120}>
<Text size="sm" fw={500}>
{destination}
</Text>
</Group>
@@ -385,10 +385,10 @@ export default function GlDjiboutiClearanceListPage() {
<PackageCheck className="size-4" strokeWidth={1.75} />
</div>
<div className="min-w-0">
<p className="truncate font-medium text-foreground">
<p className="font-medium text-foreground">
{r.reference}
</p>
<p className="mt-0.5 flex items-center gap-1 truncate text-xs text-muted-foreground">
<p className="mt-0.5 flex items-center gap-1 text-xs text-muted-foreground">
<User className="size-3 shrink-0 opacity-70" />
{r.customerLabel}
</p>
@@ -403,9 +403,7 @@ export default function GlDjiboutiClearanceListPage() {
cell: ({ row }) => (
<Group gap={6} wrap="nowrap">
<FileText size={13} className="shrink-0 text-muted-foreground" />
<Text size="sm" truncate maw={140}>
{row.original.contractReference}
</Text>
<Text size="sm">{row.original.contractReference}</Text>
</Group>
),
},
@@ -710,7 +708,7 @@ export default function GlDjiboutiClearanceListPage() {
manualPagination: true,
pageCount,
}}
containerClassName="border-0 shadow-none bg-transparent"
containerClassName="border-0 shadow-none bg-transparent [&_th]:max-w-[100px] [&_td]:max-w-[100px] [&_td]:break-words"
footer={DataTableFooter}
/>
</Box>

2
apps/edr-passenger-api/src/common/utils/payment-deadline.utils.ts
View File

@@ -8,7 +8,7 @@
*/
/** Maximum time (hours) a passenger has to pay after booking. */
export const MAX_PAYMENT_HOURS = 240;
export const MAX_PAYMENT_HOURS = 2;
/** Minutes before departure: cutoff for new bookings and payment deadline. */
export const CUTOFF_MINUTES = 30;

9
apps/edr-passenger-api/src/modules/dashboard/dashboard.module.ts
View File

@@ -1,13 +1,6 @@
import { Module } from '@nestjs/common';
import { DashboardController } from './dashboard.controller';
import { DashboardService } from './dashboard.service';
import { ReportsModule } from '../reports/reports.module';
@Module({
// ReportsModule owns the blocked-seat revenue loss rule; the dashboard's roll-up
// reads it from there instead of keeping a second copy of the definition.
imports: [ReportsModule],
controllers: [DashboardController],
providers: [DashboardService],
})
@Module({ controllers: [DashboardController], providers: [DashboardService] })
export class DashboardModule {}

53
apps/edr-passenger-api/src/modules/dashboard/dashboard.service.ts
View File

@@ -1,31 +1,17 @@
import { Injectable, Logger } from '@nestjs/common';
import { Injectable } from '@nestjs/common';
import { InjectDataSource } from '@nestjs/typeorm';
import { DataSource } from 'typeorm';
import { BlockedSeatRevenueLossStat } from '@edr/types';
import { PrismaService } from '../../common/prisma.service';
import { ReportsService } from '../reports/reports.service';
/** Shown when nothing is blocked, or when the loss roll-up could not be computed. */
const EMPTY_BLOCKED_SEAT_LOSS: BlockedSeatRevenueLossStat = {
periodDays: null,
lossByCurrency: [],
schedulesAffected: 0,
blockedSeatCount: 0,
topReasonCategory: null,
};
@Injectable()
export class DashboardService {
private readonly logger = new Logger(DashboardService.name);
constructor(
private prisma: PrismaService,
@InjectDataSource() private dataSource: DataSource,
private reports: ReportsService,
) {}
async getBackofficeStats() {
const [totalBookings, totalPackageBookings, totalTickets, totalPassengers, blockedSeatsCount, revenueRows, packageRevenueRows, blockedSeatRevenueLoss] =
const [totalBookings, totalPackageBookings, totalTickets, totalPassengers, blockedSeatsCount, revenueRows, packageRevenueRows] =
await Promise.all([
this.prisma.booking.count({ where: { status: { in: ['CONFIRMED', 'BOARDED'] } } }),
this.prisma.booking.count({ where: { status: { in: ['CONFIRMED', 'BOARDED'] }, packageId: { not: null } } }),
@@ -52,9 +38,6 @@ export class DashboardService {
AND id IN (SELECT "bookingId" FROM passenger."PaymentIntent" WHERE status = 'SUCCEEDED')
GROUP BY COALESCE("displayCurrency"::text, "currency"::text)
`,
// Joined into this same call on purpose: the dashboard's request count stays
// exactly where it was, and the card renders from the payload it already fetches.
this.getBlockedSeatRevenueLossStat(),
]);
const totalPackageTickets = await this.prisma.ticket.count({
@@ -75,43 +58,11 @@ export class DashboardService {
totalNormalTickets: totalTickets - totalPackageTickets,
totalPassengers,
blockedSeatsCount,
blockedSeatRevenueLoss,
revenueByCurrency: toMap(revenueRows),
packageRevenueByCurrency: toMap(packageRevenueRows),
};
}
/**
* Compact roll-up of the Blocked Seat Revenue Loss report over its full history.
*
* Reuses the report service rather than re-deriving the rule — there is exactly one
* definition of what a blocked seat costs. A failure here degrades to zeroes instead of
* taking the whole dashboard down with it.
*/
private async getBlockedSeatRevenueLossStat(): Promise<BlockedSeatRevenueLossStat> {
try {
// pageSize 1: only the summary is read, and paging does not change what it covers.
const report = await this.reports.getBlockedSeatsRevenueLoss({ page: 1, pageSize: 1 });
const { summary } = report;
return {
periodDays: null,
lossByCurrency: summary.lossByCurrency,
schedulesAffected: summary.schedulesAffected,
blockedSeatCount: summary.blockedSeatCount,
// topReasonCategories is already sorted by estimated loss, descending.
topReasonCategory: summary.topReasonCategories[0]?.reasonCategory ?? null,
};
} catch (err) {
this.logger.warn(
`Blocked-seat revenue loss roll-up unavailable — ${
err instanceof Error ? err.message : String(err)
}`,
);
return EMPTY_BLOCKED_SEAT_LOSS;
}
}
async getHomeDashboard(passengerId: string) {
const now = new Date();
const [passenger, upcomingBooking, wallet, promos, weatherAlerts, stationSignals, savedRoutes] = await Promise.all([

12
apps/edr-passenger-api/src/modules/reports/blocked-seats-loss.calculator.ts
View File

@@ -193,7 +193,10 @@ function supersedes(candidate: CountedBlock, existing: CountedBlock): boolean {
return candidate.block.blockedAt.getTime() > existing.block.blockedAt.getTime();
}
function isGlobalBlockInEffectAt(block: LossBlock, departureAt: Date): boolean {
export function isGlobalBlockInEffectAt(
block: Pick<LossBlock, 'blockedAt' | 'unblockAt'>,
departureAt: Date,
): boolean {
if (block.blockedAt.getTime() > departureAt.getTime()) return false;
if (block.unblockAt === null) return true;
return block.unblockAt.getTime() >= departureAt.getTime();
@@ -210,9 +213,10 @@ export function isPlaceholderSeat(seat: Pick<LossSeat, 'seatNumber'>): boolean {
* inflates the blocked-seat count. Match on a substring of type *or* name so both the
* documented convention and the data as it actually exists are covered.
*/
export function isDiningCoach(
coach: Pick<LossCoach, 'coachTypeType' | 'coachTypeName'>,
): boolean {
export function isDiningCoach(coach: {
coachTypeType?: string | null;
coachTypeName?: string | null;
}): boolean {
const haystack = `${coach.coachTypeType ?? ''} ${coach.coachTypeName ?? ''}`.toLowerCase();
return haystack.includes('dining');
}

154
apps/edr-passenger-api/src/modules/reports/reports.service.ts
View File

@@ -15,12 +15,16 @@ import {
} from "./reports.dto";
import {
assembleReport,
isDiningCoach,
isGlobalBlockInEffectAt,
isPlaceholderSeat,
LossCalculatorInput,
LossCoach,
LossFare,
LossSeat,
selectCountedBlocks,
soldKey,
TICKETING_BLOCK_REASON_PREFIX,
} from "./blocked-seats-loss.calculator";
/** Fares are quoted at the local tariff unless the caller asks otherwise. */
@@ -528,7 +532,8 @@ export class ReportsService {
}
async getSeatStatusReport(scheduleId: string) {
// Confirmed/boarded seats — exclude dining coaches
// Confirmed/boarded seats. Dining coaches are dropped in JS below — `CoachType.type`
// holds display names in real data, so an exact match here would not catch them.
const bookingSeats = await this.prisma.bookingSeat.findMany({
where: {
OR: [
@@ -536,7 +541,6 @@ export class ReportsService {
{ leg: 2, booking: { returnScheduleId: scheduleId, status: { in: ['CONFIRMED', 'BOARDED', 'PENDING_PAYMENT'] } } },
{ scheduleId: null, leg: 1, booking: { scheduleId, status: { in: ['CONFIRMED', 'BOARDED', 'PENDING_PAYMENT'] } } },
],
seat: { coach: { coachType: { type: { not: 'dining' } } } },
},
include: {
booking: {
@@ -565,12 +569,6 @@ export class ReportsService {
orderBy: [{ seat: { coach: { number: 'asc' } } }, { seat: { seatNumber: 'asc' } }],
});
// Active seat holds for this schedule
const activeHolds = await this.prisma.seatHold.findMany({
where: { scheduleId },
orderBy: { createdAt: 'desc' },
});
// Expired holds (last 24h) — held but never converted to a booking
const since24h = new Date(Date.now() - 24 * 60 * 60 * 1000);
const expiredHolds = await this.prisma.seatHold.findMany({
@@ -581,35 +579,89 @@ export class ReportsService {
orderBy: { expiresAt: 'desc' },
});
// Manually blocked seats — schedule-scoped blocks for this schedule OR global blocks (scheduleId null)
// Exclude MAINTENANCE and booking-system-created blocks
const blocks = await this.prisma.seatBlock.findMany({
where: {
OR: [
{ scheduleId },
{ scheduleId: null },
],
NOT: [
{ reason: { startsWith: 'MAINTENANCE:' } },
{ reason: { startsWith: 'Booked in tickets' } },
],
},
include: {
seat: {
select: {
seatNumber: true,
bedPosition: true,
coach: {
select: {
number: true,
coachType: { select: { name: true, type: true, seatClasses: { select: { name: true, bedPosition: true } } } },
// Manually blocked seats. Counted the same way the blocked-seat revenue loss report
// counts them (see `selectCountedBlocks`), so the two reports never disagree:
// - a schedule-scoped block naming this schedule, or
// - a global block (scheduleId null) that was in effect at departure AND sits on a
// coach actually assigned to this train.
// A global block on a coach that never joined this consist is not a blocked seat here.
// Excluded: dining coaches, placeholder seats, ticket-issuance bookkeeping blocks, and
// MAINTENANCE (a seat out of service, not one withheld by hand).
const [schedule, assignments, blockRows] = await Promise.all([
this.prisma.trainSchedule.findUnique({
where: { id: scheduleId },
select: { departureAt: true },
}),
this.prisma.coachAssignment.findMany({
where: { scheduleId },
select: { coachId: true },
}),
this.prisma.seatBlock.findMany({
where: {
OR: [
{ scheduleId },
{ scheduleId: null },
],
NOT: [
{ reason: { startsWith: 'MAINTENANCE:' } },
{ reason: { startsWith: TICKETING_BLOCK_REASON_PREFIX } },
],
},
include: {
seat: {
select: {
id: true,
coachId: true,
seatNumber: true,
bedPosition: true,
coach: {
select: {
number: true,
coachType: { select: { name: true, type: true, seatClasses: { select: { name: true, bedPosition: true } } } },
},
},
},
},
},
},
orderBy: { blockedAt: 'desc' },
});
orderBy: { blockedAt: 'desc' },
}),
]);
const assignedCoachIds = new Set(assignments.map((a) => a.coachId));
const departureAt = schedule?.departureAt ?? null;
// One counted block per seat: a schedule-scoped block beats a global one, and between
// two of the same kind the most recent wins — the rows arrive newest-first, so the
// first of a kind seen for a seat is already the most recent.
const countedBySeat = new Map<string, (typeof blockRows)[number]>();
for (const block of blockRows) {
const seat = block.seat;
if (!seat || isPlaceholderSeat(seat)) continue;
const coachType = seat.coach?.coachType;
if (
isDiningCoach({
coachTypeType: coachType?.type ?? null,
coachTypeName: coachType?.name ?? null,
})
) {
continue;
}
if (block.scheduleId === null) {
if (!assignedCoachIds.has(seat.coachId)) continue;
if (!departureAt || !isGlobalBlockInEffectAt(block, departureAt)) continue;
}
const existing = countedBySeat.get(seat.id);
if (!existing || (existing.scheduleId === null && block.scheduleId !== null)) {
countedBySeat.set(seat.id, block);
}
}
const blocks = [...countedBySeat.values()].sort(
(a, b) => b.blockedAt.getTime() - a.blockedAt.getTime(),
);
const resolveSeatClass = (seat: any): string | null => {
const classes = seat?.coach?.coachType?.seatClasses ?? [];
@@ -619,10 +671,18 @@ export class ReportsService {
return (matched ?? classes[0])?.name ?? seat?.coach?.coachType?.name ?? null;
};
const paidSeats = bookingSeats.filter(bs =>
const passengerSeats = bookingSeats.filter(
bs =>
!isDiningCoach({
coachTypeType: bs.seat?.coach?.coachType?.type ?? null,
coachTypeName: bs.seat?.coach?.coachType?.name ?? null,
}),
);
const paidSeats = passengerSeats.filter(bs =>
bs.booking.status === 'CONFIRMED' || bs.booking.status === 'BOARDED'
);
const unpaidSeats = bookingSeats.filter(bs =>
const unpaidSeats = passengerSeats.filter(bs =>
bs.booking.status === 'PENDING_PAYMENT'
);
@@ -645,7 +705,7 @@ export class ReportsService {
paidCount: paidSeats.length,
unpaidCount: unpaidSeats.length,
expiredHoldCount: expiredHolds.length,
blockedCount: blocks.filter(b => b.seat?.coach?.coachType?.type !== 'dining').length,
blockedCount: blocks.length,
},
paidSeats: paidSeats.map(mapSeat),
unpaidSeats: unpaidSeats.map(mapSeat),
@@ -655,18 +715,16 @@ export class ReportsService {
expiresAt: h.expiresAt,
createdAt: h.createdAt,
})),
blockedSeats: blocks
.filter(b => b.seat?.coach?.coachType?.type !== 'dining')
.map(b => ({
id: b.id,
coachNumber: b.seat?.coach?.number ?? null,
seatNumber: b.seat?.seatNumber ?? null,
seatClassName: resolveSeatClass(b.seat),
reason: b.reason,
blockedBy: b.blockedBy,
blockedAt: b.blockedAt,
unblockAt: b.unblockAt,
})),
blockedSeats: blocks.map(b => ({
id: b.id,
coachNumber: b.seat?.coach?.number ?? null,
seatNumber: b.seat?.seatNumber ?? null,
seatClassName: resolveSeatClass(b.seat),
reason: b.reason,
blockedBy: b.blockedBy,
blockedAt: b.blockedAt,
unblockAt: b.unblockAt,
})),
};
}

261
apps/edr-passenger-api/src/modules/reports/seat-status-blocked.spec.ts Normal file
View File

@@ -0,0 +1,261 @@
import { ReportsService } from './reports.service';
/**
* Covers the blocked-seat half of the seat status report.
*
* The count used to be a raw `SeatBlock` row count with an exact `type === 'dining'`
* exclusion. Real EDR data stores display names in `CoachType.type` ('Dining Coach '),
* so dining seats slipped through, and every global block counted even when its coach
* never joined the train. These cases pin the corrected rule.
*/
const SCHEDULE_ID = 'sched-1';
const DEPARTURE = new Date('2026-03-10T06:00:00.000Z');
interface CoachSpec {
id: string;
number: string;
typeType?: string;
typeName?: string;
}
const passengerCoach: CoachSpec = { id: 'coach-1', number: 'C1' };
const diningCoach: CoachSpec = {
id: 'coach-dining',
number: 'D1',
// As the data actually looks: display name in `type`, trailing space included.
typeType: 'Dining Coach ',
typeName: 'Dining Coach',
};
function seatRow(
id: string,
coach: CoachSpec,
seatNumber: string,
bedPosition: string | null = null,
) {
return {
id,
coachId: coach.id,
seatNumber,
bedPosition,
coach: {
number: coach.number,
coachType: {
name: coach.typeName ?? 'Standard',
type: coach.typeType ?? 'passenger',
seatClasses: [{ name: 'Economy', bedPosition: null }],
},
},
};
}
function blockRow(
overrides: Partial<{
id: string;
scheduleId: string | null;
reason: string;
blockedAt: Date;
unblockAt: Date | null;
seat: ReturnType<typeof seatRow>;
}> = {},
) {
return {
id: 'block-1',
scheduleId: SCHEDULE_ID as string | null,
reason: 'VIP hold',
blockedBy: 'user-1',
blockedAt: new Date('2026-03-01T00:00:00.000Z'),
unblockAt: null as Date | null,
seat: seatRow('seat-1', passengerCoach, '1'),
...overrides,
};
}
function makeService(opts: {
blocks: ReturnType<typeof blockRow>[];
assignedCoachIds?: string[];
departureAt?: Date | null;
bookingSeats?: any[];
}) {
const prisma = {
bookingSeat: { findMany: jest.fn().mockResolvedValue(opts.bookingSeats ?? []) },
seatHold: { findMany: jest.fn().mockResolvedValue([]) },
trainSchedule: {
findUnique: jest.fn().mockResolvedValue(
opts.departureAt === null ? null : { departureAt: opts.departureAt ?? DEPARTURE },
),
},
coachAssignment: {
findMany: jest
.fn()
.mockResolvedValue(
(opts.assignedCoachIds ?? [passengerCoach.id, diningCoach.id]).map((coachId) => ({
coachId,
})),
),
},
seatBlock: { findMany: jest.fn().mockResolvedValue(opts.blocks) },
};
return {
service: new ReportsService(prisma as any, {} as any, {} as any),
prisma,
};
}
describe('getSeatStatusReport — blocked seats', () => {
it('counts a schedule-scoped block on a passenger coach', async () => {
const { service } = makeService({ blocks: [blockRow()] });
const report = await service.getSeatStatusReport(SCHEDULE_ID);
expect(report.summary.blockedCount).toBe(1);
expect(report.blockedSeats).toHaveLength(1);
expect(report.blockedSeats[0]).toMatchObject({ coachNumber: 'C1', seatNumber: '1' });
});
it('leaves out a dining coach whose type carries a display name', async () => {
const { service } = makeService({
blocks: [blockRow({ seat: seatRow('seat-d', diningCoach, '1') })],
});
const report = await service.getSeatStatusReport(SCHEDULE_ID);
expect(report.summary.blockedCount).toBe(0);
expect(report.blockedSeats).toEqual([]);
});
it('leaves out placeholder seats', async () => {
const { service } = makeService({
blocks: [blockRow({ seat: seatRow('seat-p', passengerCoach, '-1') })],
});
expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
});
it('counts a global block on a coach assigned to this train', async () => {
const { service } = makeService({
blocks: [blockRow({ scheduleId: null })],
assignedCoachIds: [passengerCoach.id],
});
expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(1);
});
it('ignores a global block whose coach never joined this train', async () => {
const { service } = makeService({
blocks: [blockRow({ scheduleId: null })],
assignedCoachIds: ['some-other-coach'],
});
expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
});
it('ignores a global block that had already been lifted by departure', async () => {
const { service } = makeService({
blocks: [
blockRow({
scheduleId: null,
unblockAt: new Date('2026-03-05T00:00:00.000Z'),
}),
],
assignedCoachIds: [passengerCoach.id],
});
expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
});
it('ignores a global block created after departure', async () => {
const { service } = makeService({
blocks: [blockRow({ scheduleId: null, blockedAt: new Date('2026-03-20T00:00:00.000Z') })],
assignedCoachIds: [passengerCoach.id],
});
expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
});
it('counts a seat blocked both globally and for this schedule once', async () => {
const seat = seatRow('seat-1', passengerCoach, '1');
const { service } = makeService({
blocks: [
blockRow({ id: 'block-schedule', seat, reason: 'Crew seat' }),
blockRow({ id: 'block-global', scheduleId: null, seat, reason: 'Broken armrest' }),
],
assignedCoachIds: [passengerCoach.id],
});
const report = await service.getSeatStatusReport(SCHEDULE_ID);
expect(report.summary.blockedCount).toBe(1);
// The schedule-scoped block is the more specific statement, so it is the one shown.
expect(report.blockedSeats[0].reason).toBe('Crew seat');
});
it('reports nothing blocked when the schedule does not exist', async () => {
const { service } = makeService({
blocks: [blockRow({ scheduleId: null })],
departureAt: null,
});
expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
});
it('asks the database only for non-maintenance, non-ticketing blocks', async () => {
const { service, prisma } = makeService({ blocks: [] });
await service.getSeatStatusReport(SCHEDULE_ID);
const where = prisma.seatBlock.findMany.mock.calls[0][0].where;
expect(where.NOT).toEqual([
{ reason: { startsWith: 'MAINTENANCE:' } },
{ reason: { startsWith: 'Booked in tickets' } },
]);
});
});
describe('getSeatStatusReport — booked seats', () => {
const booking = {
bookingRef: 'BK-1',
status: 'CONFIRMED',
totalMinor: 20000,
currency: 'ETB',
createdAt: new Date('2026-03-01T00:00:00.000Z'),
paymentIntent: { status: 'SUCCEEDED' },
};
it('keeps dining-coach seats out of the paid and unpaid counts', async () => {
const { service } = makeService({
blocks: [],
bookingSeats: [
{
passengerName: 'Abebe',
passengerCategory: 'ADULT',
fareMinor: 20000,
booking,
seat: seatRow('seat-1', passengerCoach, '1'),
},
{
passengerName: 'Diner',
passengerCategory: 'ADULT',
fareMinor: 0,
booking,
seat: seatRow('seat-d', diningCoach, '1'),
},
{
passengerName: 'Kebede',
passengerCategory: 'ADULT',
fareMinor: 20000,
booking: { ...booking, status: 'PENDING_PAYMENT', paymentIntent: null },
seat: seatRow('seat-2', passengerCoach, '2'),
},
],
});
const report = await service.getSeatStatusReport(SCHEDULE_ID);
expect(report.summary.paidCount).toBe(1);
expect(report.summary.unpaidCount).toBe(1);
expect(report.paidSeats.map((s) => s.passengerName)).toEqual(['Abebe']);
});
});

73
apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx
View File

@@ -10,9 +10,7 @@ import {
Banknote,
ArrowRight,
ScanLine,
Ban,
} from "lucide-react";
import { SEAT_BLOCK_REASON_CATEGORY_LABELS } from "@edr/types";
import { dashboardApi } from "@/lib/api/dashboard";
import { apiClient } from "@/lib/api-client";
import { formatCurrency } from "@/lib/utils";
@@ -163,10 +161,6 @@ function DashboardPageContent() {
return rate !== null ? sum + Math.round(totalMinor * rate) : sum;
}, 0);
const blockedLoss = stats?.blockedSeatRevenueLoss;
// Never summed across currencies — each is shown on its own line, largest first.
const blockedLossRows = blockedLoss?.lossByCurrency ?? [];
const normalRows = stats?.revenueByCurrency ?? [];
const packageRows = stats?.packageRevenueByCurrency ?? [];
const normalGrand = calcGrand(normalRows);
@@ -326,73 +320,6 @@ function DashboardPageContent() {
</>
)}
</div>
{/* Blocked-seat revenue loss — rides the same backoffice-stats payload, so the
dashboard makes no extra request for it. */}
<div className="card flex flex-col gap-3 border-rose-200 bg-rose-50/60 dark:border-rose-900/50 dark:bg-rose-950/20">
<div className="flex items-center gap-2">
<div className="rounded-lg bg-rose-100 dark:bg-rose-900/40 p-1.5">
<Ban className="h-4 w-4 text-rose-600 dark:text-rose-400" />
</div>
<span className="text-xs font-semibold uppercase tracking-wider text-rose-700 dark:text-rose-400">
Blocked Seats / Revenue Not Collected
</span>
<span className="ml-auto text-[11px] text-muted-foreground">
{blockedLoss?.periodDays ? `Last ${blockedLoss.periodDays}d` : "All time"}
</span>
</div>
{statsLoading ? (
<p className="text-muted-foreground text-sm">Loading…</p>
) : (
<>
{blockedLossRows.length === 0 ? (
<p className="text-3xl font-bold text-foreground tabular-nums">
{formatCurrency(0, "ETB")}
</p>
) : (
blockedLossRows.map((row, i) => (
<p
key={row.currency}
className={
i === 0
? "text-3xl font-bold text-rose-600 dark:text-rose-400 tabular-nums"
: "text-lg font-semibold text-rose-600/80 dark:text-rose-400/80 tabular-nums"
}
>
{formatCurrency(row.estimatedLossMinor, row.currency)}
</p>
))
)}
<p className="text-xs text-muted-foreground -mt-1">
Estimated potential revenue never earned
</p>
<div className="flex flex-col gap-2 border-t border-border pt-3">
<div className="flex items-center justify-between">
<span className="text-xs text-muted-foreground">Seats blocked</span>
<span className="text-sm font-semibold text-foreground tabular-nums">
{(blockedLoss?.blockedSeatCount ?? 0).toLocaleString()} across{" "}
{(blockedLoss?.schedulesAffected ?? 0).toLocaleString()} schedules
</span>
</div>
<div className="flex items-center justify-between">
<span className="text-xs text-muted-foreground">Top reason</span>
<span className="text-sm font-semibold text-foreground">
{blockedLoss?.topReasonCategory
? (SEAT_BLOCK_REASON_CATEGORY_LABELS[blockedLoss.topReasonCategory] ??
blockedLoss.topReasonCategory)
: "—"}
</span>
</div>
</div>
<Link
href="/reports/blocked-seats"
className="flex items-center justify-center gap-1.5 rounded-md bg-rose-600 hover:bg-rose-700 dark:bg-rose-600 dark:hover:bg-rose-500 px-3 py-2 text-sm font-semibold text-white shadow-sm transition-colors mt-auto"
>
View full report <ArrowRight className="h-3.5 w-3.5" />
</Link>
</>
)}
</div>
</div>
{/* Revenue breakdown */}

2
apps/edr-passenger-web/backoffice/src/lib/api/dashboard.ts
View File

@@ -1,5 +1,4 @@
import { apiClient } from '@/lib/api-client';
import type { BlockedSeatRevenueLossStat } from '@edr/types';
import { DashboardStats, RevenueData } from '@/types';
export const dashboardApi = {
@@ -13,7 +12,6 @@ export const dashboardApi = {
totalPackageTickets: number;
totalPassengers: number;
blockedSeatsCount: number;
blockedSeatRevenueLoss: BlockedSeatRevenueLossStat;
revenueByCurrency: { currency: string; totalMinor: number }[];
packageRevenueByCurrency: { currency: string; totalMinor: number }[];
}>('/dashboard/backoffice-stats');

1
apps/edr-passenger-web/portal/tailwind.config.js
View File

@@ -1,4 +1,3 @@
/** @type {import('tailwindcss').Config} */
export default {
darkMode: "class",

22
apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.amount.spec.ts Normal file
View File

@@ -0,0 +1,22 @@
import { amountsMatchToTheCent } from "./cbe-bill.service";
describe("amountsMatchToTheCent (CBE payment amount gate)", () => {
it("accepts the exact amount", () => {
expect(amountsMatchToTheCent(1234.34, 1234.34)).toBe(true);
});
it("rejects a cents-only difference (the 1234.89 vs 1234.34 bug)", () => {
expect(amountsMatchToTheCent(1234.89, 1234.34)).toBe(false);
expect(amountsMatchToTheCent(1234.35, 1234.34)).toBe(false);
});
it("rejects whole-unit differences", () => {
expect(amountsMatchToTheCent(1235.34, 1234.34)).toBe(false);
});
it("absorbs double-precision storage noise", () => {
expect(amountsMatchToTheCent(1234.34, 1234.3399999999999)).toBe(true);
// classic float artifact: 0.1 + 0.2 !== 0.3
expect(amountsMatchToTheCent(0.1 + 0.2, 0.3)).toBe(true);
});
});

19
apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.service.ts
View File

@@ -38,8 +38,15 @@ import {
/** Postgres unique_violation — the DB-level idempotency backstop firing on a concurrent duplicate. */
const PG_UNIQUE_VIOLATION = "23505";
/** Mirrors the short-pay tolerance already applied in handlePaymentEvent. */
const AMOUNT_TOLERANCE = 0.01;
/**
* CBE must pay the bill to the exact cent — compare in integer cents so
* double-precision storage noise (1234.34 stored as 1234.33999…) can neither
* mask nor fabricate a difference. A relative tolerance is wrong here: 1% of a
* 1234.34 bill would wave through anything up to ±12.34.
*/
export function amountsMatchToTheCent(a: number, b: number): boolean {
return Math.round(a * 100) === Math.round(b * 100);
}
/**
* Translate an intent's own terminal state into the same reason vocabulary the domain apps
@@ -265,11 +272,15 @@ export class CbeBillService {
);
}
// Validate against the freshly-quoted amount — the same figure bill-query
// just showed the payer — not the intent's amount asserted at creation,
// which can go stale when the domain re-prices the invoice. Fallback to
// the intent amount only for domain builds that return no current amount.
const expectedAmount = billQuery.currentAmountMinor ?? intent.amountMinor;
const amount = Number(dto.Amount);
if (
!Number.isFinite(amount) ||
Math.abs(amount - intent.amountMinor) >
intent.amountMinor * AMOUNT_TOLERANCE
!amountsMatchToTheCent(amount, expectedAmount)
) {
throw new CbeBillError("Amount mismatch", "BUSINESS");
}

1
docker-compose.yaml
View File

@@ -4,6 +4,7 @@
#
# Build: DOCKER_BUILDKIT=1 docker compose build
# Run: docker compose up -d
services:
freight-api:
build: