Merge pull request #8475 from ProcessMaker/feature/FOUR-25919

FOUR-25919: Processmaker is not registering the name of user performing a task on behalf of someone else

Author: nolanpro

ProcessMaker/Listeners/CommentsSubscriber.php

@@ -2,6 +2,7 @@
 
 namespace ProcessMaker\Listeners;
 
+use Illuminate\Support\Facades\Auth;
 use ProcessMaker\Models\Comment;
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken;
@@ -26,11 +27,27 @@ public function onActivityCompleted(ActivityCompletedEvent $event)
         $user_id = $token->user ? $token->user_id : null;
         $user_name = $token->user ? $token->user->fullname : __('The System');
 
+        // Check the authenticated user
+        $executer_user_id = null;
+        $executer_user = __('The System');
+        $user = Auth::user();
+        if ($user) {
+            $executer_user_id = $user->id;
+            $executer_user = $user->fullname;
+        }
+
         if (!is_int($token->process_request_id)) {
             return;
         }
 
-        $message = ':user has completed the task :task_name';
+        if (!is_null($executer_user_id) && $user_id !== $executer_user_id) {
+            $subject = 'Task Completed by Different User';
+            $message = ':executer_user has completed the task :task_name (assigned to: :user)';
+        } else {
+            $subject = 'Task Complete';
+            $message = ':user has completed the task :task_name';
+        }
+
         if ($token->is_actionbyemail) {
             $message = $message . ' via email';
         }
@@ -42,8 +59,8 @@ public function onActivityCompleted(ActivityCompletedEvent $event)
             'user_id' => $user_id,
             'commentable_type' => ProcessRequest::class,
             'commentable_id' => $token->process_request_id,
-            'subject' => 'Task Complete',
-            'body' => __($message, ['user' => $user_name, 'task_name' => $token->element_name]),
+            'subject' => $subject,
+            'body' => __($message, ['user' => $user_name, 'task_name' => $token->element_name, 'executer_user' => $executer_user]),
             'case_number' => $caseNumber,
         ]);
     }