From 17c0734c62bf87f9985e782a11b8ab917a3978cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
 <90727999+agustinbusso@users.noreply.github.com>
Date: Thu, 30 Nov 2023 15:18:02 -0300
Subject: [PATCH 1/2] Emit event activity activated to trigger email
 notification

---
 ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php b/ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php
index 6d79d5a381..c9ab01511a 100644
--- a/ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php
+++ b/ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php
@@ -10,6 +10,7 @@
 use ProcessMaker\Nayra\Bpmn\Events\ActivityActivatedEvent;
 use ProcessMaker\Nayra\Bpmn\Events\ActivityClosedEvent;
 use ProcessMaker\Nayra\Bpmn\Events\ActivityCompletedEvent;
+use ProcessMaker\Nayra\Contracts\Bpmn\ActivityInterface;
 use ProcessMaker\Repositories\TokenRepository;
 
 trait PersistenceTokenTrait
@@ -32,6 +33,7 @@ public function persistActivityActivated(array $transaction)
         // Event
         $bpmnSubscriber = new BpmnSubscriber();
         $event = new ActivityActivatedEvent($activity, $token);
+        app('events')->dispatch(ActivityInterface::EVENT_ACTIVITY_ACTIVATED, $event);
         $bpmnSubscriber->onActivityActivated($event);
     }
 

From 2e455f10b7a4810f34ac4f3dc21e9788d843932e Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Thu, 30 Nov 2023 16:31:19 -0400
Subject: [PATCH 2/2] Dispatch globally Activity Complete event

---
 .../Nayra/Repositories/PersistenceTokenTrait.php         | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php b/ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php
index c9ab01511a..5673528eaf 100644
--- a/ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php
+++ b/ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php
@@ -31,10 +31,8 @@ public function persistActivityActivated(array $transaction)
         $this->tokenRepository->persistActivityActivated($activity, $token);
 
         // Event
-        $bpmnSubscriber = new BpmnSubscriber();
         $event = new ActivityActivatedEvent($activity, $token);
         app('events')->dispatch(ActivityInterface::EVENT_ACTIVITY_ACTIVATED, $event);
-        $bpmnSubscriber->onActivityActivated($event);
     }
 
     /**
@@ -65,13 +63,8 @@ public function persistActivityCompleted(array $transaction)
         $this->tokenRepository->persistActivityCompleted($activity, $token);
 
         // Event
-        $bpmnSubscriber = new BpmnSubscriber();
         $event = new ActivityCompletedEvent($activity, $token);
-        $bpmnSubscriber->onActivityCompleted($event);
-
-        // Comments
-        $subscriber = new CommentsSubscriber();
-        $subscriber->onActivityCompleted($event);
+        app('events')->dispatch(ActivityInterface::EVENT_ACTIVITY_COMPLETED, $event);
     }
 
     /**