Merge pull request #38 from rtCamp/fix/s3-attachments

Enhance attachment handling by retrieving latest file URLs in get_attachments_data function

Author: zeel-codder

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 exclude: 'node_modules|.git'
-default_stages: [commit]
+default_stages: [pre-commit]
 fail_fast: false
 
 repos:

frappe_gmail_thread/api/activity.py

@@ -4,6 +4,17 @@
 import frappe.utils
 
 
+def get_attachments_data(email):
+    attachments_data = json.loads(email.attachments_data)
+    # instead of using file_url from attachments_data, we have to use frappe.get_value to get the latest file_url
+    for attachment in attachments_data:
+        file_doc_name = attachment.get("file_doc_name")
+        if file_doc_name:
+            file_url = frappe.db.get_value("File", file_doc_name, "file_url")
+            attachment["file_url"] = file_url
+    return attachments_data
+
+
 @frappe.whitelist()
 def get_linked_gmail_threads(doctype, docname):
     gmail_threads = frappe.get_all(
@@ -49,7 +60,7 @@ def get_linked_gmail_threads(doctype, docname):
                         "read_by_recipient": email.read_by_recipient,
                         "rating": 0,  # TODO: add rating
                         "recipients": email.recipients,
-                        "attachments": json.loads(email.attachments_data),
+                        "attachments": get_attachments_data(email),
                         "_url": thread.get_url(),
                         "_doc_status": (
                             "Sent" if email.sent_or_received == "Sent" else "Received"

frappe_gmail_thread/utils/helpers.py

@@ -205,7 +205,6 @@ def process_attachments(new_email, gmail_thread, email_object):
                 {
                     "file_name": _file.file_name,
                     "file_doc_name": _file.name,
-                    "file_url": _file.file_url,
                     "is_private": _file.is_private,
                 }
             )