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

FileModel => DocumentModel

Browse Source 
Remove unused imports
This commit is contained in:
mike cullerton 2022-04-13 08:34:10 -04:00
parent c090a300c4
commit b1dca3f212
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crc/services/reference_file_service.py
View File

@ -1,19 +1,13 @@
import datetime
import hashlib
import os import os
from crc import app, session from crc import app
from crc.api.common import ApiError from crc.api.common import ApiError
from crc.models.file import FileModel, FileModelSchema, FileDataModel, FileType, File from crc.models.file import File
from crc.services.file_system_service import FileSystemService from crc.services.file_system_service import FileSystemService
from uuid import UUID
from sqlalchemy.exc import IntegrityError
class ReferenceFileService(FileSystemService): class ReferenceFileService(FileSystemService):
@staticmethod @staticmethod
def root_path(): def root_path():
# fixme: allow absolute directory names (but support relative) # fixme: allow absolute directory names (but support relative)

5
crc/services/study_service.py
View File

@ -15,7 +15,7 @@ from crc import db, session, app
from crc.api.common import ApiError from crc.api.common import ApiError
from crc.models.data_store import DataStoreModel from crc.models.data_store import DataStoreModel
from crc.models.email import EmailModel from crc.models.email import EmailModel
from crc.models.file import FileModel, File, FileSchema, FileDataModel from crc.models.file import DocumentModel, File, FileSchema
from crc.models.ldap import LdapSchema from crc.models.ldap import LdapSchema
from crc.models.protocol_builder import ProtocolBuilderCreatorStudy from crc.models.protocol_builder import ProtocolBuilderCreatorStudy
@ -272,10 +272,9 @@ class StudyService(object):
return return
session.query(TaskEventModel).filter_by(workflow_id=workflow.id).delete() session.query(TaskEventModel).filter_by(workflow_id=workflow.id).delete()
files = session.query(FileModel).filter_by(workflow_id=workflow_id).all() files = session.query(DocumentModel).filter_by(workflow_id=workflow_id).all()
for file in files: for file in files:
session.query(DataStoreModel).filter(DataStoreModel.file_id == file.id).delete() session.query(DataStoreModel).filter(DataStoreModel.file_id == file.id).delete()
session.query(FileDataModel).filter(FileDataModel.file_model_id == file.id).delete()
session.delete(file) session.delete(file)
session.delete(workflow) session.delete(workflow)

4
crc/services/workflow_processor.py
View File

@ -19,7 +19,7 @@ from SpiffWorkflow.specs import WorkflowSpec
from crc import session from crc import session
from crc.api.common import ApiError from crc.api.common import ApiError
from crc.models.file import FileModel, FileType, File from crc.models.file import DocumentModel, FileType, File
from crc.models.task_event import TaskEventModel from crc.models.task_event import TaskEventModel
from crc.models.user import UserModelSchema from crc.models.user import UserModelSchema
from crc.models.workflow import WorkflowStatus, WorkflowModel, WorkflowSpecInfo from crc.models.workflow import WorkflowStatus, WorkflowModel, WorkflowSpecInfo
@ -190,7 +190,7 @@ class WorkflowProcessor(object):
task_event.form_data = {} task_event.form_data = {}
session.add(task_event) session.add(task_event)
if delete_files: if delete_files:
files = FileModel.query.filter(FileModel.workflow_id == workflow_model.id).all() files = DocumentModel.query.filter(DocumentModel.workflow_id == workflow_model.id).all()
for file in files: for file in files:
UserFileService.delete_file(file.id) UserFileService.delete_file(file.id)
session.commit() session.commit()