fix(FOUR-32830): accept array form_data in rule expression assignees

ProcessMaker/Models/ProcessRequestToken.php

@@ -1099,12 +1099,12 @@ public function getAssignees(array $assignments, array $variables): array
     /**
      * Get the assignees from the expression
      *
-     * @param string $form_data
+     * @param string|array $form_data
      * @return array
      */
-    public function getAssigneesFromExpression(string $form_data): array
+    public function getAssigneesFromExpression(string|array $form_data): array
     {
-        $formData = json_decode($form_data, true);
+        $formData = is_array($form_data) ? $form_data : json_decode($form_data, true);
 
         $activity = $this->getBpmnDefinition()->getBpmnElementInstance();
         $assignmentRules = $activity->getProperty('assignmentRules', null);

tests/Feature/Api/UsersTest.php

@@ -1007,6 +1007,56 @@ public function testPostUsersTaskCount()
         $result->assertStatus(200);
     }
 
+    public function testPostUsersTaskCountWithRuleExpressionAssignment()
+    {
+        config(['app.reassign_restrict_to_assignable_users' => true]);
+
+        $admin = $this->user;
+        $assignableUser = User::factory()->create(['status' => 'ACTIVE']);
+        $otherUser = User::factory()->create(['status' => 'ACTIVE']);
+
+        $rules = [
+            ['type' => 'user', 'assignee' => $assignableUser->id, 'expression' => 'TestVar < 10'],
+            ['type' => 'user', 'assignee' => $otherUser->id, 'expression' => 'TestVar > 10'],
+        ];
+
+        $bpmn = file_get_contents(__DIR__ . '/processes/AssignmentByProcessVariable.bpmn');
+        $bpmn = str_replace('[ASSIGNMENT]', 'rule_expression', $bpmn);
+        $bpmn = str_replace('[ASSIGNED_USERS]', '', $bpmn);
+        $bpmn = str_replace('[ASSIGNED_GROUPS]', '', $bpmn);
+        $bpmn = str_replace('[IS_SELF_SERVICE]', 'false', $bpmn);
+        $bpmn = str_replace('[ASSIGNMENT_RULES]', htmlspecialchars(json_encode($rules)), $bpmn);
+
+        $process = Process::factory()->create([
+            'user_id' => $admin->id,
+            'manager_id' => $admin->id,
+            'bpmn' => $bpmn,
+        ]);
+
+        $request = ProcessRequest::factory()->create([
+            'process_id' => $process->id,
+            'user_id' => $admin->id,
+        ]);
+
+        $task = ProcessRequestToken::factory()->create([
+            'process_id' => $process->id,
+            'process_request_id' => $request->id,
+            'element_id' => 'task1_node',
+            'user_id' => $assignableUser->id,
+            'status' => 'ACTIVE',
+        ]);
+
+        $result = $this->apiCall('POST', route('api.users.users_task_count_post'), [
+            'assignable_for_task_id' => $task->id,
+            'form_data' => ['TestVar' => 5],
+        ]);
+
+        $result->assertStatus(200);
+        $userIds = array_column($result->json()['data'], 'id');
+        $this->assertContains($assignableUser->id, $userIds);
+        $this->assertNotContains($otherUser->id, $userIds);
+    }
+
     /**
      * Test save and get filters per user saved in cache
      */

tests/Model/ProcessRequestTokenTest.php

@@ -424,4 +424,51 @@ public function testGetUsersFromProcessVariableFiltersInvalidIds()
         $this->assertNotContains(0, $result);
         $this->assertNotContains(-1, $result);
     }
+
+    public function testGetAssigneesFromExpressionAcceptsArrayFormData()
+    {
+        $assignableUser = User::factory()->create(['status' => 'ACTIVE']);
+
+        $process = Process::factory()->create();
+        $request = ProcessRequest::factory()->create(['process_id' => $process->id]);
+
+        $rules = [
+            ['type' => 'user', 'assignee' => $assignableUser->id, 'default' => true],
+        ];
+
+        $activity = $this->createMock(\ProcessMaker\Nayra\Contracts\Bpmn\ActivityInterface::class);
+        $activity->method('getProperty')
+            ->willReturnCallback(function ($key, $default) use ($rules) {
+                if ($key === 'assignmentRules') {
+                    return json_encode($rules);
+                }
+
+                return $default;
+            });
+
+        $bpmnDefinition = $this->createMock(\ProcessMaker\Nayra\Storage\BpmnElement::class);
+        $bpmnDefinition->method('getBpmnElementInstance')
+            ->willReturn($activity);
+
+        $token = $this->getMockBuilder(ProcessRequestToken::class)
+            ->onlyMethods(['getBpmnDefinition'])
+            ->getMock();
+
+        $token->process_id = $process->id;
+        $token->process_request_id = $request->id;
+        $token->process = $process;
+
+        $token->expects($this->atLeastOnce())
+            ->method('getBpmnDefinition')
+            ->willReturn($bpmnDefinition);
+
+        $formData = ['TestVar' => 5];
+
+        $result = $token->getAssigneesFromExpression($formData);
+
+        $this->assertContains($assignableUser->id, $result);
+
+        $resultFromString = $token->getAssigneesFromExpression(json_encode($formData));
+        $this->assertEquals($result, $resultFromString);
+    }
 }