From 64beb38bae29a0f5a490ccb803dbf9feb9fd254a Mon Sep 17 00:00:00 2001 From: Jeppe B <2jepp9350@gmail.com> Date: Mon, 1 Jun 2026 22:19:34 +0200 Subject: [PATCH] Fix self-serve relay sync to enforce lane safety guards --- services/nginx/app/routes/departmentsRoute.php | 12 ++++++------ ...DepartmentSelfServeEnabledRelaySyncWiringTest.php | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/services/nginx/app/routes/departmentsRoute.php b/services/nginx/app/routes/departmentsRoute.php index 64923784..43ebc594 100644 --- a/services/nginx/app/routes/departmentsRoute.php +++ b/services/nginx/app/routes/departmentsRoute.php @@ -514,26 +514,26 @@ class departmentsRoute if ($enabled) { // Self-serve enabled: keep machine stack off. $this->setOptionalLaneRelayState($lane, 'relay_machine_program_picker_id', static function () use ($lane): void { - $lane->setMachineProgramPickerRelayStatusHard(false); + $lane->setMachineProgramPickerRelayStatus(false); }); $this->setOptionalLaneRelayState($lane, 'relay_machine_cleaner_id', static function () use ($lane): void { - $lane->setMachineCleanerRelayStatusHard(false); + $lane->setMachineCleanerRelayStatus(false); }); try { - $lane->setMachineRelayStatusHard(false); + $lane->setMachineRelayStatus(false); } catch (\Throwable) {} continue; } // Self-serve disabled: restore machine stack on. $this->setOptionalLaneRelayState($lane, 'relay_machine_cleaner_id', static function () use ($lane): void { - $lane->setMachineCleanerRelayStatusHard(true); + $lane->setMachineCleanerRelayStatus(true); }); try { - $lane->setMachineRelayStatusHard(true); + $lane->setMachineRelayStatus(true); } catch (\Throwable) {} $this->setOptionalLaneRelayState($lane, 'relay_machine_program_picker_id', static function () use ($lane): void { - $lane->setMachineProgramPickerRelayStatusHard(true); + $lane->setMachineProgramPickerRelayStatus(true); }); } } diff --git a/services/nginx/app/tests/Unit/Selfserve/DepartmentSelfServeEnabledRelaySyncWiringTest.php b/services/nginx/app/tests/Unit/Selfserve/DepartmentSelfServeEnabledRelaySyncWiringTest.php index bab0ab3c..8d84cd4a 100644 --- a/services/nginx/app/tests/Unit/Selfserve/DepartmentSelfServeEnabledRelaySyncWiringTest.php +++ b/services/nginx/app/tests/Unit/Selfserve/DepartmentSelfServeEnabledRelaySyncWiringTest.php @@ -6,10 +6,10 @@ it('syncs lane relay states when department self-serve enabled flag changes', fu expect($routeContent)->not->toBeFalse(); expect($routeContent)->toContain('/departments/self-serve/enabled'); expect($routeContent)->toContain('$this->syncDepartmentSelfServeRelayStates((int)$department->id, $enabled);'); - expect($routeContent)->toContain('setMachineProgramPickerRelayStatusHard(false)'); - expect($routeContent)->toContain('setMachineCleanerRelayStatusHard(false)'); - expect($routeContent)->toContain('setMachineRelayStatusHard(false)'); - expect($routeContent)->toContain('setMachineCleanerRelayStatusHard(true)'); - expect($routeContent)->toContain('setMachineRelayStatusHard(true)'); - expect($routeContent)->toContain('setMachineProgramPickerRelayStatusHard(true)'); + expect($routeContent)->toContain('setMachineProgramPickerRelayStatus(false)'); + expect($routeContent)->toContain('setMachineCleanerRelayStatus(false)'); + expect($routeContent)->toContain('setMachineRelayStatus(false)'); + expect($routeContent)->toContain('setMachineCleanerRelayStatus(true)'); + expect($routeContent)->toContain('setMachineRelayStatus(true)'); + expect($routeContent)->toContain('setMachineProgramPickerRelayStatus(true)'); });