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

send letters for services without letters_for_pdf

Browse Source 
also make sure that the service isn't in research mode
This commit is contained in:
Leo Hemsted
2018-02-21 14:13:06 +00:00
parent e750636a57
commit 34e98bc14c
2 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/dao/notifications_dao.py
View File

@@ -596,12 +596,11 @@ def dao_get_last_notification_added_for_job_id(job_id):
def dao_get_count_of_letters_to_process_for_date(date_to_process=None): def dao_get_count_of_letters_to_process_for_date(date_to_process=None):
""" """
Returns a count of letter notifications for services with letters_as_pdf permission set Returns a count of letter notifications to be processed today if no
to be processed today if no argument passed in otherwise will return the count for argument passed in otherwise will return the count for the date passed in.
the date passed in.
Records processed today = yesterday 17:30 to today 17:29:59 Records processed today = yesterday 17:30 to today 17:29:59
Note - services without letters_as_pdf permission will be ignored Note - services in research mode are ignored
""" """
if date_to_process is None: if date_to_process is None:
date_to_process = date.today() date_to_process = date.today()
@@ -620,9 +619,7 @@ def dao_get_count_of_letters_to_process_for_date(date_to_process=None):
Notification.notification_type == LETTER_TYPE, Notification.notification_type == LETTER_TYPE,
Notification.status == NOTIFICATION_CREATED, Notification.status == NOTIFICATION_CREATED,
Notification.key_type != KEY_TYPE_TEST, Notification.key_type != KEY_TYPE_TEST,
Service.permissions.any( Service.research_mode.is_(False)
ServicePermission.permission == 'letters_as_pdf'
)
).count() ).count()
return count_of_letters_to_process_for_date return count_of_letters_to_process_for_date

60
tests/app/dao/notification_dao/test_notification_dao.py
View File

