Update app.py

app.py

@@ -79,7 +79,7 @@ def init_salesforce():
 
         # 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}")
+        logging.info(f"Test query result (read access on Project_Closure_Handover__c): {test_query}")
 
         # Describe Project_Closure_Handover__c to find the related object for Project_ID__c
         object_description = sf.Project_Closure_Handover__c.describe()
@@ -110,6 +110,10 @@ def init_salesforce():
         related_fields = [field['name'] for field in related_object_description['fields']]
         logging.info(f"Fields on {related_object}: {related_fields}")
 
+        # Log some sample data from the related object to confirm records exist
+        sample_data_query = sf.query(f"SELECT Id, Name FROM {related_object} LIMIT 5")
+        logging.info(f"Sample data from {related_object}: {sample_data_query['records']}")
+
         # Test object permissions for Project_Closure_Handover__c
         permissions = {
             "createable": object_description.get("createable", False),
@@ -133,17 +137,27 @@ def init_salesforce():
 # Function to get the Salesforce record ID for a project based on its custom identifier
 def get_project_record_id(sf, related_object, project_code):
     try:
-        # Query the related object to find a record matching the project_code
-        # Using 'Name' as the field to match PRJ-001; adjust if the field name is different
-        query = f"SELECT Id FROM {related_object} WHERE Name = '{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 Name: {project_code} in {related_object}")
-            return None, f"No project found with Name: {project_code} in {related_object}"
-        record_id = result['records'][0]['Id']
-        logging.info(f"Found project record ID: {record_id} for Name: {project_code}")
-        return record_id, "Success"
+        # Sanitize the project_code to prevent SOQL injection
+        project_code = bleach.clean(project_code.strip())
+
+        # Try multiple fields to match the project_code
+        fields_to_try = ['Name', 'Project_Code__c', 'External_ID__c']
+        record_id = None
+        for field in fields_to_try:
+            query = f"SELECT Id FROM {related_object} WHERE {field} = '{project_code}' LIMIT 1"
+            logging.info(f"Trying query: {query}")
+            result = sf.query(query)
+            logging.debug(f"Query result for {field}: {result}")
+            if result['totalSize'] > 0:
+                record_id = result['records'][0]['Id']
+                logging.info(f"Found project record ID: {record_id} for {field}: {project_code} in {related_object}")
+                return record_id, "Success"
+            else:
+                logging.info(f"No project found with {field}: {project_code} in {related_object}")
+
+        # If no record is found after trying all fields
+        logging.error(f"No project found with {project_code} in {related_object} after trying fields: {fields_to_try}")
+        return None, f"No project found with {project_code} in {related_object} after trying fields: {fields_to_try}"
     except SalesforceError as e:
         logging.error(f"Failed to query project record: {str(e)}")
         return None, f"Salesforce query error: {str(e)}"