Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions backend/apps/ifc_validation/tasks/task_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,19 @@ def on_workflow_completed(self, result, **kwargs):
raise ValueError(f"Invalid id: {id!r}")
reason = "Processing completed"
request = ValidationRequest.objects.get(pk=id)
request.mark_as_completed(reason)

# queue sending email
send_completion_email_task.delay(id=id, file_name=request.file_name)
failed_tasks = request.tasks.filter(status=ValidationTask.Status.FAILED)
if failed_tasks.exists():
# @todo with all the try catching and skipping it's not entirely clear any more
# that at this point we didn't catch a failure. Maybe this needs to be revisited?
request.mark_as_failed("The following tasks failed: " + ' '.join(t.type for t in failed_tasks))

# queue sending email
send_failure_email_task.delay(id=id, file_name=request.file_name)
send_failure_admin_email_task.delay(id=id, file_name=request.file_name)
else:
request.mark_as_completed(reason)
# queue sending email
send_completion_email_task.delay(id=id, file_name=request.file_name)


@shared_task(bind=True)
Expand Down
2 changes: 1 addition & 1 deletion backend/apps/ifc_validation_bff/views_legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def status_combine(*args, allow_not_executed=False):
return statuses[max(map(statuses.index, args))]


def format_request(request):
def format_request(request : ValidationRequest):
return {
"id": request.public_id,
"code": request.public_id,
Expand Down