Fix bug that attempted to create duplicate workspaces

This commit is contained in:
richard-dds 2018-08-21 20:17:48 -04:00
parent 9669a42b9a
commit ee94784ac9
2 changed files with 9 additions and 4 deletions

View File

@ -118,10 +118,13 @@ class Requests(object):
return request return request
@classmethod @classmethod
def update_financial_verification(cls, request_id, data): def approve_and_create_workspace(cls, request):
updated_request = Requests.update(request_id, {"financial_verification": data}) approved_request = Requests.set_status(request, RequestStatus.APPROVED)
approved_request = Requests.set_status(updated_request, RequestStatus.APPROVED)
workspace = Workspaces.create(approved_request) workspace = Workspaces.create(approved_request)
db.session.add(approved_request)
db.session.commit()
return workspace return workspace
@classmethod @classmethod

View File

@ -36,11 +36,13 @@ def update_financial_verification(request_id):
) )
if form.validate(): if form.validate():
request_data = {"financial_verification": form.data}
valid = form.perform_extra_validation( valid = form.perform_extra_validation(
existing_request.body.get("financial_verification") existing_request.body.get("financial_verification")
) )
new_workspace = Requests.update_financial_verification(request_id, post_data) updated_request = Requests.update(request_id, request_data)
if valid: if valid:
new_workspace = Requests.approve_and_create_workspace(updated_request)
return redirect(url_for("workspaces.workspace_projects", workspace_id=new_workspace.id, newWorkspace=True)) return redirect(url_for("workspaces.workspace_projects", workspace_id=new_workspace.id, newWorkspace=True))
else: else:
form.reset() form.reset()