sartography
/
cr-connect-workflow
mirror of https://github.com/sartography/cr-connect-workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up the file api so we don't have a bunch of extra stuff in there. Just include the raw data from the document spraedsheet if it is available.

This commit is contained in:
Dan 2021-06-22 15:08:08 -04:00
parent 1f3febe2df
commit 61ad371680
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crc/models/file.py
View File

@ -108,15 +108,9 @@ class File(object):
instance.irb_doc_code = model.irb_doc_code instance.irb_doc_code = model.irb_doc_code
instance.type = model.type instance.type = model.type
if model.irb_doc_code and model.irb_doc_code in doc_dictionary: if model.irb_doc_code and model.irb_doc_code in doc_dictionary:
instance.category = "/".join(filter(None, [doc_dictionary[model.irb_doc_code]['category1'],
doc_dictionary[model.irb_doc_code]['category2'],
doc_dictionary[model.irb_doc_code]['category3']]))
instance.description = doc_dictionary[model.irb_doc_code]['description']
instance.download_name = "/".join([instance.category, model.name])
instance.document = doc_dictionary[model.irb_doc_code] instance.document = doc_dictionary[model.irb_doc_code]
else: else:
instance.category = "" instance.document = {}
instance.description = ""
if data_model: if data_model:
instance.last_modified = data_model.date_created instance.last_modified = data_model.date_created
instance.latest_version = data_model.version instance.latest_version = data_model.version
@ -147,10 +141,8 @@ class FileSchema(Schema):
model = File model = File
fields = ["id", "name", "is_status", "is_reference", "content_type", fields = ["id", "name", "is_status", "is_reference", "content_type",
"primary", "primary_process_id", "workflow_spec_id", "workflow_id", "primary", "primary_process_id", "workflow_spec_id", "workflow_id",
"irb_doc_code", "last_modified", "latest_version", "type", "categories", "irb_doc_code", "last_modified", "latest_version", "type", "size", "data_store",
"description", "category", "download_name", "size", "data_store",
"document"] "document"]
unknown = INCLUDE unknown = INCLUDE
type = EnumField(FileType) type = EnumField(FileType)

5
tests/study/test_study_api.py
View File

@ -95,9 +95,8 @@ class TestStudyApi(BaseTest):
self.assert_success(api_response) self.assert_success(api_response)
study = StudySchema().loads(api_response.get_data(as_text=True)) study = StudySchema().loads(api_response.get_data(as_text=True))
self.assertEqual(1, len(study.files)) self.assertEqual(1, len(study.files))
self.assertEqual("UVA Compliance/PRC Approval", study.files[0]["category"]) self.assertEqual("UVA Compliance", study.files[0]["document"]["category1"])
self.assertEqual("Cancer Center's PRC Approval Form", study.files[0]["description"]) self.assertEqual("Cancer Center's PRC Approval Form", study.files[0]["document"]["description"])
self.assertEqual("UVA Compliance/PRC Approval/anything.png", study.files[0]["download_name"])
# TODO: WRITE A TEST FOR STUDY FILES # TODO: WRITE A TEST FOR STUDY FILES