mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-24 01:11:38 -05:00
Make billing year aware of British Summer Time
April 1st is in British summer time, ie 1hr ahead of UTC. The database stores everything in UTC, so for accurate comparisions we need to make sure that `get_financial_year()` returns a UTC, datetime-aware timestamp that is 1hr ahead of midnight. This also means that when we group notifications by month, the months need to be in BST. So the line between one year and another is actually 01:00 on April 1st, _not_ 00:00 on April 1st. There’s no way we’ve found to do this in SQLAlchemy or raw Postgres, especially because we don’t store the timestamps with a timezone in the database. So the grouping and summing of the notifications has to be done in Python.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
from datetime import datetime, timedelta, date
|
||||
import pytz
|
||||
import uuid
|
||||
from functools import partial
|
||||
|
||||
@@ -690,18 +691,21 @@ def test_get_all_notifications_for_job_by_status(notify_db, notify_db_session, s
|
||||
def test_get_notification_billable_unit_count_per_month(notify_db, notify_db_session, sample_service):
|
||||
|
||||
for year, month, day in (
|
||||
(2017, 1, 1),
|
||||
(2017, 1, 1), # ↓ 2016 financial year
|
||||
(2016, 8, 1),
|
||||
(2016, 7, 31),
|
||||
(2016, 4, 6),
|
||||
(2016, 4, 6),
|
||||
(2016, 4, 1),
|
||||
(2016, 4, 1), # ↓ 2015 financial year
|
||||
(2016, 3, 31),
|
||||
(2016, 1, 1)
|
||||
):
|
||||
sample_notification(
|
||||
notify_db, notify_db_session, service=sample_service,
|
||||
created_at=date(year, month, day)
|
||||
created_at=datetime(
|
||||
year, month, day, 0, 0, 0, 0,
|
||||
tzinfo=pytz.utc
|
||||
)
|
||||
)
|
||||
|
||||
for financial_year, months in (
|
||||
@@ -711,11 +715,11 @@ def test_get_notification_billable_unit_count_per_month(notify_db, notify_db_ses
|
||||
),
|
||||
(
|
||||
2016,
|
||||
[('April', 3), ('July', 1), ('August', 1), ('January', 1)]
|
||||
[('April', 2), ('July', 1), ('August', 1), ('January', 1)]
|
||||
),
|
||||
(
|
||||
2015,
|
||||
[('January', 1), ('March', 1)]
|
||||
[('January', 1), ('March', 1), ('April', 1)]
|
||||
),
|
||||
(
|
||||
2014,
|
||||
@@ -1204,5 +1208,7 @@ def test_should_exclude_test_key_notifications_by_default(
|
||||
|
||||
def test_get_financial_year():
|
||||
start, end = get_financial_year(2000)
|
||||
assert start == date(2000, 4, 1)
|
||||
assert end == date(2001, 4, 1)
|
||||
assert start.tzinfo == pytz.utc
|
||||
assert start.isoformat() == '2000-04-01T00:01:00+00:00'
|
||||
assert end.tzinfo == pytz.utc
|
||||
assert end.isoformat() == '2001-04-01T00:01:00+00:00'
|
||||
|
||||
Reference in New Issue
Block a user