Update app.py

app.py

@@ -111,16 +111,18 @@ def save_dpr_to_pdf(dpr_text, image_paths, captions, filename):
     except Exception as e:
         return f"Error saving PDF: {str(e)}", None
 
-# Function to upload a file to Salesforce as ContentVersion
-def upload_file_to_salesforce(file_path, filename, sf_connection, file_type):
+
+
+def upload_pdf_to_salesforce(pdf_file, project_title, record_id=None):
     try:
-        # Read file content and encode in base64
-        with open(file_path, 'rb') as f:
-            file_content = f.read()
-        file_content_b64 = base64.b64encode(file_content).decode('utf-8')
-        
-        # Set description based on file type
-        description = "Daily Progress Report PDF" if file_type == "pdf" else "Site Image"
+        sf = get_salesforce_connection()  # Ensure Salesforce connection
+        if not sf:
+            logger.error("Salesforce connection failed. Cannot upload PDF.")
+            return None, None
+
+        # Encode PDF data in base64
+        encoded_pdf_data = base64.b64encode(pdf_file.getvalue()).decode('utf-8')
+        logger.debug(f"Uploading PDF for project: {project_title}, record ID: {record_id}")
         
         # Create ContentVersion
         content_version = sf_connection.ContentVersion.create({
@@ -130,20 +132,34 @@ def upload_file_to_salesforce(file_path, filename, sf_connection, file_type):
             'Description': description
         })
         
-        # Get ContentDocumentId
-        content_version_id = content_version['id']
-        content_document = sf_connection.query(
-            f"SELECT ContentDocumentId FROM ContentVersion WHERE Id = '{content_version_id}'"
-        )
-        content_document_id = content_document['records'][0]['ContentDocumentId']
+
+        if record_id:
+            content_version_data["FirstPublishLocationId"] = record_id
+
+        # Upload the PDF file to Salesforce
+        content_version = sf.ContentVersion.create(content_version_data)
+        content_version_id = content_version["id"]
+        logger.info(f"PDF uploaded to Salesforce with ContentVersion ID: {content_version_id}")
+
+        # Query to get the ContentDocumentId
+        result = sf.query(f"SELECT Id, ContentDocumentId FROM ContentVersion WHERE Id = '{content_version_id}'")
+        if not result['records']:
+            logger.error("No records returned for ContentVersion query")
+            return content_version_id, None
+
+        content_document_id = result['records'][0]['ContentDocumentId']
         
-        # Generate a valid Salesforce URL for the ContentDocument
-        content_document_url = f"https://{sf_connection.sf_instance}.salesforce.com/{content_version_id}"
+        # Correct URL format for downloading the file from Salesforce
+        file_url = f"https://{sf.sf_instance}.salesforce.com/sfc/servlet.shepherd/document/download/{content_document_id}"
+        logger.debug(f"Generated PDF URL: {file_url}")
+        
+        return content_version_id, file_url
 
-        # Ensure the link is valid
-        return content_document_id, content_document_url, f"File {filename} uploaded successfully"
     except Exception as e:
-        return None, None, f"Error uploading {filename} to Salesforce: {str(e)}"
+        logger.error(f"Error uploading PDF to Salesforce: {str(e)}", exc_info=True)
+        return None, None
+
+
 
 # Function to generate the daily progress report (DPR), save as PDF, and upload to Salesforce
 def generate_dpr(files):