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

enhance train scheduling logic to exclude cancelled trains and refine window filtering

Browse Source
This commit is contained in:
Marshal
2026-07-15 07:07:10 +00:00
parent b102a31fc1
commit 9be7f356f0
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
View File

@@ -435,7 +435,12 @@ export class TrainSchedulingService {
.where('s.originStationId = :originStationId', { originStationId }) .where('s.originStationId = :originStationId', { originStationId })
.andWhere('s.destinationStationId = :destinationStationId', { destinationStationId }) .andWhere('s.destinationStationId = :destinationStationId', { destinationStationId })
.andWhere('s.scheduledDepartureDate >= :dayStart', { dayStart }) .andWhere('s.scheduledDepartureDate >= :dayStart', { dayStart })
.andWhere('s.scheduledDepartureDate < :nextDayStart', { nextDayStart }); .andWhere('s.scheduledDepartureDate < :nextDayStart', { nextDayStart })
// A cancelled train is not a sibling: cancel retires its window as DONE,
// and a newborn anchoring to it would inherit that dead window verbatim.
.andWhere('s.status != :cancelledStatus', {
cancelledStatus: TrainScheduleStatusEnum.Cancelled,
});
if (excludeScheduleId) { if (excludeScheduleId) {
qb.andWhere('s.id != :excludeScheduleId', { excludeScheduleId }); qb.andWhere('s.id != :excludeScheduleId', { excludeScheduleId });
} }
@@ -471,7 +476,12 @@ export class TrainSchedulingService {
departure, departure,
); );
if (siblings.length === 0) return null; if (siblings.length === 0) return null;
const withWindow = siblings.filter((s) => s.windowOpensAt != null); // A DONE window is retired (the day's last cycle already ran) — anchoring
// to it would hand the newborn a dead window no tick ever advances. With no
// live or pending sibling left, fall back to fresh times (return null).
const withWindow = siblings.filter(
(s) => s.windowOpensAt != null && s.windowPhase !== 'DONE',
);
if (withWindow.length === 0) return null; if (withWindow.length === 0) return null;
// A group whose window is live (some sibling has moved past PRE_WINDOW but is // A group whose window is live (some sibling has moved past PRE_WINDOW but is