Add Template name to response and filter by year

The template name should be returned for the response and the user will
pick a year, so ths adds those two features to the
notifications/templates_usage/monthly endpoint and added some tests to
test the functionality.
This commit is contained in:
Richard Chapman
2017-11-15 15:55:00 +00:00
parent 618c7676e6
commit 1e4850b70f
7 changed files with 157 additions and 31 deletions

View File

@@ -1054,14 +1054,14 @@ def test_dao_fetch_monthly_historical_usage_by_template_for_service_no_stats_tod
template_two = create_sample_template(notify_db, notify_db_session, template_name='2')
n = notification_history(created_at=datetime(2017, 10, 1), sample_template=template_one)
notification_history(created_at=datetime(2016, 4, 1), sample_template=template_two)
notification_history(created_at=datetime(2016, 4, 1), sample_template=template_two)
notification_history(created_at=datetime(2017, 4, 1), sample_template=template_two)
notification_history(created_at=datetime(2017, 4, 1), sample_template=template_two)
notification_history(created_at=datetime.now(), sample_template=template_two)
daily_stats_template_usage_by_month()
result = sorted(
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id),
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id, 2017),
key=lambda x: (x.month, x.year)
)
@@ -1069,7 +1069,7 @@ def test_dao_fetch_monthly_historical_usage_by_template_for_service_no_stats_tod
assert result[0].template_id == template_two.id
assert result[0].month == 4
assert result[0].year == 2016
assert result[0].year == 2017
assert result[0].count == 2
assert result[1].template_id == template_one.id
@@ -1107,7 +1107,7 @@ def test_dao_fetch_monthly_historical_usage_by_template_for_service_add_to_histo
daily_stats_template_usage_by_month()
result = sorted(
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id),
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id, 2017),
key=lambda x: (x.month, x.year)
)
@@ -1139,7 +1139,7 @@ def test_dao_fetch_monthly_historical_usage_by_template_for_service_add_to_histo
)
result = sorted(
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id),
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id, 2017),
key=lambda x: (x.month, x.year)
)
@@ -1190,7 +1190,7 @@ def test_dao_fetch_monthly_historical_usage_by_template_for_service_does_add_old
daily_stats_template_usage_by_month()
result = sorted(
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id),
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id, 2017),
key=lambda x: (x.month, x.year)
)
@@ -1215,7 +1215,78 @@ def test_dao_fetch_monthly_historical_usage_by_template_for_service_does_add_old
)
result = sorted(
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id),
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id, 2017),
key=lambda x: (x.month, x.year)
)
assert len(result) == 2
@freeze_time("2017-11-10 11:09:00.000000")
def test_dao_fetch_monthly_historical_usage_by_template_for_service_get_this_year_only(
notify_db,
notify_db_session,
sample_service
):
notification_history = functools.partial(
create_notification_history,
notify_db,
notify_db_session,
status='delivered'
)
template_one = create_sample_template(notify_db, notify_db_session, template_name='1')
template_two = create_sample_template(notify_db, notify_db_session, template_name='2')
template_three = create_sample_template(notify_db, notify_db_session, template_name='3')
date = datetime.now()
day = date.day
month = date.month
year = date.year
n = notification_history(created_at=datetime(2016, 9, 1), sample_template=template_one)
notification_history(created_at=datetime(year, month, day) - timedelta(days=1), sample_template=template_two)
notification_history(created_at=datetime(year, month, day) - timedelta(days=1), sample_template=template_two)
daily_stats_template_usage_by_month()
result = sorted(
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id, 2017),
key=lambda x: (x.month, x.year)
)
assert len(result) == 1
assert result[0].template_id == template_two.id
assert result[0].month == 11
assert result[0].year == 2017
assert result[0].count == 2
create_notification(
notify_db,
notify_db_session,
service=sample_service,
template=template_three,
created_at=datetime.utcnow() - timedelta(days=2)
)
result = sorted(
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id, 2017),
key=lambda x: (x.month, x.year)
)
assert len(result) == 1
create_notification(
notify_db,
notify_db_session,
service=sample_service,
template=template_three,
created_at=datetime.utcnow()
)
result = sorted(
dao_fetch_monthly_historical_usage_by_template_for_service(n.service_id, 2017),
key=lambda x: (x.month, x.year)
)