ref: merge generate folder functions

api/src/backend/tasks/tasks.py

@@ -13,7 +13,6 @@ from tasks.jobs.export import (
     COMPLIANCE_CLASS_MAP,
     OUTPUT_FORMATS_MAPPING,
     _compress_output_files,
-    _generate_compliance_output_directory,
     _generate_output_directory,
     _upload_to_s3,
 )
@@ -263,10 +262,7 @@ def generate_outputs(scan_id: str, provider_id: str, tenant_id: str):
 
     frameworks_bulk = Compliance.get_bulk(provider_type)
     frameworks_avail = get_available_compliance_frameworks(provider_type)
-    out_dir = _generate_output_directory(
-        DJANGO_TMP_OUTPUT_DIRECTORY, provider_uid, tenant_id, scan_id
-    )
-    comp_dir = _generate_compliance_output_directory(
+    out_dir, comp_dir = _generate_output_directory(
         DJANGO_TMP_OUTPUT_DIRECTORY, provider_uid, tenant_id, scan_id
     )