darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-18 21:48:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed service test that deletes all the things to delete the job stats too.

Browse Source
This commit is contained in:
Martyn Inglis
2017-05-12 13:08:09 +01:00
parent 1a61f06f53
commit 4751673f43
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/dao/services_dao.py
View File

@@ -28,7 +28,7 @@ from app.models import (
KEY_TYPE_TEST, KEY_TYPE_TEST,
NOTIFICATION_STATUS_TYPES, NOTIFICATION_STATUS_TYPES,
TEMPLATE_TYPES, TEMPLATE_TYPES,
) JobStatistics)
from app.service.statistics import format_monthly_template_notification_stats from app.service.statistics import format_monthly_template_notification_stats
from app.statsd_decorators import statsd from app.statsd_decorators import statsd
from app.utils import get_london_month_from_utc_column, get_london_midnight_in_utc from app.utils import get_london_month_from_utc_column, get_london_midnight_in_utc
@@ -160,6 +160,10 @@ def delete_service_and_all_associated_db_objects(service):
query.delete() query.delete()
db.session.commit() db.session.commit()
job_stats = JobStatistics.query.join(Job).filter(Job.service_id == service.id)
list(map(db.session.delete, job_stats))
db.session.commit()
_delete_commit(NotificationStatistics.query.filter_by(service=service)) _delete_commit(NotificationStatistics.query.filter_by(service=service))
_delete_commit(TemplateStatistics.query.filter_by(service=service)) _delete_commit(TemplateStatistics.query.filter_by(service=service))
_delete_commit(ProviderStatistics.query.filter_by(service=service)) _delete_commit(ProviderStatistics.query.filter_by(service=service))
@@ -167,12 +171,14 @@ def delete_service_and_all_associated_db_objects(service):
_delete_commit(Permission.query.filter_by(service=service)) _delete_commit(Permission.query.filter_by(service=service))
_delete_commit(ApiKey.query.filter_by(service=service)) _delete_commit(ApiKey.query.filter_by(service=service))
_delete_commit(ApiKey.get_history_model().query.filter_by(service_id=service.id)) _delete_commit(ApiKey.get_history_model().query.filter_by(service_id=service.id))
_delete_commit(Job.query.filter_by(service=service))
_delete_commit(NotificationHistory.query.filter_by(service=service)) _delete_commit(NotificationHistory.query.filter_by(service=service))
_delete_commit(Notification.query.filter_by(service=service)) _delete_commit(Notification.query.filter_by(service=service))
_delete_commit(Job.query.filter_by(service=service))
_delete_commit(Template.query.filter_by(service=service)) _delete_commit(Template.query.filter_by(service=service))
_delete_commit(TemplateHistory.query.filter_by(service_id=service.id)) _delete_commit(TemplateHistory.query.filter_by(service_id=service.id))
verify_codes = VerifyCode.query.join(User).filter(User.id.in_([x.id for x in service.users])) verify_codes = VerifyCode.query.join(User).filter(User.id.in_([x.id for x in service.users]))
list(map(db.session.delete, verify_codes)) list(map(db.session.delete, verify_codes))
db.session.commit() db.session.commit()

1
tests/app/dao/test_statistics_dao.py
View File

@@ -699,6 +699,7 @@ def test_timeout_job_counts_timesout_multiple_jobs(
assert stats.sms_failed == sms_count assert stats.sms_failed == sms_count
assert stats.emails_failed == email_count assert stats.emails_failed == email_count
count_notifications = len(NOTIFICATION_STATUS_TYPES) count_notifications = len(NOTIFICATION_STATUS_TYPES)
count_success_notifications = len(NOTIFICATION_STATUS_SUCCESS) count_success_notifications = len(NOTIFICATION_STATUS_SUCCESS)
count_error_notifications = len(NOTIFICATION_STATUS_TYPES) - len(NOTIFICATION_STATUS_SUCCESS) count_error_notifications = len(NOTIFICATION_STATUS_TYPES) - len(NOTIFICATION_STATUS_SUCCESS)