Skip to content

[Notifier][TurboSMS] Process partial accepted response from transport #58242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Sep 16, 2024
Merged

[Notifier][TurboSMS] Process partial accepted response from transport #58242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,43 @@ public function testSuccessfulSend()
self::assertSame('f83f8868-5e46-c6cf-e4fb-615e5a293754', $sentMessage->getMessageId());
}

public function testFailedSendWithPartialAccepted()
{
$response = $this->createMock(ResponseInterface::class);
$response
->expects(self::exactly(2))
->method('getStatusCode')
->willReturn(200)
;
$response
->expects(self::once())
->method('getContent')
->willReturn(json_encode([
'response_code' => 0,
'response_status' => 'OK',
'response_result' => [
[
'phone' => '380931234567',
'response_code' => 406,
'message_id' => null,
'response_status' => 'NOT_ALLOWED_RECIPIENT_COUNTRY',
],
],
]))
;

$client = new MockHttpClient(static fn() => $response);

$message = new SmsMessage('380931234567', 'Test');

$transport = self::createTransport($client);

$this->expectException(TransportException::class);
$this->expectExceptionMessage('Unable to send SMS with TurboSMS: Error code 406 with message "NOT_ALLOWED_RECIPIENT_COUNTRY".');

$transport->send($message);
}

public function testFailedSend()
{
$response = $this->createMock(ResponseInterface::class);
Expand Down
8 changes: 7 additions & 1 deletion src/Symfony/Component/Notifier/Bridge/TurboSms/TurboSmsTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,14 @@ protected function doSend(MessageInterface $message): SentMessage
if (200 === $response->getStatusCode()) {
$success = $response->toArray(false);

if (null === $messageId = $success['response_result'][0]['message_id']) {
$responseResult = $success['response_result'][0];

throw new TransportException(sprintf('Unable to send SMS with TurboSMS: Error code %d with message "%s".', (int) $responseResult['response_code'], $responseResult['response_status']), $response);
}

$sentMessage = new SentMessage($message, (string) $this);
$sentMessage->setMessageId($success['response_result'][0]['message_id']);
$sentMessage->setMessageId($messageId);

return $sentMessage;
}
Expand Down