Update app.py

app.py

@@ -64,7 +64,7 @@ def authenticate(pwd):
     return True
 
 # =====================================================
-# DATA FETCH (FIXED)
+# DATA FETCH (FIXED FOR VISITS)
 # =====================================================
 def fetch_company_data(start_date, end_date):
     page = 1
@@ -79,7 +79,8 @@ def fetch_company_data(start_date, end_date):
                     "start_date": start_date,
                     "end_date": end_date,
                     "page[number]": page,
-                    "page[size]": PAGE_SIZE
+                    "page[size]": PAGE_SIZE,
+                    "include": "location,visits"  # <--- CRITICAL: Request visits data
                 },
                 timeout=30
             )
@@ -90,17 +91,43 @@ def fetch_company_data(start_date, end_date):
             if not data:
                 break
             
-            # Create a lookup map for included location objects
+            # --- MAP INCLUDED DATA ---
+            included = js.get("included", [])
+            
+            # 1. Map Locations by ID
             loc_map = {
                 i["id"]: i["attributes"]
-                for i in js.get("included", [])
+                for i in included
                 if i["type"] == "locations"
             }
             
+            # 2. Map Visits by ID (to lookup landing pages)
+            visit_map = {
+                i["id"]: i["attributes"]
+                for i in included
+                if i["type"] == "visits"
+            }
+            
             for lead in data:
                 a = lead["attributes"]
                 
-                # Get location ID safely
+                # --- LOGIC: GET LATEST VISIT ---
+                landing = None
+                exit_page = None
+                
+                # The 'relationships' key contains a list of visit IDs for this company
+                visit_refs = lead.get("relationships", {}).get("visits", {}).get("data", [])
+                
+                if visit_refs:
+                    # We take the last visit in the list, assuming it is the most recent
+                    latest_visit_id = visit_refs[-1]["id"]
+                    
+                    # Look up the details in our map
+                    visit_details = visit_map.get(latest_visit_id, {})
+                    landing = visit_details.get("landing_page_path")
+                    exit_page = visit_details.get("exit_page_path")
+                
+                # --- LOGIC: GET LOCATION ---
                 loc_id = lead.get("relationships", {}).get("location", {}).get("data", {}).get("id")
                 loc = loc_map.get(loc_id, {})
                 
@@ -133,11 +160,10 @@ def fetch_company_data(start_date, end_date):
                     "twitter_handle": a.get("twitter_handle"),
                     "facebook_url": a.get("facebook_url"),
                     
-                    # --- FIXED SECTION START ---
-                    # Using .get() to avoid NameError. 
-                    "landing_page_path": a.get("landing_page_path"),
-                    "exit_page_path": a.get("exit_page_path"),
-                    # --- FIXED SECTION END ---
+                    # --- NEW FIELDS ---
+                    "landing_page_path": landing,
+                    "exit_page_path": exit_page,
+                    # ------------------
                     
                     "country": loc.get("country"),
                     "region": loc.get("region"),