From 68fb12894a5730eeb165f61fe4c176cc3a1b5f02 Mon Sep 17 00:00:00 2001
From: fthrslntgy <fatiharslantugay@gmail.com>
Date: Wed, 20 Dec 2023 16:34:45 +0300
Subject: [PATCH] Return correct filename value

---
 helpers/docx2pdf.py | 12 ++++++------
 helpers/render.py   |  4 ++--
 main.py             |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/helpers/docx2pdf.py b/helpers/docx2pdf.py
index 5d45479..4409058 100644
--- a/helpers/docx2pdf.py
+++ b/helpers/docx2pdf.py
@@ -1,12 +1,12 @@
 import os
 
 class Converter():
-    def docx2pdf(file_name):
-        docx_file = "./results/%d.docx" % file_name
-        os.system('soffice --headless --norestore --writer --convert-to pdf ./%s --outdir %s' % (docx_file, "./reports"))
-        os.remove(docx_file)
-
-        return "./reports/%s.pdf" % docx_file
+    def docx2pdf(timestamp):
+        template_filename = "./results/%d.docx" % timestamp
+        os.system('soffice --headless --norestore --writer --convert-to pdf ./%s --outdir %s' % (template_filename, "./reports"))
+        os.remove(template_filename)
+        report_filename = "./reports/%d.docx.pdf" % timestamp
+        return report_filename
     
     def docx2preview(file_name):
         os.system('soffice --headless --norestore --writer --convert-to pdf %s --outdir %s' % (file_name, "./templates"))
diff --git a/helpers/render.py b/helpers/render.py
index 6575273..7563234 100644
--- a/helpers/render.py
+++ b/helpers/render.py
@@ -1,10 +1,10 @@
 from docxtpl import DocxTemplate
 
 class RenderClass():
-    def render(body, filename):
+    def render(body, timestamp):
         template = DocxTemplate("./templates/%s" % body.TemplateID)
         for idx,item in enumerate(body.Data):
             item["idx"] = idx
             body.Data[idx] = item
         template.render(body)    
-        template.save("./results/%d.docx" % filename)
+        template.save("./results/%d.docx" % timestamp)
\ No newline at end of file
diff --git a/main.py b/main.py
index 23959b8..435aed5 100644
--- a/main.py
+++ b/main.py
@@ -13,9 +13,9 @@
 
 @app.post("/pdf",summary="Creates a pdf report.", tags=["Report"])
 def CreatePDFReport(body: ReportCreateRequest):
-    filename = time.time()
-    RenderClass.render(body, filename)
-    return FileResponse(Converter.docx2pdf(filename))
+    timestamp = time.time()
+    RenderClass.render(body, timestamp)
+    return FileResponse(Converter.docx2pdf(timestamp))
 
 @app.post("/csv",summary="Creates a csv report.", tags=["Report"])
 def CreatePDFReport(body: ReportCreateRequest):