@@ -35,7 +35,6 @@ from app.dao.notifications_dao import (
dao_get_notifications_by_references dao_get_notifications_by_references
) )
from app.dao.services_dao import dao_update_service from app.dao.services_dao import dao_update_service
from app.dao.service_permissions_dao import dao_add_service_permission
from app.models import ( from app.models import (
Job, Job,
Notification, Notification,
@@ -52,7 +51,7 @@ from app.models import (
) )
from tests.app.conftest import ( from tests.app.conftest import (
sample_notification, sample_notification,
sample_template, sample_template as create_sample_template,
sample_email_template, sample_email_template,
sample_service, sample_service,
sample_job, sample_job,
@@ -62,7 +61,9 @@ from tests.app.conftest import (
from tests.app.db import ( from tests.app.db import (
create_api_key, create_api_key,
create_job, create_job,
create_notification create_notification,
create_service,
create_template
) )
@@ -84,7 +85,7 @@ def test_should_have_decorated_notifications_dao_functions():
def test_should_be_able_to_get_template_usage_history(notify_db, notify_db_session, sample_service): def test_should_be_able_to_get_template_usage_history(notify_db, notify_db_session, sample_service):
with freeze_time('2000-01-01 12:00:00'): with freeze_time('2000-01-01 12:00:00'):
sms = sample_template(notify_db, notify_db_session) sms = create_sample_template(notify_db, notify_db_session)
notification = sample_notification(notify_db, notify_db_session, service=sample_service, template=sms) notification = sample_notification(notify_db, notify_db_session, service=sample_service, template=sms)
results = dao_get_last_template_usage(sms.id) results = dao_get_last_template_usage(sms.id)
assert results.template.name == 'Template Name' assert results.template.name == 'Template Name'
@@ -98,7 +99,7 @@ def test_should_be_able_to_get_all_template_usage_history_order_by_notification_
notify_db, notify_db,
notify_db_session, notify_db_session,
sample_service): sample_service):
sms = sample_template(notify_db, notify_db_session) sms = create_sample_template(notify_db, notify_db_session)
sample_notification(notify_db, notify_db_session, service=sample_service, template=sms) sample_notification(notify_db, notify_db_session, service=sample_service, template=sms)
sample_notification(notify_db, notify_db_session, service=sample_service, template=sms) sample_notification(notify_db, notify_db_session, service=sample_service, template=sms)
@@ -115,7 +116,7 @@ def test_template_usage_should_ignore_test_keys(
sample_team_api_key, sample_team_api_key,
sample_test_api_key sample_test_api_key
): ):
sms = sample_template(notify_db, notify_db_session) sms = create_sample_template(notify_db, notify_db_session)
one_minute_ago = datetime.utcnow() - timedelta(minutes=1) one_minute_ago = datetime.utcnow() - timedelta(minutes=1)
two_minutes_ago = datetime.utcnow() - timedelta(minutes=2) two_minutes_ago = datetime.utcnow() - timedelta(minutes=2)
@@ -142,14 +143,14 @@ def test_template_usage_should_ignore_test_keys(
def test_should_be_able_to_get_no_template_usage_history_if_no_notifications_using_template( def test_should_be_able_to_get_no_template_usage_history_if_no_notifications_using_template(
notify_db, notify_db,
notify_db_session): notify_db_session):
sms = sample_template(notify_db, notify_db_session) sms = create_sample_template(notify_db, notify_db_session)
results = dao_get_last_template_usage(sms.id) results = dao_get_last_template_usage(sms.id)
assert not results assert not results
def test_should_by_able_to_get_template_count(notify_db, notify_db_session, sample_service): def test_should_by_able_to_get_template_count(notify_db, notify_db_session, sample_service):
sms = sample_template(notify_db, notify_db_session) sms = create_sample_template(notify_db, notify_db_session)
email = sample_email_template(notify_db, notify_db_session) email = sample_email_template(notify_db, notify_db_session)
sample_notification(notify_db, notify_db_session, service=sample_service, template=sms) sample_notification(notify_db, notify_db_session, service=sample_service, template=sms)
sample_notification(notify_db, notify_db_session, service=sample_service, template=sms) sample_notification(notify_db, notify_db_session, service=sample_service, template=sms)
@@ -174,7 +175,7 @@ def test_template_history_should_ignore_test_keys(
sample_test_api_key, sample_test_api_key,
sample_api_key sample_api_key
): ):
sms = sample_template(notify_db, notify_db_session) sms = create_sample_template(notify_db, notify_db_session)
sample_notification( sample_notification(
notify_db, notify_db_session, template=sms, api_key=sample_api_key, key_type=KEY_TYPE_NORMAL) notify_db, notify_db_session, template=sms, api_key=sample_api_key, key_type=KEY_TYPE_NORMAL)
@@ -198,7 +199,7 @@ def test_should_by_able_to_get_template_count_limited_for_service(
service_2 = sample_service(notify_db, notify_db_session, service_name="test2", email_from="test2") service_2 = sample_service(notify_db, notify_db_session, service_name="test2", email_from="test2")
service_3 = sample_service(notify_db, notify_db_session, service_name="test3", email_from="test3") service_3 = sample_service(notify_db, notify_db_session, service_name="test3", email_from="test3")
sms = sample_template(notify_db, notify_db_session) sms = create_sample_template(notify_db, notify_db_session)
sample_notification(notify_db, notify_db_session, service=service_1, template=sms) sample_notification(notify_db, notify_db_session, service=service_1, template=sms)
sample_notification(notify_db, notify_db_session, service=service_1, template=sms) sample_notification(notify_db, notify_db_session, service=service_1, template=sms)
@@ -223,7 +224,7 @@ def test_should_by_able_to_get_template_count_across_days(
notify_db, notify_db,
notify_db_session, notify_db_session,
sample_service): sample_service):
sms = sample_template(notify_db, notify_db_session) sms = create_sample_template(notify_db, notify_db_session)
email = sample_email_template(notify_db, notify_db_session) email = sample_email_template(notify_db, notify_db_session)
today = datetime.now() today = datetime.now()
@@ -351,7 +352,7 @@ def test_should_by_able_to_get_template_count_from_notifications_history_with_da
notify_db, notify_db,
notify_db_session, notify_db_session,
sample_service): sample_service):
sms = sample_template(notify_db, notify_db_session) sms = create_sample_template(notify_db, notify_db_session)
email = sample_email_template(notify_db, notify_db_session) email = sample_email_template(notify_db, notify_db_session)
@@ -693,7 +694,7 @@ def test_save_notification_with_research_mode_service_does_not_create_history(
service = sample_service(notify_db, notify_db_session) service = sample_service(notify_db, notify_db_session)
service.research_mode = True service.research_mode = True
dao_update_service(service) dao_update_service(service)
template = sample_template(notify_db, notify_db_session, service=service) template = create_sample_template(notify_db, notify_db_session, service=service)
assert Notification.query.count() == 0 assert Notification.query.count() == 0
data = _notification_json(template) data = _notification_json(template)
@@ -725,7 +726,7 @@ def test_update_notification_with_research_mode_service_does_not_create_or_updat
service = sample_service(notify_db, notify_db_session) service = sample_service(notify_db, notify_db_session)
service.research_mode = True service.research_mode = True
dao_update_service(service) dao_update_service(service)
template = sample_template(notify_db, notify_db_session, service=service) template = create_sample_template(notify_db, notify_db_session, service=service)
data = _notification_json(template) data = _notification_json(template)
notification = Notification(**data) notification = Notification(**data)
@@ -936,7 +937,7 @@ def test_should_delete_notifications_by_type_after_seven_days(
assert len(Notification.query.all()) == 0 assert len(Notification.query.all()) == 0
email_template = sample_email_template(notify_db, notify_db_session, service=sample_service) email_template = sample_email_template(notify_db, notify_db_session, service=sample_service)
sms_template = sample_template(notify_db, notify_db_session, service=sample_service) sms_template = create_sample_template(notify_db, notify_db_session, service=sample_service)
letter_template = sample_letter_template(sample_service) letter_template = sample_letter_template(sample_service)
# create one notification a day between 1st and 10th from 11:00 to 19:00 of each type # create one notification a day between 1st and 10th from 11:00 to 19:00 of each type
@@ -997,7 +998,7 @@ def test_should_delete_notifications_by_type_after_seven_days(
def test_should_not_delete_notification_history(notify_db, notify_db_session, sample_service, notification_type): def test_should_not_delete_notification_history(notify_db, notify_db_session, sample_service, notification_type):
with freeze_time('2016-01-01 12:00'): with freeze_time('2016-01-01 12:00'):
email_template = sample_email_template(notify_db, notify_db_session, service=sample_service) email_template = sample_email_template(notify_db, notify_db_session, service=sample_service)
sms_template = sample_template(notify_db, notify_db_session, service=sample_service) sms_template = create_sample_template(notify_db, notify_db_session, service=sample_service)
letter_template = sample_letter_template(sample_service) letter_template = sample_letter_template(sample_service)
sample_notification( sample_notification(
@@ -1125,7 +1126,7 @@ def test_should_delete_notification_and_ignore_history_for_research_mode(notify_
service = sample_service(notify_db, notify_db_session) service = sample_service(notify_db, notify_db_session)
service.research_mode = True service.research_mode = True
dao_update_service(service) dao_update_service(service)
template = sample_template(notify_db, notify_db_session, service=service) template = create_sample_template(notify_db, notify_db_session, service=service)
data = _notification_json(template) data = _notification_json(template)
notification = Notification(**data) notification = Notification(**data)
@@ -2042,8 +2043,6 @@ def test_dao_get_notifications_by_reference(sample_template):
@freeze_time("2017-12-18 17:50") @freeze_time("2017-12-18 17:50")
def test_dao_get_count_of_letters_to_process_for_today(sample_letter_template): def test_dao_get_count_of_letters_to_process_for_today(sample_letter_template):
dao_add_service_permission(sample_letter_template.service.id, 'letters_as_pdf')
# expected # expected
create_notification(template=sample_letter_template, created_at='2017-12-17 17:30:00') create_notification(template=sample_letter_template, created_at='2017-12-17 17:30:00')
create_notification(template=sample_letter_template, created_at='2017-12-18 17:29:59') create_notification(template=sample_letter_template, created_at='2017-12-18 17:29:59')
@@ -2059,8 +2058,6 @@ def test_dao_get_count_of_letters_to_process_for_today(sample_letter_template):
@freeze_time("2017-12-18 17:50") @freeze_time("2017-12-18 17:50")
def test_dao_get_count_of_letters_to_process_for_date_in_past(sample_letter_template): def test_dao_get_count_of_letters_to_process_for_date_in_past(sample_letter_template):
dao_add_service_permission(sample_letter_template.service.id, 'letters_as_pdf')
# expected # expected
create_notification(template=sample_letter_template, created_at='2017-12-15 17:29:59') create_notification(template=sample_letter_template, created_at='2017-12-15 17:29:59')
@@ -2075,8 +2072,6 @@ def test_dao_get_count_of_letters_to_process_for_date_in_past(sample_letter_temp
@freeze_time("2017-12-18 17:50") @freeze_time("2017-12-18 17:50")
def test_dao_get_count_of_letters_to_process_for_date_in_future_does_not_raise_error(sample_letter_template): def test_dao_get_count_of_letters_to_process_for_date_in_future_does_not_raise_error(sample_letter_template):
dao_add_service_permission(sample_letter_template.service.id, 'letters_as_pdf')
# not expected # not expected
create_notification(template=sample_letter_template, created_at='2017-12-18 17:30:00') create_notification(template=sample_letter_template, created_at='2017-12-18 17:30:00')
create_notification(template=sample_letter_template, created_at='2017-12-19 17:29:59') create_notification(template=sample_letter_template, created_at='2017-12-19 17:29:59')
@@ -2093,28 +2088,23 @@ def test_dao_get_count_of_letters_to_process_for_today_without_notis_does_not_ra
@freeze_time("2017-12-18 17:50") @freeze_time("2017-12-18 17:50")
def test_dao_get_count_of_letters_to_process_for_date_ignores_service_not_letters_as_pdf( def test_dao_get_count_of_letters_to_process_for_date_ignores_research_mode_services(sample_letter_template):
sample_letter_template, sample_template): research_service = create_service(service_name='research service', research_mode=True)
# not expected research_template = create_template(research_service, template_type='letter')
create_notification(template=sample_letter_template, created_at='2017-12-18 17:29:00')
dao_add_service_permission(sample_template.service.id, 'letters_as_pdf') # not expected
sample_template.template_type = 'letter' create_notification(template=research_template, created_at='2017-12-18 17:29:00')
# expected # expected
create_notification(template=sample_template, created_at='2017-12-18 17:29:00') create_notification(template=sample_letter_template, created_at='2017-12-18 17:29:10')
create_notification(template=sample_template, created_at='2017-12-18 17:29:10') create_notification(template=sample_letter_template, created_at='2017-12-18 17:29:20')
count_for_date = dao_get_count_of_letters_to_process_for_date() count_for_date = dao_get_count_of_letters_to_process_for_date()
assert 'letters_as_pdf' not in [p.permission for p in sample_letter_template.service.permissions]
assert count_for_date == 2 assert count_for_date == 2
@freeze_time("2017-12-18 17:50") @freeze_time("2017-12-18 17:50")
def test_dao_get_count_of_letters_to_process_for_date_ignores_test_keys(sample_letter_template): def test_dao_get_count_of_letters_to_process_for_date_ignores_test_keys(sample_letter_template):
dao_add_service_permission(sample_letter_template.service.id, 'letters_as_pdf')
# not expected # not expected
create_notification(template=sample_letter_template, key_type=KEY_TYPE_TEST, created_at='2017-12-18 17:29:00') create_notification(template=sample_letter_template, key_type=KEY_TYPE_TEST, created_at='2017-12-18 17:29:00')