Skip to content
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

Jump to bottom

feature: Call API::sendLongMessageBatch() instead of API::sendBatch() #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feature: Call API::sendLongMessageBatch() instead of API::sendBatch() #8

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
24 changes: 10 additions & 14 deletions src/API.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,24 @@ public function __construct(Client $client)
*/
public function sendBatch(array $messages)
{
$body = '';
$longMessages = [];

/** @var Message\Message $message */
foreach ($messages as $i => $message) {
if (!$message instanceof Message\Message) {
throw new InvalidArgumentException();
}

$body .= "[{$i}]\n";
$body .= $message->toINI();
$longMessages[] = (new Message\LongMessage)
->setId($i + 1)
->setDstaddr($message->getDstaddr())
->setSmbody($message->getSmbody())
->setDlvtime($message->getDlvtime())
->setVldtime($message->getVldtime())
->setResponse($message->getResponse());
}
$body = trim($body);

$request = $this->client->newRequest(
'POST',
$this->client->buildUriWithQuery('/SmSendPost.asp', ['encoding' => 'UTF8']),
'text/plain',
$body
);

$response = $this->client->sendRequest($request);

return $this->parseMessageResponse($response);
return $this->sendLongMessageBatch($longMessages);
}

/**
Expand Down
11 changes: 2 additions & 9 deletions tests/APITest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,8 @@ public function testSendBatch()
->setSmbody('須知反逆得到勝利時 / 社會纔能進步改革'),
]);

$expectedRequestBody = '[0]
dstaddr=0987654321
smbody=壓迫孕育反逆 / 反逆產生壓迫
dlvtime=60
vldtime=120
response=https://example.com/callback
[1]
dstaddr=0987654322
smbody=須知反逆得到勝利時 / 社會纔能進步改革';
$expectedRequestBody = '1$$0987654321$$60$$120$$$$https://example.com/callback$$壓迫孕育反逆 / 反逆產生壓迫
2$$0987654322$$$$$$$$$$須知反逆得到勝利時 / 社會纔能進步改革';

$expected = (new Message\Response())
->addResult(
Expand Down