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

In get study, only process categories when we ask

Browse Source
This commit is contained in:
mike cullerton 2022-03-18 16:03:50 -04:00
parent 405c63aaef
commit f4d6b07467
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crc/services/study_service.py
View File

@ -51,7 +51,7 @@ class StudyService(object):
studies = [] studies = []
for study_model in db_studies: for study_model in db_studies:
if include_invalid or study_model.review_type in self.VALID_REVIEW_TYPES: if include_invalid or study_model.review_type in self.VALID_REVIEW_TYPES:
studies.append(StudyService.get_study(study_model.id, categories, study_model=study_model)) studies.append(StudyService.get_study(study_model.id, categories, study_model=study_model, process_categories=False))
return studies return studies
@staticmethod @staticmethod
@ -69,7 +69,7 @@ class StudyService(object):
@staticmethod @staticmethod
@timeit @timeit
def get_study(study_id, categories: List[WorkflowSpecCategory], study_model: StudyModel = None, def get_study(study_id, categories: List[WorkflowSpecCategory], study_model: StudyModel = None,
master_workflow_results=None): master_workflow_results=None, process_categories=False):
"""Returns a study model that contains all the workflows organized by category. """Returns a study model that contains all the workflows organized by category.
Pass in the results of the master workflow spec, and the status of other workflows will be updated.""" Pass in the results of the master workflow spec, and the status of other workflows will be updated."""
last_time = firsttime() last_time = firsttime()
@ -95,17 +95,18 @@ class StudyService(object):
DocumentService.get_dictionary()) for model in files) DocumentService.get_dictionary()) for model in files)
study.files = list(files) study.files = list(files)
last_time = sincetime("files", last_time) last_time = sincetime("files", last_time)
if study.status != StudyStatus.abandoned: if process_categories:
for category in study.categories: if study.status != StudyStatus.abandoned:
workflow_metas = StudyService._get_workflow_metas(study_id, category) for category in study.categories:
category_meta = [] workflow_metas = StudyService._get_workflow_metas(study_id, category)
if master_workflow_results: category_meta = []
study.warnings = StudyService._update_status_of_workflow_meta(workflow_metas, if master_workflow_results:
master_workflow_results) study.warnings = StudyService._update_status_of_workflow_meta(workflow_metas,
category_meta = StudyService._update_status_of_category_meta(master_workflow_results, category) master_workflow_results)
category.workflows = workflow_metas category_meta = StudyService._update_status_of_category_meta(master_workflow_results, category)
category.meta = category_meta category.workflows = workflow_metas
last_time = sincetime("categories", last_time) category.meta = category_meta
last_time = sincetime("categories", last_time)
if study.primary_investigator is None: if study.primary_investigator is None:
associates = StudyService().get_study_associates(study.id) associates = StudyService().get_study_associates(study.id)