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

document => file 

file_refactor => file
This commit is contained in:
mike cullerton 2022-04-20 10:39:19 -04:00
parent 89a2650cc8
commit fea9c969c2
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crc/api/document.py
View File

@ -12,7 +12,7 @@ def get_document_directory(study_id, workflow_id=None):
""" """
file_models = UserFileService.get_files_for_study(study_id=study_id) file_models = UserFileService.get_files_for_study(study_id=study_id)
doc_dict = DocumentService.get_dictionary() doc_dict = DocumentService.get_dictionary()
files = (File.from_document_model(model, doc_dict) for model in file_models) files = (File.from_file_model(model, doc_dict) for model in file_models)
directory = DocumentService.get_directory(doc_dict, files, workflow_id) directory = DocumentService.get_directory(doc_dict, files, workflow_id)
return DocumentDirectorySchema(many=True).dump(directory) return DocumentDirectorySchema(many=True).dump(directory)

24
crc/models/file.py
View File

@ -124,23 +124,23 @@ class File(object):
self.data_store = {} self.data_store = {}
@classmethod @classmethod
def from_document_model(cls, document_model: FileModel, doc_dictionary): def from_file_model(cls, file_model: FileModel, doc_dictionary):
if document_model.irb_doc_code and document_model.irb_doc_code in doc_dictionary: if file_model.irb_doc_code and file_model.irb_doc_code in doc_dictionary:
document = doc_dictionary[document_model.irb_doc_code] document = doc_dictionary[file_model.irb_doc_code]
else: else:
document = {} document = {}
instance = cls() instance = cls()
instance.id = document_model.id instance.id = file_model.id
instance.name = document_model.name instance.name = file_model.name
instance.content_type = document_model.content_type instance.content_type = file_model.content_type
instance.workflow_id = document_model.workflow_id instance.workflow_id = file_model.workflow_id
instance.irb_doc_code = document_model.irb_doc_code instance.irb_doc_code = file_model.irb_doc_code
instance.type = document_model.type instance.type = file_model.type
instance.document = document instance.document = document
instance.last_modified = document_model.date_modified instance.last_modified = file_model.date_modified
instance.size = None instance.size = None
instance.data_store = {} instance.data_store = {}
for ds in document_model.data_stores: for ds in file_model.data_stores:
instance.data_store[ds.key] = ds.value instance.data_store[ds.key] = ds.value
return instance return instance
@ -191,7 +191,7 @@ class FileSchema(Schema):
def get_url(self, obj): def get_url(self, obj):
token = 'not_available' token = 'not_available'
if hasattr(obj, 'id') and obj.id is not None: if hasattr(obj, 'id') and obj.id is not None:
file_url = url_for("/v1_0.crc_api_file_refactor_get_file_data_link", file_id=obj.id, _external=True) file_url = url_for("/v1_0.crc_api_file_get_file_data_link", file_id=obj.id, _external=True)
if hasattr(flask.g, 'user'): if hasattr(flask.g, 'user'):
token = flask.g.user.encode_auth_token() token = flask.g.user.encode_auth_token()
url = file_url + '?auth_token=' + urllib.parse.quote_plus(token) url = file_url + '?auth_token=' + urllib.parse.quote_plus(token)

2
crc/scripts/get_zipped_files.py
View File

@ -1,6 +1,6 @@
from crc import session from crc import session
from crc.api.common import ApiError from crc.api.common import ApiError
from crc.api.file_refactor import to_file_api from crc.api.file import to_file_api
from crc.models.file import FileModel, FileSchema from crc.models.file import FileModel, FileSchema
from crc.scripts.script import Script from crc.scripts.script import Script
from crc.services.study_service import StudyService from crc.services.study_service import StudyService