bug #40955 [Notifier] [Bridge] Fix missed messageId for SendMessage object in slack notifier (WaylandAce)

nicolas-grekas · nicolas-grekas · commit d76bfb5a625a · 2021-05-07T16:06:30.000+02:00
This PR was merged into the 5.2 branch. Discussion ---------- [Notifier] [Bridge] Fix missed messageId for SendMessage object in slack notifier | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | - | Tickets | - | License | MIT | Doc PR | symfony/symfony-docs#...  There are missed messageId property for SendMessage object in slack notifier. Regarding slack's documentation: https://api.slack.com/messaging/sending#publishing > One very important piece of information in this response is the `ts` value, which is essentially the ID of the message, Commits ------- 838f36b [Notifier] [Bridge] Store message id for slack transport's SendMessage
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php b/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
@@ -91,6 +91,9 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new TransportException(sprintf('Unable to post the Slack message: "%s".', $result['error']), $response);
         }
 
-        return new SentMessage($message, (string) $this);
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($result['ts']);
+
+        return $sentMessage;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
@@ -110,7 +110,7 @@ public function testSendWithOptions()
 
         $response->expects($this->once())
             ->method('getContent')
-            ->willReturn(json_encode(['ok' => true]));
+            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247']));
 
         $expectedBody = json_encode(['channel' => $channel, 'text' => $message]);
 
@@ -122,7 +122,9 @@ public function testSendWithOptions()
 
         $transport = $this->createTransport($client, $channel);
 
-        $transport->send(new ChatMessage('testMessage'));
+        $sentMessage = $transport->send(new ChatMessage('testMessage'));
+
+        $this->assertSame('1503435956.000247', $sentMessage->getMessageId());
     }
 
     public function testSendWithNotification()
@@ -138,7 +140,7 @@ public function testSendWithNotification()
 
         $response->expects($this->once())
             ->method('getContent')
-            ->willReturn(json_encode(['ok' => true]));
+            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247']));
 
         $notification = new Notification($message);
         $chatMessage = ChatMessage::fromNotification($notification);
@@ -158,7 +160,9 @@ public function testSendWithNotification()
 
         $transport = $this->createTransport($client, $channel);
 
-        $transport->send($chatMessage);
+        $sentMessage = $transport->send($chatMessage);
+
+        $this->assertSame('1503435956.000247', $sentMessage->getMessageId());
     }
 
     public function testSendWithInvalidOptions()

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,9 @@ protected function doSend(MessageInterface $message): SentMessage`
`91`	`91`	`throw new TransportException(sprintf('Unable to post the Slack message: "%s".', $result['error']), $response);`
`92`	`92`	`}`
`93`	`93`
`94`		`- return new SentMessage($message, (string) $this);`
	`94`	`+ $sentMessage = new SentMessage($message, (string) $this);`
	`95`	`+ $sentMessage->setMessageId($result['ts']);`
	`96`	`+`
	`97`	`+ return $sentMessage;`
`95`	`98`	`}`
`96`	`99`	`}`