*** WIP ***

Committing to deal w/ the migration
This commit is contained in:
mike cullerton 2022-02-07 11:22:45 -05:00
parent 8ec39bca15
commit 2a6e8315a1
2 changed files with 10 additions and 5 deletions

View File

@ -1,7 +1,8 @@
from crc import session
from crc.api.common import ApiError
from crc.models.workflow import WorkflowModel, WorkflowSpecModel, WorkflowSpecModelSchema
from crc.models.workflow import WorkflowModel, WorkflowSpecInfo, WorkflowSpecInfoSchema # WorkflowSpecModel, WorkflowSpecModelSchema
from crc.scripts.script import Script
from crc.services.workflow_spec_service import WorkflowSpecService
class ScriptTemplate(Script):
@ -18,6 +19,7 @@ class ScriptTemplate(Script):
message='Please pass in a workflow_id to use in the search.')
passed_workflow_id = args[0]
workflow = session.query(WorkflowModel).filter(WorkflowModel.id == passed_workflow_id).first()
workflow_spec = session.query(WorkflowSpecModel).filter(WorkflowSpecModel.id==workflow.workflow_spec_id).first()
workflow_spec = WorkflowSpecService.get_spec(workflow.workflow_spec_id)
# TODO: Find out what type of object is returned by get_spec, and how to get info out of it
if workflow_spec:
return WorkflowSpecModelSchema().dump(workflow_spec)
return WorkflowSpecInfoSchema().dump(workflow_spec)

View File

@ -1,8 +1,9 @@
from crc import session
from crc.api.common import ApiError
from crc.models.workflow import WorkflowModel, WorkflowSpecModel
from crc.models.workflow import WorkflowModel, WorkflowSpecInfo
from crc.scripts.script import Script
from crc.services.workflow_processor import WorkflowProcessor
from crc.services.workflow_spec_service import WorkflowSpecService
class ResetWorkflow(Script):
@ -19,7 +20,9 @@ class ResetWorkflow(Script):
if 'reset_id' in kwargs.keys():
reset_id = kwargs['reset_id']
workflow_spec: WorkflowSpecModel = session.query(WorkflowSpecModel).filter_by(id=reset_id).first()
# TODO: Find out what type of object is returned by get_spec, and how to get info out of it
workflow_spec = WorkflowSpecService().get_spec(reset_id)
# workflow_spec: WorkflowSpecModel = session.query(WorkflowSpecModel).filter_by(id=reset_id).first()
if workflow_spec:
workflow_model: WorkflowModel = session.query(WorkflowModel).filter_by(
workflow_spec_id=workflow_spec.id,