darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-30 06:21:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid key errors by setting the year_start with 2020 or 2021

Browse Source 
Remove db.create_service_with_organisation method
Update comment in command
This commit is contained in:
Rebecca Law
2021-03-30 09:08:04 +01:00
parent 7da5abc17b
commit da8a7a8db1
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/app/dao/test_annual_billing_dao.py
View File

@@ -9,7 +9,7 @@ from app.dao.annual_billing_dao import (
)
from app.dao.date_util import get_current_financial_year_start_year
from app.models import AnnualBilling
from tests.app.db import create_annual_billing, create_service_with_organisation
from tests.app.db import create_annual_billing, create_service
def test_dao_update_free_sms_fragment_limit(notify_db_session, sample_service):
@@ -65,10 +65,12 @@ def test_dao_update_annual_billing_for_future_years(notify_db_session, sample_se
('school_or_college', 2020, 25000),
('other', 2020, 25000),
(None, 2020, 25000),
('central', 2019, 250000),
('school_or_college', 2022, 10000)
])
def test_set_default_free_allowance_for_service(notify_db_session, org_type, year, expected_default):
service = create_service_with_organisation(org_type=org_type)
service = create_service(organisation_type=org_type)
set_default_free_allowance_for_service(service=service, year_start=year)

8
tests/app/db.py
View File

@@ -199,14 +199,6 @@ def create_service_with_defined_sms_sender(
return service
def create_service_with_organisation(org_type):
service = create_service(service_name=f'{org_type} service')
org = create_organisation(name=f'{org_type} org', organisation_type=org_type)
dao_add_service_to_organisation(service=service, organisation_id=org.id)
return service
def create_template(
service,
template_type=SMS_TYPE,