From 9852aa2809ad61667da39c2d612cadb79d55f9b2 Mon Sep 17 00:00:00 2001
From: Daniel Roth <daniel_roth@hotmail.co.uk>
Date: Thu, 9 Apr 2026 16:40:47 +0000
Subject: [PATCH] =?UTF-8?q?differ=20handles=20missing=20timezone=20from=20?=
 =?UTF-8?q?hubspot=20=F0=9F=9F=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etl/hubspot/hubspot_deal_differ.py            | 4 ++++
 etl/hubspot/tests/test_hubspot_deal_differ.py | 7 +++----
 etl/hubspot/utils.py                          | 9 +++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/etl/hubspot/hubspot_deal_differ.py b/etl/hubspot/hubspot_deal_differ.py
index 4db303ab..b95b544c 100644
--- a/etl/hubspot/hubspot_deal_differ.py
+++ b/etl/hubspot/hubspot_deal_differ.py
@@ -103,6 +103,10 @@ class HubspotDealDiffer:
             if old_value != new_value:
                 return True
 
+        # --- Time field ---
+        if old_deal.confirmed_survey_time != new_deal.get("confirmed_survey_time"):
+            return True
+
         # No differences found
         return False
 
diff --git a/etl/hubspot/tests/test_hubspot_deal_differ.py b/etl/hubspot/tests/test_hubspot_deal_differ.py
index 9f41a5e6..69f7668b 100644
--- a/etl/hubspot/tests/test_hubspot_deal_differ.py
+++ b/etl/hubspot/tests/test_hubspot_deal_differ.py
@@ -362,14 +362,13 @@ def test_db_update_trigger__missing_hubspot_timezone__returns_false() -> None:
 
     new_deal = make_new_deal(
         deal_id,
-        design_completion_date=datetime(2025, 11, 3, 0, 0),
+        hs_object_id="1",
+        design_completion_date=datetime(2025, 11, 3, 0, 0).isoformat(),
     )
 
-    new_company = "new_company"
-
     result = HubspotDealDiffer.check_for_db_update_trigger(
         new_deal=new_deal,
-        new_company=new_company,
+        new_company=None,
         new_listing=None,
         old_deal=old_deal,
     )
diff --git a/etl/hubspot/utils.py b/etl/hubspot/utils.py
index 9fbeae62..b7331f94 100644
--- a/etl/hubspot/utils.py
+++ b/etl/hubspot/utils.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Optional
 
 
@@ -6,6 +6,11 @@ def parse_hs_date(value: Optional[str]) -> Optional[datetime]:
     if not value:
         return None
     try:
-        return datetime.fromisoformat(value.replace("Z", "+00:00"))
+        dt = datetime.fromisoformat(value.replace("Z", "+00:00"))
+
+        if dt.tzinfo is None:
+            return dt.replace(tzinfo=timezone.utc)
+
+        return dt.astimezone(timezone.utc)
     except ValueError:
         return None