This commit is contained in:
Imdad Ahad
2017-08-31 11:10:54 +01:00
parent 49a6bfc06b
commit ea2f838510
2 changed files with 11 additions and 11 deletions

View File

@@ -3,7 +3,7 @@ from datetime import datetime
from flask import current_app from flask import current_app
from app.utils import get_midnight_for_day_before, get_london_midnight_in_utc from app.utils import get_midnight_for_day_before, get_london_midnight_in_utc
from app.dao.notifications_dao import dao_get_total_notifications_sent_per_day_for_perfomance_platform from app.dao.notifications_dao import dao_get_total_notifications_sent_per_day_for_performance_platform
from app import performance_platform_client from app import performance_platform_client
@@ -12,7 +12,7 @@ def send_processing_time_to_performance_platform():
start_date = get_midnight_for_day_before(today) start_date = get_midnight_for_day_before(today)
end_date = get_london_midnight_in_utc(today) end_date = get_london_midnight_in_utc(today)
result = dao_get_total_notifications_sent_per_day_for_perfomance_platform(start_date, end_date) result = dao_get_total_notifications_sent_per_day_for_performance_platform(start_date, end_date)
current_app.logger.info( current_app.logger.info(
'Sending processing-time to performance platform for date {}. Total: {}, under 10 secs {}'.format( 'Sending processing-time to performance platform for date {}. Total: {}, under 10 secs {}'.format(

View File

@@ -2,7 +2,7 @@ from datetime import date, datetime, timedelta
from freezegun import freeze_time from freezegun import freeze_time
from app.dao.notifications_dao import dao_get_total_notifications_sent_per_day_for_perfomance_platform from app.dao.notifications_dao import dao_get_total_notifications_sent_per_day_for_performance_platform
from app.models import KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST from app.models import KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST
from tests.app.db import create_notification from tests.app.db import create_notification
@@ -12,7 +12,7 @@ def test_get_total_notifications_filters_on_date(sample_template):
create_notification(sample_template, created_at=datetime(2016, 10, 17, 10, 0)) create_notification(sample_template, created_at=datetime(2016, 10, 17, 10, 0))
create_notification(sample_template, created_at=datetime(2016, 10, 18, 10, 0)) create_notification(sample_template, created_at=datetime(2016, 10, 18, 10, 0))
create_notification(sample_template, created_at=datetime(2016, 10, 19, 10, 0)) create_notification(sample_template, created_at=datetime(2016, 10, 19, 10, 0))
result = dao_get_total_notifications_sent_per_day_for_perfomance_platform(date(2016, 10, 18), date(2016, 10, 19)) result = dao_get_total_notifications_sent_per_day_for_performance_platform(date(2016, 10, 18), date(2016, 10, 19))
assert result.messages_total == 1 assert result.messages_total == 1
@@ -21,7 +21,7 @@ def test_get_total_notifications_filters_on_date_at_midnight(sample_template):
create_notification(sample_template, created_at=datetime(2016, 10, 18, 0, 0)) create_notification(sample_template, created_at=datetime(2016, 10, 18, 0, 0))
create_notification(sample_template, created_at=datetime(2016, 10, 18, 23, 59, 59)) create_notification(sample_template, created_at=datetime(2016, 10, 18, 23, 59, 59))
create_notification(sample_template, created_at=datetime(2016, 10, 19, 0, 0)) create_notification(sample_template, created_at=datetime(2016, 10, 19, 0, 0))
result = dao_get_total_notifications_sent_per_day_for_perfomance_platform(date(2016, 10, 18), date(2016, 10, 19)) result = dao_get_total_notifications_sent_per_day_for_performance_platform(date(2016, 10, 18), date(2016, 10, 19))
assert result.messages_total == 2 assert result.messages_total == 2
@@ -32,7 +32,7 @@ def test_get_total_notifications_only_counts_api_notifications(sample_template,
create_notification(sample_template, job=sample_job) create_notification(sample_template, job=sample_job)
create_notification(sample_template, job=sample_job) create_notification(sample_template, job=sample_job)
create_notification(sample_template, api_key=sample_api_key) create_notification(sample_template, api_key=sample_api_key)
result = dao_get_total_notifications_sent_per_day_for_perfomance_platform(date(2016, 10, 18), date(2016, 10, 19)) result = dao_get_total_notifications_sent_per_day_for_performance_platform(date(2016, 10, 18), date(2016, 10, 19))
assert result.messages_total == 1 assert result.messages_total == 1
@@ -45,7 +45,7 @@ def test_get_total_notifications_ignores_test_keys(sample_template):
create_notification(sample_template, key_type=KEY_TYPE_TEAM) create_notification(sample_template, key_type=KEY_TYPE_TEAM)
create_notification(sample_template, key_type=KEY_TYPE_TEAM) create_notification(sample_template, key_type=KEY_TYPE_TEAM)
create_notification(sample_template, key_type=KEY_TYPE_TEST) create_notification(sample_template, key_type=KEY_TYPE_TEST)
result = dao_get_total_notifications_sent_per_day_for_perfomance_platform(date(2016, 10, 18), date(2016, 10, 19)) result = dao_get_total_notifications_sent_per_day_for_performance_platform(date(2016, 10, 18), date(2016, 10, 19))
assert result.messages_total == 4 assert result.messages_total == 4
@@ -62,7 +62,7 @@ def test_get_total_notifications_ignores_letters(
create_notification(sample_email_template) create_notification(sample_email_template)
create_notification(sample_email_template) create_notification(sample_email_template)
create_notification(sample_letter_template) create_notification(sample_letter_template)
result = dao_get_total_notifications_sent_per_day_for_perfomance_platform(date(2016, 10, 18), date(2016, 10, 19)) result = dao_get_total_notifications_sent_per_day_for_performance_platform(date(2016, 10, 18), date(2016, 10, 19))
assert result.messages_total == 4 assert result.messages_total == 4
@@ -74,7 +74,7 @@ def test_get_total_notifications_counts_messages_within_10_seconds(sample_templa
create_notification(sample_template, sent_at=created_at + timedelta(seconds=10)) create_notification(sample_template, sent_at=created_at + timedelta(seconds=10))
create_notification(sample_template, sent_at=created_at + timedelta(seconds=15)) create_notification(sample_template, sent_at=created_at + timedelta(seconds=15))
result = dao_get_total_notifications_sent_per_day_for_perfomance_platform(date(2016, 10, 18), date(2016, 10, 19)) result = dao_get_total_notifications_sent_per_day_for_performance_platform(date(2016, 10, 18), date(2016, 10, 19))
assert result.messages_total == 3 assert result.messages_total == 3
assert result.messages_within_10_secs == 2 assert result.messages_within_10_secs == 2
@@ -82,13 +82,13 @@ def test_get_total_notifications_counts_messages_within_10_seconds(sample_templa
@freeze_time('2016-10-18T10:00') @freeze_time('2016-10-18T10:00')
def test_get_total_notifications_counts_messages_that_have_not_sent(sample_template): def test_get_total_notifications_counts_messages_that_have_not_sent(sample_template):
create_notification(sample_template, status='created', sent_at=None) create_notification(sample_template, status='created', sent_at=None)
result = dao_get_total_notifications_sent_per_day_for_perfomance_platform(date(2016, 10, 18), date(2016, 10, 19)) result = dao_get_total_notifications_sent_per_day_for_performance_platform(date(2016, 10, 18), date(2016, 10, 19))
assert result.messages_total == 1 assert result.messages_total == 1
assert result.messages_within_10_secs == 0 assert result.messages_within_10_secs == 0
@freeze_time('2016-10-18T10:00') @freeze_time('2016-10-18T10:00')
def test_get_total_notifications_returns_zero_if_no_data(notify_db_session): def test_get_total_notifications_returns_zero_if_no_data(notify_db_session):
result = dao_get_total_notifications_sent_per_day_for_perfomance_platform(date(2016, 10, 18), date(2016, 10, 19)) result = dao_get_total_notifications_sent_per_day_for_performance_platform(date(2016, 10, 18), date(2016, 10, 19))
assert result.messages_total == 0 assert result.messages_total == 0
assert result.messages_within_10_secs == 0 assert result.messages_within_10_secs == 0