From 975b444761bc9affb901ae5941f65ee6ce08303a Mon Sep 17 00:00:00 2001
From: Prateek Banga <prateek.banga@lovebonito.com>
Date: Wed, 20 Sep 2023 20:51:03 +0530
Subject: [PATCH] fix test cases and bug fix in messaging worker

---
 app/controllers/api/account.php | 22 ++++++++++++++++++----
 app/workers/messaging.php       |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index cda5c030ed..8cce5a57f8 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1330,15 +1330,22 @@ App::post('/v1/account/sessions/phone')
         $message = $message->setParam('{{token}}', $secret);
         $message = $message->render();
 
+        $target = $dbForProject->createDocument('targets', new Document([
+            'userId' => $user->getId(),
+            'userInternalId' => $user->getInternalId(),
+            'providerId' => $provider->getId(),
+            'providerInternalId' => $provider->getInternalId(),
+            'identifier' => $phone,
+        ]));
+
         $messageDoc = $dbForProject->createDocument('messages', new Document([
-            'to' => [$phone],
+            'to' => [$target->getId()],
             'data' => [
                 'content' => $message,
                 'from' => $from,
             ],
             'providerId' => $provider->getId(),
             'providerInternalId' => $provider->getInternalId(),
-            'deliveryTime' => Datetime::now(),
         ]));
 
         $messaging
@@ -2952,15 +2959,22 @@ App::post('/v1/account/verification/phone')
         $message = $message->setParam('{{token}}', $secret);
         $message = $message->render();
 
+        $target = $dbForProject->createDocument('targets', new Document([
+            'userId' => $user->getId(),
+            'userInternalId' => $user->getInternalId(),
+            'providerId' => $provider->getId(),
+            'providerInternalId' => $provider->getInternalId(),
+            'identifier' => $user->getAttribute('phone'),
+        ]));
+
         $messageDoc = $dbForProject->createDocument('messages', new Document([
-            'to' => [$user->getAttribute('phone')],
+            'to' => [$target->getId()],
             'data' => [
                 'content' => $message,
                 'from' => $from,
             ],
             'providerId' => $provider->getId(),
             'providerInternalId' => $provider->getInternalId(),
-            'deliveryTime' => Datetime::now(),
         ]));
 
         $messaging
diff --git a/app/workers/messaging.php b/app/workers/messaging.php
index 65a519a98a..6fb1f42dc6 100644
--- a/app/workers/messaging.php
+++ b/app/workers/messaging.php
@@ -127,7 +127,7 @@ class MessagingV1 extends Worker
         }
 
         $targets = $this->dbForProject->find('targets', [Query::equal('$id', $recipientsId)]);
-        \array_merge($recipients, $targets);
+        $recipients = \array_merge($recipients, $targets);
 
         $identifiers = \array_map(function (Document $recipient) {
             return $recipient->getAttribute('identifier');