darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-25 01:41:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #815 from alphagov/fix-perf-platform-stats-job

Browse Source 
Fix perf platform stats job
This commit is contained in:
imdadahad
2017-02-03 14:01:25 +00:00
committed by GitHub
parent 0dca47b249 e75b618c6e
commit be24bfe147
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/clients/performance_platform/performance_platform_client.py
View File

@@ -1,8 +1,7 @@
import base64
import json
import requests
from datetime import datetime
from requests import request
from flask import current_app
from app.utils import (
@@ -30,7 +29,7 @@ class PerformancePlatformClient:
def send_performance_stats(self, date, channel, count, period):
if self.active:
payload = {
'_timestamp': str(date),
'_timestamp': date.isoformat(),
'service': 'govuk-notify',
'channel': channel,
'count': count,
@@ -62,10 +61,9 @@ class PerformancePlatformClient:
'Content-Type': "application/json",
'Authorization': 'Bearer {}'.format(self.bearer_token)
}
resp = request(
"POST",
resp = requests.post(
self.performance_platform_url,
data=json.dumps(payload),
json=payload,
headers=headers
)

11
app/config.py
View File

@@ -126,7 +126,7 @@ class Config(object):
},
'send-daily-performance-platform-stats': {
'task': 'send-daily-performance-platform-stats',
'schedule': crontab(minute=30, hour=0), # 00:30
'schedule': crontab(minute='*/10'), # Every 10 minutes
'options': {'queue': 'periodic'}
},
'timeout-sending-notifications': {
@@ -156,10 +156,11 @@ class Config(object):
SENDING_NOTIFICATIONS_TIMEOUT_PERIOD = 259200 # 3 days
SIMULATED_EMAIL_ADDRESSES = ('simulate-delivered@notifications.service.gov.uk',
'simulate-delivered-2@notifications.service.gov.uk',
'simulate-delivered-3@notifications.service.gov.uk',
)
SIMULATED_EMAIL_ADDRESSES = (
'simulate-delivered@notifications.service.gov.uk',
'simulate-delivered-2@notifications.service.gov.uk',
'simulate-delivered-3@notifications.service.gov.uk',
)
SIMULATED_SMS_NUMBERS = ('+447700900000', '+447700900111', '+447700900222')

10
tests/app/clients/test_performance_platform.py
View File

@@ -28,7 +28,7 @@ def test_should_not_call_if_not_enabled(notify_api, client, mocker):
mocker.patch.object(client, '_send_stats_to_performance_platform')
client.active = False
client.send_performance_stats(
date='2016-10-16T00:00:00+00:00',
date=datetime(2016, 10, 16, 0, 0, 0),
channel='sms',
count=142,
period='day'
@@ -40,7 +40,7 @@ def test_should_not_call_if_not_enabled(notify_api, client, mocker):
def test_should_call_if_enabled(notify_api, client, mocker):
mocker.patch.object(client, '_send_stats_to_performance_platform')
client.send_performance_stats(
date='2016-10-16T00:00:00+00:00',
date=datetime(2016, 10, 16, 0, 0, 0),
channel='sms',
count=142,
period='day'
@@ -57,7 +57,7 @@ def test_send_platform_stats_creates_correct_call(notify_api, client):
status_code=200
)
client.send_performance_stats(
date='2016-10-16T00:00:00+00:00',
date=datetime(2016, 10, 16, 0, 0, 0),
channel='sms',
count=142,
period='day'
@@ -73,9 +73,9 @@ def test_send_platform_stats_creates_correct_call(notify_api, client):
assert request_args['service'] == 'govuk-notify'
assert request_args['period'] == 'day'
assert request_args['channel'] == 'sms'
assert request_args['_timestamp'] == '2016-10-16T00:00:00+00:00'
assert request_args['_timestamp'] == '2016-10-16T00:00:00'
assert request_args['count'] == 142
expected_base64_id = 'MjAxNi0xMC0xNlQwMDowMDowMCswMDowMGdvdnVrLW5vdGlmeXNtc25vdGlmaWNhdGlvbnNkYXk='
expected_base64_id = 'MjAxNi0xMC0xNlQwMDowMDowMGdvdnVrLW5vdGlmeXNtc25vdGlmaWNhdGlvbnNkYXk='
assert request_args['_id'] == expected_base64_id