sartography/cr-connect-workflow
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-workflow.git synced 2025-02-22 20:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we don't include archived files as attachments

Browse Source
This commit is contained in:
mike cullerton 2022-08-10 14:40:53 -04:00
parent 4816da7aaa
commit fdf3dd497c
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crc/scripts/email.py
View File

@ -241,7 +241,8 @@ email(subject="My Subject", recipients="user@example.com", attachments=[('Study_
query = session.query(FileModel).\
filter(FileModel.workflow_id == workflow.id).\
filter(FileModel.irb_doc_code == doc_code)
filter(FileModel.irb_doc_code == doc_code).\
filter(FileModel.archived == False)
if isinstance(file_filter, list) and len(file_filter) > 0:
query = query.filter(FileModel.name.in_(file_filter))

22
tests/scripts/test_email_script_attachments.py
View File

@ -2,6 +2,7 @@ from tests.base_test import BaseTest
from crc import mail
from crc.models.file import FileModel
from crc.services.user_file_service import UserFileService
@ -105,3 +106,24 @@ class TestEmailAttachments(BaseTest):
# We should only get 2 files because we filtered one out
self.assertEqual(2, len(outbox[0].attachments))
def test_email_attachments_no_archived(self):
"""Update a user file.
Make sure we don't add the archived file as an attachment.
"""
workflow, first_task = self.setup_attachments()
file_model = FileModel.query.first()
new_data = b'NewData'
UserFileService().update_file(file_model, new_data, file_model.content_type)
UserFileService().add_workflow_file(file_model.workflow_id, file_model.irb_doc_code, file_model.task_spec, file_model.name, file_model.content_type, new_data)
form_data = {'subject': 'My Test Subject',
'recipients': 'user@example.com',
'doc_codes': [self.irb_code_1, self.irb_code_2]
}
with mail.record_messages() as outbox:
self.complete_form(workflow, first_task, form_data)
self.assertEqual(1, len(outbox))
self.assertEqual(3, len(outbox[0].attachments))