Add unit tests for department lane dynamic image overrides and introduce classes for self-serve signal and virtual hardware management

- Add `DepartmentLaneDynamicImageRouteTest` to verify dynamic image preview handling for studio lanes. - Introduce `selfserve_machine_signal` class to standardize signal normalization, recording, and gateway signal management workflows. - Add `selfserve_virtual_hardware` class to handle virtual hardware configurations, including gateway and binding management. - Enhance structure with auxiliary methods for payload normalization, workspace merging, and validation warnings.
2026-04-29 09:52:51 +02:00
parent 690e114d38
commit eeccacb2a7
33 changed files with 4880 additions and 140 deletions
@@ -1,8 +1,10 @@
 <?php

 app_require('modules/selfserve/classes/selfserve_studio_graph.php');
+app_require('modules/selfserve/classes/selfserve_virtual_hardware.php');

 use modules\selfserve\classes\selfserve_studio_graph;
+use modules\selfserve\classes\selfserve_virtual_hardware;
 use modules\selfserve\classes\selfserve_wash_flow;

 function selfserve_studio_graph_without_constructor(): selfserve_studio_graph
@@ -17,6 +19,12 @@ function selfserve_wash_flow_without_constructor(): selfserve_wash_flow
    return $reflection->newInstanceWithoutConstructor();
 }

