From 45037fa2ff6f21c81bcfd59f6e2782da2fd74c2a Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Mon, 25 Aug 2025 19:44:51 -0400
Subject: [PATCH 1/2] FOUR-25919

---
 ProcessMaker/Listeners/CommentsSubscriber.php | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/ProcessMaker/Listeners/CommentsSubscriber.php b/ProcessMaker/Listeners/CommentsSubscriber.php
index 7e56b72727..8cfd1732ab 100644
--- a/ProcessMaker/Listeners/CommentsSubscriber.php
+++ b/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,26 @@ 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');
+        if (Auth::check()) {
+            $executer_user_id = Auth::user() ? Auth::user()?->id : null;
+            $executer_user = Auth::user() ? Auth::user()?->fullname : __('The System');
+        }
+
         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 +58,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,
         ]);
     }

From cf40dc1c001e77128c13537ca09f258ad948503d Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Wed, 3 Sep 2025 08:31:30 -0400
Subject: [PATCH 2/2] FOUR-25919: solving obsevations

---
 ProcessMaker/Listeners/CommentsSubscriber.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ProcessMaker/Listeners/CommentsSubscriber.php b/ProcessMaker/Listeners/CommentsSubscriber.php
index 8cfd1732ab..f8ab44b4cb 100644
--- a/ProcessMaker/Listeners/CommentsSubscriber.php
+++ b/ProcessMaker/Listeners/CommentsSubscriber.php
@@ -30,9 +30,10 @@ public function onActivityCompleted(ActivityCompletedEvent $event)
         // Check the authenticated user
         $executer_user_id = null;
         $executer_user = __('The System');
-        if (Auth::check()) {
-            $executer_user_id = Auth::user() ? Auth::user()?->id : null;
-            $executer_user = Auth::user() ? Auth::user()?->fullname : __('The System');
+        $user = Auth::user();
+        if ($user) {
+            $executer_user_id = $user->id;
+            $executer_user = $user->fullname;
         }
 
         if (!is_int($token->process_request_id)) {