darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 15:46:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

update fact_billing_dao::get_rate to use dates not datetimes

Browse Source 
update unit tests too
This commit is contained in:
Leo Hemsted
2019-04-03 14:52:41 +01:00
parent 6f41f6c7d7
commit 9f1f858997
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/app/celery/test_reporting_tasks.py
View File

@@ -3,7 +3,6 @@ from decimal import Decimal
import pytest
from freezegun import freeze_time
from sqlalchemy import desc
from app.celery.reporting_tasks import create_nightly_billing, create_nightly_notification_status
from app.dao.fact_billing_dao import get_rate
@@ -19,7 +18,7 @@ from tests.app.db import create_service, create_template, create_notification, c
def mocker_get_rate(
non_letter_rates, letter_rates, notification_type, date, crown=None, rate_multiplier=None, post_class="second"
non_letter_rates, letter_rates, notification_type, bst_date, crown=None, rate_multiplier=None, post_class="second"
):
if notification_type == LETTER_TYPE:
return Decimal(2.1)
@@ -326,20 +325,20 @@ def test_get_rate_for_letter_latest(notify_db_session):
old = create_letter_rate(datetime(2016, 12, 1), crown=True, sheet_count=1, rate=0.30, post_class='second')
letter_rates = [new, old]
rate = get_rate([], letter_rates, LETTER_TYPE, datetime(2018, 1, 1), True, 1)
rate = get_rate([], letter_rates, LETTER_TYPE, date(2018, 1, 1), True, 1)
assert rate == Decimal(0.33)
def test_get_rate_for_sms_and_email(notify_db_session):
non_letter_rates = [
create_rate(datetime(2017, 12, 1), 0.15, SMS_TYPE)
create_rate(datetime(2017, 12, 1), 0.15, SMS_TYPE),
create_rate(datetime(2017, 12, 1), 0, EMAIL_TYPE)
]
rate = get_rate(non_letter_rates, [], SMS_TYPE, datetime(2018, 1, 1))
rate = get_rate(non_letter_rates, [], SMS_TYPE, date(2018, 1, 1))
assert rate == Decimal(0.15)
rate = get_rate(non_letter_rates, [], EMAIL_TYPE, datetime(2018, 1, 1))
rate = get_rate(non_letter_rates, [], EMAIL_TYPE, date(2018, 1, 1))
assert rate == Decimal(0)

14
tests/app/dao/test_ft_billing_dao.py
View File

@@ -1,7 +1,7 @@
from calendar import monthrange
from decimal import Decimal
from datetime import datetime, timedelta
from datetime import datetime, timedelta, date
from freezegun import freeze_time
import pytest
@@ -288,18 +288,20 @@ def test_get_rates_for_billing(notify_db_session):
assert len(letter_rates) == 29
@freeze_time('2017-06-01 12:00')
def test_get_rate(notify_db_session):
create_rate(start_date=datetime.utcnow(), value=1.2, notification_type='email')
create_rate(start_date=datetime.utcnow(), value=2.2, notification_type='sms')
create_rate(start_date=datetime.utcnow(), value=3.3, notification_type='email')
create_rate(start_date=datetime(2017, 5, 30, 23, 00), value=1.2, notification_type='email')
create_rate(start_date=datetime(2017, 5, 30, 23, 00), value=2.2, notification_type='sms')
create_rate(start_date=datetime(2017, 5, 30, 23, 00), value=3.3, notification_type='email')
non_letter_rates, letter_rates = get_rates_for_billing()
rate = get_rate(non_letter_rates=non_letter_rates, letter_rates=letter_rates, notification_type='sms',
date=datetime.utcnow())
date=date(2017, 6, 1))
letter_rate = get_rate(non_letter_rates=non_letter_rates, letter_rates=letter_rates,
notification_type='letter',
crown=True,
letter_page_count=1,
date=datetime.utcnow())
date=date(2017, 6, 1))
assert rate == 2.2
assert letter_rate == Decimal('0.3')