from_models => from_document_model

This commit is contained in:
mike cullerton 2022-04-12 13:50:26 -04:00
parent f8d6f0a6da
commit 3f97de6430
1 changed files with 2 additions and 3 deletions

View File

@ -94,8 +94,7 @@ class StudyService(object):
last_time = sincetime("task_events", last_time) last_time = sincetime("task_events", last_time)
study.categories = categories study.categories = categories
files = UserFileService.get_files_for_study(study.id) files = UserFileService.get_files_for_study(study.id)
files = (File.from_models(model, UserFileService.get_file_data(model.id), files = (File.from_document_model(model, 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 process_categories and master_workflow_results: if process_categories and master_workflow_results:
@ -346,7 +345,7 @@ class StudyService(object):
for file_model in doc_files: for file_model in doc_files:
file = File.from_models(file_model, UserFileService.get_file_data(file_model.id), []) file = File.from_document_model(file_model, [])
file_data = FileSchema().dump(file) file_data = FileSchema().dump(file)
del file_data['document'] del file_data['document']
doc['files'].append(Box(file_data)) doc['files'].append(Box(file_data))