darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 15:31:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use archived flag to see if job needs deleting from s3 bucket

Browse Source
This commit is contained in:
Pea Tyczynska
2018-11-26 16:30:23 +00:00
committed by Alexey Bezhan
parent fd06924f3a
commit f941b8b146
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/dao/jobs_dao.py
View File

@@ -130,24 +130,22 @@ def dao_get_jobs_older_than_data_retention(notification_types):
today = datetime.utcnow().date()
for f in flexible_data_retention:
end_date = today - timedelta(days=f.days_of_retention)
start_date = end_date - timedelta(days=2)
jobs.extend(Job.query.join(Template).filter(
Job.created_at < end_date,
Job.created_at >= start_date,
Job.archived == False, # noqa
Template.template_type == f.notification_type,
Job.service_id == f.service_id
).order_by(desc(Job.created_at)).all())
end_date = today - timedelta(days=7)
start_date = end_date - timedelta(days=2)
for notification_type in notification_types:
services_with_data_retention = [
x.service_id for x in flexible_data_retention if x.notification_type == notification_type
]
jobs.extend(Job.query.join(Template).filter(
Job.created_at < end_date,
Job.created_at >= start_date,
Job.archived == False, # noqa
Template.template_type == notification_type,
Job.service_id.notin_(services_with_data_retention)
).order_by(desc(Job.created_at)).all())