diff --git a/backend/apps/ifc_validation/tasks/processing/bsdd.py b/backend/apps/ifc_validation/tasks/processing/bsdd.py index b5990ef3..749b9313 100644 --- a/backend/apps/ifc_validation/tasks/processing/bsdd.py +++ b/backend/apps/ifc_validation/tasks/processing/bsdd.py @@ -38,5 +38,3 @@ def process_bsdd(context:TaskContext): agg_status = context.task.determine_aggregate_status() model.status_bsdd = agg_status model.save(update_fields=['status_bsdd']) - - return f"agg_status = {Model.Status(agg_status).label}\nmessages = {json_output['messages']}" \ No newline at end of file diff --git a/backend/apps/ifc_validation/tasks/processing/digital_signatures.py b/backend/apps/ifc_validation/tasks/processing/digital_signatures.py index ea65fe4e..d4eb4237 100644 --- a/backend/apps/ifc_validation/tasks/processing/digital_signatures.py +++ b/backend/apps/ifc_validation/tasks/processing/digital_signatures.py @@ -26,4 +26,4 @@ def create_outcome(di): ValidationOutcome.objects.bulk_create(list(map(create_outcome, output)), batch_size=DJANGO_DB_BULK_CREATE_BATCH_SIZE) model.save(update_fields=['status_signatures']) - return 'Digital signature check completed' if success else f"Script returned exit code {context.result.returncode} and {context.result.stderr}" + logger.info('Digital signature check completed' if success else f"Script returned exit code {context.result.returncode} and {context.result.stderr}") diff --git a/backend/apps/ifc_validation/tasks/processing/gherkin.py b/backend/apps/ifc_validation/tasks/processing/gherkin.py index a38d5a93..b229d0c2 100644 --- a/backend/apps/ifc_validation/tasks/processing/gherkin.py +++ b/backend/apps/ifc_validation/tasks/processing/gherkin.py @@ -9,8 +9,6 @@ def process_gherkin_outcomes(context:TaskContext): agg_status = context.task.determine_aggregate_status() setattr(model, status_field, agg_status) model.save(update_fields=[status_field]) - - return f'agg_status = {Model.Status(agg_status).label}\nraw_output = {context.result}' def process_normative_ia(context:TaskContext): return process_gherkin_outcomes(context) diff --git a/backend/apps/ifc_validation/tasks/processing/header.py b/backend/apps/ifc_validation/tasks/processing/header.py index 7e7328d3..52e6e54b 100644 --- a/backend/apps/ifc_validation/tasks/processing/header.py +++ b/backend/apps/ifc_validation/tasks/processing/header.py @@ -82,5 +82,3 @@ def process_header(context:TaskContext): model.header_validation = header_validation model.save(update_fields=['status_header', 'header_validation']) model.save() - - return f'agg_status = {Model.Status(agg_status).label}\nraw_output = {header_validation}' diff --git a/backend/apps/ifc_validation/tasks/processing/instance_completion.py b/backend/apps/ifc_validation/tasks/processing/instance_completion.py index 1e26e6c5..adfbe73a 100644 --- a/backend/apps/ifc_validation/tasks/processing/instance_completion.py +++ b/backend/apps/ifc_validation/tasks/processing/instance_completion.py @@ -18,4 +18,4 @@ def process_instance_completion(context:TaskContext): inst.ifc_type = ifc_file[inst.stepfile_id].is_a() inst.save() - return f'Updated {instance_count:,} ModelInstance record(s)' + logger.info(f'Updated {instance_count:,} ModelInstance record(s)') diff --git a/backend/apps/ifc_validation/tasks/processing/schema.py b/backend/apps/ifc_validation/tasks/processing/schema.py index 0445c141..29cdfa40 100644 --- a/backend/apps/ifc_validation/tasks/processing/schema.py +++ b/backend/apps/ifc_validation/tasks/processing/schema.py @@ -57,6 +57,4 @@ def process_schema(context:TaskContext): ValidationOutcome.objects.bulk_create(outcomes_to_save, batch_size=DJANGO_DB_BULK_CREATE_BATCH_SIZE) - model.save(update_fields=['status_schema']) - - return "No IFC schema errors." if success else f"'ifcopenshell.validate' returned exit code {context.proc.returncode} and {len(output):,} errors." + model.save(update_fields=['status_schema']) \ No newline at end of file diff --git a/backend/apps/ifc_validation/tasks/processing/syntax.py b/backend/apps/ifc_validation/tasks/processing/syntax.py index 112cbab9..d785c7ed 100644 --- a/backend/apps/ifc_validation/tasks/processing/syntax.py +++ b/backend/apps/ifc_validation/tasks/processing/syntax.py @@ -39,7 +39,7 @@ def process_syntax_outcomes(context:TaskContext): model.save(update_fields=[status_field]) # return reason for logging - return "No IFC syntax error(s)." if success else f"Found IFC syntax errors:\n\nConsole: \n{output}\n\nError: {error_output}" + logger.info("No IFC syntax error(s)." if success else f"Found IFC syntax errors:\n\nConsole: \n{output}\n\nError: {error_output}") def process_syntax(context:TaskContext):