From a4b883b7ea486bc419cd6dabbc31bd735239b62c Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Thu, 7 Mar 2024 23:39:57 +0800
Subject: [PATCH] Fix rider assign MQTT event for new rider app #783

---
 src/Service/JobOrderHandler/ResqJobOrderHandler.php | 1 +
 src/Service/MQTTClient.php                          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 71f91357..419c27c3 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -2021,6 +2021,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
 
             // NOTE: for resq2 app
             $mclientv2->sendEvent($obj, $payload);
+            $mclientv2->sendRiderEvent($obj, $payload);
             $fcmclient->sendJoEvent($obj, "jo_fcm_title_driver_assigned", "jo_fcm_body_driver_assigned");
         }
 
diff --git a/src/Service/MQTTClient.php b/src/Service/MQTTClient.php
index 00229f5f..f1f3f2b3 100644
--- a/src/Service/MQTTClient.php
+++ b/src/Service/MQTTClient.php
@@ -89,6 +89,6 @@ class MQTTClient
         */
 
         // NOTE: this is for the new rider app
-        $this->publish('rider/' . $rider->getID(), json_encode($payload));
+        $this->publish('rider/' . $rider->getID() . '/delivery', json_encode($payload));
     }
 }