Update app.py

app.py

@@ -94,7 +94,7 @@ def save_dpr_to_pdf(dpr_text, filename):
     except Exception as e:
         return f"Error saving PDF: {str(e)}", None
 
-# Function to upload a file to Salesforce as ContentVersion
+# Function to upload a file to Salesforce as ContentVersion and get its URL
 def upload_file_to_salesforce(file_path, filename, sf_connection, field_name):
     try:
         # Read file content and encode in base64
@@ -117,9 +117,12 @@ def upload_file_to_salesforce(file_path, filename, sf_connection, field_name):
         )
         content_document_id = content_document['records'][0]['ContentDocumentId']
         
-        return content_document_id, f"File {filename} uploaded successfully for {field_name}"
+        # Construct the file download URL
+        file_url = f"/sfc/servlet.shepherd/document/download/{content_document_id}"
+        
+        return content_document_id, file_url, f"File {filename} uploaded successfully for {field_name}"
     except Exception as e:
-        return None, f"Error uploading {filename} to Salesforce for {field_name}: {str(e)}"
+        return None, None, f"Error uploading {filename} to Salesforce for {field_name}: {str(e)}"
 
 # Function to generate the daily progress report (DPR), save as PDF, and upload to Salesforce
 def generate_dpr(files):
@@ -158,12 +161,14 @@ def generate_dpr(files):
     # Salesforce upload
     salesforce_result = ""
     pdf_content_document_id = None
+    pdf_url = None
+    image_urls = []
     image_content_document_ids = []
     
     if sf and pdf_filepath:
         try:
             # Upload PDF to Salesforce for Report_PDF__c
-            pdf_content_document_id, pdf_upload_result = upload_file_to_salesforce(
+            pdf_content_document_id, pdf_url, pdf_upload_result = upload_file_to_salesforce(
                 pdf_filepath, pdf_filename, sf, 'Report_PDF__c'
             )
             salesforce_result += pdf_upload_result + "\n"
@@ -171,20 +176,21 @@ def generate_dpr(files):
             # Upload images to Salesforce for Site_Images__c
             for file in files:
                 image_filename = os.path.basename(file.name)
-                image_content_document_id, image_upload_result = upload_file_to_salesforce(
+                image_content_document_id, image_url, image_upload_result = upload_file_to_salesforce(
                     file.name, image_filename, sf, 'Site_Images__c'
                 )
-                if image_content_document_id:
+                if image_content_document_id and image_url:
                     image_content_document_ids.append(image_content_document_id)
+                    image_urls.append(image_url)
                 salesforce_result += image_upload_result + "\n"
             
-            # Create Daily_Progress_Reports__c record with file references
+            # Create Daily_Progress_Reports__c record with file URLs
             report_description = "; ".join(captions)[:255]  # Concatenate captions, limit to 255 chars
-            images_ids = ";".join(image_content_document_ids)  # Semicolon-separated image IDs
+            images_urls_str = ";".join(image_urls)  # Semicolon-separated image URLs
             dpr_record = sf.Daily_Progress_Reports__c.create({
                 'Report_Description__c': report_description,
-                'Report_PDF__c': pdf_content_document_id if pdf_content_document_id else '',
-                'Site_Images__c': images_ids if images_ids else ''
+                'Report_PDF__c': pdf_url if pdf_url else '',
+                'Site_Images__c': images_urls_str if images_urls_str else ''
             })
             dpr_record_id = dpr_record['id']
             salesforce_result += f"Created Daily_Progress_Reports__c record with ID: {dpr_record_id}\n"