+function selfserve_virtual_hardware_without_constructor(): selfserve_virtual_hardware
+{
+    $reflection = new ReflectionClass(selfserve_virtual_hardware::class);
+    return $reflection->newInstanceWithoutConstructor();
+}
+
 it('serializes questions, conditions, tasks, scopes, and gateways into one graph', function (): void {
    $service = selfserve_studio_graph_without_constructor();

@@ -107,6 +115,66 @@ it('serializes questions, conditions, tasks, scopes, and gateways into one graph
    expect($bindingNode['data']['raw']['services'] ?? [])->toBe(['MACHINE']);
 });

+it('serializes v2 condition expressions without standalone rule nodes', function (): void {
+    $service = selfserve_studio_graph_without_constructor();
+
+    $graph = $service->buildGraphFromConfig([
+        'schema_version' => 2,
+        'questions' => [
+            ['id' => 1, 'question' => 'Are mirrors folded?', 'condition_id' => null, 'lane' => 7, 'product' => 3, 'department' => 2, 'order_priority' => 1],
+        ],
+        'conditions' => [
+            [
+                'id' => 10,
+                'name' => 'Ready',
+                'lane' => 7,
+                'product' => 3,
+                'department' => 2,
+                'expression' => [
+                    'type' => 'group',
+                    'operator' => 'ALL',
+                    'children' => [
+                        ['type' => 'predicate', 'subject_type' => 'question', 'subject_id' => 1, 'operator' => 'IS_TRUE'],
+                    ],
+                ],
+            ],
+        ],
+        'rules' => [
+            ['id' => 99, 'condition_id' => 10, 'type' => 'IS_TRUE', 'object_type' => 'question', 'object_id' => 1],
+        ],
+        'tasks' => [],
+    ], [
+        'lookups' => [
+            'labels' => [
+                'questions' => ['1' => 'Are mirrors folded?'],
+                'conditions' => ['10' => 'Ready'],
+            ],
+        ],
+    ]);
+
+    $nodeIds = array_column($graph['nodes'], 'id');
+    $edgeIds = array_column($graph['edges'], 'id');
+    $conditionNode = array_values(array_filter(
+        $graph['nodes'],
+        static fn(array $node): bool => ($node['id'] ?? null) === 'condition:10'
+    ))[0] ?? null;
+
+    expect($nodeIds)->toContain('condition:10');
+    expect($nodeIds)->not->toContain('rule:99');
+    expect($edgeIds)->toContain('expression:10:question:1:' . substr(md5('0.0'), 0, 8));
+    expect($conditionNode['data']['expression_summary'] ?? null)->toContain('Question 1');
+});
+
+it('keeps runtime on published v2 configs and leaves draft JSON as the studio edit surface', function (): void {
+    $washFlowSource = file_get_contents((new ReflectionClass(selfserve_wash_flow::class))->getFileName());
+    $studioGraphSource = file_get_contents((new ReflectionClass(selfserve_studio_graph::class))->getFileName());
+
+    expect($washFlowSource)->toContain('getPublishedV2Config($departmentId)');
+    expect($washFlowSource)->toContain("\$configSource = \$publishedConfigPayload === null ? 'legacy' : 'published';");
+    expect($studioGraphSource)->toContain('$draftObject->config_json->set($config);');
+    expect($studioGraphSource)->toContain('Standalone rule operations are not supported in self-serve rules v2.');
+});
+
 it('derives studio vehicle type lookup rows from selectable wash products', function (): void {
    $service = selfserve_studio_graph_without_constructor();
    $method = new ReflectionMethod(selfserve_studio_graph::class, 'vehicleTypeRowsFromProducts');
@@ -125,6 +193,95 @@ it('derives studio vehicle type lookup rows from selectable wash products', func
    expect($vehicleTypes[0]['source'])->toBe('products');
 });

+it('exposes dynamic images and referenced machine types as studio lookup choices', function (): void {
+    $service = selfserve_studio_graph_without_constructor();
+    $dynamicImages = new ReflectionMethod(selfserve_studio_graph::class, 'dynamicImageRowsFromLanes');
+    $machineTypes = new ReflectionMethod(selfserve_studio_graph::class, 'addReferencedMachineTypeRows');
+
+    $dynamicImageRows = $dynamicImages->invoke($service, [
+        ['id' => 7, 'label' => 'Lane 7', 'dynamic_image_id' => 1],
+        ['id' => 8, 'label' => 'Lane 8', 'dynamic_image_id' => 9],
+    ]);
+    $machineTypeRows = $machineTypes->invoke(
+        $service,
+        [
+            ['id' => 1001, 'name' => 'Portal', 'label' => 'Portal'],
+        ],
+        [
+            ['id' => 7, 'machine_type_id' => 2002],
+        ],
+        [
+            'conditions' => [
+                ['id' => 21, 'machine_type_id' => 3003],
+            ],
+            'tasks' => [
+                ['id' => 41, 'machine_type_id' => 1001],
+            ],
+        ]
+    );
+
+    expect(array_column($dynamicImageRows, 'id'))->toBe([1, 9]);
+    expect($dynamicImageRows[0]['label'])->toBe('Machine 1');
+    expect($dynamicImageRows[1]['label'])->toBe('Dynamic image 9');
+    expect(array_column($machineTypeRows, 'id'))->toBe([1001, 2002, 3003]);
+    expect($machineTypeRows[0]['label'])->toBe('Portal');
+    expect($machineTypeRows[1]['label'])->toBe('Machine type 2002');
+    expect($machineTypeRows[2]['label'])->toBe('Machine type 3003');
+});
+
+it('keeps lane management fields on lane scope nodes', function (): void {
+    $service = selfserve_studio_graph_without_constructor();
+
+    $graph = $service->buildGraphFromConfig([
+        'questions' => [],
+        'conditions' => [],
+        'rules' => [],
+        'tasks' => [],
+    ], [
+        'lookups' => [
+            'lanes' => [
+                [
+                    'id' => 7,
+                    'department' => 6,
+                    'name' => 'Lane 7',
+                    'label' => 'Lane 7',
+                    'relay_machine_id' => 'M-7',
+                    'machine_type_id' => 1001,
+                    'dynamic_image_id' => 1,
+                ],
+            ],
+            'machine_types' => [['id' => 1001, 'label' => 'Portal']],
+            'dynamic_images' => [['id' => 1, 'label' => 'Machine 1']],
+            'labels' => [
+                'lanes' => ['7' => 'Lane 7'],
+                'machine_types' => ['1001' => 'Portal'],
+                'dynamic_images' => ['1' => 'Machine 1'],
+            ],
+        ],
+    ]);
+
+    $laneNode = array_values(array_filter(
+        $graph['nodes'],
+        static fn(array $node): bool => ($node['id'] ?? null) === 'lane:7'
+    ))[0] ?? null;
+
+    expect($laneNode)->not->toBeNull()
+        ->and($laneNode['data']['raw']['relay_machine_id'])->toBe('M-7')
+        ->and($laneNode['data']['raw']['machine_type_id'])->toBe(1001)
+        ->and($laneNode['data']['raw']['dynamic_image_id'])->toBe(1);
+});
+
+it('routes studio lane graph operations through department_lanes', function (): void {
+    $source = file_get_contents((new ReflectionClass(selfserve_studio_graph::class))->getFileName());
+
+    expect($source)->toContain("if (\$entity === 'lane')")
+        ->and($source)->toContain('private function applyLaneOperation')
+        ->and($source)->toContain('private function createLane')
+        ->and($source)->toContain('private function updateLane')
+        ->and($source)->toContain('INSERT INTO department_lanes')
+        ->and($source)->toContain("'dynamic_image_id'");
+});
+
 it('applies saved layout without changing graph semantics', function (): void {
    $service = selfserve_studio_graph_without_constructor();

@@ -337,3 +494,173 @@ it('resolves simulator gateway service bindings from lane relay slots', function
        ->and($debug['tasks'][0]['relay_bindings'][0]['service'])->toBe('MACHINE')
        ->and(array_column($debug['recommendations'], 'title'))->toBe(['Flow is ready']);
 });
+
+it('generates and merges virtual hardware as studio-only relay coverage', function (): void {
+    $service = selfserve_virtual_hardware_without_constructor();
+    $workspace = [
+        'gateways' => [],
+        'relays' => [],
+        'lanes' => [
+            [
+                'id' => 7,
+                'name' => 'Lane 7',
+                'relay_slots' => [
+                    ['slot' => 'MACHINE', 'relay_id' => 'M-7', 'coverage' => ['covered' => false, 'status' => 'MISSING']],
+                    ['slot' => 'EXIT', 'relay_id' => 'EXIT-7', 'coverage' => ['covered' => false, 'status' => 'MISSING']],
+                ],
+                'binding_coverage' => ['required' => 2, 'bound' => 0, 'missing' => 2, 'state' => 'MISSING'],
+            ],
+        ],
+        'issues' => [
+            ['severity' => 'danger', 'code' => 'NO_GATEWAY', 'message' => 'No edge gateway has been claimed for this department.'],
+            ['severity' => 'warning', 'code' => 'LANE_BINDING_GAP', 'message' => 'Lane 7 is missing relay bindings.', 'target_type' => 'lane', 'target_id' => 7],
+        ],
+        'actions' => [],
+    ];
+
+    $config = $service->generateFromLanes($workspace);
+    $merged = $service->mergeWorkspaceWithConfig($workspace, $config);
+
+    expect($config['bindings'])->toHaveCount(2)
+        ->and($merged['virtual']['has_virtual_hardware'])->toBeTrue()
+        ->and($merged['gateways'][0]['virtual'])->toBeTrue()
+        ->and($merged['gateways'][0]['bindings'][0]['relay_id'])->toBe('M-7')
+        ->and($merged['lanes'][0]['binding_coverage']['state'])->toBe('READY')
+        ->and($merged['lanes'][0]['relay_slots'][0]['coverage']['virtual'])->toBeTrue()
+        ->and(array_column($merged['issues'], 'code'))->toContain('VIRTUAL_HARDWARE_ACTIVE')
+        ->and($service->validationWarnings($merged)[0])->toContain('live relay dispatch still requires a real edge gateway');
+});
+
+it('renders virtual gateway nodes and task service edges in the studio graph', function (): void {
+    $virtual = selfserve_virtual_hardware_without_constructor();
+    $graphService = selfserve_studio_graph_without_constructor();
+    $workspace = $virtual->mergeWorkspaceWithConfig([
+        'gateways' => [],
+        'relays' => [],
+        'lanes' => [
+            [
+                'id' => 7,
+                'name' => 'Lane 7',
+                'relay_slots' => [
+                    ['slot' => 'MACHINE', 'relay_id' => 'M-7', 'coverage' => ['covered' => false, 'status' => 'MISSING']],
+                ],
+                'binding_coverage' => ['required' => 1, 'bound' => 0, 'missing' => 1, 'state' => 'MISSING'],
+            ],
+        ],
+        'issues' => [],
+        'actions' => [],
+    ], [
+        'schema_version' => 1,
+        'enabled' => true,
+        'gateways' => [['key' => 'virtual-main', 'label' => 'Virtual Studio Gateway', 'status' => 'VIRTUAL']],
+        'relays' => [['relay_id' => 'M-7', 'name' => 'Lane 7 MACHINE']],
+        'bindings' => [['gateway_key' => 'virtual-main', 'relay_id' => 'M-7', 'role' => 'MACHINE', 'services' => ['MACHINE'], 'label' => 'Lane 7 MACHINE']],
+    ]);
+
+    $graph = $graphService->buildGraphFromConfig([
+        'questions' => [],
+        'conditions' => [],
+        'rules' => [],
+        'tasks' => [
+            ['id' => 41, 'task' => 'Start machine', 'services' => ['MACHINE'], 'order_priority' => 1],
+        ],
+    ], [
+        'lookups' => [
+            'labels' => [
+                'tasks' => ['41' => 'Start machine'],
+                'lanes' => ['7' => 'Lane 7'],
+            ],
+        ],
+        'gateway_workspace' => $workspace,
+    ]);
+
+    $nodeIds = array_column($graph['nodes'], 'id');
+    $edgeIds = array_column($graph['edges'], 'id');
+    $gatewayNode = array_values(array_filter($graph['nodes'], static fn(array $node): bool => ($node['id'] ?? '') === 'gateway:virtual-main'))[0] ?? [];
+    $bindingNode = array_values(array_filter($graph['nodes'], static fn(array $node): bool => ($node['id'] ?? '') === 'binding:virtual-main:M-7:0'))[0] ?? [];
+
+    expect($nodeIds)->toContain('gateway:virtual-main')
+        ->and($nodeIds)->toContain('binding:virtual-main:M-7:0')
+        ->and($edgeIds)->toContain('task-service:41:MACHINE:virtual-main:M-7:0')
+        ->and($gatewayNode['data']['raw']['virtual'])->toBeTrue()
+        ->and($bindingNode['data']['raw']['virtual'])->toBeTrue();
+});
+
+it('adds ordered simulator signal timeline rows for virtual hardware dry runs', function (): void {
+    $service = selfserve_wash_flow_without_constructor();
+
+    $debug = $service->buildStudioDebugPayload(6, [
+        'lane' => ['id' => 7, 'name' => 'Lane 7'],
+        'machine_type' => ['id' => 1001, 'name' => 'Portal'],
+        'vehicle' => null,
+        'reg' => 'TEST123',
+        'customer_number' => null,
+        'vehicle_type_id' => 2,
+        'answers' => [],
+        'answer_sources' => [],
+        'questions' => [],
+        'tasks' => [
+            ['id' => 41, 'task' => 'Start machine', 'services' => ['MACHINE']],
+        ],
+        'allowed_services' => ['MACHINE'],
+        'machine_available' => true,
+        'all_visible_questions_answered' => true,
+        'allowed' => true,
+        'config_version_id' => 90,
+        'config_source' => 'draft',
+        'evaluation_trace' => [
+            'visible_question_ids' => [],
+            'visibility_condition_results' => [],
+            'condition_results' => [],
+            'task_gates' => [
+                ['task_id' => 41, 'gate_type' => 'ALWAYS', 'gate_ref_id' => null, 'satisfied' => true],
+            ],
+        ],
+        'debug_candidates' => [
+            'questions' => [],
+            'conditions' => [],
+            'rules' => [],
+            'tasks' => [
+                ['id' => 41, 'task' => 'Start machine', 'gate_type' => 'ALWAYS', 'gate_ref_id' => null, 'services' => ['MACHINE'], 'order_priority' => 1],
+            ],
+        ],
+    ], [
+        'gateway_workspace' => [
+            'gateways' => [
+                [
+                    'id' => 'virtual-main',
+                    'label' => 'Virtual Studio Gateway',
+                    'status' => 'VIRTUAL',
+                    'virtual' => true,
+                    'bindings' => [
+                        ['node_id' => 'binding:virtual-main:M-7:0', 'relay_id' => 'M-7', 'label' => 'Machine', 'role' => 'MACHINE', 'services' => ['MACHINE'], 'virtual' => true],
+                        ['node_id' => 'binding:virtual-main:CLEAN-7:1', 'relay_id' => 'CLEAN-7', 'label' => 'Cleaner', 'role' => 'CLEANER', 'services' => ['CLEANER'], 'virtual' => true],
+                        ['node_id' => 'binding:virtual-main:EXIT-7:2', 'relay_id' => 'EXIT-7', 'label' => 'Exit', 'role' => 'EXIT', 'services' => ['EXIT'], 'virtual' => true],
+                    ],
+                ],
+            ],
+            'lanes' => [
+                [
+                    'id' => 7,
+                    'relay_slots' => [
+                        ['slot' => 'MACHINE', 'relay_id' => 'M-7'],
+                        ['slot' => 'CLEANER', 'relay_id' => 'CLEAN-7'],
+                        ['slot' => 'EXIT', 'relay_id' => 'EXIT-7'],
+                    ],
+                ],
+            ],
+            'virtual' => ['has_virtual_hardware' => true],
+        ],
+        'lookups' => ['labels' => ['lanes' => ['7' => 'Lane 7'], 'tasks' => ['41' => 'Start machine']]],
+    ]);
+
+    expect(array_column($debug['signal_timeline'], 'sequence'))->toBe([1, 2, 3, 4, 5, 6, 7, 8])
+        ->and(array_column($debug['signal_timeline'], 'relay_role'))->toBe(['SESSION', 'MACHINE', 'MACHINE', 'CLEANER', 'EXIT', 'CLEANER', 'MACHINE', 'SESSION'])
+        ->and($debug['signal_timeline'][1]['predicted_status'])->toBe('virtual_only')
+        ->and($debug['signal_timeline'][2]['signal_type'])->toBe('shelly_event')
+        ->and($debug['signal_timeline'][2]['runtime_stage'])->toBe('machine_start_signal')
+        ->and($debug['signal_timeline'][2]['transport'])->toBe('shelly_webhook_or_edge_gateway_event')
+        ->and($debug['signal_timeline'][2]['payload'])->toMatchArray(['event' => 'input.toggle_on', 'bill_machine_wash' => true])
+        ->and($debug['signal_timeline'][4]['payload'])->toMatchArray(['id' => 'EXIT-7', 'toggle_after' => 1])
+        ->and($debug['hardware']['signal_timeline'][6]['payload'])->toMatchArray(['id' => 'M-7', 'on' => false]);
+});