fix(FOUR-32830): evaluate assignment rules per rule when resolving assignees

Replace getAssignees plus in_array second pass with a single loop that
evaluates each rule via isAssignmentRuleMatch. This prevents unmatched
group rules from expanding when they share an assignee id with a matched
user rule, and avoids losing group members when manager_id collides with
sequential indexes from getConsolidatedUsers.

- Merge group users into userIds keyed by user id
- Reuse one ExpressionLanguage instance per loop
- Add unit tests for assignee id collision and manager id collision cases

https://processmaker.atlassian.net/browse/FOUR-32830

Author: gproly

ProcessMaker/Models/ProcessRequestToken.php

@@ -1074,21 +1074,7 @@ public function getAssignees(array $assignments, array $variables): array
         $language = new ExpressionLanguage();
 
         foreach ($assignments as $assignment) {
-            $isTrue = false;
-
-            if (!empty($assignment['expression'])) {
-                try {
-                    $isTrue = $language->evaluate($assignment['expression'], $variables);
-                } catch (Throwable $e) {
-                    $isTrue = false;
-                }
-            }
-
-            if ($isTrue) {
-                $result[] = $assignment['assignee'];
-            }
-
-            if (isset($assignment['default']) && $assignment['default'] === true) {
+            if ($this->isAssignmentRuleMatch($assignment, $variables, $language)) {
                 $result[] = $assignment['assignee'];
             }
         }
@@ -1110,16 +1096,21 @@ public function getAssigneesFromExpression(string|array $form_data): array
         $assignmentRules = $activity->getProperty('assignmentRules', null);
         $assignments = json_decode($assignmentRules, true) ?? [];
 
-        $assigneeIds = $this->getAssignees($assignments, $formData);
         $userIds = [];
-
+        $language = new ExpressionLanguage();
         foreach ($assignments as $assignment) {
-            if (!in_array($assignment['assignee'], $assigneeIds, true)) {
+            if (!$this->isAssignmentRuleMatch($assignment, $formData, $language)) {
                 continue;
             }
 
             if (($assignment['type'] ?? 'user') === 'group') {
-                $this->process->getConsolidatedUsers($assignment['assignee'], $userIds);
+                $groupUsers = [];
+                $this->process->getConsolidatedUsers($assignment['assignee'], $groupUsers);
+                foreach ($groupUsers as $userId) {
+                    if (!empty($userId) && is_numeric($userId)) {
+                        $userIds[$userId] = $userId;
+                    }
+                }
             } else {
                 $userIds[$assignment['assignee']] = $assignment['assignee'];
             }
@@ -1134,6 +1125,23 @@ public function getAssigneesFromExpression(string|array $form_data): array
         return array_values($userIds);
     }
 
+    private function isAssignmentRuleMatch(array $assignment, array $variables, ExpressionLanguage $language): bool
+    {
+        if (isset($assignment['default']) && $assignment['default'] === true) {
+            return true;
+        }
+
+        if (empty($assignment['expression'])) {
+            return false;
+        }
+
+        try {
+            return $language->evaluate($assignment['expression'], $variables);
+        } catch (Throwable $e) {
+            return false;
+        }
+    }
+
     /**
      * Returns if the token has the self service option activated
      */

tests/Model/ProcessRequestTokenTest.php

@@ -471,4 +471,101 @@ public function testGetAssigneesFromExpressionAcceptsArrayFormData()
         $resultFromString = $token->getAssigneesFromExpression(json_encode($formData));
         $this->assertEquals($result, $resultFromString);
     }
+
+    public function testGetAssigneesFromExpressionDoesNotExpandUnmatchedGroupWithSameAssigneeId()
+    {
+        $assignableUser = User::factory()->create(['status' => 'ACTIVE']);
+        $sharedAssigneeId = $assignableUser->id;
+        $rules = [
+            ['type' => 'user', 'assignee' => $sharedAssigneeId, 'expression' => 'TestVar<10'],
+            ['type' => 'group', 'assignee' => $sharedAssigneeId, 'expression' => 'TestVar>10'],
+        ];
+
+        $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);
+
+        $process = $this->createMock(Process::class);
+        $process->expects($this->never())->method('getConsolidatedUsers');
+
+        $request = ProcessRequest::factory()->create();
+
+        $token = $this->getMockBuilder(ProcessRequestToken::class)
+            ->onlyMethods(['getBpmnDefinition'])
+            ->getMock();
+
+        $token->process_id = $request->process_id;
+        $token->process_request_id = $request->id;
+        $token->process = $process;
+
+        $token->expects($this->atLeastOnce())
+            ->method('getBpmnDefinition')
+            ->willReturn($bpmnDefinition);
+
+        $result = $token->getAssigneesFromExpression(['TestVar' => 5]);
+
+        $this->assertEquals([$sharedAssigneeId], $result);
+    }
+
+    public function testGetAssigneesFromExpressionPreservesGroupMembersWhenManagerIdCollides()
+    {
+        $groupUsers = User::factory()->count(3)->create(['status' => 'ACTIVE']);
+        $group = Group::factory()->create();
+        foreach ($groupUsers as $groupUser) {
+            GroupMember::factory()->create([
+                'group_id' => $group->id,
+                'member_id' => $groupUser->id,
+                'member_type' => User::class,
+            ]);
+        }
+
+        $process = Process::factory()->create(['manager_id' => $groupUsers[1]->id]);
+        $request = ProcessRequest::factory()->create(['process_id' => $process->id]);
+
+        $rules = [
+            ['type' => 'group', 'assignee' => $group->id, 'expression' => 'TestVar<10'],
+        ];
+
+        $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);
+
+        $result = $token->getAssigneesFromExpression(['TestVar' => 5]);
+
+        foreach ($groupUsers as $groupUser) {
+            $this->assertContains($groupUser->id, $result);
+        }
+    }
 }