Merge pull request #886 from adfinis/fix-filename

fix(merge): fix extension in filename when merging without convert

Author: winged

document_merge_service/api/tests/test_template.py

@@ -1,6 +1,7 @@
 import io
 import json
 import os
+import re
 from collections import namedtuple
 
 import openpyxl
@@ -17,6 +18,10 @@
 from .. import models, serializers
 
 
+def get_filename_from_response(response):
+    return re.search(r'filename="(.*)"', response["Content-Disposition"])[1]
+
+
 @pytest.mark.parametrize("template__description", ["test description"])
 @pytest.mark.parametrize(
     "query_params,size",
@@ -628,6 +633,7 @@ def test_template_merge_docx(
         response.get("content-type")
         == "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
     )
+    assert get_filename_from_response(response) == f"{template.slug}.docx"
 
     docx = Document(io.BytesIO(response.getvalue()))
     xml = etree.tostring(docx._element.body, encoding="unicode", pretty_print=True)
@@ -735,7 +741,7 @@ def test_template_merge_as_pdf(
     )
     assert response.status_code == status.HTTP_200_OK
     assert response["Content-Type"] == "application/pdf"
-    assert f"{template.pk}.pdf" in response["Content-Disposition"]
+    assert get_filename_from_response(response) == f"{template.slug}.pdf"
     assert response.content[0:4] == b"%PDF"
 
 

document_merge_service/api/views.py

@@ -58,7 +58,8 @@ def merge(self, request, pk=None):
         if convert:
             response = FileConverter.convert(response.content, convert)
 
-        filename = f"{template.slug}.{convert}"
+        extension = mimetypes.guess_extension(response.headers["Content-Type"])
+        filename = f"{template.slug}{extension}"
         response["Content-Disposition"] = f'attachment; filename="{filename}"'
         return response