mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-26 18:42:49 +00:00
Merge pull request #1155 from Tria-plc/mulufeatures
Removing Blocked seat from dashboard
This commit is contained in:
@@ -1,13 +1,6 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
import { DashboardController } from './dashboard.controller';
|
import { DashboardController } from './dashboard.controller';
|
||||||
import { DashboardService } from './dashboard.service';
|
import { DashboardService } from './dashboard.service';
|
||||||
import { ReportsModule } from '../reports/reports.module';
|
|
||||||
|
|
||||||
@Module({
|
@Module({ controllers: [DashboardController], providers: [DashboardService] })
|
||||||
// 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],
|
|
||||||
})
|
|
||||||
export class DashboardModule {}
|
export class DashboardModule {}
|
||||||
|
|||||||
@@ -1,31 +1,17 @@
|
|||||||
import { Injectable, Logger } from '@nestjs/common';
|
import { Injectable } from '@nestjs/common';
|
||||||
import { InjectDataSource } from '@nestjs/typeorm';
|
import { InjectDataSource } from '@nestjs/typeorm';
|
||||||
import { DataSource } from 'typeorm';
|
import { DataSource } from 'typeorm';
|
||||||
import { BlockedSeatRevenueLossStat } from '@edr/types';
|
|
||||||
import { PrismaService } from '../../common/prisma.service';
|
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()
|
@Injectable()
|
||||||
export class DashboardService {
|
export class DashboardService {
|
||||||
private readonly logger = new Logger(DashboardService.name);
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
@InjectDataSource() private dataSource: DataSource,
|
@InjectDataSource() private dataSource: DataSource,
|
||||||
private reports: ReportsService,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async getBackofficeStats() {
|
async getBackofficeStats() {
|
||||||
const [totalBookings, totalPackageBookings, totalTickets, totalPassengers, blockedSeatsCount, revenueRows, packageRevenueRows, blockedSeatRevenueLoss] =
|
const [totalBookings, totalPackageBookings, totalTickets, totalPassengers, blockedSeatsCount, revenueRows, packageRevenueRows] =
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
this.prisma.booking.count({ where: { status: { in: ['CONFIRMED', 'BOARDED'] } } }),
|
this.prisma.booking.count({ where: { status: { in: ['CONFIRMED', 'BOARDED'] } } }),
|
||||||
this.prisma.booking.count({ where: { status: { in: ['CONFIRMED', 'BOARDED'] }, packageId: { not: null } } }),
|
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')
|
AND id IN (SELECT "bookingId" FROM passenger."PaymentIntent" WHERE status = 'SUCCEEDED')
|
||||||
GROUP BY COALESCE("displayCurrency"::text, "currency"::text)
|
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({
|
const totalPackageTickets = await this.prisma.ticket.count({
|
||||||
@@ -75,43 +58,11 @@ export class DashboardService {
|
|||||||
totalNormalTickets: totalTickets - totalPackageTickets,
|
totalNormalTickets: totalTickets - totalPackageTickets,
|
||||||
totalPassengers,
|
totalPassengers,
|
||||||
blockedSeatsCount,
|
blockedSeatsCount,
|
||||||
blockedSeatRevenueLoss,
|
|
||||||
revenueByCurrency: toMap(revenueRows),
|
revenueByCurrency: toMap(revenueRows),
|
||||||
packageRevenueByCurrency: toMap(packageRevenueRows),
|
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) {
|
async getHomeDashboard(passengerId: string) {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const [passenger, upcomingBooking, wallet, promos, weatherAlerts, stationSignals, savedRoutes] = await Promise.all([
|
const [passenger, upcomingBooking, wallet, promos, weatherAlerts, stationSignals, savedRoutes] = await Promise.all([
|
||||||
|
|||||||
@@ -193,7 +193,10 @@ function supersedes(candidate: CountedBlock, existing: CountedBlock): boolean {
|
|||||||
return candidate.block.blockedAt.getTime() > existing.block.blockedAt.getTime();
|
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.blockedAt.getTime() > departureAt.getTime()) return false;
|
||||||
if (block.unblockAt === null) return true;
|
if (block.unblockAt === null) return true;
|
||||||
return block.unblockAt.getTime() >= departureAt.getTime();
|
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
|
* 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.
|
* documented convention and the data as it actually exists are covered.
|
||||||
*/
|
*/
|
||||||
export function isDiningCoach(
|
export function isDiningCoach(coach: {
|
||||||
coach: Pick<LossCoach, 'coachTypeType' | 'coachTypeName'>,
|
coachTypeType?: string | null;
|
||||||
): boolean {
|
coachTypeName?: string | null;
|
||||||
|
}): boolean {
|
||||||
const haystack = `${coach.coachTypeType ?? ''} ${coach.coachTypeName ?? ''}`.toLowerCase();
|
const haystack = `${coach.coachTypeType ?? ''} ${coach.coachTypeName ?? ''}`.toLowerCase();
|
||||||
return haystack.includes('dining');
|
return haystack.includes('dining');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,12 +15,16 @@ import {
|
|||||||
} from "./reports.dto";
|
} from "./reports.dto";
|
||||||
import {
|
import {
|
||||||
assembleReport,
|
assembleReport,
|
||||||
|
isDiningCoach,
|
||||||
|
isGlobalBlockInEffectAt,
|
||||||
|
isPlaceholderSeat,
|
||||||
LossCalculatorInput,
|
LossCalculatorInput,
|
||||||
LossCoach,
|
LossCoach,
|
||||||
LossFare,
|
LossFare,
|
||||||
LossSeat,
|
LossSeat,
|
||||||
selectCountedBlocks,
|
selectCountedBlocks,
|
||||||
soldKey,
|
soldKey,
|
||||||
|
TICKETING_BLOCK_REASON_PREFIX,
|
||||||
} from "./blocked-seats-loss.calculator";
|
} from "./blocked-seats-loss.calculator";
|
||||||
|
|
||||||
/** Fares are quoted at the local tariff unless the caller asks otherwise. */
|
/** Fares are quoted at the local tariff unless the caller asks otherwise. */
|
||||||
@@ -528,7 +532,8 @@ export class ReportsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getSeatStatusReport(scheduleId: string) {
|
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({
|
const bookingSeats = await this.prisma.bookingSeat.findMany({
|
||||||
where: {
|
where: {
|
||||||
OR: [
|
OR: [
|
||||||
@@ -536,7 +541,6 @@ export class ReportsService {
|
|||||||
{ leg: 2, booking: { returnScheduleId: scheduleId, status: { in: ['CONFIRMED', 'BOARDED', 'PENDING_PAYMENT'] } } },
|
{ leg: 2, booking: { returnScheduleId: scheduleId, status: { in: ['CONFIRMED', 'BOARDED', 'PENDING_PAYMENT'] } } },
|
||||||
{ scheduleId: null, leg: 1, booking: { 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: {
|
include: {
|
||||||
booking: {
|
booking: {
|
||||||
@@ -565,12 +569,6 @@ export class ReportsService {
|
|||||||
orderBy: [{ seat: { coach: { number: 'asc' } } }, { seat: { seatNumber: 'asc' } }],
|
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
|
// Expired holds (last 24h) — held but never converted to a booking
|
||||||
const since24h = new Date(Date.now() - 24 * 60 * 60 * 1000);
|
const since24h = new Date(Date.now() - 24 * 60 * 60 * 1000);
|
||||||
const expiredHolds = await this.prisma.seatHold.findMany({
|
const expiredHolds = await this.prisma.seatHold.findMany({
|
||||||
@@ -581,35 +579,89 @@ export class ReportsService {
|
|||||||
orderBy: { expiresAt: 'desc' },
|
orderBy: { expiresAt: 'desc' },
|
||||||
});
|
});
|
||||||
|
|
||||||
// Manually blocked seats — schedule-scoped blocks for this schedule OR global blocks (scheduleId null)
|
// Manually blocked seats. Counted the same way the blocked-seat revenue loss report
|
||||||
// Exclude MAINTENANCE and booking-system-created blocks
|
// counts them (see `selectCountedBlocks`), so the two reports never disagree:
|
||||||
const blocks = await this.prisma.seatBlock.findMany({
|
// - a schedule-scoped block naming this schedule, or
|
||||||
where: {
|
// - a global block (scheduleId null) that was in effect at departure AND sits on a
|
||||||
OR: [
|
// coach actually assigned to this train.
|
||||||
{ scheduleId },
|
// A global block on a coach that never joined this consist is not a blocked seat here.
|
||||||
{ scheduleId: null },
|
// Excluded: dining coaches, placeholder seats, ticket-issuance bookkeeping blocks, and
|
||||||
],
|
// MAINTENANCE (a seat out of service, not one withheld by hand).
|
||||||
NOT: [
|
const [schedule, assignments, blockRows] = await Promise.all([
|
||||||
{ reason: { startsWith: 'MAINTENANCE:' } },
|
this.prisma.trainSchedule.findUnique({
|
||||||
{ reason: { startsWith: 'Booked in tickets' } },
|
where: { id: scheduleId },
|
||||||
],
|
select: { departureAt: true },
|
||||||
},
|
}),
|
||||||
include: {
|
this.prisma.coachAssignment.findMany({
|
||||||
seat: {
|
where: { scheduleId },
|
||||||
select: {
|
select: { coachId: true },
|
||||||
seatNumber: true,
|
}),
|
||||||
bedPosition: true,
|
this.prisma.seatBlock.findMany({
|
||||||
coach: {
|
where: {
|
||||||
select: {
|
OR: [
|
||||||
number: true,
|
{ scheduleId },
|
||||||
coachType: { select: { name: true, type: true, seatClasses: { select: { name: true, bedPosition: true } } } },
|
{ 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 resolveSeatClass = (seat: any): string | null => {
|
||||||
const classes = seat?.coach?.coachType?.seatClasses ?? [];
|
const classes = seat?.coach?.coachType?.seatClasses ?? [];
|
||||||
@@ -619,10 +671,18 @@ export class ReportsService {
|
|||||||
return (matched ?? classes[0])?.name ?? seat?.coach?.coachType?.name ?? null;
|
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'
|
bs.booking.status === 'CONFIRMED' || bs.booking.status === 'BOARDED'
|
||||||
);
|
);
|
||||||
const unpaidSeats = bookingSeats.filter(bs =>
|
const unpaidSeats = passengerSeats.filter(bs =>
|
||||||
bs.booking.status === 'PENDING_PAYMENT'
|
bs.booking.status === 'PENDING_PAYMENT'
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -645,7 +705,7 @@ export class ReportsService {
|
|||||||
paidCount: paidSeats.length,
|
paidCount: paidSeats.length,
|
||||||
unpaidCount: unpaidSeats.length,
|
unpaidCount: unpaidSeats.length,
|
||||||
expiredHoldCount: expiredHolds.length,
|
expiredHoldCount: expiredHolds.length,
|
||||||
blockedCount: blocks.filter(b => b.seat?.coach?.coachType?.type !== 'dining').length,
|
blockedCount: blocks.length,
|
||||||
},
|
},
|
||||||
paidSeats: paidSeats.map(mapSeat),
|
paidSeats: paidSeats.map(mapSeat),
|
||||||
unpaidSeats: unpaidSeats.map(mapSeat),
|
unpaidSeats: unpaidSeats.map(mapSeat),
|
||||||
@@ -655,18 +715,16 @@ export class ReportsService {
|
|||||||
expiresAt: h.expiresAt,
|
expiresAt: h.expiresAt,
|
||||||
createdAt: h.createdAt,
|
createdAt: h.createdAt,
|
||||||
})),
|
})),
|
||||||
blockedSeats: blocks
|
blockedSeats: blocks.map(b => ({
|
||||||
.filter(b => b.seat?.coach?.coachType?.type !== 'dining')
|
id: b.id,
|
||||||
.map(b => ({
|
coachNumber: b.seat?.coach?.number ?? null,
|
||||||
id: b.id,
|
seatNumber: b.seat?.seatNumber ?? null,
|
||||||
coachNumber: b.seat?.coach?.number ?? null,
|
seatClassName: resolveSeatClass(b.seat),
|
||||||
seatNumber: b.seat?.seatNumber ?? null,
|
reason: b.reason,
|
||||||
seatClassName: resolveSeatClass(b.seat),
|
blockedBy: b.blockedBy,
|
||||||
reason: b.reason,
|
blockedAt: b.blockedAt,
|
||||||
blockedBy: b.blockedBy,
|
unblockAt: b.unblockAt,
|
||||||
blockedAt: b.blockedAt,
|
})),
|
||||||
unblockAt: b.unblockAt,
|
|
||||||
})),
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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']);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -10,9 +10,7 @@ import {
|
|||||||
Banknote,
|
Banknote,
|
||||||
ArrowRight,
|
ArrowRight,
|
||||||
ScanLine,
|
ScanLine,
|
||||||
Ban,
|
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { SEAT_BLOCK_REASON_CATEGORY_LABELS } from "@edr/types";
|
|
||||||
import { dashboardApi } from "@/lib/api/dashboard";
|
import { dashboardApi } from "@/lib/api/dashboard";
|
||||||
import { apiClient } from "@/lib/api-client";
|
import { apiClient } from "@/lib/api-client";
|
||||||
import { formatCurrency } from "@/lib/utils";
|
import { formatCurrency } from "@/lib/utils";
|
||||||
@@ -163,10 +161,6 @@ function DashboardPageContent() {
|
|||||||
return rate !== null ? sum + Math.round(totalMinor * rate) : sum;
|
return rate !== null ? sum + Math.round(totalMinor * rate) : sum;
|
||||||
}, 0);
|
}, 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 normalRows = stats?.revenueByCurrency ?? [];
|
||||||
const packageRows = stats?.packageRevenueByCurrency ?? [];
|
const packageRows = stats?.packageRevenueByCurrency ?? [];
|
||||||
const normalGrand = calcGrand(normalRows);
|
const normalGrand = calcGrand(normalRows);
|
||||||
@@ -326,73 +320,6 @@ function DashboardPageContent() {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</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>
|
</div>
|
||||||
|
|
||||||
{/* Revenue breakdown */}
|
{/* Revenue breakdown */}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { apiClient } from '@/lib/api-client';
|
import { apiClient } from '@/lib/api-client';
|
||||||
import type { BlockedSeatRevenueLossStat } from '@edr/types';
|
|
||||||
import { DashboardStats, RevenueData } from '@/types';
|
import { DashboardStats, RevenueData } from '@/types';
|
||||||
|
|
||||||
export const dashboardApi = {
|
export const dashboardApi = {
|
||||||
@@ -13,7 +12,6 @@ export const dashboardApi = {
|
|||||||
totalPackageTickets: number;
|
totalPackageTickets: number;
|
||||||
totalPassengers: number;
|
totalPassengers: number;
|
||||||
blockedSeatsCount: number;
|
blockedSeatsCount: number;
|
||||||
blockedSeatRevenueLoss: BlockedSeatRevenueLossStat;
|
|
||||||
revenueByCurrency: { currency: string; totalMinor: number }[];
|
revenueByCurrency: { currency: string; totalMinor: number }[];
|
||||||
packageRevenueByCurrency: { currency: string; totalMinor: number }[];
|
packageRevenueByCurrency: { currency: string; totalMinor: number }[];
|
||||||
}>('/dashboard/backoffice-stats');
|
}>('/dashboard/backoffice-stats');
|
||||||
|
|||||||
Reference in New Issue
Block a user