From c54642934dc498f9bb7bf4ae01fe3b142174c467 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Mon, 19 Oct 2026 12:23:15 -0400 Subject: [PATCH] fix(FOUR-32849): send task action-by-email to self-service pool recipients Resolve ABE recipients from self_service_groups when the task has no assignee (self-service with user_group/group). Previously email was only sent when a single user was assigned, so self-service tasks never triggered ABE. https://processmaker.atlassian.net/browse/FOUR-32849 --- ProcessMaker/Repositories/TokenRepository.php | 37 ++++++++-- .../Api/TaskActionByEmailSelfServiceTest.php | 69 +++++++++++++++++++ .../TaskActionByEmailSelfService.bpmn | 38 ++++++++++ 3 files changed, 138 insertions(+), 6 deletions(-) create mode 100644 tests/Feature/Api/TaskActionByEmailSelfServiceTest.php create mode 100644 tests/Feature/Api/processes/TaskActionByEmailSelfService.bpmn diff --git a/ProcessMaker/Repositories/TokenRepository.php b/ProcessMaker/Repositories/TokenRepository.php index 33da49a451..d7d25216db 100644 --- a/ProcessMaker/Repositories/TokenRepository.php +++ b/ProcessMaker/Repositories/TokenRepository.php @@ -10,6 +10,7 @@ use ProcessMaker\Mail\TaskActionByEmail; use ProcessMaker\Managers\DataManager; use ProcessMaker\Models\FeelExpressionEvaluator; +use ProcessMaker\Models\Process; use ProcessMaker\Models\ProcessAbeRequestToken; use ProcessMaker\Models\ProcessCollaboration; use ProcessMaker\Models\ProcessRequest; @@ -184,10 +185,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter CaseUpdate::dispatchSync($request, $token); - if (!is_null($user)) { - // Review if the task has enable the action by email - $this->validateAndSendActionByEmail($activity, $token, $user->email); - } + $this->validateAndSendActionByEmail($activity, $token, $user); $this->instanceRepository->persistInstanceUpdated($token->getInstance()); } @@ -196,15 +194,42 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter * * @param ActivityInterface $activity * @param TokenInterface $token - * @param string $to + * @param User|null $user * * @return void */ - private function validateAndSendActionByEmail(ActivityInterface $activity, TokenInterface $token, string $to) + private function validateAndSendActionByEmail(ActivityInterface $activity, TokenInterface $token, ?User $user) { try { $isActionsByEmail = $activity->getProperty('isActionsByEmail', false); Log::Info('Activity isActionsByEmail: ' . $isActionsByEmail); + $to = $user && $user->email ? $user->email : ''; + if ($to === '' && $token->is_self_service && is_array($token->self_service_groups)) { + $userIds = array_map('intval', array_filter( + $token->self_service_groups['users'] ?? [], + fn ($id) => is_numeric($id) && (int) $id > 0 + )); + $groupIds = array_values(array_filter( + $token->self_service_groups['groups'] ?? [], + fn ($id) => $id !== '' && $id !== null + )); + if ($groupIds !== []) { + $fromGroups = []; + $token->getInstance()->getProcess()->getOwnerDocument()->getModel() + ->getConsolidatedUsers($groupIds, $fromGroups); + $userIds = array_unique(array_merge($userIds, $fromGroups)); + } + if ($userIds !== []) { + $to = User::query() + ->whereIn('id', $userIds) + ->whereNotIn('status', Process::NOT_ASSIGNABLE_USER_STATUS) + ->whereNotNull('email') + ->where('email', '!=', '') + ->pluck('email') + ->unique() + ->implode(', '); + } + } // If the actionByEmail is enable if ($isActionsByEmail === 'true' && !empty($to)) { $configEmail = json_decode($activity->getProperty('configEmail'), true); diff --git a/tests/Feature/Api/TaskActionByEmailSelfServiceTest.php b/tests/Feature/Api/TaskActionByEmailSelfServiceTest.php new file mode 100644 index 0000000000..7749c1be4b --- /dev/null +++ b/tests/Feature/Api/TaskActionByEmailSelfServiceTest.php @@ -0,0 +1,69 @@ +create([ + 'status' => 'ACTIVE', + 'email' => 'abe-direct@example.com', + ]); + $group = Group::factory()->create(['status' => 'ACTIVE']); + $groupMember = User::factory()->create([ + 'status' => 'ACTIVE', + 'email' => 'abe-group-member@example.com', + ]); + GroupMember::factory()->create([ + 'group_id' => $group->id, + 'member_id' => $groupMember->id, + 'member_type' => User::class, + ]); + + $bpmn = str_replace( + ['[ASSIGNED_USERS]', '[ASSIGNED_GROUPS]'], + [(string) $directUser->id, (string) $group->id], + file_get_contents(__DIR__ . '/processes/TaskActionByEmailSelfService.bpmn') + ); + + $process = Process::factory()->create(['bpmn' => $bpmn]); + + ProcessTaskAssignment::factory()->create([ + 'process_id' => $process->id, + 'process_task_id' => 'node_2', + 'assignment_id' => $directUser->id, + 'assignment_type' => User::class, + ]); + ProcessTaskAssignment::factory()->create([ + 'process_id' => $process->id, + 'process_task_id' => 'node_2', + 'assignment_id' => $group->id, + 'assignment_type' => Group::class, + ]); + + $route = route('api.process_events.trigger', [$process->id, 'event' => 'node_1']); + $response = $this->apiCall('POST', $route, []); + $response->assertStatus(201); + + $task = ProcessRequestToken::where('status', 'ACTIVE')->firstOrFail(); + $this->assertEquals(1, $task->is_self_service); + $this->assertNull($task->user_id); + + $abeToken = ProcessAbeRequestToken::first(); + $this->assertNotNull($abeToken); + $this->assertEquals($task->id, $abeToken->process_request_token_id); + } +} diff --git a/tests/Feature/Api/processes/TaskActionByEmailSelfService.bpmn b/tests/Feature/Api/processes/TaskActionByEmailSelfService.bpmn new file mode 100644 index 0000000000..69a9f4b2ac --- /dev/null +++ b/tests/Feature/Api/processes/TaskActionByEmailSelfService.bpmn @@ -0,0 +1,38 @@ + + + + + node_13 + + + node_13 + node_29 + + + node_29 + + + + + + + + + + + + + + + + + + + + + + + + + +