Skip to content

Commit 811c0fe

Browse files
committed
Dans comments
1 parent b34066f commit 811c0fe

File tree

2 files changed

+2
-43
lines changed

2 files changed

+2
-43
lines changed

src/worker/sms.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ async def _test_send_sms(self, sms_data: SmsData):
147147

148148
async def _messagebird_send_sms(self, sms_data: SmsData):
149149
send_ts = utcnow()
150+
main_logger.info('sending SMS to %s, parts: %d', sms_data.number.number, sms_data.length.parts)
151+
150152
r = await self.messagebird.post(
151153
'messages',
152154
originator=self.from_name,

tests/test_sms.py

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -222,45 +222,6 @@ def test_send_messagebird(cli, tmpdir, dummy_server, worker, loop):
222222
assert dummy_server.log[1] == 'POST /messagebird/messages > 201'
223223

224224

225-
def test_messagebird_webhook(cli, sync_db: SyncDb, dummy_server, worker, loop):
226-
data = {
227-
'uid': str(uuid4()),
228-
'company_code': 'webhook-test',
229-
'method': 'sms-messagebird',
230-
'main_template': 'this is a message',
231-
'recipients': [{'first_name': 'John', 'last_name': 'Doe', 'user_link': 4321, 'number': '07801234567'}],
232-
}
233-
r = cli.post('/send/sms/', json=data, headers={'Authorization': 'testing-key'})
234-
assert r.status_code == 201, r.text
235-
assert worker.test_run() == 1
236-
237-
msg = sync_db.fetchrow_b('select * from messages join message_groups g on g.id = messages.id')
238-
assert msg['status'] == 'send'
239-
assert msg['to_first_name'] == 'John'
240-
assert msg['to_last_name'] == 'Doe'
241-
assert msg['to_user_link'] == '4321'
242-
assert msg['to_address'] == '+44 7801 234567'
243-
assert msg['from_name'] == 'Morpheus'
244-
assert msg['body'] == 'this is a message'
245-
assert msg['cost'] is None
246-
assert len(msg['tags']) == 1 # just group_id
247-
248-
url_args = {
249-
'id': msg['external_id'],
250-
'reference': 'morpheus',
251-
'recipient': '447801234567',
252-
'status': 'delivered',
253-
'statusDatetime': '2032-06-06T12:00:00',
254-
'price[amount]': 0.006,
255-
}
256-
r = cli.get(f'/webhook/messagebird/?{urlencode(url_args)}')
257-
assert r.status_code == 200, r.text
258-
assert worker.test_run() == 2
259-
260-
msg = sync_db.fetchrow_b('select * from messages')
261-
assert msg['status'] == 'delivered'
262-
263-
264225
def test_messagebird_webhook_sms_pricing(cli, sync_db: SyncDb, dummy_server, worker, loop):
265226
data = {
266227
'uid': str(uuid4()),
@@ -301,8 +262,6 @@ def test_messagebird_webhook_sms_pricing(cli, sync_db: SyncDb, dummy_server, wor
301262
assert msg['status'] == 'delivered'
302263
assert msg['cost'] == 0.07
303264

304-
#
305-
306265

307266
def test_failed_render(cli, tmpdir, sync_db: SyncDb, worker, loop):
308267
data = {
@@ -402,6 +361,4 @@ def test_sms_billing(cli, send_sms, send_webhook, sync_db):
402361
'/billing/sms-test/billing-test/', json=dict(uid=str(uuid4()), **data), headers={'Authorization': 'testing-key'}
403362
)
404363
assert r.status_code == 200, r.text
405-
406-
print(r.json())
407364
assert {'company': 'billing-test', 'start': start, 'end': end, 'spend': 0.048} == r.json()

0 commit comments

Comments
 (0)