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

Remove contact list db, dao, and s3 code

Browse Source
This commit is contained in:
Ryan Ahearn
2023-04-12 13:30:50 -04:00
parent f7418d62cb
commit e07b596857
22 changed files with 1 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/app/dao/test_jobs_dao.py
View File

@@ -23,7 +23,6 @@ from tests.app.db import (
create_job,
create_notification,
create_service,
create_service_contact_list,
create_template,
)
@@ -165,26 +164,6 @@ def test_get_jobs_for_service_in_processed_at_then_created_at_order(notify_db_se
assert jobs[index].id == created_jobs[index].id
def test_get_jobs_for_service_by_contact_list(sample_template):
contact_list = create_service_contact_list()
job_1 = create_job(sample_template)
job_2 = create_job(sample_template, contact_list_id=contact_list.id)
assert dao_get_jobs_by_service_id(
sample_template.service.id
).items == [
job_2,
job_1,
]
assert dao_get_jobs_by_service_id(
sample_template.service.id,
contact_list_id=contact_list.id,
).items == [
job_2,
]
def test_update_job(sample_job):
assert sample_job.job_status == 'pending'

15
tests/app/dao/test_service_contact_list_dao.py
View File

@@ -1,15 +0,0 @@
from app.dao.service_contact_list_dao import dao_get_contact_lists
from tests.app.db import create_service_contact_list
def test_dao_get_contact_lists(notify_db_session):
contact_list = create_service_contact_list()
create_service_contact_list(
service=contact_list.service,
archived=True,
)
fetched_list = dao_get_contact_lists(contact_list.service_id)
assert len(fetched_list) == 1
assert fetched_list[0] == contact_list

4
tests/app/dao/test_uploads_dao.py
View File

@@ -9,7 +9,6 @@ from tests.app.db import (
create_job,
create_notification,
create_service,
create_service_contact_list,
create_service_data_retention,
create_template,
)
@@ -43,9 +42,6 @@ def create_uploaded_template(service):
@freeze_time("2020-02-02 09:00") # GMT time
def test_get_uploads_for_service(sample_template):
create_service_data_retention(sample_template.service, 'sms', days_of_retention=9)
contact_list = create_service_contact_list()
# Jobs created from contact lists should be filtered out
create_job(sample_template, contact_list_id=contact_list.id)
job = create_job(sample_template, processing_started=datetime.utcnow())
letter_template = create_uploaded_template(sample_template.service)
letter = create_uploaded_letter(letter_template, sample_template.service)

28
tests/app/db.py
View File

@@ -51,7 +51,6 @@ from app.models import (
Rate,
Service,
ServiceCallbackApi,
ServiceContactList,
ServiceEmailReplyTo,
ServiceGuestList,
ServiceInboundApi,
@@ -376,7 +375,6 @@ def create_job(
processing_finished=None,
original_file_name='some.csv',
archived=False,
contact_list_id=None,
):
data = {
'id': uuid.uuid4(),
@@ -393,7 +391,6 @@ def create_job(
'processing_started': processing_started,
'processing_finished': processing_finished,
'archived': archived,
'contact_list_id': contact_list_id,
}
job = Job(**data)
dao_create_job(job)
@@ -944,31 +941,6 @@ def set_up_usage_data(start_date):
}
def create_service_contact_list(
service=None,
original_file_name='EmergencyContactList.xls',
row_count=100,
template_type='email',
created_by_id=None,
archived=False,
):
if not service:
service = create_service(service_name='service for contact list', user=create_user())
contact_list = ServiceContactList(
service_id=service.id,
original_file_name=original_file_name,
row_count=row_count,
template_type=template_type,
created_by_id=created_by_id or service.users[0].id,
created_at=datetime.utcnow(),
archived=archived,
)
db.session.add(contact_list)
db.session.commit()
return contact_list
def create_webauthn_credential(
user,
name='my key',

49
tests/app/job/test_rest.py
View File

@@ -16,7 +16,6 @@ from tests.app.db import (
create_job,
create_notification,
create_service,
create_service_contact_list,
create_template,
)
from tests.conftest import set_config
@@ -186,39 +185,6 @@ def test_create_scheduled_job(client, sample_template, mocker, fake_uuid):
assert resp_json['data']['notification_count'] == 1
@pytest.mark.parametrize('contact_list_archived', (
True, False,
))
def test_create_job_with_contact_list_id(
client,
mocker,
sample_template,
fake_uuid,
contact_list_archived,
):
mocker.patch('app.celery.tasks.process_job.apply_async')
mocker.patch('app.job.rest.get_job_metadata_from_s3', return_value={
'template_id': str(sample_template.id)
})
contact_list = create_service_contact_list(archived=contact_list_archived)
data = {
'id': fake_uuid,
'valid': 'True',
'original_file_name': contact_list.original_file_name,
'created_by': str(sample_template.service.users[0].id),
'notification_count': 100,
'contact_list_id': str(contact_list.id),
}
response = client.post(
f'/service/{sample_template.service_id}/job',
data=json.dumps(data),
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
resp_json = response.get_json()
assert response.status_code == 201
assert resp_json['data']['contact_list_id'] == str(contact_list.id)
assert resp_json['data']['original_file_name'] == 'EmergencyContactList.xls'
def test_create_job_returns_403_if_service_is_not_active(client, fake_uuid, sample_service, mocker):
sample_service.active = False
mock_job_dao = mocker.patch("app.dao.jobs_dao.dao_create_job")
@@ -645,7 +611,6 @@ def test_get_jobs(admin_request, sample_template):
'template_type': 'sms',
'template_version': 1,
'updated_at': None,
'contact_list_id': None
}
@@ -664,20 +629,6 @@ def test_get_jobs_with_limit_days(admin_request, sample_template):
assert len(resp_json['data']) == 2
def test_get_jobs_by_contact_list(admin_request, sample_template):
contact_list = create_service_contact_list()
create_job(template=sample_template)
create_job(template=sample_template, contact_list_id=contact_list.id)
resp_json = admin_request.get(
'job.get_jobs_by_service',
service_id=sample_template.service_id,
contact_list_id=contact_list.id,
)
assert len(resp_json['data']) == 1
def test_get_jobs_should_return_statistics(admin_request, sample_template):
now = datetime.utcnow()
earlier = datetime.utcnow() - timedelta(days=1)

258
tests/app/service/test_service_contact_list_rest.py
View File

@@ -1,258 +0,0 @@
import uuid
from datetime import datetime, timedelta
import pytest
from freezegun import freeze_time
from app.models import ServiceContactList
from tests.app.db import (
create_job,
create_service,
create_service_contact_list,
create_service_data_retention,
create_template,
)
def test_create_service_contact_list(sample_service, admin_request):
data = {
"id": str(uuid.uuid4()),
"row_count": 100,
"original_file_name": "staff_emergency_list.xls",
"template_type": 'email',
"created_by": str(sample_service.users[0].id)
}
response = admin_request.post(
'service.create_contact_list',
_data=data,
service_id=sample_service.id,
_expected_status=201
)
assert response['id'] == data['id']
assert response['original_file_name'] == 'staff_emergency_list.xls'
assert response['row_count'] == 100
assert response['template_type'] == 'email'
assert response['service_id'] == str(sample_service.id)
assert response['created_at']
db_results = ServiceContactList.query.all()
assert len(db_results) == 1
assert str(db_results[0].id) == data['id']
def test_create_service_contact_list_cannot_save_type_letter(sample_service, admin_request):
data = {
"id": str(uuid.uuid4()),
"row_count": 100,
"original_file_name": "staff_emergency_list.xls",
"template_type": 'letter',
"created_by": str(sample_service.users[0].id)
}
response = admin_request.post(
'service.create_contact_list',
_data=data,
service_id=sample_service.id,
_expected_status=400
)
assert response['errors'][0]['message'] == "template_type letter is not one of [email, sms]"
@freeze_time('2020-06-06 12:00')
def test_get_contact_list(admin_request, notify_db_session):
contact_list = create_service_contact_list()
response = admin_request.get(
'service.get_contact_list',
service_id=contact_list.service_id
)
assert len(response) == 1
assert response[0] == contact_list.serialize()
assert response[0]['recent_job_count'] == 0
assert response[0]['created_at'] == '2020-06-06T12:00:00.000000Z'
@pytest.mark.parametrize('days_of_email_retention, expected_job_count', (
(None, 8),
(7, 8),
(3, 4),
))
def test_get_contact_list_counts_jobs(
sample_template,
admin_request,
days_of_email_retention,
expected_job_count,
):
if days_of_email_retention:
create_service_data_retention(sample_template.service, 'email', days_of_email_retention)
# This should be ignored because it’s another template type
create_service_data_retention(sample_template.service, 'sms', 1)
contact_list_1 = create_service_contact_list(service=sample_template.service)
contact_list_2 = create_service_contact_list(service=sample_template.service)
for i in range(10):
create_job(
template=sample_template,
contact_list_id=contact_list_2.id,
created_at=datetime.utcnow() - timedelta(days=i)
)
response = admin_request.get(
'service.get_contact_list',
service_id=contact_list_1.service_id
)
assert len(response) == 2
assert response[0]['id'] == str(contact_list_2.id)
assert response[0]['recent_job_count'] == expected_job_count
assert response[0]['has_jobs'] is True
assert response[1]['id'] == str(contact_list_1.id)
assert response[1]['recent_job_count'] == 0
assert response[1]['has_jobs'] is False
def test_get_contact_list_returns_for_service(admin_request, notify_db_session):
service_1 = create_service(service_name='Service under test')
service_2 = create_service(service_name='Service should return results')
expected_list_1 = create_service_contact_list(service=service_1)
expected_list_2 = create_service_contact_list(service=service_1)
# not included in results
create_service_contact_list(service=service_2)
create_service_contact_list(service=service_1, archived=True)
response = admin_request.get(
'service.get_contact_list',
service_id=service_1.id
)
assert len(response) == 2
assert response[0] == expected_list_2.serialize()
assert response[1] == expected_list_1.serialize()
def test_dao_get_contact_list_by_id(admin_request, sample_service):
service_1 = create_service(service_name='Service under test')
expected_list_1 = create_service_contact_list(service=service_1)
create_service_contact_list(service=service_1)
response = admin_request.get(
'service.get_contact_list_by_id',
service_id=service_1.id,
contact_list_id=expected_list_1.id
)
assert response == expected_list_1.serialize()
def test_dao_get_archived_contact_list_by_id(admin_request):
contact_list = create_service_contact_list(archived=True)
admin_request.get(
'service.get_contact_list_by_id',
service_id=contact_list.service.id,
contact_list_id=contact_list.id,
_expected_status=404,
)
def test_dao_get_contact_list_by_id_does_not_return_if_contact_list_id_for_another_service(
admin_request, sample_service
):
service_1 = create_service(service_name='Service requesting list')
service_2 = create_service(service_name='Service that owns the list')
create_service_contact_list(service=service_1)
list_2 = create_service_contact_list(service=service_2)
response = admin_request.get(
'service.get_contact_list_by_id',
service_id=service_1.id,
contact_list_id=list_2.id,
_expected_status=404
)
assert response['message'] == "No result found"
def test_archive_contact_list_by_id(mocker, admin_request, sample_service):
mock_s3 = mocker.patch('app.service.rest.s3.remove_contact_list_from_s3')
service_1 = create_service(service_name='Service under test')
template_1 = create_template(service=service_1)
expected_list = create_service_contact_list(service=service_1)
other_list = create_service_contact_list(service=service_1)
# Job linked to the contact list we’re deleting
job_1 = create_job(template=template_1, contact_list_id=expected_list.id)
# Other jobs and lists shouldn’t be affected
job_2 = create_job(template=template_1, contact_list_id=other_list.id)
job_3 = create_job(template=template_1)
admin_request.delete(
'service.delete_contact_list_by_id',
service_id=service_1.id,
contact_list_id=expected_list.id,
)
assert job_1.contact_list_id == expected_list.id
assert expected_list.archived is True
assert job_2.contact_list_id == other_list.id
assert other_list.archived is False
assert job_3.contact_list_id is None
mock_s3.assert_called_once_with(
expected_list.service.id,
expected_list.id,
)
def test_archive_contact_list_when_unused(mocker, admin_request, sample_service):
mock_s3 = mocker.patch('app.service.rest.s3.remove_contact_list_from_s3')
service = create_service(service_name='Service under test')
expected_list = create_service_contact_list(service=service)
assert ServiceContactList.query.count() == 1
admin_request.delete(
'service.delete_contact_list_by_id',
service_id=service.id,
contact_list_id=expected_list.id
)
assert ServiceContactList.query.count() == 1
assert expected_list.archived is True
mock_s3.assert_called_once_with(
expected_list.service.id,
expected_list.id,
)
def test_archive_contact_list_by_id_for_different_service(mocker, admin_request, sample_service):
mock_s3 = mocker.patch('app.service.rest.s3.remove_contact_list_from_s3')
service_1 = create_service(service_name='Service under test')
service_2 = create_service(service_name='Other service')
contact_list = create_service_contact_list(service=service_1)
assert ServiceContactList.query.count() == 1
admin_request.delete(
'service.delete_contact_list_by_id',
service_id=service_2.id,
contact_list_id=contact_list.id,
_expected_status=404,
)
assert ServiceContactList.query.count() == 1
assert mock_s3.called is False