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

Merge pull request #929 from Tria-plc/freight_feature/usermanagement

Browse Source 
fix configratio
This commit is contained in:
marshal
2026-07-23 09:50:49 +03:00
committed by GitHub
parent 8d51425f90 8f143b2341
commit b756ae2f1c
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/edr-freight-api/src/seed/freight-permissions.registry.ts
View File

@@ -212,8 +212,10 @@ export const FLEET_RAIL_PERMISSIONS: FreightPermissionSeed[] = [
perm('e1f00001-0001-4000-8000-000000000002', 'edr_freight_app:cargoes:create', 'Create cargo'),
perm('e1f00001-0001-4000-8000-000000000003', 'edr_freight_app:cargoes:update', 'Update cargo'),
perm('e1f00001-0001-4000-8000-000000000004', 'edr_freight_app:cargoes:delete', 'Delete cargo'),
perm('e1g00001-0001-4000-8000-000000000001', 'edr_freight_app:consignments:view', 'View consignments'),
perm('e1g00001-0001-4000-8000-000000000002', 'edr_freight_app:consignments:create', 'Create consignment'),
// NB: id prefixes must stay hex — 'e1g…' once crashed the boot seeder
// (postgres: invalid input syntax for type uuid).
perm('e1900001-0001-4000-8000-000000000001', 'edr_freight_app:consignments:view', 'View consignments'),
perm('e1900001-0001-4000-8000-000000000002', 'edr_freight_app:consignments:create', 'Create consignment'),
];
// G. Fleet — road & telemetry

9
e2e/freight/cypress/e2e/flows/import_window_reopen.cy.ts
View File

@@ -82,11 +82,16 @@ describe("import: dead first cycle — expire all, reopen, book again", { retrie
withSchedule(DEPARTURE, (s) => {
endPaymentPhase(s.id);
// Not full + departure days away → the engine schedules a fresh cycle.
// When the reopen instant falls inside office hours, the 10s tick's
// guard-loop chains PRE_WINDOW straight into OPEN within the SAME tick
// (booking-window.service.ts advanceSchedule), so PRE_WINDOW is not a
// reliably observable resting state — assert the cycle left PAYMENT
// without concluding FULL/DONE, whichever phase it lands on.
pollDb<ScheduleRow>(
"window reopens (PRE_WINDOW, cycle 2 pending)",
"window concludes not-full (PRE_WINDOW or fast-forwarded to OPEN)",
`SELECT window_phase FROM freight.train_schedules WHERE id = $1`,
[s.id],
(row) => row?.window_phase === "PRE_WINDOW",
(row) => !!row && row.window_phase !== "PAYMENT" && row.window_phase !== "DONE",
);
});
});