sartography/cr-connect-workflow
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-workflow.git synced 2025-02-22 12:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

save changes before refactor

Browse Source
This commit is contained in:
Kelly McDonald 2020-12-10 10:06:21 -05:00
parent e377a05dea
commit a8203ed01d
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/default.py
View File

@ -12,7 +12,7 @@ JSON_SORT_KEYS = False # CRITICAL. Do not sort the data when returning values
# you may want to change this to something simple for testing!! # you may want to change this to something simple for testing!!
# NB, if you change this in the local endpoint, # NB, if you change this in the local endpoint,
# it needs to be changed in the remote endpoint as well # it needs to be changed in the remote endpoint as well
API_TOKEN = 'af95596f327c9ecc007b60414fc84b61' API_TOKEN = environ.get('API_TOKEN', default = 'af95596f327c9ecc007b60414fc84b61')
NAME = "CR Connect Workflow" NAME = "CR Connect Workflow"
FLASK_PORT = environ.get('PORT0') or environ.get('FLASK_PORT', default="5000") FLASK_PORT = environ.get('PORT0') or environ.get('FLASK_PORT', default="5000")

20
crc/api/workflow.py
View File

@ -352,8 +352,17 @@ def sync_changed_files(remote,workflow_spec_id):
if specdict['category'] == None: if specdict['category'] == None:
localspec.category = None localspec.category = None
else: else:
localspec.category = session.query(WorkflowSpecCategoryModel).filter(WorkflowSpecCategoryModel.id localcategory = session.query(WorkflowSpecCategoryModel).filter(WorkflowSpecCategoryModel.name
== specdict['category']['id']).first() == specdict['category']['name']).first()
if localcategory == None:
#category doesn't exist - lets make it
localcategory = WorkflowSpecCategoryModel()
localcategory.name = specdict['category']['name']
localcategory.display_name = specdict['category']['display_name']
localcategory.display_order = specdict['category']['display_order']
session.add(localcategory)
localspec.category = localcategory
localspec.display_order = specdict['display_order'] localspec.display_order = specdict['display_order']
localspec.display_name = specdict['display_name'] localspec.display_name = specdict['display_name']
localspec.name = specdict['name'] localspec.name = specdict['name']
@ -372,7 +381,12 @@ def sync_changed_files(remote,workflow_spec_id):
for delfile in deletefiles: for delfile in deletefiles:
currentfile = session.query(FileModel).filter(FileModel.workflow_spec_id==workflow_spec_id, currentfile = session.query(FileModel).filter(FileModel.workflow_spec_id==workflow_spec_id,
FileModel.name == delfile['filename']).first() FileModel.name == delfile['filename']).first()
FileService.delete_file(currentfile.id)
# it is more appropriate to archive the file than delete
# due to the fact that we might have workflows that are using the
# file data
currentfile.archived = True
session.add(currentfile)
for updatefile in updatefiles: for updatefile in updatefiles:
currentfile = session.query(FileModel).filter(FileModel.workflow_spec_id==workflow_spec_id, currentfile = session.query(FileModel).filter(FileModel.workflow_spec_id==workflow_spec_id,

1
example_data.py
View File

@ -67,6 +67,7 @@ class ExampleDataLoader:
display_order=6 display_order=6
), ),
] ]
db.session.execute("select setval('workflow_spec_category_id_seq',7);")
db.session.add_all(categories) db.session.add_all(categories)
db.session.commit() db.session.commit()