Replace extra_fields by prepend_fields in queryset_to_xlsx_worksheet #1524

Signed-off-by: tdruez <[email protected]>

Author: tdruez

scanpipe/pipes/output.py

@@ -308,7 +308,7 @@ def queryset_to_xlsx_worksheet(
     queryset,
     workbook,
     exclude_fields=None,
-    extra_fields=None,
+    prepend_fields=None,
     worksheet_name=None,
 ):
     """
@@ -328,10 +328,10 @@ def queryset_to_xlsx_worksheet(
 
     fields = get_serializer_fields(model_class)
     exclude_fields = exclude_fields or []
-    extra_fields = extra_fields or []
+    prepend_fields = prepend_fields or []
     fields = [field for field in fields if field not in exclude_fields]
-    if extra_fields:
-        fields.extend(extra_fields)
+    if prepend_fields:
+        fields = prepend_fields + fields
 
     return _add_xlsx_worksheet(
         workbook=workbook,

scanpipe/views.py

@@ -451,7 +451,7 @@ def get_export_xlsx_queryset(self):
     def get_export_xlsx_filename(self):
         return f"{self.project.name}_{self.model._meta.model_name}.xlsx"
 
-    def get_export_xlsx_extra_fields(self):
+    def get_export_xlsx_prepend_fields(self):
         return []
 
     def get_export_xlsx_worksheet_name(self):
@@ -460,13 +460,13 @@ def get_export_xlsx_worksheet_name(self):
     def export_xlsx_file_response(self):
         output_file = io.BytesIO()
         queryset = self.get_export_xlsx_queryset()
-        extra_fields = self.get_export_xlsx_extra_fields()
+        prepend_fields = self.get_export_xlsx_prepend_fields()
         worksheet_name = self.get_export_xlsx_worksheet_name()
         with xlsxwriter.Workbook(output_file) as workbook:
             output.queryset_to_xlsx_worksheet(
                 queryset,
                 workbook,
-                extra_fields=extra_fields,
+                prepend_fields=prepend_fields,
                 worksheet_name=worksheet_name,
             )
 
@@ -1241,7 +1241,7 @@ def get_export_xlsx_queryset(self):
         projects = self.get_projects_queryset()
         return queryset.filter(project__in=projects)
 
-    def get_export_xlsx_extra_fields(self):
+    def get_export_xlsx_prepend_fields(self):
         return ["project"]
 
     def get_export_xlsx_worksheet_name(self):