Update app.py

app.py

@@ -65,7 +65,7 @@ else:
 def init_salesforce():
     if not SALESFORCE_AVAILABLE:
         logging.error("Salesforce library not available. Skipping connection.")
-        return None, "Salesforce library not available"
+        return None, None, "Salesforce library not available"
 
     try:
         logging.info("Attempting to connect to Salesforce...")
@@ -76,23 +76,46 @@ def init_salesforce():
             instance_url=SF_INSTANCE_URL
         )
         logging.info("Salesforce connected successfully")
+
         # Test read access on Project_Closure_Handover__c
         test_query = sf.query("SELECT Id FROM Project_Closure_Handover__c LIMIT 1")
         logging.info(f"Test query result (read access): {test_query}")
-        # Test read access on Project__c (assumed related object)
-        project_query = sf.query("SELECT Id FROM Project__c LIMIT 1")
-        logging.info(f"Project__c test query result (read access): {project_query}")
-        # Test object permissions
+
+        # Describe Project_Closure_Handover__c to find the related object for Project_ID__c
         object_description = sf.Project_Closure_Handover__c.describe()
+        project_id_field = None
+        for field in object_description['fields']:
+            if field['name'] == 'Project_ID__c':
+                project_id_field = field
+                break
+
+        if not project_id_field:
+            logging.error("Project_ID__c field not found on Project_Closure_Handover__c")
+            return None, None, "Project_ID__c field not found on Project_Closure_Handover__c"
+
+        # Check if Project_ID__c is a reference (Lookup) field
+        if not project_id_field['referenceTo']:
+            logging.error("Project_ID__c is not a reference field. It must be a Lookup or Master-Detail field.")
+            return None, None, "Project_ID__c is not a reference field"
+
+        related_object = project_id_field['referenceTo'][0]  # e.g., 'Projects__c'
+        logging.info(f"Project_ID__c references object: {related_object}")
+
+        # Test read access on the related object
+        related_query = sf.query(f"SELECT Id FROM {related_object} LIMIT 1")
+        logging.info(f"{related_object} test query result (read access): {related_query}")
+
+        # Test object permissions for Project_Closure_Handover__c
         permissions = {
             "createable": object_description.get("createable", False),
             "updateable": object_description.get("updateable", False)
         }
-        logging.info(f"Object permissions: {permissions}")
+        logging.info(f"Object permissions for Project_Closure_Handover__c: {permissions}")
         if not permissions["createable"]:
             logging.error("User lacks create permission on Project_Closure_Handover__c")
-            return None, "User lacks create permission on Project_Closure_Handover__c"
-        return sf, "Salesforce connected successfully"
+            return None, None, "User lacks create permission on Project_Closure_Handover__c"
+
+        return sf, related_object, "Salesforce connected successfully"
     except SalesforceError as e:
         logging.error(f"Salesforce authentication failed: {str(e)}")
         logging.error("Possible issues: Incorrect credentials, IP restrictions, or insufficient permissions.")
@@ -103,16 +126,17 @@ def init_salesforce():
         raise
 
 # Function to get the Salesforce record ID for a project based on its custom identifier
-def get_project_record_id(sf, project_code):
+def get_project_record_id(sf, related_object, project_code):
     try:
-        # Assuming Project__c has a field 'Project_Code__c' or 'Name' that stores the identifier (e.g., PRJ-001)
-        # Adjust the field name based on your Salesforce org's configuration
-        query = f"SELECT Id FROM Project__c WHERE Project_Code__c = '{project_code}' LIMIT 1"
+        # Query the related object to find a record matching the project_code
+        # Assuming the related object has a field 'Project_Code__c' to match the identifier
+        # Adjust the field name (e.g., to 'Name' or 'ProjectNumber__c') based on your Salesforce org
+        query = f"SELECT Id FROM {related_object} WHERE Project_Code__c = '{project_code}' LIMIT 1"
         result = sf.query(query)
         logging.debug(f"Project query result: {result}")
         if result['totalSize'] == 0:
-            logging.error(f"No project found with Project_Code__c: {project_code}")
-            return None, f"No project found with Project Code: {project_code}"
+            logging.error(f"No project found with Project_Code__c: {project_code} in {related_object}")
+            return None, f"No project found with Project Code: {project_code} in {related_object}"
         record_id = result['records'][0]['Id']
         logging.info(f"Found project record ID: {record_id} for Project_Code__c: {project_code}")
         return record_id, "Success"
@@ -150,13 +174,13 @@ def create_salesforce_record(project_id, score, checklist_summary, missing_summa
         return "Salesforce library not available"
 
     try:
-        sf, connection_message = init_salesforce()
-        if not sf:
+        sf, related_object, connection_message = init_salesforce()
+        if not sf or not related_object:
             logging.error(f"Skipping Salesforce record creation due to connection failure: {connection_message}")
             return connection_message
 
         # Get the Salesforce record ID for the project
-        project_record_id, project_query_message = get_project_record_id(sf, project_id)
+        project_record_id, project_query_message = get_project_record_id(sf, related_object, project_id)
         if not project_record_id:
             logging.error(f"Failed to get project record ID: {project_query_message}")
             return f"Error: {project_query_message}"