mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-26 18:42:49 +00:00
337ff6cfe3
Export cargo reaches a train two ways, but the platform only modelled one. Direct truck-to-train cargo loads straight onto the wagon, never enters a warehouse and so never has a GRN — yet assertExportReceivedWithGrn required one before the carriage acceptance sheet could be issued or the booking loaded from inside its schedule. Adds export_handover_mode to freight.bookings (null = WAREHOUSE, so existing bookings are unaffected) and teaches the shared gate to skip DIRECT_TO_TRAIN. Both call sites are fixed by that single early return. For direct bookings the carriage acceptance sheet builds its lines from the booking's own containers, falling back to the declared bulk tonnage, and is issuable as soon as the mode is chosen. Direct bookings are also removed from the warehouse receive queue, since that cargo is never coming to the shed. Staff choose the mode from the booking detail page via a new endpoint reusing bookings:operations. Switching to direct is refused once warehouse inventory exists, so the two flows cannot cross. Warehouse-then-train keeps every gate it had.
63 lines
2.1 KiB
TypeScript
63 lines
2.1 KiB
TypeScript
import { BadRequestException } from '@nestjs/common';
|
|
import type { DataSource } from 'typeorm';
|
|
|
|
import { assertExportReceivedWithGrn } from './export-received-gate';
|
|
|
|
const db = (rows: unknown[]) =>
|
|
({ query: jest.fn().mockResolvedValue(rows) }) as unknown as DataSource;
|
|
|
|
describe('assertExportReceivedWithGrn', () => {
|
|
it('passes when the export booking has a received row with a GRN', async () => {
|
|
await expect(
|
|
assertExportReceivedWithGrn(db([{ '?column?': 1 }]), {
|
|
id: 'b-1',
|
|
tradeDirection: 'EXPORT',
|
|
}),
|
|
).resolves.toBeUndefined();
|
|
});
|
|
|
|
it('rejects an export booking with nothing received', async () => {
|
|
await expect(
|
|
assertExportReceivedWithGrn(db([]), { id: 'b-1', tradeDirection: 'EXPORT' }),
|
|
).rejects.toBeInstanceOf(BadRequestException);
|
|
});
|
|
|
|
it('never blocks import — it loads off a train, not out of the warehouse', async () => {
|
|
const source = db([]);
|
|
await expect(
|
|
assertExportReceivedWithGrn(source, { id: 'b-1', tradeDirection: 'IMPORT' }),
|
|
).resolves.toBeUndefined();
|
|
// Import short-circuits before querying.
|
|
expect((source.query as jest.Mock)).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('does not block intercity cargo', async () => {
|
|
await expect(
|
|
assertExportReceivedWithGrn(db([]), { id: 'b-1', tradeDirection: 'DOMESTIC' }),
|
|
).resolves.toBeUndefined();
|
|
});
|
|
|
|
it('never blocks direct truck-to-train export — that cargo has no GRN by design', async () => {
|
|
const source = db([]);
|
|
await expect(
|
|
assertExportReceivedWithGrn(source, {
|
|
id: 'b-1',
|
|
tradeDirection: 'EXPORT',
|
|
exportHandoverMode: 'DIRECT_TO_TRAIN',
|
|
}),
|
|
).resolves.toBeUndefined();
|
|
// Direct short-circuits before querying — there is no inventory to look for.
|
|
expect(source.query as jest.Mock).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('still gates a warehouse export booking', async () => {
|
|
await expect(
|
|
assertExportReceivedWithGrn(db([]), {
|
|
id: 'b-1',
|
|
tradeDirection: 'EXPORT',
|
|
exportHandoverMode: 'WAREHOUSE',
|
|
}),
|
|
).rejects.toBeInstanceOf(BadRequestException);
|
|
});
|
|
});
|